Merge branch 'vpn_cert_update' into 'master'

improve VPN cert update

Closes #9087

See merge request leap/bitmask_android!184

1 files changed, 5 insertions, 2 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java b/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java
index 0b481780..59c1290a 100644
--- a/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java
+++ b/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java
@@ -113,13 +113,16 @@ public class ClientTransportPlugin implements ClientTransportPluginInterface {
     @Override
     public void stop() {
         IPtProxy.stopSnowflake();
-         try {
+        try {
             TorStatusObservable.waitUntil(this::isSnowflakeOff, 10);
         } catch (InterruptedException | TimeoutException e) {
             e.printStackTrace();
         }
         snowflakePort = -1;
-        logFileObserver.stopWatching();
+        if (logFileObserver != null) {
+            logFileObserver.stopWatching();
+            logFileObserver = null;
+        }
     }
 
     private boolean isSnowflakeOff() {