From a094730690ab8097e516cd96dc28819bdd114227 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 25 Aug 2016 14:54:11 +0200
Subject: [PATCH] remove support for "Comment" field

---
 .../keychain/ui/EditIdentitiesFragment.java   |  3 +--
 .../keychain/ui/EditKeyFragment.java          |  3 +--
 .../ui/ViewKeyAdvUserIdsFragment.java         |  3 +--
 .../ui/dialog/AddUserIdDialogFragment.java    | 22 +++----------------
 .../main/res/layout/add_user_id_dialog.xml    | 12 ----------
 5 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditIdentitiesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditIdentitiesFragment.java
index aec0bb711..6c5ad43ca 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditIdentitiesFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditIdentitiesFragment.java
@@ -321,8 +321,7 @@ public class EditIdentitiesFragment extends Fragment
 
         // pre-fill out primary name
         String predefinedName = KeyRing.splitUserId(mPrimaryUserId).name;
-        AddUserIdDialogFragment addUserIdDialog = AddUserIdDialogFragment.newInstance(messenger,
-                predefinedName, false);
+        AddUserIdDialogFragment addUserIdDialog = AddUserIdDialogFragment.newInstance(messenger, predefinedName);
 
         addUserIdDialog.show(getActivity().getSupportFragmentManager(), "addUserIdDialog");
     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
index 80fea7b23..9181c6f79 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
@@ -549,8 +549,7 @@ public class EditKeyFragment extends QueueingCryptoOperationFragment<SaveKeyring
 
         // pre-fill out primary name
         String predefinedName = KeyRing.splitUserId(mPrimaryUserId).name;
-        AddUserIdDialogFragment addUserIdDialog = AddUserIdDialogFragment.newInstance(messenger,
-                predefinedName, true);
+        AddUserIdDialogFragment addUserIdDialog = AddUserIdDialogFragment.newInstance(messenger, predefinedName);
 
         addUserIdDialog.show(getActivity().getSupportFragmentManager(), "addUserIdDialog");
     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvUserIdsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvUserIdsFragment.java
index 69ccab162..ae1dd51d0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvUserIdsFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvUserIdsFragment.java
@@ -210,8 +210,7 @@ public class ViewKeyAdvUserIdsFragment extends LoaderFragment implements
         Messenger messenger = new Messenger(returnHandler);
 
         // pre-fill out primary name
-        AddUserIdDialogFragment addUserIdDialog =
-                AddUserIdDialogFragment.newInstance(messenger, "", true);
+        AddUserIdDialogFragment addUserIdDialog = AddUserIdDialogFragment.newInstance(messenger, "");
 
         addUserIdDialog.show(getActivity().getSupportFragmentManager(), "addUserIdDialog");
     }
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 2daece4ac..d732ae085 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
@@ -34,7 +34,6 @@ import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
@@ -49,7 +48,6 @@ 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,16 +57,13 @@ public class AddUserIdDialogFragment extends DialogFragment implements OnEditorA
     private Messenger mMessenger;
     private NameEditText  mName;
     private EmailEditText mEmail;
-    private EditText mComment;
 
-    public static AddUserIdDialogFragment newInstance(Messenger messenger, String predefinedName,
-                                                      boolean allowComment) {
+    public static AddUserIdDialogFragment newInstance(Messenger messenger, String predefinedName) {
 
         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;
@@ -82,7 +77,6 @@ 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);
 
@@ -94,13 +88,6 @@ public class AddUserIdDialogFragment extends DialogFragment implements OnEditorA
 
         mName = (NameEditText) view.findViewById(R.id.add_user_id_name);
         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);
 
@@ -111,8 +98,8 @@ public class AddUserIdDialogFragment extends DialogFragment implements OnEditorA
 
                 // return new user id back to activity
                 Bundle data = new Bundle();
-                String userId = KeyRing.createUserId(new OpenPgpUtils.UserId(mName.getText().toString(),
-                        mEmail.getText().toString(), mComment.getText().toString()));
+                String userId = KeyRing.createUserId(new OpenPgpUtils.UserId(
+                        mName.getText().toString(), mEmail.getText().toString(), null));
                 data.putString(MESSAGE_DATA_USER_ID, userId);
                 sendMessageToHandler(MESSAGE_OKAY, data);
             }
@@ -145,9 +132,6 @@ public class AddUserIdDialogFragment extends DialogFragment implements OnEditorA
         });
         mEmail.requestFocus();
 
-        mComment.setImeActionLabel(getString(android.R.string.ok), EditorInfo.IME_ACTION_DONE);
-        mComment.setOnEditorActionListener(this);
-
         return alert.show();
     }
 
diff --git a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
index b3969a2bd..64d2934c5 100644
--- a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
@@ -25,16 +25,4 @@
         android:hint="@string/create_key_hint_full_name"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
-    <EditText
-        android:id="@+id/add_user_id_comment"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="?attr/colorTertiaryText"
-        android:singleLine="true"
-        android:lines="1"
-        android:maxLines="1"
-        android:imeOptions="actionDone"
-        android:hint="@string/label_comment"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
-
 </LinearLayout>