Improve UX when restoring e2e keys (#2999)

element-hq · Feb 25, 2019 · b0984c3 · b0984c3
1 parent 54e9154
commit b0984c3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,7 +8,7 @@ Features:
  -
 
 Improvements:
- -
+ - Improve UX when restoring e2e keys (#2999)
 
 Other changes:
  -

diff --git a/...src/main/java/im/vector/fragments/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt b/...src/main/java/im/vector/fragments/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt
@@ -68,10 +68,18 @@ class KeysBackupRestoreFromKeyViewModel : ViewModel() {
                                             isIndeterminate = true)
                                 }
                                 is StepProgressListener.Step.ImportingKey -> {
-                                    sharedViewModel.loadingEvent.value = WaitingViewData(context.getString(R.string.keys_backup_restoring_waiting_message)
-                                            + "\n" + context.getString(R.string.keys_backup_restoring_importing_keys_waiting_message),
-                                            step.progress,
-                                            step.total)
+                                    // Progress 0 can take a while, display an indeterminate progress in this case
+                                    if (step.progress == 0) {
+                                        sharedViewModel.loadingEvent.value = WaitingViewData(context.getString(R.string.keys_backup_restoring_waiting_message)
+                                                + "\n" + context.getString(R.string.keys_backup_restoring_importing_keys_waiting_message),
+                                                isIndeterminate = true)
+
+                                    } else {
+                                        sharedViewModel.loadingEvent.value = WaitingViewData(context.getString(R.string.keys_backup_restoring_waiting_message)
+                                                + "\n" + context.getString(R.string.keys_backup_restoring_importing_keys_waiting_message),
+                                                step.progress,
+                                                step.total)
+                                    }
                                 }
                             }
                         }

diff --git a/...n/java/im/vector/fragments/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt b/...n/java/im/vector/fragments/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt
@@ -76,10 +76,18 @@ class KeysBackupRestoreFromPassphraseViewModel : ViewModel() {
                                             isIndeterminate = true)
                                 }
                                 is StepProgressListener.Step.ImportingKey -> {
-                                    sharedViewModel.loadingEvent.value = WaitingViewData(context.getString(R.string.keys_backup_restoring_waiting_message)
-                                            + "\n" + context.getString(R.string.keys_backup_restoring_importing_keys_waiting_message),
-                                            step.progress,
-                                            step.total)
+                                    // Progress 0 can take a while, display an indeterminate progress in this case
+                                    if (step.progress == 0) {
+                                        sharedViewModel.loadingEvent.value = WaitingViewData(context.getString(R.string.keys_backup_restoring_waiting_message)
+                                                + "\n" + context.getString(R.string.keys_backup_restoring_importing_keys_waiting_message),
+                                                isIndeterminate = true)
+
+                                    } else {
+                                        sharedViewModel.loadingEvent.value = WaitingViewData(context.getString(R.string.keys_backup_restoring_waiting_message)
+                                                + "\n" + context.getString(R.string.keys_backup_restoring_importing_keys_waiting_message),
+                                                step.progress,
+                                                step.total)
+                                    }
                                 }
                             }
                         }

diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
@@ -1287,7 +1287,7 @@ Why choose Riot.im?
     <string name="keys_backup_passphrase_error_decrypt">Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.</string>
     <string name="network_error_please_check_and_retry">Network error: please check your connection and retry.</string>
 
-    <string name="keys_backup_restoring_waiting_message">Restoring backup…</string>
+    <string name="keys_backup_restoring_waiting_message">Restoring backup:</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">Computing recovery key…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Downloading keys…</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Importing keys…</string>
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ Features: @@
      -
     Improvements:
-     -
+     - Improve UX when restoring e2e keys (#2999)
     Other changes:
      -
@@ Expand Down @@