From f1f43aa4acc3f6be1aa84f43599eb61173644caa Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 6 Jul 2014 02:56:42 +0000
Subject: [PATCH] Pull out hard-coded strings, inform user if importer found no
 identities

---
 .../android/config/IdentityShipFragment.java  | 20 ++++++++++++++-----
 app/src/main/res/values/strings.xml           |  4 ++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/i2p/bote/android/config/IdentityShipFragment.java b/app/src/main/java/i2p/bote/android/config/IdentityShipFragment.java
index 3757833..057989e 100644
--- a/app/src/main/java/i2p/bote/android/config/IdentityShipFragment.java
+++ b/app/src/main/java/i2p/bote/android/config/IdentityShipFragment.java
@@ -26,6 +26,7 @@ import i2p.bote.I2PBote;
 import i2p.bote.android.R;
 import i2p.bote.android.util.RobustAsyncTask;
 import i2p.bote.android.util.TaskFragment;
+import i2p.bote.fileencryption.PasswordException;
 
 public abstract class IdentityShipFragment extends Fragment {
     private Callbacks mCallbacks = sDummyCallbacks;
@@ -257,7 +258,7 @@ public abstract class IdentityShipFragment extends Fragment {
             @Override
             protected String doInBackground(Object... params) {
                 try {
-                    publishProgress("Exporting identities");
+                    publishProgress(getResources().getString(R.string.exporting_identities));
                     I2PBote.getInstance().getIdentities().export(
                             (File) params[0],
                             (String) params[1]);
@@ -390,17 +391,26 @@ public abstract class IdentityShipFragment extends Fragment {
             @Override
             protected String doInBackground(Object... params) {
                 try {
-                    publishProgress("Importing identities");
-                    I2PBote.getInstance().getIdentities().importFromFileDescriptor(
+                    publishProgress(getResources().getString(R.string.importing_identities));
+                    boolean success = I2PBote.getInstance().getIdentities().importFromFileDescriptor(
                             (FileDescriptor) params[0],
                             (String) params[1],
                             (Boolean) params[2],
                             (Boolean) params[3]);
-                    return null;
+                    if (success)
+                        return null;
+                    else {
+                        cancel(false);
+                        return (params[1] == null) ?
+                                getResources().getString(R.string.no_identities_found_maybe_encrypted) :
+                                getResources().getString(R.string.no_identities_found);
+                    }
                 } catch (Throwable e) {
                     e.printStackTrace();
                     cancel(false);
-                    return e.getMessage();
+                    if (e instanceof PasswordException)
+                        return getResources().getString(R.string.password_incorrect);
+                    return e.getLocalizedMessage();
                 }
             }
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7058c57..45188c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -152,8 +152,12 @@
     <string name="password_empty">Password is empty</string>
     <string name="passwords_do_not_match">Passwords do not match</string>
     <string name="file_exists">File exists</string>
+    <string name="exporting_identities">Exporting identities</string>
     <string name="identities_exported">Identities exported to Downloads folder</string>
     <string name="import_identities">Import identities</string>
+    <string name="importing_identities">Importing identities</string>
+    <string name="no_identities_found">No identities were found.</string>
+    <string name="no_identities_found_maybe_encrypted">No identities were found. Is the file encrypted?</string>
     <string name="identities_imported">Identities imported</string>
 
 </resources>