Merge branch 'development' into linked-identities

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java

4 files changed, 18 insertions, 18 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java
index 1bdec7b84..e21c5d510 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java
@@ -58,9 +58,10 @@ public class EmailEditText extends AutoCompleteTextView {
     }
 
     private void init() {
-        this.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
-        this.addTextChangedListener(textWatcher);
-        removeFlag();
+        setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
+        reenableKeyboardSuggestions();
+
+        addTextChangedListener(textWatcher);
         initAdapter();
     }
 
@@ -104,7 +105,7 @@ public class EmailEditText extends AutoCompleteTextView {
      * Hack to re-enable keyboard auto correction in AutoCompleteTextView.
      * From http://stackoverflow.com/a/22512858
      */
-    private void removeFlag() {
+    private void reenableKeyboardSuggestions() {
         int inputType = getInputType();
         inputType &= ~EditorInfo.TYPE_TEXT_FLAG_AUTO_COMPLETE;
         setRawInputType(inputType);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
index 94a321f29..ceace1d26 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
@@ -184,7 +184,7 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView {
 
     public class EncryptionKey {
         private String mUserIdFull;
-        private String[] mUserId;
+        private KeyRing.UserId mUserId;
         private long mKeyId;
         private boolean mHasDuplicate;
         private Date mCreation;
@@ -222,23 +222,23 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView {
         }
 
         public String getPrimary() {
-            if (mUserId[0] != null) {
-                return mUserId[0];
+            if (mUserId.name != null) {
+                return mUserId.name;
             } else {
-                return mUserId[1];
+                return mUserId.email;
             }
         }
 
         public String getSecondary() {
-            if (mUserId[1] != null) {
-                return mUserId[1];
+            if (mUserId.email != null) {
+                return mUserId.email;
             } else {
                 return getCreationDate();
             }
         }
 
         public String getTertiary() {
-            if (mUserId[0] != null) {
+            if (mUserId.name != null) {
                 return getCreationDate();
             } else {
                 return null;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
index aeb013c71..70f4e7792 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
@@ -39,7 +39,6 @@ import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.KeyRing;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
-import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.Log;
 
 import java.util.Calendar;
@@ -158,9 +157,9 @@ public abstract class KeySpinner extends TintSpinner implements LoaderManager.Lo
                     TextView vKeyEmail = (TextView) view.findViewById(R.id.keyspinner_key_email);
                     TextView vDuplicate = (TextView) view.findViewById(R.id.keyspinner_duplicate);
 
-                    String[] userId = KeyRing.splitUserId(cursor.getString(mIndexUserId));
-                    vKeyName.setText(userId[2] == null ? userId[0] : (userId[0] + " (" + userId[2] + ")"));
-                    vKeyEmail.setText(userId[1]);
+                    KeyRing.UserId userId = KeyRing.splitUserId(cursor.getString(mIndexUserId));
+                    vKeyName.setText(userId.name);
+                    vKeyEmail.setText(userId.email);
 
                     boolean duplicate = cursor.getLong(mIndexDuplicate) > 0;
                     if (duplicate) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NameEditText.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NameEditText.java
index f086c5696..153bf2ff2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NameEditText.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NameEditText.java
@@ -50,7 +50,7 @@ public class NameEditText extends AutoCompleteTextView {
     }
 
     private void init() {
-        removeFlag();
+        reenableKeyboardSuggestions();
         initAdapter();
     }
 
@@ -62,10 +62,10 @@ public class NameEditText extends AutoCompleteTextView {
     }
 
     /**
-     * Hack to re-enable keyboard auto correction in AutoCompleteTextView.
+     * Hack to re-enable keyboard suggestions in AutoCompleteTextView.
      * From http://stackoverflow.com/a/22512858
      */
-    private void removeFlag() {
+    private void reenableKeyboardSuggestions() {
         int inputType = getInputType();
         inputType &= ~EditorInfo.TYPE_TEXT_FLAG_AUTO_COMPLETE;
         setRawInputType(inputType);