moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-08-13 15:53:53 -04:00
Code Issues Releases Wiki Activity

take failed keys into account in importkeyresult notification

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-09-23 16:19:01 +02:00
parent bf9a708e84
commit da1779816b
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java
View File

@ -61,6 +61,10 @@ public class ImportKeyResult extends OperationResult {
return (mResult & RESULT_OK_UPDATED) == RESULT_OK_UPDATED;
}
public boolean isOkWithErrors() {
return (mResult & RESULT_WITH_ERRORS) == RESULT_WITH_ERRORS;
}
public boolean isFailNothing() {
return (mResult & RESULT_FAIL_NOTHING) == RESULT_FAIL_NOTHING;
}
@ -129,7 +133,7 @@ public class ImportKeyResult extends OperationResult {
}
// New and updated keys
if (this.isOkBoth()) {
if (isOkBoth()) {
str = activity.getResources().getQuantityString(
R.plurals.import_keys_added_and_updated_1, mNewKeys, mNewKeys);
str += " " + activity.getResources().getQuantityString(
@ -145,6 +149,13 @@ public class ImportKeyResult extends OperationResult {
color = Style.RED;
str = "internal error";
}
if (isOkWithErrors()) {
// definitely switch to warning-style message in this case!
duration = 0;
color = Style.RED;
str += " " + activity.getResources().getQuantityString(
R.plurals.import_keys_with_errors, mBadKeys);
}
} else {
duration = 0;

4
OpenKeychain/src/main/res/values/strings.xml
View File

@ -394,6 +394,10 @@
<item quantity="one">"Successfully updated key%2$s."</item>
<item quantity="other">"Successfully updated %1$d keys%2$s."</item>
</plurals>
<plurals name="import_keys_with_errors">
<item quantity="one">"Import failed for one key."</item>
<item quantity="other">"Import failed for %d keys."</item>
</plurals>
<string name="view_log">"View Log"</string>
<string name="import_error_nothing">"Nothing to import."</string>
<string name="import_error_nothing_cancelled">"Import cancelled."</string>