diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-10 19:27:33 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-10 19:31:43 +0200 |
commit | 45dcc7d070adbbdddd954d614b4d202d83eaee2b (patch) | |
tree | 79dd83581d8207f6ee7c9611955f102af4b82cba /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp | |
parent | 21ea0409101454d4016eca2be7ac68b017439b91 (diff) | |
download | open-keychain-45dcc7d070adbbdddd954d614b4d202d83eaee2b.tar.gz open-keychain-45dcc7d070adbbdddd954d614b4d202d83eaee2b.tar.bz2 open-keychain-45dcc7d070adbbdddd954d614b4d202d83eaee2b.zip |
move operations into ops package, introduce BaseOperation class
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ops/BaseOperation.java | 55 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ops/ImportExportOperation.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java) | 48 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ops/PgpCertifyOperation.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpCertifyOperation.java) | 26 |
3 files changed, 77 insertions, 52 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ops/BaseOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ops/BaseOperation.java new file mode 100644 index 000000000..811df7563 --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ops/BaseOperation.java @@ -0,0 +1,55 @@ +package org.sufficientlysecure.keychain.pgp.ops; + +import android.content.Context; + +import org.sufficientlysecure.keychain.pgp.Progressable; +import org.sufficientlysecure.keychain.provider.ProviderHelper; + +import java.util.concurrent.atomic.AtomicBoolean; + +public class BaseOperation { + + final public Context mContext; + final public Progressable mProgressable; + final public AtomicBoolean mCancelled; + + final public ProviderHelper mProviderHelper; + + // TODO do we really need the context in these operations? + public BaseOperation(Context context, ProviderHelper providerHelper, Progressable progressable) { + this.mContext = context; + this.mProgressable = progressable; + this.mProviderHelper = providerHelper; + mCancelled = null; + } + + public BaseOperation(Context context, ProviderHelper providerHelper, Progressable progressable, AtomicBoolean cancelled) { + mContext = context; + mProgressable = progressable; + mProviderHelper = providerHelper; + mCancelled = cancelled; + } + + public void updateProgress(int message, int current, int total) { + if (mProgressable != null) { + mProgressable.setProgress(message, current, total); + } + } + + public void updateProgress(String message, int current, int total) { + if (mProgressable != null) { + mProgressable.setProgress(message, current, total); + } + } + + public void updateProgress(int current, int total) { + if (mProgressable != null) { + mProgressable.setProgress(current, total); + } + } + + protected boolean checkCancelled() { + return mCancelled != null && mCancelled.get(); + } + +} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ops/ImportExportOperation.java index 9b21b49ce..32151c4d9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ops/ImportExportOperation.java @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package org.sufficientlysecure.keychain.pgp; +package org.sufficientlysecure.keychain.pgp.ops; import android.content.Context; import android.os.Bundle; @@ -29,6 +29,11 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.keyimport.HkpKeyserver; import org.sufficientlysecure.keychain.keyimport.Keyserver.AddKeyException; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; +import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKeyRing; +import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing; +import org.sufficientlysecure.keychain.pgp.PgpHelper; +import org.sufficientlysecure.keychain.pgp.Progressable; +import org.sufficientlysecure.keychain.pgp.UncachedKeyRing; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.ProviderHelper; @@ -48,45 +53,14 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.concurrent.atomic.AtomicBoolean; -public class PgpImportExport { +public class ImportExportOperation extends BaseOperation { - private Context mContext; - private Progressable mProgressable; - private AtomicBoolean mCancelled; - - private ProviderHelper mProviderHelper; - - public PgpImportExport(Context context, ProviderHelper providerHelper, Progressable progressable) { - super(); - this.mContext = context; - this.mProgressable = progressable; - this.mProviderHelper = providerHelper; - } - - public PgpImportExport(Context context, ProviderHelper providerHelper, Progressable progressable, AtomicBoolean cancelled) { - super(); - mContext = context; - mProgressable = progressable; - mProviderHelper = providerHelper; - mCancelled = cancelled; + public ImportExportOperation(Context context, ProviderHelper providerHelper, Progressable progressable) { + super(context, providerHelper, progressable); } - public void updateProgress(int message, int current, int total) { - if (mProgressable != null) { - mProgressable.setProgress(message, current, total); - } - } - - public void updateProgress(String message, int current, int total) { - if (mProgressable != null) { - mProgressable.setProgress(message, current, total); - } - } - - public void updateProgress(int current, int total) { - if (mProgressable != null) { - mProgressable.setProgress(current, total); - } + public ImportExportOperation(Context context, ProviderHelper providerHelper, Progressable progressable, AtomicBoolean cancelled) { + super(context, providerHelper, progressable, cancelled); } public void uploadKeyRingToServer(HkpKeyserver server, CanonicalizedPublicKeyRing keyring) throws AddKeyException { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpCertifyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ops/PgpCertifyOperation.java index b0c801a93..63dabc8db 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpCertifyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ops/PgpCertifyOperation.java @@ -1,7 +1,14 @@ -package org.sufficientlysecure.keychain.pgp; +package org.sufficientlysecure.keychain.pgp.ops; + +import android.content.Context; import org.spongycastle.openpgp.PGPException; import org.sufficientlysecure.keychain.Constants; +import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKeyRing; +import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey; +import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing; +import org.sufficientlysecure.keychain.pgp.Progressable; +import org.sufficientlysecure.keychain.pgp.UncachedKeyRing; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.provider.ProviderHelper.NotFoundException; @@ -15,23 +22,12 @@ import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.util.Log; import java.util.ArrayList; -import java.util.Arrays; import java.util.concurrent.atomic.AtomicBoolean; -public class PgpCertifyOperation { - - private AtomicBoolean mCancelled; - - private ProviderHelper mProviderHelper; - - public PgpCertifyOperation(ProviderHelper providerHelper, AtomicBoolean cancelled) { - mProviderHelper = providerHelper; - - mCancelled = cancelled; - } +public class PgpCertifyOperation extends BaseOperation { - private boolean checkCancelled() { - return mCancelled != null && mCancelled.get(); + public PgpCertifyOperation(Context context, ProviderHelper providerHelper, Progressable progressable, AtomicBoolean cancelled) { + super(context, providerHelper, progressable, cancelled); } public CertifyResult certify(CertifyActionsParcel parcel, String passphrase) { |