diff --git a/res/values/strings.xml b/res/values/strings.xml index d14cd272..911caf68 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -242,7 +242,7 @@ LibEvent v2.1: http://www.monkey.org/~provos/libevent/ Privoxy v3.0.12: http://www.privoxy.org Iptables v1.4.7: http://www.netfilter.org -OpenSSL v1.0.0f: http://www.openssl.org +OpenSSL v0.9.8c: http://www.openssl.org An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app. found existing Tor process... Something bad happened. Check the log diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 0a4ab445..b07026a4 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1044,12 +1044,17 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (msg.indexOf(TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE)!=-1) { currentStatus = STATUS_ON; - // showToolbarNotification (getString(R.string.status_activated),NOTIFY_ID,R.drawable.tornotificationon, Notification.FLAG_ONGOING_EVENT); - // TorService.this.set - + if (prefPersistNotifications) + { startNotification(); - + } + else + { + showToolbarNotification (getString(R.string.status_activated),NOTIFY_ID,R.drawable.tornotificationon, Notification.FLAG_ONGOING_EVENT); + + } + getHiddenServiceHostname (); }