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

Updated OrbotHelper with the latest NetCipher

1 files changed, 15 insertions, 4 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddEditKeyserverDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddEditKeyserverDialogFragment.java
index 691cc009d..47bc7dfda 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddEditKeyserverDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddEditKeyserverDialogFragment.java
@@ -50,6 +50,7 @@ import android.widget.TextView.OnEditorActionListener;
 
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.Request;
+
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.keyimport.HkpKeyserver;
@@ -216,15 +217,25 @@ public class AddEditKeyserverDialogFragment extends DialogFragment implements On
                     if (mVerifyKeyserverCheckBox.isChecked()) {
                         final Preferences.ProxyPrefs proxyPrefs = Preferences.getPreferences(getActivity())
                                 .getProxyPrefs();
-                        Runnable ignoreTor = new Runnable() {
+                        OrbotHelper.DialogActions dialogActions = new OrbotHelper.DialogActions() {
+                            @Override
+                            public void onOrbotStarted() {
+                                verifyConnection(keyserverUrl,
+                                        proxyPrefs.parcelableProxy.getProxy());
+                            }
+
                             @Override
-                            public void run() {
+                            public void onNeutralButton() {
                                 verifyConnection(keyserverUrl, null);
                             }
+
+                            @Override
+                            public void onCancel() {
+                                // do nothing
+                            }
                         };
 
-                        if (OrbotHelper.putOrbotInRequiredState(R.string.orbot_ignore_tor, ignoreTor, proxyPrefs,
-                                getActivity())) {
+                        if (OrbotHelper.putOrbotInRequiredState(dialogActions, getActivity())) {
                             verifyConnection(keyserverUrl, proxyPrefs.parcelableProxy.getProxy());
                         }
                     } else {