1 files changed, 19 insertions, 14 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java
index 0f4312dad..7dee90b4e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java
@@ -23,12 +23,14 @@ import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Typeface;
 import android.net.Uri;
+import android.support.annotation.Nullable;
 import android.support.v4.content.CursorLoader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.ViewAnimator;
 
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.KeyRing;
@@ -52,10 +54,6 @@ public class UserIdsAdapter extends UserAttributesAdapter {
         mShowStatusImages = showStatusImages;
     }
 
-    public UserIdsAdapter(Context context, Cursor c, int flags, SaveKeyringParcel saveKeyringParcel) {
-        this(context, c, flags, true, saveKeyringParcel);
-    }
-
     public UserIdsAdapter(Context context, Cursor c, int flags) {
         this(context, c, flags, true, null);
     }
@@ -66,7 +64,7 @@ public class UserIdsAdapter extends UserAttributesAdapter {
         TextView vAddress = (TextView) view.findViewById(R.id.user_id_item_address);
         TextView vComment = (TextView) view.findViewById(R.id.user_id_item_comment);
         ImageView vVerified = (ImageView) view.findViewById(R.id.user_id_item_certified);
-        View vVerifiedLayout = view.findViewById(R.id.user_id_item_certified_layout);
+        ViewAnimator vVerifiedLayout = (ViewAnimator) view.findViewById(R.id.user_id_icon_animator);
         ImageView vEditImage = (ImageView) view.findViewById(R.id.user_id_item_edit_image);
         ImageView vDeleteButton = (ImageView) view.findViewById(R.id.user_id_item_delete_button);
         vDeleteButton.setVisibility(View.GONE); // not used
@@ -114,16 +112,9 @@ public class UserIdsAdapter extends UserAttributesAdapter {
                 }
             }
 
-            vEditImage.setVisibility(View.VISIBLE);
-            vVerifiedLayout.setVisibility(View.GONE);
+            vVerifiedLayout.setDisplayedChild(2);
         } else {
-            vEditImage.setVisibility(View.GONE);
-
-            if (mShowStatusImages) {
-                vVerifiedLayout.setVisibility(View.VISIBLE);
-            } else {
-                vVerifiedLayout.setVisibility(View.GONE);
-            }
+            vVerifiedLayout.setDisplayedChild(mShowStatusImages ? 1 : 0);
         }
 
         if (isRevoked) {
@@ -177,6 +168,20 @@ public class UserIdsAdapter extends UserAttributesAdapter {
         return isRevokedPending;
     }
 
+    /** Set this adapter into edit mode. This mode displays additional info for
+     * each item from a supplied SaveKeyringParcel reference.
+     *
+     * Note that it is up to the caller to reload the underlying cursor after
+     * updating the SaveKeyringParcel!
+     *
+     * @see SaveKeyringParcel
+     *
+     * @param saveKeyringParcel The parcel to get info from, or null to leave edit mode.
+     */
+    public void setEditMode(@Nullable SaveKeyringParcel saveKeyringParcel) {
+        mSaveKeyringParcel = saveKeyringParcel;
+    }
+
     @Override
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
         return mInflater.inflate(R.layout.view_key_adv_user_id_item, null);