dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated strings; made notify on/off option work again

This commit is contained in:
n8fr8 2012-06-27 22:44:33 -04:00
parent 5c5bfba88e
commit 6620e144a1
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@ -242,7 +242,7 @@
<string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <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="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="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="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="found_existing_tor_process">found existing Tor process...</string>
<string name="something_bad_happened">Something bad happened. Check the log</string> <string name="something_bad_happened">Something bad happened. Check the log</string>

11
src/org/torproject/android/service/TorService.java
View File

@ -1044,11 +1044,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst
if (msg.indexOf(TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE)!=-1) if (msg.indexOf(TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE)!=-1)
{ {
currentStatus = STATUS_ON; currentStatus = STATUS_ON;
// showToolbarNotification (getString(R.string.status_activated),NOTIFY_ID,R.drawable.tornotificationon, Notification.FLAG_ONGOING_EVENT);
// TorService.this.set
if (prefPersistNotifications)
{
startNotification(); startNotification();
}
else
{
showToolbarNotification (getString(R.string.status_activated),NOTIFY_ID,R.drawable.tornotificationon, Notification.FLAG_ONGOING_EVENT);
}
getHiddenServiceHostname (); getHiddenServiceHostname ();