Add missing columns for projections, remove use of raw user id

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectPublicKeyFragment.java

@@ -174,16 +174,6 @@ public class SelectPublicKeyFragment extends RecyclerFragment<SelectEncryptKeyAd
                 getAdapter().getMasterKeyIds() : new long[0];
     }
 
-    public String[] getSelectedRawUserIds() {
-        return getAdapter() != null ?
-                getAdapter().getRawUserIds() : new String[0];
-    }
-
-    public OpenPgpUtils.UserId[] getSelectedUserIds() {
-        return getAdapter() != null ?
-                getAdapter().getUserIds() : new OpenPgpUtils.UserId[0];
-    }
-
     @Override
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
         Uri baseUri = KeyRings.buildUnifiedKeyRingsUri();
@@ -199,6 +189,9 @@ public class SelectPublicKeyFragment extends RecyclerFragment<SelectEncryptKeyAd
                 KeyRings.VERIFIED,
                 KeyRings.HAS_DUPLICATE_USER_ID,
                 KeyRings.CREATION,
+                KeyRings.NAME,
+                KeyRings.EMAIL,
+                KeyRings.COMMENT
         };
 
         String inMasterKeyList = null;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdListFragment.java

@@ -121,6 +121,9 @@ public class SelectSignKeyIdListFragment extends RecyclerFragment<SelectSignKeyA
                 KeyRings.HAS_ANY_SECRET,
                 KeyRings.HAS_DUPLICATE_USER_ID,
                 KeyRings.CREATION,
+                KeyRings.NAME,
+                KeyRings.EMAIL,
+                KeyRings.COMMENT
         };
 
         String selection = KeyRings.HAS_ANY_SECRET + " != 0";

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/adapter/SelectEncryptKeyAdapter.java

@@ -30,7 +30,6 @@ import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.openintents.openpgp.util.OpenPgpUtils;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.ui.adapter.KeyCursorAdapter;
@@ -113,34 +112,6 @@ public class SelectEncryptKeyAdapter extends KeyCursorAdapter<SelectEncryptKeyAd
         }
     }
 
-    public String[] getRawUserIds() {
-        String[] selected = new String[mSelected.size()];
-        for (int i = 0; i < selected.length; i++) {
-            int position = mSelected.get(i);
-            if (!moveCursor(position)) {
-                return selected;
-            }
-
-            selected[i] = getCursor().getRawUserId();
-        }
-
-        return selected;
-    }
-
-    public OpenPgpUtils.UserId[] getUserIds() {
-        OpenPgpUtils.UserId[] selected = new OpenPgpUtils.UserId[mSelected.size()];
-        for (int i = 0; i < selected.length; i++) {
-            int position = mSelected.get(i);
-            if (!moveCursor(position)) {
-                return selected;
-            }
-
-            selected[i] = getCursor().getUserId();
-        }
-
-        return selected;
-    }
-
     @Override
     public void onContentChanged() {
         mSelected.clear();

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

@@ -192,11 +192,11 @@ public class KeySectionedListAdapter extends SectionCursorAdapter<KeySectionedLi
 
             return '#';
         } else {
-            String userId = cursor.getRawUserId();
+            String name = cursor.getName();
-            if (TextUtils.isEmpty(userId)) {
+            if (name != null) {
-                return '?';
+                return Character.toUpperCase(name.charAt(0));
             } else {
-                return Character.toUpperCase(userId.charAt(0));
+                return '?';
             }
         }
     }
@@ -313,11 +313,11 @@ public class KeySectionedListAdapter extends SectionCursorAdapter<KeySectionedLi
 
                 return "My";
             } else {
-                String userId = cursor.getRawUserId();
+                String name = cursor.getName();
-                if (TextUtils.isEmpty(userId)) {
+                if (name != null) {
-                    return null;
+                    return name.substring(0, 1).toUpperCase();
                 } else {
-                    return userId.substring(0, 1).toUpperCase();
+                    return null;
                 }
             }
         } else {

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/adapter/CursorAdapter.java

@@ -32,7 +32,6 @@ import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.util.Log;
 
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -109,6 +108,7 @@ public abstract class CursorAdapter<C extends CursorAdapter.AbstractCursor, VH e
 
     /**
      * Returns the cursor.
+     *
      * @return the cursor.
      */
     public C getCursor() {
@@ -147,10 +147,9 @@ public abstract class CursorAdapter<C extends CursorAdapter.AbstractCursor, VH e
     }
 
     /**
-     * @see android.support.v7.widget.RecyclerView.Adapter#getItemId(int)
-     *
      * @param position Adapter position to query
      * @return the id of the item
+     * @see android.support.v7.widget.RecyclerView.Adapter#getItemId(int)
      */
     @Override
     public long getItemId(int position) {
@@ -168,6 +167,7 @@ public abstract class CursorAdapter<C extends CursorAdapter.AbstractCursor, VH e
     /**
      * Return the id of the item represented by the row the cursor
      * is currently moved to.
+     *
      * @param cursor The cursor moved to the correct position.
      * @return The id of the dataset
      */
@@ -421,11 +421,6 @@ public abstract class CursorAdapter<C extends CursorAdapter.AbstractCursor, VH e
             return getLong(index);
         }
 
-        public String getRawUserId() {
-            int index = getColumnIndexOrThrow(KeychainContract.KeyRings.USER_ID);
-            return getString(index);
-        }
-
         public String getName() {
             int index = getColumnIndexOrThrow(KeychainContract.KeyRings.NAME);
             return getString(index);
@@ -441,11 +436,6 @@ public abstract class CursorAdapter<C extends CursorAdapter.AbstractCursor, VH e
             return getString(index);
         }
 
-        @Deprecated
-        public OpenPgpUtils.UserId getUserId() {
-            return KeyRing.splitUserId(getRawUserId());
-        }
-
         public boolean hasDuplicate() {
             int index = getColumnIndexOrThrow(KeychainContract.KeyRings.HAS_DUPLICATE_USER_ID);
             return getLong(index) > 0L;