master merge

1 files changed, 28 insertions, 0 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 12bc33995..ba931c61a 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -28,6 +28,7 @@ import org.spongycastle.openpgp.PGPPublicKey;
 import org.spongycastle.openpgp.PGPPublicKeyRing;
 import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
+import org.spongycastle.openpgp.PGPSignature;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.pgp.PgpConversionHelper;
 import org.sufficientlysecure.keychain.pgp.PgpHelper;
@@ -210,6 +211,13 @@ public class ProviderHelper {
             ++userIdRank;
         }
 
+        for (PGPSignature certification : new IterableIterator<PGPSignature>(masterKey.getSignaturesOfType(PGPSignature.POSITIVE_CERTIFICATION))) {
+            //TODO: how to do this?? we need to verify the signatures again and again when they are displayed...
+//            if (certification.verify
+//            operations.add(buildPublicKeyOperations(context, keyRingRowId, key, rank));
+        }
+
+
         try {
             context.getContentResolver().applyBatch(KeychainContract.CONTENT_AUTHORITY, operations);
         } catch (RemoteException e) {
@@ -562,6 +570,26 @@ public class ProviderHelper {
         return fingerprint;
     }
 
+    public static String getUserId(Context context, Uri queryUri) {
+        String[] projection = new String[]{UserIds.USER_ID};
+        Cursor cursor = context.getContentResolver().query(queryUri, projection, null, null, null);
+
+        String userId = null;
+        try {
+            if (cursor != null && cursor.moveToFirst()) {
+                int col = cursor.getColumnIndexOrThrow(UserIds.USER_ID);
+
+                userId = cursor.getString(col);
+            }
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+
+        return userId;
+    }
+
     public static ArrayList<String> getKeyRingsAsArmoredString(Context context, Uri uri,
                                                                long[] masterKeyIds) {
         ArrayList<String> output = new ArrayList<String>();