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

Merge branch 'development' into v/crypto-input-parcel

Browse Source
This commit is contained in:
Dominik Schürmann
2015-03-29 21:00:06 +02:00
parent 95f1527afe 6b48ddd717
commit 7ffb55faaa
3 changed files with 42 additions and 14 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()) {
// 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);
}
}