use autovalue for DeleteKeyringParcel

2017-05-22 12:33:44 +02:00
parent ef366173d0
commit 68ca88c87d
3 changed files with 19 additions and 37 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java
@@ -183,9 +183,12 @@ public class DeleteKeyDialogActivity extends FragmentActivity {
        return new CryptoOperationHelper.Callback<DeleteKeyringParcel, DeleteResult>() {
            @Override
            public DeleteKeyringParcel createOperationInput() {
-                return new DeleteKeyringParcel(mMasterKeyIds, mHasSecret);
+                if (mHasSecret) {
+                    return DeleteKeyringParcel.createDeleteSingleSecretKeyParcel(mMasterKeyIds[0]);
+                } else {
+                    return DeleteKeyringParcel.createDeletePublicKeysParcel(mMasterKeyIds);
+                }
            }
-
            @Override
            public void onCryptoOperationSuccess(DeleteResult result) {
                returnResult(result);