From e6a7960b8f3c838c66ef8cdaed5faf11a8d1ab26 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 10 Oct 2014 21:18:50 +0200 Subject: move delete into operation class --- .../keychain/operations/DeleteOperation.java | 85 ++++++++++++++++++++++ .../keychain/operations/results/DeleteResult.java | 57 +++++++++++++++ .../operations/results/OperationResult.java | 11 ++- 3 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/DeleteOperation.java create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/DeleteResult.java (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations') 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); + + } + +} 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 new file mode 100644 index 000000000..1dce8f89e --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/DeleteResult.java @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2014 Dominik Schürmann + * Copyright (C) 2014 Vincent Breitmoser + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package org.sufficientlysecure.keychain.operations.results; + +import android.os.Parcel; + +public class DeleteResult extends OperationResult { + + final public int mOk, mFail; + + public DeleteResult(int result, OperationLog log, int ok, int fail) { + super(result, log); + mOk = ok; + mFail = fail; + } + + /** Construct from a parcel - trivial because we have no extra data. */ + public DeleteResult(Parcel source) { + super(source); + mOk = source.readInt(); + mFail = source.readInt(); + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + super.writeToParcel(dest, flags); + dest.writeInt(mOk); + dest.writeInt(mFail); + } + + public static Creator CREATOR = new Creator() { + public DeleteResult createFromParcel(final Parcel source) { + return new DeleteResult(source); + } + + public DeleteResult[] newArray(final int size) { + return new DeleteResult[size]; + } + }; + +} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java index 45470ef20..dc47942fc 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java @@ -593,7 +593,16 @@ public abstract class OperationResult implements Parcelable { MSG_GET_QUERY_TOO_SHORT(LogLevel.ERROR, R.string.msg_download_query_too_short), MSG_GET_TOO_MANY_RESPONSES(LogLevel.ERROR, R.string.msg_download_too_many_responses), MSG_GET_QUERY_TOO_SHORT_OR_TOO_MANY_RESPONSES(LogLevel.ERROR, R.string.msg_download_query_too_short_or_too_many_responses), - MSG_GET_QUERY_FAILED(LogLevel.ERROR, R.string.msg_download_query_failed) + MSG_GET_QUERY_FAILED(LogLevel.ERROR, R.string.msg_download_query_failed), + + MSG_DEL_ERROR_EMPTY (LogLevel.ERROR, R.string.msg_del_error_empty), + MSG_DEL_ERROR_MULTI_SECRET (LogLevel.DEBUG, R.string.msg_del_error_multi_secret), + MSG_DEL (LogLevel.START, R.plurals.msg_del), + MSG_DEL_KEY (LogLevel.DEBUG, R.string.msg_del_key), + MSG_DEL_KEY_FAIL (LogLevel.WARN, R.string.msg_del_key_fail), + MSG_DEL_CONSOLIDATE (LogLevel.DEBUG, R.string.msg_del_consolidate), + MSG_DEL_OK (LogLevel.OK, R.plurals.msg_del_ok), + MSG_DEL_FAIL (LogLevel.WARN, R.plurals.msg_del_fail), ; public final int mMsgId; -- cgit v1.2.3