diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-29 21:00:06 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-29 21:00:06 +0200 |
| commit | 7ffb55faaa42b748c7742a11ba223f0ebed65622 (patch) | |
| tree | 6552e89c381a7d72f7e0a5c84e97b06894dfe151 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results | |
| parent | 95f1527afe81c59a116cadc2ed37c065da1819ac (diff) | |
| parent | 6b48ddd71747bc5179861c25b6b327dae3321fca (diff) | |
| download | open-keychain-7ffb55faaa42b748c7742a11ba223f0ebed65622.tar.gz open-keychain-7ffb55faaa42b748c7742a11ba223f0ebed65622.tar.bz2 open-keychain-7ffb55faaa42b748c7742a11ba223f0ebed65622.zip | |
Merge branch 'development' into v/crypto-input-parcel
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results')
| -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); } } |