Share option and brute force protection

aashishksahu · Apr 20, 2024 · 41f1b92 · 41f1b92
1 parent 86f4f71
commit 41f1b92
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 11 deletions.
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm
diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,10 +11,27 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 20,
-      "versionName": "1.4.6",
+      "versionCode": 22,
+      "versionName": "1.4.8",
       "outputFile": "app-release.apk"
     }
   ],
-  "elementType": "File"
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/app-release.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/app-release.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 29
 }
diff --git a/app/src/main/java/org/privacymatters/safespace/main/MainActivity.kt b/app/src/main/java/org/privacymatters/safespace/main/MainActivity.kt
@@ -25,7 +25,6 @@ import androidx.appcompat.content.res.AppCompatResources
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import androidx.core.text.isDigitsOnly
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.appbar.MaterialToolbar
@@ -485,8 +484,7 @@ class MainActivity : AppCompatActivity(), ItemClickListener, FolderClickListener
             .setView(changePinLayout)
             .setPositiveButton(getString(R.string.ok)) { _, _ ->
 
-                if (currentPinEditText.text.toString().isDigitsOnly() &&
-                    currentPinEditText.text.toString() == EncPref.getString(
+                if (currentPinEditText.text.toString() == EncPref.getString(
                         Constants.HARD_PIN,
                         applicationContext
                     )
@@ -495,6 +493,10 @@ class MainActivity : AppCompatActivity(), ItemClickListener, FolderClickListener
                     // clear pin from shared prefs and reset enrollment status
                     EncPref.clearString(Constants.HARD_PIN, applicationContext)
                     EncPref.clearBoolean(Constants.HARD_PIN_SET, applicationContext)
+                    sharedPref.edit()
+                        .putBoolean(Constants.USE_BIOMETRIC, false)
+                        .putBoolean(Constants.USE_BIOMETRIC_BCKP, false)
+                        .apply()
 
                     // restart application to set pin again
                     finish()

diff --git a/app/src/main/res/layout/change_pin.xml b/app/src/main/res/layout/change_pin.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -13,12 +14,13 @@
         android:autofillHints="@string/current_pin"
         android:ems="10"
         android:hint="@string/current_pin"
-        android:inputType="numberPassword"
+        android:inputType="textPassword"
         android:textAlignment="center"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="TextFields" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.3.1' apply false
-    id 'com.android.library' version '8.3.1' apply false
+    id 'com.android.application' version '8.3.2' apply false
+    id 'com.android.library' version '8.3.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
 }
diff --git a/fastlane/metadata/android/en-US/changelogs/22.txt b/fastlane/metadata/android/en-US/changelogs/22.txt
@@ -0,0 +1,2 @@
+* Share files with other apps
+* Multiple failed password attempts protection
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
+#Sat Apr 20 11:27:52 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=4159b938ec734a8388ce03f52aa8f3c7ed0d31f5438622545de4f83a89b79788
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME