rfct: Move password dialog to Backpack

cyb3rko · Jun 24, 2023 · 585251f · 585251f
1 parent 93e783a
commit 585251f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 123 deletions.
diff --git a/app/src/main/kotlin/com/cyb3rko/pincredible/modals/PasswordDialog.kt b/app/src/main/kotlin/com/cyb3rko/pincredible/modals/PasswordDialog.kt
diff --git a/app/src/main/kotlin/com/cyb3rko/pincredible/utils/BackupHandler.kt b/app/src/main/kotlin/com/cyb3rko/pincredible/utils/BackupHandler.kt
@@ -27,6 +27,7 @@ import com.cyb3rko.backpack.crypto.CryptoManager.Hash
 import com.cyb3rko.backpack.data.Serializable
 import com.cyb3rko.backpack.managers.StorageManager
 import com.cyb3rko.backpack.modals.ErrorDialog
+import com.cyb3rko.backpack.modals.PasswordDialog
 import com.cyb3rko.backpack.utils.ObjectSerializer
 import com.cyb3rko.backpack.utils.dateNow
 import com.cyb3rko.backpack.utils.lastN
@@ -36,7 +37,6 @@ import com.cyb3rko.backpack.utils.withoutLast
 import com.cyb3rko.backpack.utils.withoutLastN
 import com.cyb3rko.pincredible.R
 import com.cyb3rko.pincredible.data.PinTable
-import com.cyb3rko.pincredible.modals.PasswordDialog
 import com.cyb3rko.pincredible.modals.ProgressDialog
 import java.io.File
 
@@ -80,19 +80,11 @@ internal object BackupHandler {
         multiPin: Boolean,
         singleBackup: SingleBackupStructure? = null
     ) {
-        PasswordDialog.show(
-            context,
-            R.string.dialog_backup_title
-        ) { dialog, inputLayout, input ->
-            if (input.isNotEmpty() && input.length in 10..100) {
-                dialog.dismiss()
-                if (!multiPin) {
-                    runSingleExport(context, uri, CryptoManager.shaHash(input), singleBackup!!)
-                } else {
-                    runExport(context, uri, CryptoManager.shaHash(input))
-                }
+        PasswordDialog.show(context, R.string.dialog_backup_title) { input ->
+            if (!multiPin) {
+                runSingleExport(context, uri, CryptoManager.shaHash(input), singleBackup!!)
             } else {
-                inputLayout.error = context.getString(R.string.dialog_name_error_length, 10, 100)
+                runExport(context, uri, CryptoManager.shaHash(input))
             }
         }
     }
@@ -227,16 +219,11 @@ internal object BackupHandler {
             context,
             R.string.dialog_backup_title,
             showError
-        ) { dialog, inputLayout, input ->
-            if (input.isNotEmpty() && input.length in 10..100) {
-                dialog.dismiss()
-                if (backupType == BackupType.SINGLE_PIN) {
-                    doRestoreSingleBackup(context, uri, input, onFinished)
-                } else if (backupType == BackupType.MULTI_PIN) {
-                    doRestoreMultiBackup(context, uri, input, onFinished)
-                }
-            } else {
-                inputLayout.error = context.getString(R.string.dialog_name_error_length, 10, 100)
+        ) { input ->
+            if (backupType == BackupType.SINGLE_PIN) {
+                doRestoreSingleBackup(context, uri, input, onFinished)
+            } else if (backupType == BackupType.MULTI_PIN) {
+                doRestoreMultiBackup(context, uri, input, onFinished)
             }
         }
     }

diff --git a/app/src/main/res/layout/dialog_password.xml b/app/src/main/res/layout/dialog_password.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -32,8 +32,6 @@
     <string name="dialog_name_error_length">Use between %1$d-%2$d characters</string>
     <string name="dialog_name_hint">Give it a name</string>
     <string name="dialog_name_title">PIN Name</string>
-    <string name="dialog_password_hint">Your Password</string>
-    <string name="dialog_password_error">Invalid integrity, most likely wrong password</string>
     <string name="dialog_backup_title">Encryption Password</string>
     <string name="dialog_single_export_message">Exporting single PIN…</string>
     <string name="dialog_single_export_finished">PIN export completed…</string>

diff --git a/backpack-apps b/backpack-apps