cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import: make operation cancelable (again), make "update all" cancelable

Browse Source 
(also, use unbounded blocking queue to fix update of more than 10 keys)
This commit is contained in:
Vincent Breitmoser
2015-10-29 18:21:49 +01:00
parent 55e22e68b4
commit e45636c07a
4 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
View File

@@ -446,7 +446,6 @@ public class HkpKeyserver extends Keyserver {
* Tries to find a server responsible for a given domain * Tries to find a server responsible for a given domain
* *
* @return A responsible Keyserver or null if not found. * @return A responsible Keyserver or null if not found.
* TODO: Add proxy functionality
*/ */
public static HkpKeyserver resolve(String domain, Proxy proxy) { public static HkpKeyserver resolve(String domain, Proxy proxy) {
try { try {

44
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java
View File

@@ -28,7 +28,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorCompletionService; import java.util.concurrent.ExecutorCompletionService;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.SynchronousQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
@@ -262,12 +262,6 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
continue; continue;
} }
// Another check if we have been cancelled
if (checkCancelled()) {
cancelled = true;
break;
}
SaveKeyringResult result; SaveKeyringResult result;
// synchronizing prevents https://github.com/open-keychain/open-keychain/issues/1221 // synchronizing prevents https://github.com/open-keychain/open-keychain/issues/1221
// and https://github.com/open-keychain/open-keychain/issues/1480 // and https://github.com/open-keychain/open-keychain/issues/1480
@@ -366,13 +360,15 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
} }
} }
// Final log entry, it's easier to do this individually if (!cancelled) {
if ((newKeys > 0 || updatedKeys > 0) && badKeys > 0) { // Final log entry, it's easier to do this individually
log.add(LogType.MSG_IMPORT_PARTIAL, 1); if ((newKeys > 0 || updatedKeys > 0) && badKeys > 0) {
} else if (newKeys > 0 || updatedKeys > 0) { log.add(LogType.MSG_IMPORT_PARTIAL, 1);
log.add(LogType.MSG_IMPORT_SUCCESS, 1); } else if (newKeys > 0 || updatedKeys > 0) {
} else { log.add(LogType.MSG_IMPORT_SUCCESS, 1);
log.add(LogType.MSG_IMPORT_ERROR, 1); } else {
log.add(LogType.MSG_IMPORT_ERROR, 1);
}
} }
return new ImportKeyResult(resultType, log, newKeys, updatedKeys, badKeys, secret, return new ImportKeyResult(resultType, log, newKeys, updatedKeys, badKeys, secret,
@@ -423,7 +419,7 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
final ProgressScaler ignoreProgressable = new ProgressScaler(); final ProgressScaler ignoreProgressable = new ProgressScaler();
ExecutorService importExecutor = new ThreadPoolExecutor(0, MAX_THREADS, 30L, TimeUnit.SECONDS, ExecutorService importExecutor = new ThreadPoolExecutor(0, MAX_THREADS, 30L, TimeUnit.SECONDS,
new SynchronousQueue<Runnable>()); new LinkedBlockingQueue<Runnable>());
ExecutorCompletionService<ImportKeyResult> importCompletionService = ExecutorCompletionService<ImportKeyResult> importCompletionService =
new ExecutorCompletionService<>(importExecutor); new ExecutorCompletionService<>(importExecutor);
@@ -438,6 +434,10 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
@Override @Override
public ImportKeyResult call() { public ImportKeyResult call() {
if (checkCancelled()) {
return null;
}
ArrayList<ParcelableKeyRing> list = new ArrayList<>(); ArrayList<ParcelableKeyRing> list = new ArrayList<>();
list.add(pkRing); list.add(pkRing);
@@ -481,6 +481,7 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
private int mUpdatedKeys = 0; private int mUpdatedKeys = 0;
private int mSecret = 0; private int mSecret = 0;
private int mResultType = 0; private int mResultType = 0;
private boolean mHasCancelledResult;
/** /**
* Accumulates keyring imports and updates the progressable whenever a new key is imported. * Accumulates keyring imports and updates the progressable whenever a new key is imported.
@@ -501,11 +502,22 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
public void accumulateKeyImport(ImportKeyResult result) { public void accumulateKeyImport(ImportKeyResult result) {
mImportedKeys++; mImportedKeys++;
if (result == null) {
return;
}
if (mProgressable != null) { if (mProgressable != null) {
mProgressable.setProgress(mImportedKeys, mTotalKeys); mProgressable.setProgress(mImportedKeys, mTotalKeys);
} }
mImportLog.addAll(result.getLog().toList());//accumulates log boolean notCancelledOrFirstCancelled = !result.cancelled() || !mHasCancelledResult;
if (notCancelledOrFirstCancelled) {
mImportLog.addAll(result.getLog().toList()); //accumulates log
if (result.cancelled()) {
mHasCancelledResult = true;
}
}
mBadKeys += result.mBadKeys; mBadKeys += result.mBadKeys;
mNewKeys += result.mNewKeys; mNewKeys += result.mNewKeys;
mUpdatedKeys += result.mUpdatedKeys; mUpdatedKeys += result.mUpdatedKeys;

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
View File

@@ -559,8 +559,8 @@ public class KeyListFragment extends LoaderFragment
mKeyserver = cloudPrefs.keyserver; mKeyserver = cloudPrefs.keyserver;
} }
mImportOpHelper = new CryptoOperationHelper<>(1, this, mImportOpHelper = new CryptoOperationHelper<>(1, this, this, R.string.progress_updating);
this, R.string.progress_updating); mImportOpHelper.setProgressCancellable(true);
mImportOpHelper.cryptoOperation(); mImportOpHelper.cryptoOperation();
} }

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java
View File

@@ -84,6 +84,7 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
public static final int REQUEST_CODE_RETRY_UPLOAD = 4; public static final int REQUEST_CODE_RETRY_UPLOAD = 4;
private Integer mProgressMessageResource; private Integer mProgressMessageResource;
private boolean mCancellable = false;
private FragmentActivity mActivity; private FragmentActivity mActivity;
private Fragment mFragment; private Fragment mFragment;
@@ -118,6 +119,10 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
mProgressMessageResource = id; mProgressMessageResource = id;
} }
public void setProgressCancellable(boolean cancellable) {
mCancellable = cancellable;
}
private void initiateInputActivity(RequiredInputParcel requiredInput, private void initiateInputActivity(RequiredInputParcel requiredInput,
CryptoInputParcel cryptoInputParcel) { CryptoInputParcel cryptoInputParcel) {
@@ -311,7 +316,7 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
if (mProgressMessageResource != null) { if (mProgressMessageResource != null) {
saveHandler.showProgressDialog( saveHandler.showProgressDialog(
activity.getString(mProgressMessageResource), activity.getString(mProgressMessageResource),
ProgressDialog.STYLE_HORIZONTAL, false); ProgressDialog.STYLE_HORIZONTAL, mCancellable);
} }
activity.startService(intent); activity.startService(intent);