Rename adapter

2 files changed, 19 insertions, 8 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
index dae287bbc..6d8455589 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
@@ -35,7 +35,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
 
 import java.util.Date;
 
-public class ViewKeyKeysAdapter extends CursorAdapter {
+public class SubkeysAdapter extends CursorAdapter {
     private LayoutInflater mInflater;
 
     private int mIndexKeyId;
@@ -69,7 +69,7 @@ public class ViewKeyKeysAdapter extends CursorAdapter {
             Keys.FINGERPRINT
     };
 
-    public ViewKeyKeysAdapter(Context context, Cursor c, int flags) {
+    public SubkeysAdapter(Context context, Cursor c, int flags) {
         super(context, c, flags);
 
         mInflater = LayoutInflater.from(context);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java
index 763752edc..77da1d0e3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java
@@ -34,10 +34,11 @@ import org.sufficientlysecure.keychain.helper.OtherHelper;
 import org.sufficientlysecure.keychain.pgp.KeyRing;
 import org.sufficientlysecure.keychain.provider.KeychainContract.Certs;
 import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
+import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 
 import java.util.ArrayList;
 
-public class ViewKeyUserIdsAdapter extends CursorAdapter implements AdapterView.OnItemClickListener {
+public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemClickListener {
     private LayoutInflater mInflater;
 
     private int mIndexUserId, mIndexRank;
@@ -45,6 +46,8 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter implements AdapterView.
 
     private final ArrayList<Boolean> mCheckStates;
 
+    private SaveKeyringParcel mSaveKeyringParcel;
+
     public static final String[] USER_IDS_PROJECTION = new String[]{
             UserIds._ID,
             UserIds.USER_ID,
@@ -54,18 +57,27 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter implements AdapterView.
             UserIds.IS_REVOKED
     };
 
-    public ViewKeyUserIdsAdapter(Context context, Cursor c, int flags, boolean showCheckBoxes) {
+    public UserIdsAdapter(Context context, Cursor c, int flags, boolean showCheckBoxes,
+                          SaveKeyringParcel saveKeyringParcel) {
         super(context, c, flags);
-
         mInflater = LayoutInflater.from(context);
 
         mCheckStates = showCheckBoxes ? new ArrayList<Boolean>() : null;
+        mSaveKeyringParcel = saveKeyringParcel;
 
         initIndex(c);
     }
 
-    public ViewKeyUserIdsAdapter(Context context, Cursor c, int flags) {
-        this(context, c, flags, false);
+    public UserIdsAdapter(Context context, Cursor c, int flags, boolean showCheckBoxes) {
+        this(context, c, flags, showCheckBoxes, null);
+    }
+
+    public UserIdsAdapter(Context context, Cursor c, int flags, SaveKeyringParcel saveKeyringParcel) {
+        this(context, c, flags, false, saveKeyringParcel);
+    }
+
+    public UserIdsAdapter(Context context, Cursor c, int flags) {
+        this(context, c, flags, false, null);
     }
 
     @Override
@@ -181,7 +193,6 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter implements AdapterView.
             }
         });
         vCheckBox.setClickable(false);
-
     }
 
     public void onItemClick(AdapterView<?> adapter, View view, int position, long id) {