diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-15 20:16:07 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-15 20:16:07 +0530 |
| commit | fe0b083bc5fdcd3cd4543945ef22bcec7a2876f4 (patch) | |
| tree | 46b3a2b5b7e4d73fdcd9228f6118d244b00f3d8b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/DeleteResult.java | |
| parent | 771d65476647c4df0d88e95f8df80b201eeb9bf3 (diff) | |
| download | open-keychain-fe0b083bc5fdcd3cd4543945ef22bcec7a2876f4.tar.gz open-keychain-fe0b083bc5fdcd3cd4543945ef22bcec7a2876f4.tar.bz2 open-keychain-fe0b083bc5fdcd3cd4543945ef22bcec7a2876f4.zip | |
fixed multi-deletion bug, moved logic into DeleteKeyDialogActivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/DeleteResult.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/DeleteResult.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/DeleteResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/DeleteResult.java index c7c48ed56..1a8f10d4f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/DeleteResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/DeleteResult.java @@ -125,7 +125,10 @@ public class DeleteResult extends InputPendingResult { } else { duration = 0; style = Style.ERROR; - if (mFail == 0) { + if (mLog.getLast().mType == LogType.MSG_DEL_ERROR_MULTI_SECRET) { + str = activity.getString(R.string.secret_cannot_multiple); + } + else if (mFail == 0) { str = activity.getString(R.string.delete_nothing); } else { str = activity.getResources().getQuantityString(R.plurals.delete_fail, mFail); |