1 files changed, 6 insertions, 16 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
index 1a03b8102..f45f1b350 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
@@ -195,23 +195,23 @@ public class ImportKeysProxyActivity extends FragmentActivity
         }
     }
 
-    public void importKeys(byte[] keyringData, ParcelableProxy parcelableProxy) {
+    public void importKeys(byte[] keyringData) {
         ParcelableKeyRing keyEntry = new ParcelableKeyRing(keyringData);
         ArrayList<ParcelableKeyRing> selectedEntries = new ArrayList<>();
         selectedEntries.add(keyEntry);
 
-        startImportService(selectedEntries, parcelableProxy);
+        startImportService(selectedEntries);
     }
 
-    public void importKeys(String fingerprint, ParcelableProxy parcelableProxy) {
+    public void importKeys(String fingerprint) {
         ParcelableKeyRing keyEntry = new ParcelableKeyRing(fingerprint, null, null);
         ArrayList<ParcelableKeyRing> selectedEntries = new ArrayList<>();
         selectedEntries.add(keyEntry);
 
-        startImportService(selectedEntries, parcelableProxy);
+        startImportService(selectedEntries);
     }
 
-    private void startImportService(ArrayList<ParcelableKeyRing> keyRings, ParcelableProxy parcelableProxy) {
+    private void startImportService(ArrayList<ParcelableKeyRing> keyRings) {
 
         // search config
         {
@@ -275,18 +275,8 @@ public class ImportKeysProxyActivity extends FragmentActivity
         NdefMessage msg = (NdefMessage) rawMsgs[0];
         // record 0 contains the MIME type, record 1 is the AAR, if present
         final byte[] receivedKeyringBytes = msg.getRecords()[0].getPayload();
-        final Preferences.ProxyPrefs proxyPrefs = Preferences.getPreferences(this)
-                .getProxyPrefs();
-        Runnable ignoreTor = new Runnable() {
-            @Override
-            public void run() {
-                importKeys(receivedKeyringBytes, new ParcelableProxy(null, -1, null));
-            }
-        };
 
-        if (OrbotHelper.isOrbotInRequiredState(R.string.orbot_ignore_tor, ignoreTor, proxyPrefs, this)) {
-            importKeys(receivedKeyringBytes, proxyPrefs.parcelableProxy);
-        }
+        importKeys(receivedKeyringBytes);
     }
 
 }