commit 6620e144a1c0a97680ea9d593e80d7775ff9e207 Author: n8fr8 <nathan@freitas.net> Date: Wed Jun 27 22:44:33 2012 -0400 updated strings; made notify on/off option work again --- res/values/strings.xml | 2 +- src/org/torproject/android/service/TorService.java | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index d14cd27..911caf6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -242,7 +242,7 @@ <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> -<string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> +<string name="openssl_version">OpenSSL v0.9.8c: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string> diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 0a4ab44..b07026a 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 (); }