Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify

1 files changed, 0 insertions, 16 deletions

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 fd013739e..427fc9315 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java
@@ -73,7 +73,6 @@ public class AddKeysActivity extends ActionBarActivity implements
     ImageView mActionSafeSlingerIcon;
     View mActionQrCode;
     View mActionNfc;
-    View mActionSearchCloud;
 
     ProviderHelper mProviderHelper;
 
@@ -103,7 +102,6 @@ public class AddKeysActivity extends ActionBarActivity implements
                 PorterDuff.Mode.SRC_IN);
         mActionQrCode = findViewById(R.id.add_keys_qr_code);
         mActionNfc = findViewById(R.id.add_keys_nfc);
-        mActionSearchCloud = findViewById(R.id.add_keys_search_cloud);
 
         mSafeSlingerKeySpinner.setOnKeyChangedListener(new KeySpinner.OnKeyChangedListener() {
             @Override
@@ -135,14 +133,6 @@ public class AddKeysActivity extends ActionBarActivity implements
                 startActivityForResult(intent, REQUEST_CODE_RESULT);
             }
         });
-
-        mActionSearchCloud.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                searchCloud();
-            }
-        });
-
     }
 
     private void startExchange() {
@@ -171,12 +161,6 @@ public class AddKeysActivity extends ActionBarActivity implements
         new IntentIntegrator(this).initiateScan();
     }
 
-    private void searchCloud() {
-        finish();
-        Intent importIntent = new Intent(this, ImportKeysActivity.class);
-        startActivity(importIntent);
-    }
-
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {