aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authormar-v-in <github@rvin.mooo.com>2014-08-01 05:31:04 +0200
committermar-v-in <github@rvin.mooo.com>2014-08-01 05:31:04 +0200
commit00f5352ddc90ab05f3d1a44534e44b015e071e18 (patch)
tree671ed05998587902b6bc39a62c12536365a1c283 /OpenKeychain
parentfc2a1f583856d66c4fe13e9f77218dca79a9ccca (diff)
downloadopen-keychain-00f5352ddc90ab05f3d1a44534e44b015e071e18.tar.gz
open-keychain-00f5352ddc90ab05f3d1a44534e44b015e071e18.tar.bz2
open-keychain-00f5352ddc90ab05f3d1a44534e44b015e071e18.zip
Fixes after merge
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
index f05fec782..2295183a9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
@@ -30,9 +30,12 @@ import android.support.v4.widget.CursorAdapter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.CheckBox;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.Spinner;
+import android.widget.SpinnerAdapter;
import android.widget.TextView;
-import android.widget.Button;
+
import com.tokenautocomplete.TokenCompleteTextView;
import org.sufficientlysecure.keychain.Constants;