January 2014 - tor-commits - lists.torproject.org

[orbot/master] remove double entry for jtorctrl
by n8fr8＠torproject.org 10 Jan '14

10 Jan '14

commit 8b8e51bb1b24efe0b557c7365bfd86d4cf980de5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 9 15:32:43 2014 -0500 remove double entry for jtorctrl --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0e89bae..01a7b19 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "external/jtorctrl"] path = external/jtorctrl url = https://git.torproject.org/git/jtorctl -[submodule "external/jtorctl"] - path = external/jtorctl - url = https://git.torproject.org/git/jtorctl [submodule "external/obfsproxy"] path = external/obfsproxy url = https://git.torproject.org/pluggable-transports/obfsproxy-legacy.git

1 0

[orbot/master] unregister receive and check for alternate library path
by n8fr8＠torproject.org 10 Jan '14

10 Jan '14

commit 852792962e9c2d9fefe16f458db46eeeb435aba6 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 9 21:14:01 2014 -0500 unregister receive and check for alternate library path --- src/org/torproject/android/service/TorService.java | 32 +++++++++++--------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 4413bd8..ff5da45 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -259,7 +259,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst catch (Exception e) { Log.e(TAG,"error setting up Tor",e); - throw new RuntimeException("Unable to start Tor"); + throw new RuntimeException("Unable to start Tor",e); } IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); @@ -332,12 +332,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst { super.onDestroy(); - Log.d(TAG,"onDestroy called"); + //Log.d(TAG,"onDestroy called"); // Unregister all callbacks. mCallbacks.kill(); - + unregisterReceiver(mNetworkStateReceiver); } private void stopTor () @@ -528,13 +528,25 @@ public class TorService extends Service implements TorServiceConstants, TorConst appCacheHome = getDir("data",Application.MODE_PRIVATE); appLibsHome = new File(getApplicationInfo().nativeLibraryDir); - fileTorOrig = new File(appLibsHome, TOR_BINARY_ASSET_KEY); + if (!appLibsHome.exists()) + appLibsHome = new File(getApplicationInfo().dataDir + "/lib"); + + fileTorOrig = new File(appLibsHome, TOR_BINARY_ASSET_KEY); + if (fileTorOrig.exists()) { logNotice ("Tor binary exists: " + fileTorOrig.getAbsolutePath()); } else - throw new RuntimeException("Tor binary not installed"); + { + appLibsHome = new File(getApplicationInfo().dataDir + "/lib"); + fileTorOrig = new File(appLibsHome, TOR_BINARY_ASSET_KEY); + + if (fileTorOrig.exists()) + logNotice ("Tor binary exists: " + fileTorOrig.getAbsolutePath()); + else + throw new RuntimeException("Tor binary not installed"); + } filePrivoxy = new File(appLibsHome, PRIVOXY_ASSET_KEY); if (filePrivoxy.exists()) @@ -553,15 +565,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (!fileTorRc.exists()) { TorBinaryInstaller installer = new TorBinaryInstaller(this, appBinHome); - try { - boolean success = installer.installResources(); - } catch (FileNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + boolean success = installer.installResources(); }

1 0

[orbot/master] fixes #2847 use class name to start service
by n8fr8＠torproject.org 10 Jan '14

10 Jan '14

commit 069a9bf37787db477753787cb19c0b638a3eb0a5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 9 15:28:53 2014 -0500 fixes #2847 use class name to start service --- src/org/torproject/android/Orbot.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 15a3a1c..ad6e488 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -88,8 +88,6 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick setLocale(); - startService(new Intent(INTENT_TOR_SERVICE)); - doLayout(); } @@ -1054,10 +1052,15 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick //this is where we bind! private void bindService () { + + Intent iTorService = new Intent(ITorService.class.getName()); + + getApplication().getApplicationContext().startService(iTorService); + //since its auto create, we prob don't ever need to call startService //also we should again be consistent with using either iTorService.class.getName() //or the variable constant - bindService(new Intent(ITorService.class.getName()), + bindService(iTorService, mConnection, Context.BIND_AUTO_CREATE); mIsBound = true;

1 0

[orbot/master] peg to new repo and head with fix for empty element bug
by n8fr8＠torproject.org 10 Jan '14

10 Jan '14

commit 1fa568d04c645f98682cafba95c5eed14421a961 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 9 21:12:57 2014 -0500 peg to new repo and head with fix for empty element bug --- external/jtorctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/jtorctl b/external/jtorctl index d818f43..3539cbd 160000 --- a/external/jtorctl +++ b/external/jtorctl @@ -1 +1 @@ -Subproject commit d818f4381e164273aadfcbff131da8e1a2cbc1f8 +Subproject commit 3539cbd134f48c2c8875c440a4cbe8e15ebca280

1 0

[orbot/master] fixes #2848 newnym might call a null conn in service
by n8fr8＠torproject.org 10 Jan '14

10 Jan '14

commit cf5e4454eb01c2bce055dd95c11314ad44141568 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 9 15:29:51 2014 -0500 fixes #2848 newnym might call a null conn in service --- src/org/torproject/android/service/TorService.java | 23 +++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 1167d4e..4413bd8 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1387,17 +1387,20 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void newIdentity () { - - new Thread () + //it is possible to not have a connection yet, and someone might try to newnym + if (conn != null) { - public void run () - { - try { conn.signal("NEWNYM"); } - catch (IOException ioe){ - logMessage("error requesting newny: " + ioe.getLocalizedMessage()); - } - } - }.start(); + new Thread () + { + public void run () + { + try { conn.signal("NEWNYM"); } + catch (IOException ioe){ + logMessage("error requesting newny: " + ioe.getLocalizedMessage()); + } + } + }.start(); + } } public boolean saveConfiguration ()

1 0

[orbot/master] update Makefile - try building with older toolchain
by n8fr8＠torproject.org 10 Jan '14

10 Jan '14

commit e24ae6cb0720cc4aba4996713c404296f2e6df88 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 9 21:15:23 2014 -0500 update Makefile - try building with older toolchain --- external/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Makefile b/external/Makefile index 5efe8e6..cef047c 100644 --- a/external/Makefile +++ b/external/Makefile @@ -29,7 +29,7 @@ APP_ABI=armeabi APP_PLATFORM := android-$(shell sed -n 's,.*android:minSdkVersion="$[0-9][0-9]*$".*,\1,p' \ $(EXTERNAL_ROOT)/../AndroidManifest.xml) NDK_SYSROOT=$(NDK_BASE)/platforms/$(APP_PLATFORM)/arch-$(NDK_ABI) -NDK_TOOLCHAIN_VERSION=4.7 +NDK_TOOLCHAIN_VERSION=4.6 NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]') ifeq ($(NDK_ABI),x86) HOST = i686-linux-android

1 0

[orbot/master] new binaries built with update Makefile
by n8fr8＠torproject.org 10 Jan '14

10 Jan '14

commit 8c4f09e2f5dbd8bd1340f3f70eaaee262b2e28e8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 9 21:14:16 2014 -0500 new binaries built with update Makefile --- libs/armeabi/libprivoxy.so | Bin 700276 -> 593132 bytes libs/armeabi/libtor.so | Bin 4593528 -> 4523600 bytes libs/jtorctl.jar | Bin 14744 -> 14742 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/armeabi/libprivoxy.so b/libs/armeabi/libprivoxy.so index 30a110e..67ad3c7 100755 Binary files a/libs/armeabi/libprivoxy.so and b/libs/armeabi/libprivoxy.so differ diff --git a/libs/armeabi/libtor.so b/libs/armeabi/libtor.so index 1ce65c5..8c6d070 100755 Binary files a/libs/armeabi/libtor.so and b/libs/armeabi/libtor.so differ diff --git a/libs/jtorctl.jar b/libs/jtorctl.jar index 73d2bc5..68327b2 100755 Binary files a/libs/jtorctl.jar and b/libs/jtorctl.jar differ

1 0

[orbot/master] change jtorctl path to github updated version
by n8fr8＠torproject.org 10 Jan '14

10 Jan '14

commit a60c614e6efa3875d62f3c39d8270f42bc0e9dc6 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 9 21:14:49 2014 -0500 change jtorctl path to github updated version --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 01a7b19..8222708 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,9 @@ [submodule "external/libevent"] path = external/libevent url = https://github.com/libevent/libevent.git -[submodule "external/jtorctrl"] - path = external/jtorctrl - url = https://git.torproject.org/git/jtorctl +[submodule "external/jtorctl"] + path = external/jtorctl + url = https://github.com/guardianproject/jtorctl [submodule "external/obfsproxy"] path = external/obfsproxy url = https://git.torproject.org/pluggable-transports/obfsproxy-legacy.git

1 0

[orbot/master] add geoip v6 file and support in TorService
by n8fr8＠torproject.org 10 Jan '14

10 Jan '14

commit d3c11bed4bb03ae129d3f5ad330d2cf677b138b7 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 9 21:32:07 2014 -0500 add geoip v6 file and support in TorService --- res/raw/geoip.mp3 | Bin 1210843 -> 609031 bytes res/raw/geoip6.mp3 | Bin 0 -> 81420 bytes src/org/torproject/android/service/TorBinaryInstaller.java | 4 ++++ src/org/torproject/android/service/TorService.java | 6 ++++-- src/org/torproject/android/service/TorServiceConstants.java | 2 ++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/res/raw/geoip.mp3 b/res/raw/geoip.mp3 index 4b5ce6d..3db9c63 100644 Binary files a/res/raw/geoip.mp3 and b/res/raw/geoip.mp3 differ diff --git a/res/raw/geoip6.mp3 b/res/raw/geoip6.mp3 new file mode 100644 index 0000000..e5e5910 Binary files /dev/null and b/res/raw/geoip6.mp3 differ diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java index 45705ae..3ff0a38 100644 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ b/src/org/torproject/android/service/TorBinaryInstaller.java @@ -76,6 +76,10 @@ public class TorBinaryInstaller implements TorServiceConstants { is = context.getResources().openRawResource(R.raw.geoip); outFile = new File(installFolder, GEOIP_ASSET_KEY); streamToFile(is, outFile, false, true); + + is = context.getResources().openRawResource(R.raw.geoip6); + outFile = new File(installFolder, GEOIP6_ASSET_KEY); + streamToFile(is, outFile, false, true); return true; } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index ff5da45..d26ca03 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1645,9 +1645,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (entranceNodes.length() > 0 || exitNodes.length() > 0 || excludeNodes.length() > 0) { - //only apple GeoIP if you need it + //only apply GeoIP if you need it File fileGeoIP = new File(appBinHome,GEOIP_ASSET_KEY); - + File fileGeoIP6 = new File(appBinHome,GEOIP6_ASSET_KEY); + try { if ((!fileGeoIP.exists())) @@ -1658,6 +1659,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } mBinder.updateConfiguration("GeoIPFile", fileGeoIP.getAbsolutePath(), false); + mBinder.updateConfiguration("GeoIPv6File", fileGeoIP6.getAbsolutePath(), false); } catch (Exception e) diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index ce16be2..469427b 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -31,6 +31,8 @@ public interface TorServiceConstants { //geoip data file asset key public final static String GEOIP_ASSET_KEY = "geoip"; + public final static String GEOIP6_ASSET_KEY = "geoip6"; + //various console cmds public final static String SHELL_CMD_CHMOD = "chmod";

1 0

[orbot/master] add new icons showing different status
by n8fr8＠torproject.org 10 Jan '14

10 Jan '14

commit 39699e69c6b6abae01ded698bb35ffa9c88710b9 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 9 22:01:02 2014 -0500 add new icons showing different status --- res/drawable-hdpi-v11/ic_stat_tor_off.png | Bin 0 -> 744 bytes res/drawable-hdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 712 bytes res/drawable/ic_stat_tor_off.png | Bin 0 -> 744 bytes res/drawable/ic_stat_tor_xfer.png | Bin 0 -> 712 bytes src/org/torproject/android/service/TorService.java | 98 ++++++++++---------- 5 files changed, 48 insertions(+), 50 deletions(-) diff --git a/res/drawable-hdpi-v11/ic_stat_tor_off.png b/res/drawable-hdpi-v11/ic_stat_tor_off.png new file mode 100644 index 0000000..6df646e Binary files /dev/null and b/res/drawable-hdpi-v11/ic_stat_tor_off.png differ diff --git a/res/drawable-hdpi-v11/ic_stat_tor_xfer.png b/res/drawable-hdpi-v11/ic_stat_tor_xfer.png new file mode 100644 index 0000000..a8cfda7 Binary files /dev/null and b/res/drawable-hdpi-v11/ic_stat_tor_xfer.png differ diff --git a/res/drawable/ic_stat_tor_off.png b/res/drawable/ic_stat_tor_off.png new file mode 100644 index 0000000..6df646e Binary files /dev/null and b/res/drawable/ic_stat_tor_off.png differ diff --git a/res/drawable/ic_stat_tor_xfer.png b/res/drawable/ic_stat_tor_xfer.png new file mode 100644 index 0000000..a8cfda7 Binary files /dev/null and b/res/drawable/ic_stat_tor_xfer.png differ diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index d26ca03..b052951 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -200,14 +200,33 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - private void showToolbarNotification (String notifyMsg, int notifyId, int icon, int flags) + private void showToolbarNotification (String notifyMsg, int notifyId, int icon, int flags, boolean isOngoing) { if (mNotifyBuilder == null) - startNotification(getString(R.string.status_activated),prefPersistNotifications); + { + + //Reusable code. + Intent intent = new Intent(TorService.this, Orbot.class); + PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0); + + mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + + if (mNotifyBuilder == null) + { + mNotifyBuilder = new NotificationCompat.Builder(this) + .setContentTitle(getString(R.string.app_name)) + .setContentText( getString(R.string.status_activated)) + .setSmallIcon(R.drawable.ic_stat_tor); + + mNotifyBuilder.setContentIntent(pendIntent); + } + + } mNotifyBuilder.setContentText(notifyMsg); mNotifyBuilder.setSmallIcon(icon); + mNotifyBuilder.setOngoing(isOngoing); if (notifyId == ERROR_NOTIFY_ID) { @@ -314,7 +333,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst catch (Exception e) { currentStatus = STATUS_OFF; - this.showToolbarNotification(getString(R.string.status_disabled), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1); + this.showToolbarNotification(getString(R.string.status_disabled), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1, false); Log.d(TAG,"Unable to start Tor: " + e.getMessage(),e); } } @@ -352,7 +371,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst //stop the foreground priority and make sure to remove the persistant notification stopForeground(true); - + currentStatus = STATUS_OFF; clearNotifications(); @@ -412,7 +431,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { try { String onionHostname = Utils.readString(new FileInputStream(file)).trim(); - showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, HS_NOTIFY_ID, R.drawable.ic_stat_tor, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, HS_NOTIFY_ID, R.drawable.ic_stat_tor, Notification.FLAG_ONGOING_EVENT, true); Editor pEdit = prefs.edit(); pEdit.putString("pref_hs_hostname",onionHostname); pEdit.commit(); @@ -421,13 +440,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (FileNotFoundException e) { logException("unable to read onion hostname file",e); - showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1); + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1, false); return null; } } else { - showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1); + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1, false); } @@ -668,13 +687,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst if(proxyAll) { - showToolbarNotification(getString(R.string.setting_up_full_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1); + showToolbarNotification(getString(R.string.setting_up_full_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1, false); code = mTransProxy.setTransparentProxyingAll(this); } else { - showToolbarNotification(getString(R.string.setting_up_app_based_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1); + showToolbarNotification(getString(R.string.setting_up_app_based_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1, false); code = mTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this, getSharedPrefs(getApplicationContext()))); } @@ -684,11 +703,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (code == 0) { - showToolbarNotification(getString(R.string.transparent_proxying_enabled), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1); + showToolbarNotification(getString(R.string.transparent_proxying_enabled), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1, false); if (enableTether) { - showToolbarNotification(getString(R.string.transproxy_enabled_for_tethering_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1); + showToolbarNotification(getString(R.string.transproxy_enabled_for_tethering_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1, false); mTransProxy.enableTetheringRules(this); @@ -696,7 +715,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } else { - showToolbarNotification(getString(R.string.warning_error_starting_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1); + showToolbarNotification(getString(R.string.warning_error_starting_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1, false); } @@ -1015,33 +1034,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - private void startNotification (String message, boolean persistent) - { - //Reusable code. - Intent intent = new Intent(TorService.this, Orbot.class); - PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0); - - mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - - if (mNotifyBuilder == null) - { - mNotifyBuilder = new NotificationCompat.Builder(this) - .setContentTitle(getString(R.string.app_name)) - .setContentText( getString(R.string.status_activated)) - .setSmallIcon(R.drawable.ic_stat_tor); - - mNotifyBuilder.setContentIntent(pendIntent); - } - - mNotifyBuilder.setOngoing(persistent); - mNotifyBuilder.setContentText(message); - - mNotificationManager.notify( - NOTIFY_ID, - mNotifyBuilder.getNotification()); - - - } + public void message(String severity, String msg) { @@ -1053,8 +1046,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { currentStatus = STATUS_ON; - startNotification(getString(R.string.status_activated),prefPersistNotifications); - + showToolbarNotification(getString(R.string.status_activated), NOTIFY_ID, R.drawable.ic_stat_tor, -1, prefPersistNotifications); } @@ -1121,9 +1113,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst sb.append(" "); sb.append(getString(R.string.up)); - if (mConnectivity && prefPersistNotifications) - startNotification(sb.toString(),prefPersistNotifications); + int iconId = R.drawable.ic_stat_tor; + + if (read > 0 || written > 0) + iconId = R.drawable.ic_stat_tor_xfer; + if (mConnectivity && prefPersistNotifications) + showToolbarNotification(sb.toString(), NOTIFY_ID, iconId, -1, prefPersistNotifications); + mTotalTrafficWritten += written; mTotalTrafficRead += read; @@ -1578,13 +1575,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (!mConnectivity) { logNotice("No network connectivity. Putting Tor to sleep..."); - startNotification(getString(R.string.no_internet_connection_tor),prefPersistNotifications); + showToolbarNotification(getString(R.string.no_internet_connection_tor),NOTIFY_ID,R.drawable.ic_stat_tor_off,-1,prefPersistNotifications); } else { logNotice("Network connectivity is good. Waking Tor up..."); - startNotification(getString(R.string.status_activated),prefPersistNotifications); + showToolbarNotification(getString(R.string.status_activated),NOTIFY_ID,R.drawable.ic_stat_tor,-1,prefPersistNotifications); + } } catch (RemoteException e) { logException ("error applying mPrefs",e); @@ -1664,7 +1662,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showToolbarNotification (getString(R.string.error_installing_binares),ERROR_NOTIFY_ID,R.drawable.ic_stat_notifyerr, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification (getString(R.string.error_installing_binares),ERROR_NOTIFY_ID,R.drawable.ic_stat_notifyerr, Notification.FLAG_ONGOING_EVENT, false); return false; } @@ -1683,7 +1681,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { String msgBridge = getString(R.string.bridge_requires_ip) + getString(R.string.send_email_for_bridges); - showToolbarNotification(msgBridge, ERROR_NOTIFY_ID, R.drawable.ic_stat_tor, -1); + showToolbarNotification(msgBridge, ERROR_NOTIFY_ID, R.drawable.ic_stat_tor, -1, false); return false; @@ -1698,7 +1696,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst bridgeDelim = ","; } - showToolbarNotification(getString(R.string.notification_using_bridges) + ": " + bridgeList, TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1); + showToolbarNotification(getString(R.string.notification_using_bridges) + ": " + bridgeList, TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1, false); boolean obfsBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_OBFUSCATED, false); String bridgeCfgKey = "bridge"; @@ -1746,7 +1744,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showToolbarNotification (getString(R.string.your_reachableaddresses_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_notifyerr, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification (getString(R.string.your_reachableaddresses_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_notifyerr, Notification.FLAG_ONGOING_EVENT, false); return false; } @@ -1775,7 +1773,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showToolbarNotification (getString(R.string.your_relay_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_notifyerr, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification (getString(R.string.your_relay_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_notifyerr, Notification.FLAG_ONGOING_EVENT, false); return false;

1 0