modify ImportKeysActivity to match new pattern

1 files changed, 4 insertions, 18 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index b41ca58b4..4b6af6072 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -357,30 +357,16 @@ public class ImportKeysActivity extends BaseNfcActivity
         if (loaderState instanceof ImportKeysListFragment.CloudLoaderState) {
             // do the tor check
             // this handle will set tor to be ignored whenever a message is received
-            Handler ignoreTorHandler = new Handler() {
+            Runnable ignoreTor = new Runnable() {
                 @Override
-                public void handleMessage(Message msg) {
+                public void run() {
                     // disables Tor until Activity is recreated
                     mProxyPrefs = new Preferences.ProxyPrefs(false, false, null, -1, null);
                     mListFragment.loadNew(loaderState, mProxyPrefs.parcelableProxy);
                 }
             };
-
-            if(mProxyPrefs.torEnabled && !OrbotHelper.isOrbotInstalled(this)) {
-
-                OrbotHelper.getInstallDialogFragmentWithThirdButton(
-                        new Messenger(ignoreTorHandler),
-                        R.string.orbot_install_dialog_ignore_tor
-                ).show(getSupportFragmentManager(), "orbotInstallDialog");
-
-                return;
-            }
-
-            if(mProxyPrefs.torEnabled && !OrbotHelper.isOrbotRunning()) {
-                OrbotHelper.getOrbotStartDialogFragment(new Messenger(ignoreTorHandler),
-                        R.string.orbot_install_dialog_ignore_tor)
-                        .show(getSupportFragmentManager(), "orbotStartDialog");
-                return;
+            if (OrbotHelper.isOrbotInRequiredState(R.string.orbot_ignore_tor, ignoreTor, mProxyPrefs, this)) {
+                mListFragment.loadNew(loaderState, mProxyPrefs.parcelableProxy);
             }
         }