Compare commits
1 Commits
879f682849
...
pvabel
| Author | SHA1 | Date | |
|---|---|---|---|
|
93e226f0b7
|
@@ -21,6 +21,8 @@ import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
|
|||||||
import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
|
import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
|
||||||
import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
|
import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
|
||||||
|
|
||||||
|
import timber.log.Timber;
|
||||||
|
|
||||||
public class ImportKeysOperationCallback implements
|
public class ImportKeysOperationCallback implements
|
||||||
CryptoOperationHelper.Callback<ImportKeyringParcel, ImportKeyResult> {
|
CryptoOperationHelper.Callback<ImportKeyringParcel, ImportKeyResult> {
|
||||||
|
|
||||||
@@ -45,6 +47,7 @@ public class ImportKeysOperationCallback implements
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCryptoOperationSuccess(ImportKeyResult result) {
|
public void onCryptoOperationSuccess(ImportKeyResult result) {
|
||||||
|
Timber.d("+onCryptoOperationSuccess");
|
||||||
mResultListener.handleResult(result, mPosition);
|
mResultListener.handleResult(result, mPosition);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,6 +58,7 @@ public class ImportKeysOperationCallback implements
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCryptoOperationError(ImportKeyResult result) {
|
public void onCryptoOperationError(ImportKeyResult result) {
|
||||||
|
Timber.d("+onCryptoOperationError");
|
||||||
mResultListener.handleResult(result, mPosition);
|
mResultListener.handleResult(result, mPosition);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -50,9 +50,12 @@ import org.sufficientlysecure.keychain.pgp.Progressable;
|
|||||||
import org.sufficientlysecure.keychain.pgp.SignEncryptParcel;
|
import org.sufficientlysecure.keychain.pgp.SignEncryptParcel;
|
||||||
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
|
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
|
||||||
|
|
||||||
|
import timber.log.Timber;
|
||||||
|
|
||||||
|
|
||||||
public class KeychainServiceTask {
|
public class KeychainServiceTask {
|
||||||
public static KeychainServiceTask create(Activity activity) {
|
public static KeychainServiceTask create(Activity activity) {
|
||||||
|
Timber.d("+create#1");
|
||||||
Context context = activity.getApplicationContext();
|
Context context = activity.getApplicationContext();
|
||||||
KeyWritableRepository keyRepository = KeyWritableRepository.create(context);
|
KeyWritableRepository keyRepository = KeyWritableRepository.create(context);
|
||||||
return new KeychainServiceTask(context, keyRepository);
|
return new KeychainServiceTask(context, keyRepository);
|
||||||
|
|||||||
@@ -213,15 +213,16 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
|
|||||||
|
|
||||||
private void getKey(int position, ImportKeysListEntry entry, boolean skipSave) {
|
private void getKey(int position, ImportKeysListEntry entry, boolean skipSave) {
|
||||||
Timber.d("+getKey position %d, entry %s, skipSave %s", position, entry.getKeyIdHex(), skipSave ? "true" : "false");
|
Timber.d("+getKey position %d, entry %s, skipSave %s", position, entry.getKeyIdHex(), skipSave ? "true" : "false");
|
||||||
Timber.d("getKeys => prepareKeyOperation");
|
Timber.d("getKey => prepareKeyOperation");
|
||||||
ImportKeyringParcel inputParcel = prepareKeyOperation(entry, skipSave);
|
ImportKeyringParcel inputParcel = prepareKeyOperation(entry, skipSave);
|
||||||
ImportKeysResultListener listener = skipSave ? this : mListener;
|
ImportKeysResultListener listener = skipSave ? this : mListener;
|
||||||
Timber.d("getKeys => new ImportKeysOperationCallback");
|
Timber.d("getKey => new ImportKeysOperationCallback");
|
||||||
ImportKeysOperationCallback cb = new ImportKeysOperationCallback(listener, inputParcel, position);
|
ImportKeysOperationCallback cb = new ImportKeysOperationCallback(listener, inputParcel, position);
|
||||||
Timber.d("getKeys => new CryptoOperationHelper");
|
Timber.d("getKey => new CryptoOperationHelper");
|
||||||
CryptoOperationHelper opHelper = new CryptoOperationHelper<>(1, mActivity, cb, null);
|
CryptoOperationHelper opHelper = new CryptoOperationHelper<>(1, mActivity, cb, null);
|
||||||
Timber.d("getKeys => opHelper.cryptoOperation");
|
Timber.d("getKey => opHelper.cryptoOperation");
|
||||||
opHelper.cryptoOperation();
|
opHelper.cryptoOperation();
|
||||||
|
Timber.d("-getKey");
|
||||||
}
|
}
|
||||||
|
|
||||||
private ImportKeyringParcel prepareKeyOperation(ImportKeysListEntry entry, boolean skipSave) {
|
private ImportKeyringParcel prepareKeyOperation(ImportKeysListEntry entry, boolean skipSave) {
|
||||||
|
|||||||
@@ -264,6 +264,7 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void cryptoOperation(final CryptoInputParcel cryptoInput) {
|
public void cryptoOperation(final CryptoInputParcel cryptoInput) {
|
||||||
|
Timber.d("+cryptoOperation#1");
|
||||||
T operationInput = mCallback.createOperationInput();
|
T operationInput = mCallback.createOperationInput();
|
||||||
if (operationInput == null) {
|
if (operationInput == null) {
|
||||||
return;
|
return;
|
||||||
@@ -320,8 +321,12 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void cryptoOperation() {
|
public void cryptoOperation() {
|
||||||
|
Timber.d("+cryptoOperation");
|
||||||
operationStartTime = SystemClock.elapsedRealtime();
|
operationStartTime = SystemClock.elapsedRealtime();
|
||||||
cryptoOperation(CryptoInputParcel.createCryptoInputParcel(new Date()));
|
Timber.d("cryptoOperation => CryptoInputParcel.createCryptoInputParcel");
|
||||||
|
CryptoInputParcel tmp = CryptoInputParcel.createCryptoInputParcel(new Date());
|
||||||
|
Timber.d("cryptoOperation => cryptoOperation#1");
|
||||||
|
cryptoOperation(tmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
@UiThread
|
@UiThread
|
||||||
|
|||||||
Reference in New Issue
Block a user