diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java index eba55d14c..479a874d9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java @@ -36,9 +36,7 @@ import com.google.zxing.integration.android.IntentResult; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.keyimport.ImportKeysList; import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry; -import org.sufficientlysecure.keychain.keyimport.Keyserver; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.ProviderHelper; @@ -93,7 +91,7 @@ public class AddKeysActivity extends ActionBarActivity implements mProviderHelper = new ProviderHelper(this); - setContentView(R.layout.add_key_activity); + setContentView(R.layout.add_keys_activity); mSafeSlingerKeySpinner = (ExchangeKeySpinner) findViewById(R.id.add_keys_safeslinger_key_spinner); mActionSafeSlinger = findViewById(R.id.add_keys_safeslinger); diff --git a/OpenKeychain/src/main/res/layout/add_key_activity.xml b/OpenKeychain/src/main/res/layout/add_keys_activity.xml similarity index 96% rename from OpenKeychain/src/main/res/layout/add_key_activity.xml rename to OpenKeychain/src/main/res/layout/add_keys_activity.xml index 548d1224e..b058c8268 100644 --- a/OpenKeychain/src/main/res/layout/add_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/add_keys_activity.xml @@ -153,6 +153,12 @@ android:drawablePadding="8dp" android:gravity="center_vertical" /> + + \ No newline at end of file