remove duplicate string

jamie-mh · May 15, 2024 · ea02007 · ea02007
1 parent eb9da6b
commit ea02007
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/AuthenticatorPro.Droid/Resources/values/strings.xml b/AuthenticatorPro.Droid/Resources/values/strings.xml
@@ -196,7 +196,6 @@
     -->
 
     <string name="restoreFormatError">The backup could not be restored</string>
-    <string name="restorePasswordError">The password is incorrect</string>
     <string name="cameraPermissionError">The camera permission must be granted in order to scan a QR code</string>
     <string name="googlePlayNotInstalledError">Google Play is not installed on your device</string>
     <string name="filePickerMissing">Cannot open file picker. A file manager must be installed.</string>

diff --git a/AuthenticatorPro.Droid/src/Activity/MainActivity.cs b/AuthenticatorPro.Droid/src/Activity/MainActivity.cs
@@ -1341,7 +1341,7 @@ private void PromptForRestorePassword(byte[] data)
                 catch (Exception e)
                 {
                     sheet.Error = GetString(e is BackupPasswordException
-                        ? Resource.String.restorePasswordError : Resource.String.restoreFormatError);
+                        ? Resource.String.passwordIncorrect: Resource.String.restoreFormatError);
                     _log.Error(e, "Error decrypting file");
                     sheet.SetLoading(false);
                     return;
@@ -1443,7 +1443,7 @@ void ShowPasswordSheet()
                     {
                         _log.Error(e, "Error converting backup for restore");
                         sheet.Error = GetString(e is BackupPasswordException
-                            ? Resource.String.restorePasswordError : Resource.String.importError);
+                            ? Resource.String.passwordIncorrect : Resource.String.importError);
                         sheet.SetLoading(false);
                     }
                 };