1 files changed, 29 insertions, 14 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 697f5a61e..1bdec7b84 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
@@ -25,6 +25,7 @@ import android.text.InputType;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.util.Patterns;
+import android.view.inputmethod.EditorInfo;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 
@@ -34,35 +35,33 @@ import org.sufficientlysecure.keychain.util.ContactHelper;
 import java.util.regex.Matcher;
 
 public class EmailEditText extends AutoCompleteTextView {
-    EmailEditText emailEditText;
 
     public EmailEditText(Context context) {
         super(context);
-        emailEditText = this;
-        this.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
-        this.addTextChangedListener(textWatcher);
+        init();
     }
 
     public EmailEditText(Context context, AttributeSet attrs) {
         super(context, attrs);
-        emailEditText = this;
-        this.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
-        this.addTextChangedListener(textWatcher);
+        init();
     }
 
     public EmailEditText(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        emailEditText = this;
-        this.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
-        this.addTextChangedListener(textWatcher);
+        init();
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public EmailEditText(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
-        emailEditText = this;
+        init();
+    }
+
+    private void init() {
         this.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
         this.addTextChangedListener(textWatcher);
+        removeFlag();
+        initAdapter();
     }
 
     TextWatcher textWatcher = new TextWatcher() {
@@ -82,16 +81,32 @@ public class EmailEditText extends AutoCompleteTextView {
             if (email.length() > 0) {
                 Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(email);
                 if (emailMatcher.matches()) {
-                    emailEditText.setCompoundDrawablesWithIntrinsicBounds(0, 0,
+                    EmailEditText.this.setCompoundDrawablesWithIntrinsicBounds(0, 0,
                             R.drawable.uid_mail_ok, 0);
                 } else {
-                    emailEditText.setCompoundDrawablesWithIntrinsicBounds(0, 0,
+                    EmailEditText.this.setCompoundDrawablesWithIntrinsicBounds(0, 0,
                             R.drawable.uid_mail_bad, 0);
                 }
             } else {
                 // remove drawable if email is empty
-                emailEditText.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+                EmailEditText.this.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
             }
         }
     };
+
+    private void initAdapter() {
+        setThreshold(1); // Start working from first character
+        setAdapter(new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_dropdown_item,
+                ContactHelper.getPossibleUserEmails(getContext())));
+    }
+
+    /**
+     * Hack to re-enable keyboard auto correction in AutoCompleteTextView.
+     * From http://stackoverflow.com/a/22512858
+     */
+    private void removeFlag() {
+        int inputType = getInputType();
+        inputType &= ~EditorInfo.TYPE_TEXT_FLAG_AUTO_COMPLETE;
+        setRawInputType(inputType);
+    }
 }