correctly handle vpnService's onRevoke method(), which fires off when another VPN app takes the stage

Author: bitmold

app/src/main/java/org/torproject/android/service/OrbotService.java

@@ -632,10 +632,11 @@ public void setNotificationSubtext(String message) {
     // system calls this method when VPN disconnects (either by the user or another VPN app)
     @Override
     public void onRevoke() {
-        Prefs.putUseVpn(false);
-        mVpnManager.handleIntent(new Builder(), new Intent(ACTION_STOP));
         // tell UI, if it's open, to update immediately (don't wait for onResume() in Activity...)
-        sendBroadcast(new Intent(ACTION_STOP).setPackage(getPackageName()));
+        sendLocalStatusOffBroadcast();
+        mVpnManager.handleIntent(new Builder(), new Intent(ACTION_STOP));
+        Prefs.putUseVpn(false);
+        super.onRevoke(); // invokes stopSelf()
     }
 
     private void setExitNode(String newExits) {

app/src/main/res/values/strings.xml

@@ -306,6 +306,6 @@
     <string name="unable_to_start_orbot_vpn_title">Unable to start Orbot VPN</string>
     <string name="unable_to_start_legacy_vpn_error_msg">There is a Custom VPN Profile configured to be an \"Always-on\" VPN. Please disable it before starting Orbot.</string>
     <string name="unable_to_start_other_vpn_app_error_msg">The app %1$s is configured to be an \"Always-on\" VPN. Please disable it before starting Orbot.</string>
-    <string name="unable_to_start_unknown_reason_error_msg">The VPN permission was denied or another app has \"Always-on VPN\" enabled. You can dismiss this and reconnect if you exited the previous VPN Request dialog by mistake. Technical users can use another VPN app and use Tor as a SOCKS Proxy by enabling Orbot\'s Power User Mode.</string>
+    <string name="unable_to_start_unknown_reason_error_msg">The VPN permission was denied or another VPN app has the \"Always-on VPN\" feature enabled. You can dismiss this and reconnect if you exited the previous VPN Request dialog by mistake. Technical users can use another VPN app and use Tor as a SOCKS Proxy by enabling Orbot\'s Power User Mode.</string>
     <string name="open_vpn_settings">Open Android VPN Settings</string>
 </resources>