moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-24 08:38:51 -05:00
Code Issues Releases Wiki Activity

Clarify logic for when an importer needs a password prompt.

Browse Source
This commit is contained in:
danapple 2011-03-20 12:01:29 -05:00
parent 89bdbdce94
commit 2e7a785209
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/fsck/k9/preferences/StorageImporter.java
View File

@ -47,12 +47,11 @@ public class StorageImporter {
{
throw new StorageImportExportException(activity.getString(R.string.settings_unknown_version, version));
}
if (providedEncryptionKey != null || storageImporter.needsKey() == false) {
Log.i(K9.LOG_TAG, "Version " + version + " settings file needs encryption key");
finishImport(activity, storageImporter, dataset, providedEncryptionKey, listener);
if (storageImporter.needsKey() && providedEncryptionKey == null) {
gatherPassword(activity, storageImporter, dataset, listener);
}
else {
gatherPassword(activity, storageImporter, dataset, listener);
finishImport(activity, storageImporter, dataset, providedEncryptionKey, listener);
}
}
catch (Exception e)