diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-11 16:50:18 +0300 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-11 16:50:18 +0300 |
commit | b362668f8144f07b2bd388ccae4d52dca1590396 (patch) | |
tree | b259266ade960e65cc1021669b34b5c326650620 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java | |
parent | 39849c2c572e23341d3fda260e72d4fc8367a68d (diff) | |
parent | 26a73724548797cec791ea4b622e5e8baea06980 (diff) | |
download | open-keychain-b362668f8144f07b2bd388ccae4d52dca1590396.tar.gz open-keychain-b362668f8144f07b2bd388ccae4d52dca1590396.tar.bz2 open-keychain-b362668f8144f07b2bd388ccae4d52dca1590396.zip |
Merge pull request #1865 from vanitasvitae/master
Fixed 'Orbot appears not to be running' (#1792)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java | 10 |
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) { |