Create backup password copy fix #429. Wallet restore password entry C…

…TA button enabled/disabled fix #474. Settings and backup settings screen backup state display fix #509.
tari-project · Jul 27, 2020 · f420008 · f420008
1 parent e39a42f
commit f420008
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 10 deletions.
diff --git a/app/src/main/java/com/tari/android/wallet/infrastructure/backup/BackupManager.kt b/app/src/main/java/com/tari/android/wallet/infrastructure/backup/BackupManager.kt
@@ -120,10 +120,16 @@ internal class BackupManager(
             if (!backupStorage.hasBackupForDate(backupDate)) {
                 throw BackupStorageTamperedException("Backup storage is tampered.")
             }
-            if (sharedPrefs.scheduledBackupDate?.isAfterNow == true) {
-                EventBus.postBackupState(BackupScheduled)
-            } else {
-                EventBus.postBackupState(BackupUpToDate)
+            when {
+                sharedPrefs.backupFailureDate != null -> {
+                    EventBus.postBackupState(BackupOutOfDate())
+                }
+                sharedPrefs.scheduledBackupDate?.isAfterNow == true -> {
+                    EventBus.postBackupState(BackupScheduled)
+                }
+                else -> {
+                    EventBus.postBackupState(BackupUpToDate)
+                }
             }
         } catch (e: BackupStorageAuthRevokedException) {
             sharedPrefs.lastSuccessfulBackupDate = null

diff --git a/app/src/main/java/com/tari/android/wallet/ui/activity/home/HomeActivity.kt b/app/src/main/java/com/tari/android/wallet/ui/activity/home/HomeActivity.kt
@@ -990,7 +990,8 @@ internal class HomeActivity : AppCompatActivity(),
      */
     private fun onStoreButtonClicked(view: View) {
         UiUtil.temporarilyDisableClick(view)
-        showTTLStoreDialog()
+        // showTTLStoreDialog()
+        backupManager.scheduleBackup(delayMs = 10000)
     }
 
     /**

diff --git a/app/src/main/java/com/tari/android/wallet/ui/fragment/restore/ChooseRestoreOptionFragment.kt b/app/src/main/java/com/tari/android/wallet/ui/fragment/restore/ChooseRestoreOptionFragment.kt
@@ -194,15 +194,15 @@ framework for UI tree rebuild on configuration changes"""
     private fun showAuthFailedDialog() {
         ErrorDialog(
             requireContext(),
-            title = string(back_up_wallet_storage_setup_error_title),
+            title = string(restore_wallet_error_title),
             description = string(back_up_wallet_storage_setup_error_desc)
         ).show()
     }
 
     private fun showBackupFileNotFoundDialog() {
         ErrorDialog(
             requireContext(),
-            title = string(back_up_wallet_storage_setup_error_title),
+            title = string(restore_wallet_error_title),
             description = string(restore_wallet_error_file_not_found),
             onClose = {
                 requireActivity().onBackPressed()

diff --git a/...main/java/com/tari/android/wallet/ui/fragment/restore/EnterRestorationPasswordFragment.kt b/...main/java/com/tari/android/wallet/ui/fragment/restore/EnterRestorationPasswordFragment.kt
@@ -33,6 +33,7 @@
 package com.tari.android.wallet.ui.fragment.restore
 
 import android.content.Context
+import android.graphics.Color
 import android.os.Bundle
 import android.text.SpannableString
 import android.text.SpannableStringBuilder
@@ -90,10 +91,10 @@ UI tree rebuild on configuration changes"""
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setupUi()
+        setupUI()
     }
 
-    private fun setupUi() {
+    private fun setupUI() {
         requireActivity().onBackPressedDispatcher
             .addCallback(viewLifecycleOwner, blockingBackPressDispatcher)
         setPageDescription()
@@ -108,19 +109,30 @@ UI tree rebuild on configuration changes"""
                 }
             }
         )
+        setRestoreWalletCTAState(isEnabled = false)
         ui.restoreWalletCtaView.setOnClickListener {
             showRestoringUI()
             performRestoration(ui.passwordEditText.text!!.toString())
         }
         ui.passwordEditText.addTextChangedListener(
             afterTextChanged = {
+                setRestoreWalletCTAState(it?.length ?: 0 != 0)
                 ui.enterPasswordLabelTextView.setTextColor(color(black))
                 ui.passwordEditText.setTextColor(color(black))
                 ui.wrongPasswordLabelView.gone()
             }
         )
     }
 
+    private fun setRestoreWalletCTAState(isEnabled: Boolean) {
+        if (ui.restoreWalletCtaView.isEnabled == isEnabled) return
+        ui.restoreWalletCtaView.isEnabled = isEnabled
+        ui.restoreWalletTextView.setTextColor(
+            if (isEnabled) Color.WHITE
+            else color(seed_phrase_button_disabled_text_color)
+        )
+    }
+
     private fun showRestoringUI() {
         blockingBackPressDispatcher.isEnabled = true
         ui.passwordEditText.isEnabled = false

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -346,7 +346,7 @@
     <string name="restore_with_cloud_page_title">Enter your backup password</string>
 
     <!--Change password-->
-    <string name="change_password_enter_password_label">Create Password</string>
+    <string name="change_password_enter_password_label">Create a Password</string>
     <string name="change_password_enter_password_hint">Make it a strong one!</string>
     <string name="change_password_confirm_password_label">Confirm Password</string>
     <string name="change_password_confirm_password_hint">Let’s see it again</string>