Merge pull request #1473 from open-keychain/orbot-helper

Updated OrbotHelper with the latest NetCipher

1 files changed, 26 insertions, 20 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
index 53e5efabe..8502798cd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
@@ -371,32 +371,38 @@ public class ImportKeysListFragment extends ListFragment implements
                         Runnable showOrbotDialog = new Runnable() {
                             @Override
                             public void run() {
-                                final Runnable ignoreTor = new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        mParcelableProxy = ParcelableProxy
-                                                .getForNoProxy();
-                                        mShowingOrbotDialog = false;
-                                        restartLoaders();
-                                    }
-                                };
-
-                                final Runnable dialogDismiss = new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        mShowingOrbotDialog = false;
-                                    }
-                                };
-
-                                if (OrbotHelper.putOrbotInRequiredState(
-                                        ignoreTor, dialogDismiss, getActivity())) {
+                                OrbotHelper.DialogActions dialogActions =
+                                        new OrbotHelper.DialogActions() {
+                                            @Override
+                                            public void onOrbotStarted() {
+                                                mShowingOrbotDialog = false;
+                                                restartLoaders();
+                                            }
+
+                                            @Override
+                                            public void onNeutralButton() {
+                                                mParcelableProxy = ParcelableProxy
+                                                        .getForNoProxy();
+                                                mShowingOrbotDialog = false;
+                                                restartLoaders();
+                                            }
+
+                                            @Override
+                                            public void onCancel() {
+                                                mShowingOrbotDialog = false;
+                                            }
+                                        };
+
+                                if (OrbotHelper.putOrbotInRequiredState(dialogActions,
+                                        getActivity())) {
                                     // looks like we didn't have to show the
                                     // dialog after all
+                                    mShowingOrbotDialog = false;
                                     restartLoaders();
                                 }
                             }
                         };
-                        new Handler().post(showOrbotDialog );
+                        new Handler().post(showOrbotDialog);
                         mShowingOrbotDialog = true;
                     }
                 } else {