Merge pull request #1865 from vanitasvitae/master

Fixed 'Orbot appears not to be running' (#1792)

1 files changed, 7 insertions, 3 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java
index d85ad9128..b2809d576 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java
@@ -150,10 +150,14 @@ public class OrbotHelper {
         // only static utility methods, do not instantiate
     }
 
+    /**
+     * Initialize the OrbotStatusReceiver (if not already happened) and check, whether Orbot is
+     * running or not.
+     * @param context context
+     * @return if Orbot is running
+     */
     public static boolean isOrbotRunning(Context context) {
-        int procId = TorServiceUtils.findProcessId(context);
-
-        return (procId != -1);
+        return OrbotStatusReceiver.getInstance().isTorRunning(context);
     }
 
     public static boolean isOrbotInstalled(Context context) {