move delete into operation class

1 files changed, 85 insertions, 0 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/DeleteOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/DeleteOperation.java
new file mode 100644
index 000000000..00d50aa9b
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/DeleteOperation.java
@@ -0,0 +1,85 @@
+package org.sufficientlysecure.keychain.operations;
+
+import android.content.Context;
+
+import org.sufficientlysecure.keychain.operations.results.ConsolidateResult;
+import org.sufficientlysecure.keychain.operations.results.DeleteResult;
+import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType;
+import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
+import org.sufficientlysecure.keychain.pgp.Progressable;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRingData;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.service.ContactSyncAdapterService;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
+
+public class DeleteOperation extends BaseOperation {
+
+    public DeleteOperation(Context context, ProviderHelper providerHelper, Progressable progressable) {
+        super(context, providerHelper, progressable);
+    }
+
+    public DeleteResult execute(long[] masterKeyIds, boolean isSecret) {
+
+        OperationLog log = new OperationLog();
+
+        if (masterKeyIds.length == 0) {
+            log.add(LogType.MSG_DEL_ERROR_EMPTY, 0);
+            return new DeleteResult(DeleteResult.RESULT_ERROR, log, 0, 0);
+        }
+
+        if (isSecret && masterKeyIds.length > 1) {
+            log.add(LogType.MSG_DEL_ERROR_MULTI_SECRET, 0);
+            return new DeleteResult(DeleteResult.RESULT_ERROR, log, 0, 0);
+        }
+
+        log.add(LogType.MSG_DEL, 0, masterKeyIds.length);
+
+        boolean cancelled = false;
+        int success = 0, fail = 0;
+        for (long masterKeyId : masterKeyIds) {
+            if (checkCancelled()) {
+                cancelled = true;
+                break;
+            }
+            int count = mProviderHelper.getContentResolver().delete(
+                    KeyRingData.buildPublicKeyRingUri(masterKeyId), null, null
+            );
+            if (count > 0) {
+                log.add(LogType.MSG_DEL_KEY, 1, KeyFormattingUtils.beautifyKeyId(masterKeyId));
+                success += 1;
+            } else {
+                log.add(LogType.MSG_DEL_KEY_FAIL, 1, KeyFormattingUtils.beautifyKeyId(masterKeyId));
+                fail += 1;
+            }
+        }
+
+        if (isSecret && success > 0) {
+            log.add(LogType.MSG_DEL_CONSOLIDATE, 1);
+            ConsolidateResult sub = mProviderHelper.consolidateDatabaseStep1(mProgressable);
+            log.add(sub, 2);
+        }
+
+        int result = DeleteResult.RESULT_OK;
+        if (success > 0) {
+            // make sure new data is synced into contacts
+            ContactSyncAdapterService.requestSync();
+
+            log.add(LogType.MSG_DEL_OK, 0, success);
+        }
+        if (fail > 0) {
+            log.add(LogType.MSG_DEL_FAIL, 0, fail);
+            result |= DeleteResult.RESULT_WARNINGS;
+            if (success == 0) {
+                result |= DeleteResult.RESULT_ERROR;
+            }
+        }
+        if (cancelled) {
+            log.add(LogType.MSG_OPERATION_CANCELLED, 0);
+            result |= DeleteResult.RESULT_CANCELLED;
+        }
+
+        return new DeleteResult(result, log, success, fail);
+
+    }
+
+}