I2P_Developers/i2p.i2p-bote.android
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull out hard-coded strings, inform user if importer found no identities

Browse Source
This commit is contained in:
str4d
2014-07-06 02:56:42 +00:00
parent ba0cb15097
commit f1f43aa4ac
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/i2p/bote/android/config/IdentityShipFragment.java
View File

@@ -26,6 +26,7 @@ import i2p.bote.I2PBote;
import i2p.bote.android.R; import i2p.bote.android.R;
import i2p.bote.android.util.RobustAsyncTask; import i2p.bote.android.util.RobustAsyncTask;
import i2p.bote.android.util.TaskFragment; import i2p.bote.android.util.TaskFragment;
import i2p.bote.fileencryption.PasswordException;
public abstract class IdentityShipFragment extends Fragment { public abstract class IdentityShipFragment extends Fragment {
private Callbacks mCallbacks = sDummyCallbacks; private Callbacks mCallbacks = sDummyCallbacks;
@@ -257,7 +258,7 @@ public abstract class IdentityShipFragment extends Fragment {
@Override @Override
protected String doInBackground(Object... params) { protected String doInBackground(Object... params) {
try { try {
publishProgress("Exporting identities"); publishProgress(getResources().getString(R.string.exporting_identities));
I2PBote.getInstance().getIdentities().export( I2PBote.getInstance().getIdentities().export(
(File) params[0], (File) params[0],
(String) params[1]); (String) params[1]);
@@ -390,17 +391,26 @@ public abstract class IdentityShipFragment extends Fragment {
@Override @Override
protected String doInBackground(Object... params) { protected String doInBackground(Object... params) {
try { try {
publishProgress("Importing identities"); publishProgress(getResources().getString(R.string.importing_identities));
I2PBote.getInstance().getIdentities().importFromFileDescriptor( boolean success = I2PBote.getInstance().getIdentities().importFromFileDescriptor(
(FileDescriptor) params[0], (FileDescriptor) params[0],
(String) params[1], (String) params[1],
(Boolean) params[2], (Boolean) params[2],
(Boolean) params[3]); (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) { } catch (Throwable e) {
e.printStackTrace(); e.printStackTrace();
cancel(false); cancel(false);
return e.getMessage(); if (e instanceof PasswordException)
return getResources().getString(R.string.password_incorrect);
return e.getLocalizedMessage();
} }
} }
} }

4
app/src/main/res/values/strings.xml
View File

@@ -152,8 +152,12 @@
<string name="password_empty">Password is empty</string> <string name="password_empty">Password is empty</string>
<string name="passwords_do_not_match">Passwords do not match</string> <string name="passwords_do_not_match">Passwords do not match</string>
<string name="file_exists">File exists</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="identities_exported">Identities exported to Downloads folder</string>
<string name="import_identities">Import identities</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> <string name="identities_imported">Identities imported</string>
</resources> </resources>