diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-29 18:21:49 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-29 18:22:04 +0100 |
commit | e45636c07a5bb17f8327e20ee8feac9904bebba8 (patch) | |
tree | 0f9ec9ca8916c07bae2c5f7dc422ba08f9636f77 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui | |
parent | 55e22e68b45657d97128f99f0f13bc8a16a9d61a (diff) | |
download | open-keychain-e45636c07a5bb17f8327e20ee8feac9904bebba8.tar.gz open-keychain-e45636c07a5bb17f8327e20ee8feac9904bebba8.tar.bz2 open-keychain-e45636c07a5bb17f8327e20ee8feac9904bebba8.zip |
import: make operation cancelable (again), make "update all" cancelable
(also, use unbounded blocking queue to fix update of more than 10 keys)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | 4 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java index ce6994ba4..38f160ea6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -559,8 +559,8 @@ public class KeyListFragment extends LoaderFragment mKeyserver = cloudPrefs.keyserver; } - mImportOpHelper = new CryptoOperationHelper<>(1, this, - this, R.string.progress_updating); + mImportOpHelper = new CryptoOperationHelper<>(1, this, this, R.string.progress_updating); + mImportOpHelper.setProgressCancellable(true); mImportOpHelper.cryptoOperation(); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java index d2877d542..7ab9c7237 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java @@ -84,6 +84,7 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu public static final int REQUEST_CODE_RETRY_UPLOAD = 4; private Integer mProgressMessageResource; + private boolean mCancellable = false; private FragmentActivity mActivity; private Fragment mFragment; @@ -118,6 +119,10 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu mProgressMessageResource = id; } + public void setProgressCancellable(boolean cancellable) { + mCancellable = cancellable; + } + private void initiateInputActivity(RequiredInputParcel requiredInput, CryptoInputParcel cryptoInputParcel) { @@ -311,7 +316,7 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu if (mProgressMessageResource != null) { saveHandler.showProgressDialog( activity.getString(mProgressMessageResource), - ProgressDialog.STYLE_HORIZONTAL, false); + ProgressDialog.STYLE_HORIZONTAL, mCancellable); } activity.startService(intent); |