1 files changed, 21 insertions, 2 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 52ff8bf44..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
@@ -21,8 +21,11 @@ package org.sufficientlysecure.keychain.operations.results;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Parcel;
+import android.support.annotation.Nullable;
 
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
+import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
 import org.sufficientlysecure.keychain.ui.LogDisplayActivity;
 import org.sufficientlysecure.keychain.ui.LogDisplayFragment;
 import org.sufficientlysecure.keychain.ui.util.Notify;
@@ -30,7 +33,7 @@ import org.sufficientlysecure.keychain.ui.util.Notify.ActionListener;
 import org.sufficientlysecure.keychain.ui.util.Notify.Showable;
 import org.sufficientlysecure.keychain.ui.util.Notify.Style;
 
-public class DeleteResult extends OperationResult {
+public class DeleteResult extends InputPendingResult {
 
     final public int mOk, mFail;
 
@@ -40,6 +43,19 @@ public class DeleteResult extends OperationResult {
         mFail = fail;
     }
 
+    /**
+     * used when more input is required
+     * @param log operation log upto point of required input, if any
+     * @param requiredInput represents input required
+     */
+    public DeleteResult(@Nullable OperationLog log, RequiredInputParcel requiredInput,
+                        CryptoInputParcel cryptoInputParcel) {
+        super(log, requiredInput, cryptoInputParcel);
+        // values are not to be used
+        mOk = -1;
+        mFail = -1;
+    }
+
     /** Construct from a parcel - trivial because we have no extra data. */
     public DeleteResult(Parcel source) {
         super(source);
@@ -109,7 +125,10 @@ public class DeleteResult extends OperationResult {
         } 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);