Compare commits

..

1 Commits

Author SHA1 Message Date
879f682849 REVERT ME: debug loss of Auth key 2025-09-30 15:14:14 +02:00
4 changed files with 5 additions and 18 deletions

View File

@@ -21,8 +21,6 @@ import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
import timber.log.Timber;
public class ImportKeysOperationCallback implements
CryptoOperationHelper.Callback<ImportKeyringParcel, ImportKeyResult> {
@@ -47,7 +45,6 @@ public class ImportKeysOperationCallback implements
@Override
public void onCryptoOperationSuccess(ImportKeyResult result) {
Timber.d("+onCryptoOperationSuccess");
mResultListener.handleResult(result, mPosition);
}
@@ -58,7 +55,6 @@ public class ImportKeysOperationCallback implements
@Override
public void onCryptoOperationError(ImportKeyResult result) {
Timber.d("+onCryptoOperationError");
mResultListener.handleResult(result, mPosition);
}

View File

@@ -50,12 +50,9 @@ import org.sufficientlysecure.keychain.pgp.Progressable;
import org.sufficientlysecure.keychain.pgp.SignEncryptParcel;
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
import timber.log.Timber;
public class KeychainServiceTask {
public static KeychainServiceTask create(Activity activity) {
Timber.d("+create#1");
Context context = activity.getApplicationContext();
KeyWritableRepository keyRepository = KeyWritableRepository.create(context);
return new KeychainServiceTask(context, keyRepository);

View File

@@ -213,16 +213,15 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
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 => prepareKeyOperation");
Timber.d("getKeys => prepareKeyOperation");
ImportKeyringParcel inputParcel = prepareKeyOperation(entry, skipSave);
ImportKeysResultListener listener = skipSave ? this : mListener;
Timber.d("getKey => new ImportKeysOperationCallback");
Timber.d("getKeys => new ImportKeysOperationCallback");
ImportKeysOperationCallback cb = new ImportKeysOperationCallback(listener, inputParcel, position);
Timber.d("getKey => new CryptoOperationHelper");
Timber.d("getKeys => new CryptoOperationHelper");
CryptoOperationHelper opHelper = new CryptoOperationHelper<>(1, mActivity, cb, null);
Timber.d("getKey => opHelper.cryptoOperation");
Timber.d("getKeys => opHelper.cryptoOperation");
opHelper.cryptoOperation();
Timber.d("-getKey");
}
private ImportKeyringParcel prepareKeyOperation(ImportKeysListEntry entry, boolean skipSave) {

View File

@@ -264,7 +264,6 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
}
public void cryptoOperation(final CryptoInputParcel cryptoInput) {
Timber.d("+cryptoOperation#1");
T operationInput = mCallback.createOperationInput();
if (operationInput == null) {
return;
@@ -321,12 +320,8 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
}
public void cryptoOperation() {
Timber.d("+cryptoOperation");
operationStartTime = SystemClock.elapsedRealtime();
Timber.d("cryptoOperation => CryptoInputParcel.createCryptoInputParcel");
CryptoInputParcel tmp = CryptoInputParcel.createCryptoInputParcel(new Date());
Timber.d("cryptoOperation => cryptoOperation#1");
cryptoOperation(tmp);
cryptoOperation(CryptoInputParcel.createCryptoInputParcel(new Date()));
}
@UiThread