(WIP) ImportKeys: Check if key is already present and verified

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java

@@ -173,7 +173,7 @@ public class CachedPublicKeyRing extends KeyRing {
             Object data = mProviderHelper.getGenericData(mUri,
                     KeychainContract.KeyRings.VERIFIED,
                     ProviderHelper.FIELD_TYPE_INTEGER);
-            return (Integer) data;
+            return ((Long) data).intValue();
         } catch(ProviderHelper.NotFoundException e) {
             throw new PgpKeyNotFoundException(e);
         }

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

@@ -37,7 +37,10 @@ import org.sufficientlysecure.keychain.keyimport.processing.ImportKeysResultList
 import org.sufficientlysecure.keychain.operations.ImportOperation;
 import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
 import org.sufficientlysecure.keychain.pgp.CanonicalizedKeyRing;
+import org.sufficientlysecure.keychain.pgp.KeyRing;
+import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
 import org.sufficientlysecure.keychain.ui.ViewKeyActivity;
 import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
@@ -58,23 +61,41 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
     private boolean mNonInteractive;
 
     private List<ImportKeysListEntry> mData;
-
     private KeyState[] mKeyStates;
     private int mCurrent;
 
+    private ProviderHelper mProviderHelper;
+
     public ImportKeysAdapter(FragmentActivity activity, ImportKeysListener listener,
                              boolean nonInteractive) {
 
-        this.mActivity = activity;
+        mActivity = activity;
-        this.mListener = listener;
+        mListener = listener;
-        this.mNonInteractive = nonInteractive;
+        mNonInteractive = nonInteractive;
+
+        mProviderHelper = new ProviderHelper(activity);
     }
 
     public void setData(List<ImportKeysListEntry> data) {
-        this.mData = data;
+        mData = data;
-        this.mKeyStates = new KeyState[data.size()];
+
+        mKeyStates = new KeyState[data.size()];
         for (int i = 0; i < mKeyStates.length; i++) {
             mKeyStates[i] = new KeyState();
+
+            ImportKeysListEntry entry = mData.get(i);
+            long keyId = KeyFormattingUtils.convertKeyIdHexToKeyId(entry.getKeyIdHex());
+            try {
+                KeyRing keyRing;
+                if (entry.isSecretKey()) {
+                    keyRing = mProviderHelper.getCanonicalizedSecretKeyRing(keyId);
+                } else {
+                    keyRing = mProviderHelper.getCachedPublicKeyRing(keyId);
+                }
+                mKeyStates[i].mAlreadyPresent = true;
+                mKeyStates[i].mVerified = keyRing.getVerified() > 0;
+            } catch (ProviderHelper.NotFoundException | PgpKeyNotFoundException ignored) {
+            }
         }
 
         // If there is only one key, get it automatically
@@ -259,6 +280,9 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
     }
 
     private class KeyState {
+        public boolean mAlreadyPresent = false;
+        public boolean mVerified = false;
+
         public boolean mDownloaded = false;
         public boolean mShowed = false;
     }

OpenKeychain/src/main/res/layout/import_keys_list_item.xml

@@ -23,10 +23,9 @@
             android:orientation="vertical"
             android:paddingBottom="8dp">
 
-            <LinearLayout
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
                 android:paddingBottom="16dp"
                 android:paddingLeft="16dp"
                 android:paddingRight="16dp"
@@ -35,6 +34,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
                     android:orientation="vertical">
 
                     <TextView
@@ -64,7 +64,7 @@
 
                 </LinearLayout>
 
-            </LinearLayout>
+            </RelativeLayout>
 
             <FrameLayout
                 android:id="@+id/extra_container"