diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 01:52:41 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 12:36:58 +0200 |
| commit | dea98a4a7e3143acfc01ce1567a9d17c25025b4d (patch) | |
| tree | cc9eb2df29d71a3449d784acf07b0e7f6b59299c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | |
| parent | 47368f1d24cb3b4112133a6dddd2793e6787dfdd (diff) | |
| download | open-keychain-dea98a4a7e3143acfc01ce1567a9d17c25025b4d.tar.gz open-keychain-dea98a4a7e3143acfc01ce1567a9d17c25025b4d.tar.bz2 open-keychain-dea98a4a7e3143acfc01ce1567a9d17c25025b4d.zip | |
import-log: properly distinguish return states
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index 3ff4f9887..7fa18406c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -404,12 +404,12 @@ public class ImportKeysActivity extends ActionBarActivity implements ActionBar.O R.plurals.import_keys_added_and_updated_1, result.mNewKeys, result.mNewKeys); str += getResources().getQuantityString( R.plurals.import_keys_added_and_updated_2, result.mUpdatedKeys, result.mUpdatedKeys, withWarnings); - } else if (result.isOkNew()) { - str = getResources().getQuantityString( - R.plurals.import_keys_added, result.mNewKeys, result.mNewKeys, withWarnings); } else if (result.isOkUpdated()) { str = getResources().getQuantityString( R.plurals.import_keys_updated, result.mUpdatedKeys, result.mUpdatedKeys, withWarnings); + } else if (result.isOkNew()) { + str = getResources().getQuantityString( + R.plurals.import_keys_added, result.mNewKeys, result.mNewKeys, withWarnings); } else { duration = 0; color = Style.RED; |