REVERT ME: debug loss of Auth key

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java

@@ -46,11 +46,14 @@ import org.sufficientlysecure.keychain.operations.ImportOperation;
 import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
 import org.sufficientlysecure.keychain.pgp.CanonicalizedKeyRing;
 import org.sufficientlysecure.keychain.pgp.CanonicalizedKeyRing.VerificationStatus;
+import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKey;
+import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
 import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
 import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
 import org.sufficientlysecure.keychain.ui.keyview.ViewKeyActivity;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.ui.util.Notify;
+import org.sufficientlysecure.keychain.util.IterableIterator;
 import org.sufficientlysecure.keychain.util.ParcelableFileCache;
 import timber.log.Timber;
 
@@ -209,10 +212,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("getKeys => prepareKeyOperation");
         ImportKeyringParcel inputParcel = prepareKeyOperation(entry, skipSave);
         ImportKeysResultListener listener = skipSave ? this : mListener;
+        Timber.d("getKeys => new ImportKeysOperationCallback");
         ImportKeysOperationCallback cb = new ImportKeysOperationCallback(listener, inputParcel, position);
+        Timber.d("getKeys => new CryptoOperationHelper");
         CryptoOperationHelper opHelper = new CryptoOperationHelper<>(1, mActivity, cb, null);
+        Timber.d("getKeys => opHelper.cryptoOperation");
         opHelper.cryptoOperation();
     }
 
@@ -264,9 +272,18 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
             ArrayList<CanonicalizedKeyRing> canKeyRings = result.mCanonicalizedKeyRings;
             if (canKeyRings.size() == 1) {
                 CanonicalizedKeyRing keyRing = canKeyRings.get(0);
-                Timber.e("Key ID: " + keyRing.getMasterKeyId() +
-                        "| isRev: " + keyRing.isRevoked() + "| isExp: " + keyRing.isExpired()
-                        + "| isSec: " + keyRing.isSecure());
+                Timber.e("Key ID: %016X| isRev: " + keyRing.isRevoked() + " | isExp: " + keyRing.isExpired()
+                        + " | isSec: " + keyRing.isSecure(), keyRing.getMasterKeyId());
+                try {
+                    Timber.e("[E]: %016X", keyRing.getEncryptId());
+                } catch (PgpKeyNotFoundException ignored) {}
+                try {
+                    Timber.e("[S]: %016X", keyRing.getSigningId());
+                } catch (PgpKeyNotFoundException ignored) {}
+
+                for (CanonicalizedPublicKey val : keyRing.publicKeyIterator()) {
+                    Timber.e("KEY %016X; [%s%s%s%s]", val.getKeyId(), val.canAuthenticate() ? "A" : "", val.canCertify() ? "C" : "", val.canEncrypt() ? "E" : "", val.canSign() ? "S" : "");
+                }
 
                 ImportKeysListEntry entry = mData.get(position);
                 entry.setUpdated(result.isOkUpdated());