Implemented NameEditText

2 files changed, 4 insertions, 51 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/AutoCorrectAutoCompleteTextView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/AutoCorrectAutoCompleteTextView.java
deleted file mode 100644
index ed373a938..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/AutoCorrectAutoCompleteTextView.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.sufficientlysecure.keychain.ui.widget;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.inputmethod.EditorInfo;
-import android.widget.AutoCompleteTextView;
-
-/**
- * Hack to re-enable keyboard auto correction in AutoCompleteTextView.
- * From http://stackoverflow.com/a/22512858
- */
-public class AutoCorrectAutoCompleteTextView extends AutoCompleteTextView {
-
-    public AutoCorrectAutoCompleteTextView(Context context) {
-        super(context);
-        removeFlag();
-    }
-
-    public AutoCorrectAutoCompleteTextView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        removeFlag();
-    }
-
-    public AutoCorrectAutoCompleteTextView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        removeFlag();
-    }
-
-    private void removeFlag() {
-        int inputType = getInputType();
-        inputType &= ~EditorInfo.TYPE_TEXT_FLAG_AUTO_COMPLETE;
-        setRawInputType(inputType);
-    }
-}
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 c7dfa6359..895cd45ec 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
@@ -31,22 +31,26 @@ public class NameEditText extends AutoCompleteTextView {
     public NameEditText(Context context) {
         super(context);
         removeFlag();
+        makeAdapter();
     }
 
     public NameEditText(Context context, AttributeSet attrs) {
         super(context, attrs);
         removeFlag();
+        makeAdapter();
     }
 
     public NameEditText(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         removeFlag();
+        makeAdapter();
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public NameEditText(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
         removeFlag();
+        makeAdapter();
     }
 
     private void removeFlag() {