mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-23 17:22:16 -05:00
introduced multi-threading
refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
This commit is contained in:
parent
208434087f
commit
19775c399b
@ -168,7 +168,7 @@ public class ImportExportOperation extends BaseOperation {
|
|||||||
return new ImportKeyResult(ImportKeyResult.RESULT_FAIL_NOTHING, log);
|
return new ImportKeyResult(ImportKeyResult.RESULT_FAIL_NOTHING, log);
|
||||||
}
|
}
|
||||||
|
|
||||||
int newKeys = 0, oldKeys = 0, badKeys = 0, secret = 0;
|
int newKeys = 0, updatedKeys = 0, badKeys = 0, secret = 0;
|
||||||
ArrayList<Long> importedMasterKeyIds = new ArrayList<>();
|
ArrayList<Long> importedMasterKeyIds = new ArrayList<>();
|
||||||
|
|
||||||
boolean cancelled = false;
|
boolean cancelled = false;
|
||||||
@ -302,7 +302,7 @@ public class ImportExportOperation extends BaseOperation {
|
|||||||
if (!result.success()) {
|
if (!result.success()) {
|
||||||
badKeys += 1;
|
badKeys += 1;
|
||||||
} else if (result.updated()) {
|
} else if (result.updated()) {
|
||||||
oldKeys += 1;
|
updatedKeys += 1;
|
||||||
importedMasterKeyIds.add(key.getMasterKeyId());
|
importedMasterKeyIds.add(key.getMasterKeyId());
|
||||||
} else {
|
} else {
|
||||||
newKeys += 1;
|
newKeys += 1;
|
||||||
@ -333,7 +333,9 @@ public class ImportExportOperation extends BaseOperation {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Special: make sure new data is synced into contacts
|
// Special: make sure new data is synced into contacts
|
||||||
ContactSyncAdapterService.requestSync();
|
// disabling sync right now since it reduces speed while multi-threading
|
||||||
|
// so, we expect calling functions to take care of it. KeychainIntentService handles this
|
||||||
|
//ContactSyncAdapterService.requestSync();
|
||||||
|
|
||||||
// convert to long array
|
// convert to long array
|
||||||
long[] importedMasterKeyIdsArray = new long[importedMasterKeyIds.size()];
|
long[] importedMasterKeyIdsArray = new long[importedMasterKeyIds.size()];
|
||||||
@ -348,18 +350,18 @@ public class ImportExportOperation extends BaseOperation {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// special return case: no new keys at all
|
// special return case: no new keys at all
|
||||||
if (badKeys == 0 && newKeys == 0 && oldKeys == 0) {
|
if (badKeys == 0 && newKeys == 0 && updatedKeys == 0) {
|
||||||
resultType = ImportKeyResult.RESULT_FAIL_NOTHING;
|
resultType = ImportKeyResult.RESULT_FAIL_NOTHING;
|
||||||
} else {
|
} else {
|
||||||
if (newKeys > 0) {
|
if (newKeys > 0) {
|
||||||
resultType |= ImportKeyResult.RESULT_OK_NEWKEYS;
|
resultType |= ImportKeyResult.RESULT_OK_NEWKEYS;
|
||||||
}
|
}
|
||||||
if (oldKeys > 0) {
|
if (updatedKeys > 0) {
|
||||||
resultType |= ImportKeyResult.RESULT_OK_UPDATED;
|
resultType |= ImportKeyResult.RESULT_OK_UPDATED;
|
||||||
}
|
}
|
||||||
if (badKeys > 0) {
|
if (badKeys > 0) {
|
||||||
resultType |= ImportKeyResult.RESULT_WITH_ERRORS;
|
resultType |= ImportKeyResult.RESULT_WITH_ERRORS;
|
||||||
if (newKeys == 0 && oldKeys == 0) {
|
if (newKeys == 0 && updatedKeys == 0) {
|
||||||
resultType |= ImportKeyResult.RESULT_ERROR;
|
resultType |= ImportKeyResult.RESULT_ERROR;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -369,15 +371,15 @@ public class ImportExportOperation extends BaseOperation {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Final log entry, it's easier to do this individually
|
// Final log entry, it's easier to do this individually
|
||||||
if ( (newKeys > 0 || oldKeys > 0) && badKeys > 0) {
|
if ( (newKeys > 0 || updatedKeys > 0) && badKeys > 0) {
|
||||||
log.add(LogType.MSG_IMPORT_PARTIAL, 1);
|
log.add(LogType.MSG_IMPORT_PARTIAL, 1);
|
||||||
} else if (newKeys > 0 || oldKeys > 0) {
|
} else if (newKeys > 0 || updatedKeys > 0) {
|
||||||
log.add(LogType.MSG_IMPORT_SUCCESS, 1);
|
log.add(LogType.MSG_IMPORT_SUCCESS, 1);
|
||||||
} else {
|
} else {
|
||||||
log.add(LogType.MSG_IMPORT_ERROR, 1);
|
log.add(LogType.MSG_IMPORT_ERROR, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new ImportKeyResult(resultType, log, newKeys, oldKeys, badKeys, secret,
|
return new ImportKeyResult(resultType, log, newKeys, updatedKeys, badKeys, secret,
|
||||||
importedMasterKeyIdsArray);
|
importedMasterKeyIdsArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,11 +21,11 @@ package org.sufficientlysecure.keychain.service;
|
|||||||
import android.app.IntentService;
|
import android.app.IntentService;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.Message;
|
import android.os.Message;
|
||||||
import android.os.Messenger;
|
import android.os.Messenger;
|
||||||
import android.os.RemoteException;
|
import android.os.RemoteException;
|
||||||
|
|
||||||
import com.textuality.keybase.lib.Proof;
|
import com.textuality.keybase.lib.Proof;
|
||||||
import com.textuality.keybase.lib.prover.Prover;
|
import com.textuality.keybase.lib.prover.Prover;
|
||||||
|
|
||||||
@ -74,7 +74,9 @@ import java.io.IOException;
|
|||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.concurrent.*;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
||||||
import de.measite.minidns.Client;
|
import de.measite.minidns.Client;
|
||||||
@ -201,7 +203,127 @@ public class KeychainIntentService extends IntentService implements Progressable
|
|||||||
Messenger mMessenger;
|
Messenger mMessenger;
|
||||||
|
|
||||||
// this attribute can possibly merged with the one above? not sure...
|
// this attribute can possibly merged with the one above? not sure...
|
||||||
private AtomicBoolean mActionCanceled = new AtomicBoolean(false);
|
private static AtomicBoolean sActionCanceled = new AtomicBoolean(false);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* accumulates the results from a multi-threaded key import from a keyserver and
|
||||||
|
* consolidates them into a single ImportKeyResult, besides keeping count of keys imported and
|
||||||
|
* total keys to be imported. Also provides the Progressable used by these threads, which
|
||||||
|
* currently ignores updates
|
||||||
|
*/
|
||||||
|
private class KeyImportAccumulator {
|
||||||
|
private OperationLog mImportLog = new OperationLog();
|
||||||
|
private int mTotalKeys;
|
||||||
|
private int mImportedKeys = 0;
|
||||||
|
private Progressable mImportProgressable;
|
||||||
|
ArrayList<Long> mImportedMasterKeyIds = new ArrayList<Long>();
|
||||||
|
private int mBadKeys = 0;
|
||||||
|
private int mNewKeys = 0;
|
||||||
|
private int mUpdatedKeys = 0;
|
||||||
|
private int mSecret = 0;
|
||||||
|
private int mResultType = 0;
|
||||||
|
|
||||||
|
public KeyImportAccumulator(int totalKeys) {
|
||||||
|
mTotalKeys = totalKeys;
|
||||||
|
//ignore updates from ImportExportOperation for now
|
||||||
|
mImportProgressable = new Progressable() {
|
||||||
|
@Override
|
||||||
|
public void setProgress(String message, int current, int total) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setProgress(int resourceId, int current, int total) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setProgress(int current, int total) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setPreventCancel() {
|
||||||
|
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public Progressable getImportProgressable() {
|
||||||
|
return mImportProgressable;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getTotalKeys() {
|
||||||
|
return mTotalKeys;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getImportedKeys() {
|
||||||
|
return mImportedKeys;
|
||||||
|
}
|
||||||
|
|
||||||
|
public synchronized void accumulateKeyImport(ImportKeyResult result) {
|
||||||
|
mImportedKeys++;
|
||||||
|
mImportLog.addAll(result.getLog().toList());//accumulates log
|
||||||
|
mBadKeys += result.mBadKeys;
|
||||||
|
mNewKeys += result.mNewKeys;
|
||||||
|
mUpdatedKeys += result.mUpdatedKeys;
|
||||||
|
mSecret += result.mSecret;
|
||||||
|
|
||||||
|
long[] masterKeyIds = result.getImportedMasterKeyIds();
|
||||||
|
for (int i = 0; i < masterKeyIds.length; i++) {
|
||||||
|
mImportedMasterKeyIds.add(masterKeyIds[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// if any key import has been cancelled, set result type to cancelled
|
||||||
|
// resultType is added to in getConsolidatedKayImport to account for remaining factors
|
||||||
|
mResultType |= result.getResult() & ImportKeyResult.RESULT_CANCELLED;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* returns accumulated result of all imports so far
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public ImportKeyResult getConsolidatedImportKeyResult() {
|
||||||
|
|
||||||
|
// adding required information to mResultType
|
||||||
|
// special case,no keys requested for import
|
||||||
|
if (mBadKeys == 0 && mNewKeys == 0 && mUpdatedKeys == 0) {
|
||||||
|
mResultType = ImportKeyResult.RESULT_FAIL_NOTHING;
|
||||||
|
} else {
|
||||||
|
if (mNewKeys > 0) {
|
||||||
|
mResultType |= ImportKeyResult.RESULT_OK_NEWKEYS;
|
||||||
|
}
|
||||||
|
if (mUpdatedKeys > 0) {
|
||||||
|
mResultType |= ImportKeyResult.RESULT_OK_UPDATED;
|
||||||
|
}
|
||||||
|
if (mBadKeys > 0) {
|
||||||
|
mResultType |= ImportKeyResult.RESULT_WITH_ERRORS;
|
||||||
|
if (mNewKeys == 0 && mUpdatedKeys == 0) {
|
||||||
|
mResultType |= ImportKeyResult.RESULT_ERROR;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (mImportLog.containsWarnings()) {
|
||||||
|
mResultType |= ImportKeyResult.RESULT_WARNINGS;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
long masterKeyIds[] = new long[mImportedMasterKeyIds.size()];
|
||||||
|
for (int i = 0; i < masterKeyIds.length; i++) {
|
||||||
|
masterKeyIds[i] = mImportedMasterKeyIds.get(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new ImportKeyResult(mResultType, mImportLog, mNewKeys, mUpdatedKeys, mBadKeys,
|
||||||
|
mSecret, masterKeyIds);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isImportFinished() {
|
||||||
|
return mTotalKeys == mImportedKeys;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private KeyImportAccumulator mKeyImportAccumulator;
|
||||||
|
|
||||||
public KeychainIntentService() {
|
public KeychainIntentService() {
|
||||||
super("KeychainIntentService");
|
super("KeychainIntentService");
|
||||||
@ -216,7 +338,7 @@ public class KeychainIntentService extends IntentService implements Progressable
|
|||||||
protected void onHandleIntent(Intent intent) {
|
protected void onHandleIntent(Intent intent) {
|
||||||
|
|
||||||
// We have not been cancelled! (yet)
|
// We have not been cancelled! (yet)
|
||||||
mActionCanceled.set(false);
|
sActionCanceled.set(false);
|
||||||
|
|
||||||
Bundle extras = intent.getExtras();
|
Bundle extras = intent.getExtras();
|
||||||
if (extras == null) {
|
if (extras == null) {
|
||||||
@ -242,7 +364,7 @@ public class KeychainIntentService extends IntentService implements Progressable
|
|||||||
|
|
||||||
Log.logDebugBundle(data, "EXTRA_DATA");
|
Log.logDebugBundle(data, "EXTRA_DATA");
|
||||||
|
|
||||||
ProviderHelper providerHelper = new ProviderHelper(this);
|
final ProviderHelper providerHelper = new ProviderHelper(this);
|
||||||
|
|
||||||
String action = intent.getAction();
|
String action = intent.getAction();
|
||||||
|
|
||||||
@ -255,7 +377,7 @@ public class KeychainIntentService extends IntentService implements Progressable
|
|||||||
String keyServerUri = data.getString(UPLOAD_KEY_SERVER);
|
String keyServerUri = data.getString(UPLOAD_KEY_SERVER);
|
||||||
|
|
||||||
// Operation
|
// Operation
|
||||||
CertifyOperation op = new CertifyOperation(this, providerHelper, this, mActionCanceled);
|
CertifyOperation op = new CertifyOperation(this, providerHelper, this, sActionCanceled);
|
||||||
CertifyResult result = op.certify(parcel, keyServerUri);
|
CertifyResult result = op.certify(parcel, keyServerUri);
|
||||||
|
|
||||||
// Result
|
// Result
|
||||||
@ -473,7 +595,7 @@ public class KeychainIntentService extends IntentService implements Progressable
|
|||||||
Passphrase passphrase = data.getParcelable(EDIT_KEYRING_PASSPHRASE);
|
Passphrase passphrase = data.getParcelable(EDIT_KEYRING_PASSPHRASE);
|
||||||
|
|
||||||
// Operation
|
// Operation
|
||||||
EditKeyOperation op = new EditKeyOperation(this, providerHelper, this, mActionCanceled);
|
EditKeyOperation op = new EditKeyOperation(this, providerHelper, this, sActionCanceled);
|
||||||
EditKeyResult result = op.execute(saveParcel, passphrase);
|
EditKeyResult result = op.execute(saveParcel, passphrase);
|
||||||
|
|
||||||
// Result
|
// Result
|
||||||
@ -487,7 +609,7 @@ public class KeychainIntentService extends IntentService implements Progressable
|
|||||||
long keyRingId = data.getInt(EXPORT_KEY_RING_MASTER_KEY_ID);
|
long keyRingId = data.getInt(EXPORT_KEY_RING_MASTER_KEY_ID);
|
||||||
|
|
||||||
// Operation
|
// Operation
|
||||||
PromoteKeyOperation op = new PromoteKeyOperation(this, providerHelper, this, mActionCanceled);
|
PromoteKeyOperation op = new PromoteKeyOperation(this, providerHelper, this, sActionCanceled);
|
||||||
PromoteKeyResult result = op.execute(keyRingId);
|
PromoteKeyResult result = op.execute(keyRingId);
|
||||||
|
|
||||||
// Result
|
// Result
|
||||||
@ -520,26 +642,68 @@ public class KeychainIntentService extends IntentService implements Progressable
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ACTION_IMPORT_KEYRING: {
|
case ACTION_IMPORT_KEYRING: {
|
||||||
|
|
||||||
// Input
|
// Input
|
||||||
String keyServer = data.getString(IMPORT_KEY_SERVER);
|
final String keyServer = data.getString(IMPORT_KEY_SERVER);
|
||||||
ArrayList<ParcelableKeyRing> list = data.getParcelableArrayList(IMPORT_KEY_LIST);
|
ArrayList<ParcelableKeyRing> list = data.getParcelableArrayList(IMPORT_KEY_LIST);
|
||||||
ParcelableFileCache<ParcelableKeyRing> cache =
|
ParcelableFileCache<ParcelableKeyRing> cache =
|
||||||
new ParcelableFileCache<>(this, "key_import.pcl");
|
new ParcelableFileCache<>(this, "key_import.pcl");
|
||||||
|
int totKeys = 0;
|
||||||
|
Iterator<ParcelableKeyRing> keyListIterator = null;
|
||||||
|
//either list or cache must be null, no guarantees otherwise
|
||||||
|
if (list == null) {//export from cache, copied from ImportExportOperation.importKeyRings
|
||||||
|
|
||||||
|
try {
|
||||||
|
ParcelableFileCache.IteratorWithSize<ParcelableKeyRing> it = cache.readCache();
|
||||||
|
keyListIterator = it;
|
||||||
|
totKeys = it.getSize();
|
||||||
|
} catch (IOException e) {
|
||||||
|
|
||||||
|
// Special treatment here, we need a lot
|
||||||
|
OperationLog log = new OperationLog();
|
||||||
|
log.add(OperationResult.LogType.MSG_IMPORT, 0, 0);
|
||||||
|
log.add(OperationResult.LogType.MSG_IMPORT_ERROR_IO, 0, 0);
|
||||||
|
|
||||||
|
keyImportFailed(new ImportKeyResult(ImportKeyResult.RESULT_ERROR, log));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
keyListIterator = list.iterator();
|
||||||
|
totKeys = list.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (keyListIterator != null) {
|
||||||
|
mKeyImportAccumulator = new KeyImportAccumulator(totKeys);
|
||||||
|
setProgress(0, totKeys);
|
||||||
|
|
||||||
|
final int maxThreads = 200;
|
||||||
|
ExecutorService importExecutor = new ThreadPoolExecutor(0, maxThreads,
|
||||||
|
30L, TimeUnit.SECONDS,
|
||||||
|
new SynchronousQueue<Runnable>());
|
||||||
|
|
||||||
|
while (keyListIterator.hasNext()) {
|
||||||
|
final ParcelableKeyRing pkRing = keyListIterator.next();
|
||||||
|
Runnable importOperationRunnable = new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
// Operation
|
// Operation
|
||||||
ImportExportOperation importExportOperation = new ImportExportOperation(
|
ImportExportOperation importExportOperation = new ImportExportOperation(
|
||||||
this, providerHelper, this, mActionCanceled);
|
KeychainIntentService.this,
|
||||||
// Either list or cache must be null, no guarantees otherwise.
|
new ProviderHelper(KeychainIntentService.this),
|
||||||
ImportKeyResult result = list != null
|
mKeyImportAccumulator.getImportProgressable(),
|
||||||
? importExportOperation.importKeyRings(list, keyServer)
|
sActionCanceled);
|
||||||
: importExportOperation.importKeyRings(cache, keyServer);
|
|
||||||
|
|
||||||
// Result
|
ArrayList<ParcelableKeyRing> list = new ArrayList<>();
|
||||||
sendMessageToHandler(MessageStatus.OKAY, result);
|
list.add(pkRing);
|
||||||
|
ImportKeyResult result = importExportOperation.importKeyRings(list,
|
||||||
|
keyServer);
|
||||||
|
singleKeyRingImportCompleted(result);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
importExecutor.execute(importOperationRunnable);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
case ACTION_SIGN_ENCRYPT: {
|
case ACTION_SIGN_ENCRYPT: {
|
||||||
|
|
||||||
@ -548,7 +712,7 @@ public class KeychainIntentService extends IntentService implements Progressable
|
|||||||
|
|
||||||
// Operation
|
// Operation
|
||||||
SignEncryptOperation op = new SignEncryptOperation(
|
SignEncryptOperation op = new SignEncryptOperation(
|
||||||
this, new ProviderHelper(this), this, mActionCanceled);
|
this, new ProviderHelper(this), this, sActionCanceled);
|
||||||
SignEncryptResult result = op.execute(inputParcel);
|
SignEncryptResult result = op.execute(inputParcel);
|
||||||
|
|
||||||
// Result
|
// Result
|
||||||
@ -584,6 +748,23 @@ public class KeychainIntentService extends IntentService implements Progressable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private synchronized void singleKeyRingImportCompleted(ImportKeyResult result) {
|
||||||
|
mKeyImportAccumulator.accumulateKeyImport(result);
|
||||||
|
|
||||||
|
setProgress(mKeyImportAccumulator.getImportedKeys(), mKeyImportAccumulator.getTotalKeys());
|
||||||
|
|
||||||
|
if (mKeyImportAccumulator.isImportFinished()) {
|
||||||
|
ContactSyncAdapterService.requestSync();
|
||||||
|
|
||||||
|
sendMessageToHandler(MessageStatus.OKAY,
|
||||||
|
mKeyImportAccumulator.getConsolidatedImportKeyResult());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void keyImportFailed(ImportKeyResult result) {
|
||||||
|
sendMessageToHandler(MessageStatus.OKAY, result);
|
||||||
|
}
|
||||||
|
|
||||||
private void sendProofError(List<String> log, String label) {
|
private void sendProofError(List<String> log, String label) {
|
||||||
String msg = null;
|
String msg = null;
|
||||||
label = (label == null) ? "" : label + ": ";
|
label = (label == null) ? "" : label + ": ";
|
||||||
@ -655,7 +836,7 @@ public class KeychainIntentService extends IntentService implements Progressable
|
|||||||
/**
|
/**
|
||||||
* Set progress of ProgressDialog by sending message to handler on UI thread
|
* Set progress of ProgressDialog by sending message to handler on UI thread
|
||||||
*/
|
*/
|
||||||
public void setProgress(String message, int progress, int max) {
|
public synchronized void setProgress(String message, int progress, int max) {
|
||||||
Log.d(Constants.TAG, "Send message by setProgress with progress=" + progress + ", max="
|
Log.d(Constants.TAG, "Send message by setProgress with progress=" + progress + ", max="
|
||||||
+ max);
|
+ max);
|
||||||
|
|
||||||
@ -669,16 +850,16 @@ public class KeychainIntentService extends IntentService implements Progressable
|
|||||||
sendMessageToHandler(MessageStatus.UPDATE_PROGRESS, null, data);
|
sendMessageToHandler(MessageStatus.UPDATE_PROGRESS, null, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setProgress(int resourceId, int progress, int max) {
|
public synchronized void setProgress(int resourceId, int progress, int max) {
|
||||||
setProgress(getString(resourceId), progress, max);
|
setProgress(getString(resourceId), progress, max);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setProgress(int progress, int max) {
|
public synchronized void setProgress(int progress, int max) {
|
||||||
setProgress(null, progress, max);
|
setProgress(null, progress, max);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setPreventCancel() {
|
public synchronized void setPreventCancel() {
|
||||||
sendMessageToHandler(MessageStatus.PREVENT_CANCEL);
|
sendMessageToHandler(MessageStatus.PREVENT_CANCEL);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -743,8 +924,10 @@ public class KeychainIntentService extends IntentService implements Progressable
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int onStartCommand(Intent intent, int flags, int startId) {
|
public int onStartCommand(Intent intent, int flags, int startId) {
|
||||||
|
// onStartCommand will be run on the thread which starts the service
|
||||||
|
// cancel operation is introduced here as it must not be queued up
|
||||||
if (ACTION_CANCEL.equals(intent.getAction())) {
|
if (ACTION_CANCEL.equals(intent.getAction())) {
|
||||||
mActionCanceled.set(true);
|
sActionCanceled.set(true);
|
||||||
return START_NOT_STICKY;
|
return START_NOT_STICKY;
|
||||||
}
|
}
|
||||||
return super.onStartCommand(intent, flags, startId);
|
return super.onStartCommand(intent, flags, startId);
|
||||||
|
@ -20,6 +20,7 @@ package org.sufficientlysecure.keychain.ui;
|
|||||||
|
|
||||||
import android.animation.ObjectAnimator;
|
import android.animation.ObjectAnimator;
|
||||||
import android.annotation.TargetApi;
|
import android.annotation.TargetApi;
|
||||||
|
import android.app.Activity;
|
||||||
import android.app.ProgressDialog;
|
import android.app.ProgressDialog;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
@ -58,13 +59,17 @@ import com.getbase.floatingactionbutton.FloatingActionsMenu;
|
|||||||
|
|
||||||
import org.sufficientlysecure.keychain.Constants;
|
import org.sufficientlysecure.keychain.Constants;
|
||||||
import org.sufficientlysecure.keychain.R;
|
import org.sufficientlysecure.keychain.R;
|
||||||
|
import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
|
||||||
|
import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
|
||||||
import org.sufficientlysecure.keychain.operations.results.ConsolidateResult;
|
import org.sufficientlysecure.keychain.operations.results.ConsolidateResult;
|
||||||
import org.sufficientlysecure.keychain.operations.results.DeleteResult;
|
import org.sufficientlysecure.keychain.operations.results.DeleteResult;
|
||||||
|
import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
|
||||||
import org.sufficientlysecure.keychain.operations.results.OperationResult;
|
import org.sufficientlysecure.keychain.operations.results.OperationResult;
|
||||||
import org.sufficientlysecure.keychain.pgp.KeyRing;
|
import org.sufficientlysecure.keychain.pgp.KeyRing;
|
||||||
import org.sufficientlysecure.keychain.provider.KeychainContract;
|
import org.sufficientlysecure.keychain.provider.KeychainContract;
|
||||||
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
|
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
|
||||||
import org.sufficientlysecure.keychain.provider.KeychainDatabase;
|
import org.sufficientlysecure.keychain.provider.KeychainDatabase;
|
||||||
|
import org.sufficientlysecure.keychain.provider.ProviderHelper;
|
||||||
import org.sufficientlysecure.keychain.service.KeychainIntentService;
|
import org.sufficientlysecure.keychain.service.KeychainIntentService;
|
||||||
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
|
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
|
||||||
import org.sufficientlysecure.keychain.ui.dialog.DeleteKeyDialogFragment;
|
import org.sufficientlysecure.keychain.ui.dialog.DeleteKeyDialogFragment;
|
||||||
@ -78,6 +83,7 @@ import org.sufficientlysecure.keychain.util.Log;
|
|||||||
import org.sufficientlysecure.keychain.util.Preferences;
|
import org.sufficientlysecure.keychain.util.Preferences;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|
||||||
import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
|
import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
|
||||||
@ -477,6 +483,10 @@ public class KeyListFragment extends LoaderFragment
|
|||||||
mExportHelper.showExportKeysDialog(null, Constants.Path.APP_DIR_FILE, true);
|
mExportHelper.showExportKeysDialog(null, Constants.Path.APP_DIR_FILE, true);
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
case R.id.menu_key_list_update_all_keys:
|
||||||
|
updateAllKeys();
|
||||||
|
return true;
|
||||||
|
|
||||||
case R.id.menu_key_list_debug_cons:
|
case R.id.menu_key_list_debug_cons:
|
||||||
consolidate();
|
consolidate();
|
||||||
return true;
|
return true;
|
||||||
@ -561,6 +571,84 @@ public class KeyListFragment extends LoaderFragment
|
|||||||
startActivityForResult(intent, 0);
|
startActivityForResult(intent, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void updateAllKeys() {
|
||||||
|
Context context = this.getActivity();
|
||||||
|
|
||||||
|
ProviderHelper providerHelper = new ProviderHelper(context);
|
||||||
|
|
||||||
|
Cursor cursor = providerHelper.getContentResolver().query(
|
||||||
|
KeyRings.buildUnifiedKeyRingsUri(), new String[]{
|
||||||
|
KeyRings.FINGERPRINT
|
||||||
|
}, null, null, null
|
||||||
|
);
|
||||||
|
|
||||||
|
ArrayList<ParcelableKeyRing> keyList = new ArrayList<>();
|
||||||
|
|
||||||
|
while (cursor.moveToNext()) {
|
||||||
|
byte[] blob = cursor.getBlob(0);//fingerprint column is 0
|
||||||
|
String fingerprint = KeyFormattingUtils.convertFingerprintToHex(blob);
|
||||||
|
ParcelableKeyRing keyEntry = new ParcelableKeyRing(fingerprint, null, null);
|
||||||
|
keyList.add(keyEntry);
|
||||||
|
}
|
||||||
|
|
||||||
|
KeychainIntentServiceHandler serviceHandler = new KeychainIntentServiceHandler(
|
||||||
|
getActivity(),
|
||||||
|
getString(R.string.progress_importing),
|
||||||
|
ProgressDialog.STYLE_HORIZONTAL,
|
||||||
|
true) {
|
||||||
|
public void handleMessage(Message message) {
|
||||||
|
// handle messages by standard KeychainIntentServiceHandler first
|
||||||
|
super.handleMessage(message);
|
||||||
|
|
||||||
|
if (message.arg1 == MessageStatus.OKAY.ordinal()) {
|
||||||
|
// get returned data bundle
|
||||||
|
Bundle returnData = message.getData();
|
||||||
|
if (returnData == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final ImportKeyResult result =
|
||||||
|
returnData.getParcelable(OperationResult.EXTRA_RESULT);
|
||||||
|
if (result == null) {
|
||||||
|
Log.e(Constants.TAG, "result == null");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
result.createNotify(KeyListFragment.this.getActivity()).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Send all information needed to service to query keys in other thread
|
||||||
|
Intent intent = new Intent(getActivity(), KeychainIntentService.class);
|
||||||
|
|
||||||
|
intent.setAction(KeychainIntentService.ACTION_IMPORT_KEYRING);
|
||||||
|
|
||||||
|
// fill values for this action
|
||||||
|
Bundle data = new Bundle();
|
||||||
|
|
||||||
|
// search config
|
||||||
|
{
|
||||||
|
Preferences prefs = Preferences.getPreferences(getActivity());
|
||||||
|
Preferences.CloudSearchPrefs cloudPrefs =
|
||||||
|
new Preferences.CloudSearchPrefs(true, true, prefs.getPreferredKeyserver());
|
||||||
|
data.putString(KeychainIntentService.IMPORT_KEY_SERVER, cloudPrefs.keyserver);
|
||||||
|
}
|
||||||
|
|
||||||
|
data.putParcelableArrayList(KeychainIntentService.IMPORT_KEY_LIST, keyList);
|
||||||
|
|
||||||
|
intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
|
||||||
|
|
||||||
|
// Create a new Messenger for the communication back
|
||||||
|
Messenger messenger = new Messenger(serviceHandler);
|
||||||
|
intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
|
||||||
|
|
||||||
|
// show progress dialog
|
||||||
|
serviceHandler.showProgressDialog(getActivity());
|
||||||
|
|
||||||
|
// start service with intent
|
||||||
|
getActivity().startService(intent);
|
||||||
|
}
|
||||||
|
|
||||||
private void consolidate() {
|
private void consolidate() {
|
||||||
// Message is received after importing is done in KeychainIntentService
|
// Message is received after importing is done in KeychainIntentService
|
||||||
KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(
|
KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(
|
||||||
|
@ -83,10 +83,22 @@ public class ParcelableFileCache<E extends Parcelable> {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reads from cache file and deletes it afterward. Convenience function for readCache(boolean).
|
||||||
|
* @return an IteratorWithSize object containing entries read from the cache file
|
||||||
|
* @throws IOException
|
||||||
|
*/
|
||||||
public IteratorWithSize<E> readCache() throws IOException {
|
public IteratorWithSize<E> readCache() throws IOException {
|
||||||
return readCache(true);
|
return readCache(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reads entries from a cache file and returns an IteratorWithSize object containing the entries
|
||||||
|
* @param deleteAfterRead if true, the cache file will be deleted after being read
|
||||||
|
* @return an IteratorWithSize object containing entries read from the cache file
|
||||||
|
* @throws IOException if cache directory/parcel import file does not exist, or a read error
|
||||||
|
* occurs
|
||||||
|
*/
|
||||||
public IteratorWithSize<E> readCache(final boolean deleteAfterRead) throws IOException {
|
public IteratorWithSize<E> readCache(final boolean deleteAfterRead) throws IOException {
|
||||||
|
|
||||||
File cacheDir = mContext.getCacheDir();
|
File cacheDir = mContext.getCacheDir();
|
||||||
|
@ -19,6 +19,11 @@
|
|||||||
android:title="@string/menu_manage_keys"
|
android:title="@string/menu_manage_keys"
|
||||||
app:showAsAction="never" />
|
app:showAsAction="never" />
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/menu_key_list_update_all_keys"
|
||||||
|
android:title="@string/menu_update_all_keys"
|
||||||
|
app:showAsAction="never" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/menu_key_list_debug_cons"
|
android:id="@+id/menu_key_list_debug_cons"
|
||||||
android:title="Debug / Consolidate"
|
android:title="Debug / Consolidate"
|
||||||
|
@ -118,6 +118,7 @@
|
|||||||
<string name="menu_add_keys">"Add keys"</string>
|
<string name="menu_add_keys">"Add keys"</string>
|
||||||
<string name="menu_search_cloud">"Search cloud"</string>
|
<string name="menu_search_cloud">"Search cloud"</string>
|
||||||
<string name="menu_export_all_keys">"Export all keys"</string>
|
<string name="menu_export_all_keys">"Export all keys"</string>
|
||||||
|
<string name="menu_update_all_keys">"Update all keys"</string>
|
||||||
<string name="menu_advanced">"Show advanced info"</string>
|
<string name="menu_advanced">"Show advanced info"</string>
|
||||||
<string name="menu_certify_fingerprint">"Confirm via fingerprint comparison"</string>
|
<string name="menu_certify_fingerprint">"Confirm via fingerprint comparison"</string>
|
||||||
<string name="menu_export_log">"Export Log"</string>
|
<string name="menu_export_log">"Export Log"</string>
|
||||||
@ -316,6 +317,7 @@
|
|||||||
<string name="progress_cancelling">"cancelling…"</string>
|
<string name="progress_cancelling">"cancelling…"</string>
|
||||||
<string name="progress_saving">"saving…"</string>
|
<string name="progress_saving">"saving…"</string>
|
||||||
<string name="progress_importing">"importing…"</string>
|
<string name="progress_importing">"importing…"</string>
|
||||||
|
<string name="progress_updating">"Updating keys…"</string>
|
||||||
<string name="progress_exporting">"exporting…"</string>
|
<string name="progress_exporting">"exporting…"</string>
|
||||||
<string name="progress_uploading">"uploading…"</string>
|
<string name="progress_uploading">"uploading…"</string>
|
||||||
<string name="progress_building_key">"building key…"</string>
|
<string name="progress_building_key">"building key…"</string>
|
||||||
|
Loading…
Reference in New Issue
Block a user