[tor-commits] [orbot/master] Fixes 519 Icon Always Leaves on Exit

[n8fr8 at torproject.org]

commit 031524549b8573ffc547224d6504b52ee411045f
Author: bim <dsnake at protonmail.com>
Date:   Thu Sep 23 18:52:14 2021 -0400

    Fixes 519 Icon Always Leaves on Exit
---
 .../src/main/java/org/torproject/android/service/OrbotService.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 8af18be2..70ccf17e 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -172,7 +172,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
             e.printStackTrace(new PrintStream(baos));
 
             sendCallbackLogMessage(msg + '\n' + baos.toString());
-
         } else
             sendCallbackLogMessage(msg);
 
@@ -310,12 +309,12 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
 
             stopTor();
 
-            //stop the foreground priority and make sure to remove the persistant notification
+            //stop the foreground priority and make sure to remove the persistent notification
             stopForeground(true);
 
             sendCallbackLogMessage(getString(R.string.status_disabled));
         } catch (Exception e) {
-            logNotice("An error occured stopping Tor: " + e.getMessage());
+            logNotice("An error occurred stopping Tor: " + e.getMessage());
             sendCallbackLogMessage(getString(R.string.something_bad_happened));
         }
         clearNotifications();
@@ -421,6 +420,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
             }
 
             conn = null;
+        } else {
+            stopSelf();
         }
     }