[tor-commits] [orbot/master] Merge branch 'bug_tor_wont_stop_with_activeVPN' of https://github.com/bitmold/orbot into bitmold-bug_tor_wont_stop_with_activeVPN

[n8fr8 at torproject.org]

commit 80b532ea8fc2d4f98ca05e07d1ab4b9131bb3610
Merge: da5f80d7 f8b1fceb
Author: n8fr8 <nathan at guardianproject.info>
Date:   Sat May 30 06:24:15 2020 -0400

    Merge branch 'bug_tor_wont_stop_with_activeVPN' of https://github.com/bitmold/orbot into bitmold-bug_tor_wont_stop_with_activeVPN

 .../org/torproject/android/OrbotMainActivity.java  |  53 ++++-----
 .../torproject/android/service/OrbotService.java   |  37 ++-----
 .../android/service/vpn/OrbotVpnManager.java       | 123 ++++-----------------
 3 files changed, 55 insertions(+), 158 deletions(-)

diff --cc app/src/main/java/org/torproject/android/OrbotMainActivity.java
index c1359457,ec7db2ba..61e4b4f2
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@@ -827,11 -883,12 +831,10 @@@ public class OrbotMainActivity extends 
                      torStatus.equals(TorServiceConstants.STATUS_ON))
                  refreshVPNApps();
  
 -        }
 -        else if (request == REQUEST_VPN && response == RESULT_OK) {
 +        } else if (request == REQUEST_VPN && response == RESULT_OK) {
              sendIntentToService(ACTION_START_VPN);
 -        }
 -        else if (request == REQUEST_VPN && response == RESULT_CANCELED) {
 +        } else if (request == REQUEST_VPN && response == RESULT_CANCELED) {
              mBtnVPN.setChecked(false);
-             Prefs.putUseVpn(false);
          }
  
          IntentResult scanResult = IntentIntegrator.parseActivityResult(request, response, data);