cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Corrected import error message, changed style to WARN
This commit is contained in:
Dominik Schürmann
2015-03-28 18:11:26 +01:00
parent 73bccd6c58 1af522cf35
commit 6b48ddd717
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java
View File

@@ -162,7 +162,7 @@ public class ImportKeyResult extends OperationResult {
if (isOkWithErrors()) { if (isOkWithErrors()) {
// definitely switch to warning-style message in this case! // definitely switch to warning-style message in this case!
duration = 0; duration = 0;
style = Style.ERROR; style = Style.WARN;
str += " " + activity.getResources().getQuantityString( str += " " + activity.getResources().getQuantityString(
R.plurals.import_keys_with_errors, mBadKeys, mBadKeys); 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_cancelled
: R.string.import_error_nothing); : R.string.import_error_nothing);
} else { } else {
str = activity.getResources().getQuantityString(R.plurals.import_error, mBadKeys); str = activity.getResources().getQuantityString(
R.plurals.import_error,
mBadKeys,
mBadKeys);
} }
} }