diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-28 18:11:26 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-28 18:11:26 +0100 |
commit | 6b48ddd71747bc5179861c25b6b327dae3321fca (patch) | |
tree | 87c2f245be2d3a8e13ca086c521c914886ea50be /OpenKeychain/src/main/java/org/sufficientlysecure | |
parent | 73bccd6c58adb411a906532bed3d1387da1a4fc9 (diff) | |
parent | 1af522cf353dd344cf89b1e68a549aa706d80c43 (diff) | |
download | open-keychain-6b48ddd71747bc5179861c25b6b327dae3321fca.tar.gz open-keychain-6b48ddd71747bc5179861c25b6b327dae3321fca.tar.bz2 open-keychain-6b48ddd71747bc5179861c25b6b327dae3321fca.zip |
Merge pull request #1188 from adithyaphilip/import-message-error
Corrected import error message, changed style to WARN
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java index af9f67114..1438ad698 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java @@ -162,7 +162,7 @@ public class ImportKeyResult extends OperationResult { if (isOkWithErrors()) { // definitely switch to warning-style message in this case! duration = 0; - style = Style.ERROR; + style = Style.WARN; str += " " + activity.getResources().getQuantityString( R.plurals.import_keys_with_errors, mBadKeys, mBadKeys); } @@ -175,7 +175,10 @@ public class ImportKeyResult extends OperationResult { ? R.string.import_error_nothing_cancelled : R.string.import_error_nothing); } else { - str = activity.getResources().getQuantityString(R.plurals.import_error, mBadKeys); + str = activity.getResources().getQuantityString( + R.plurals.import_error, + mBadKeys, + mBadKeys); } } |