Edit identities design

1 files changed, 11 insertions, 1 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java
index bc82feb70..4500ccd24 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java
@@ -48,6 +48,7 @@ import org.sufficientlysecure.keychain.util.Log;
 public class AddUserIdDialogFragment extends DialogFragment implements OnEditorActionListener {
     private static final String ARG_MESSENGER = "messenger";
     private static final String ARG_NAME = "name";
+    private static final String ARG_ALLOW_COMMENT = "allow_comment";
 
     public static final int MESSAGE_OKAY = 1;
     public static final int MESSAGE_CANCEL = 2;
@@ -59,12 +60,14 @@ public class AddUserIdDialogFragment extends DialogFragment implements OnEditorA
     private EmailEditText mEmail;
     private EditText mComment;
 
-    public static AddUserIdDialogFragment newInstance(Messenger messenger, String predefinedName) {
+    public static AddUserIdDialogFragment newInstance(Messenger messenger, String predefinedName,
+                                                      boolean allowComment) {
 
         AddUserIdDialogFragment frag = new AddUserIdDialogFragment();
         Bundle args = new Bundle();
         args.putParcelable(ARG_MESSENGER, messenger);
         args.putString(ARG_NAME, predefinedName);
+        args.putBoolean(ARG_ALLOW_COMMENT, allowComment);
         frag.setArguments(args);
 
         return frag;
@@ -78,6 +81,7 @@ public class AddUserIdDialogFragment extends DialogFragment implements OnEditorA
         final Activity activity = getActivity();
         mMessenger = getArguments().getParcelable(ARG_MESSENGER);
         String predefinedName = getArguments().getString(ARG_NAME);
+        boolean allowComment = getArguments().getBoolean(ARG_ALLOW_COMMENT);
 
         CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(activity);
 
@@ -91,6 +95,12 @@ public class AddUserIdDialogFragment extends DialogFragment implements OnEditorA
         mEmail = (EmailEditText) view.findViewById(R.id.add_user_id_address);
         mComment = (EditText) view.findViewById(R.id.add_user_id_comment);
 
+        if (allowComment) {
+            mComment.setVisibility(View.VISIBLE);
+        } else {
+            mComment.setVisibility(View.GONE);
+        }
+
         mName.setText(predefinedName);
 
         alert.setPositiveButton(android.R.string.ok, new OnClickListener() {