Merge pull request #1188 from adithyaphilip/import-message-error

Corrected import error message, changed style to WARN

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);
             }
         }