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

[translation/orbot] Update translations for orbot
by translation＠torproject.org 26 Jan '12

26 Jan '12

commit 376fae8cd246c63de1b7b9bd7d430c9f4db8b844 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 26 09:45:08 2012 +0000 Update translations for orbot --- values-ar/strings.xml | 2 ++ values-ca/strings.xml | 2 ++ values-de/strings.xml | 2 ++ values-el/strings.xml | 2 ++ values-es/strings.xml | 2 ++ values-eu/strings.xml | 2 ++ values-fa/strings.xml | 2 ++ values-fr/strings.xml | 2 ++ values-hu/strings.xml | 2 ++ values-it/strings.xml | 2 ++ values-mk/strings.xml | 2 ++ values-nb/strings.xml | 2 ++ values-nl/strings.xml | 2 ++ values-pl/strings.xml | 2 ++ values-pt/strings.xml | 2 ++ values-ru/strings.xml | 2 ++ values-sv/strings.xml | 2 ++ values-zh/strings.xml | 2 ++ values/strings.xml | 4 +++- 19 files changed, 39 insertions(+), 1 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index b1c2d7d..fff1c52 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -197,4 +197,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-ca/strings.xml b/values-ca/strings.xml index 39c6268..3d9e1d7 100644 --- a/values-ca/strings.xml +++ b/values-ca/strings.xml @@ -197,4 +197,6 @@ Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu elect <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-de/strings.xml b/values-de/strings.xml index 6ae2765..f3f3b99 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -198,4 +198,6 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-el/strings.xml b/values-el/strings.xml index f44522d..5903f37 100644 --- a/values-el/strings.xml +++ b/values-el/strings.xml @@ -187,4 +187,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-es/strings.xml b/values-es/strings.xml index 77d9710..b8ae420 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -197,4 +197,6 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-eu/strings.xml b/values-eu/strings.xml index d02f3d6..8d9dbd2 100644 --- a/values-eu/strings.xml +++ b/values-eu/strings.xml @@ -187,4 +187,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-fa/strings.xml b/values-fa/strings.xml index 5cd9c6d..8c4299a 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -187,4 +187,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 71385df..06312ac 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -192,4 +192,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-hu/strings.xml b/values-hu/strings.xml index 8bb5d72..8687bbe 100644 --- a/values-hu/strings.xml +++ b/values-hu/strings.xml @@ -191,4 +191,6 @@ <string name="pref_use_sys_iptables_title">Alapértelmezett Iptables használata</string> <string name="pref_use_sys_iptables_summary">a beépített iptables bináris használata az Orbot-tal együtt szállított helyett</string> <string name="error_installing_binares">A Tor binárisok nem telepíthetők, vagy frissíthetők.</string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-it/strings.xml b/values-it/strings.xml index ff13966..e3a949a 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -192,4 +192,6 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-mk/strings.xml b/values-mk/strings.xml index 62283a1..e49c4b6 100644 --- a/values-mk/strings.xml +++ b/values-mk/strings.xml @@ -191,4 +191,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-nb/strings.xml b/values-nb/strings.xml index 55ef32c..9b6ccbf 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -187,4 +187,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-nl/strings.xml b/values-nl/strings.xml index 0ab07a0..49c99f5 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -197,4 +197,6 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="pref_use_sys_iptables_title">Gebruik standaard iptables</string> <string name="pref_use_sys_iptables_summary">gebruik de ingebouwde iptables binary in plaats van de in Orbot geïntegreerde.</string> <string name="error_installing_binares">De Tor binaries konden niet worden geïnstalleerd of geüpgraded.</string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-pl/strings.xml b/values-pl/strings.xml index c08a1c6..44473f6 100644 --- a/values-pl/strings.xml +++ b/values-pl/strings.xml @@ -191,4 +191,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-pt/strings.xml b/values-pt/strings.xml index dea597c..fc97af9 100644 --- a/values-pt/strings.xml +++ b/values-pt/strings.xml @@ -187,4 +187,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-ru/strings.xml b/values-ru/strings.xml index c11deda..7e339cd 100644 --- a/values-ru/strings.xml +++ b/values-ru/strings.xml @@ -191,4 +191,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-sv/strings.xml b/values-sv/strings.xml index dcd60a2..f8bc878 100644 --- a/values-sv/strings.xml +++ b/values-sv/strings.xml @@ -187,4 +187,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values-zh/strings.xml b/values-zh/strings.xml index 1ae662f..62704fb 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -190,4 +190,6 @@ <string name="pref_use_sys_iptables_title"></string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> </resources> diff --git a/values/strings.xml b/values/strings.xml index 3aca1ee..144db09 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -177,7 +177,7 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.10-alpha: https://www.torproject.org</string> + <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> <string name="libevent_version">LibEvent v1.4.13: 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> @@ -191,4 +191,6 @@ <string name="pref_use_sys_iptables_title">Use Default Iptables</string> <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> + <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> + <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> </resources>

1 0

[orbot/master] removed whisper binary
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 24b9b673d0aca48c58a8d1671b9802b26c9f0460 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:09:53 2012 -0500 removed whisper binary --- .classpath | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/.classpath b/.classpath index 9a448b2..b4c22c4 100644 --- a/.classpath +++ b/.classpath @@ -4,6 +4,5 @@ <classpathentry kind="src" path="gen"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry kind="lib" path="libs/jtorctrl.jar"/> - <classpathentry kind="lib" path="libs/whispercore.jar"/> <classpathentry kind="output" path="bin/classes"/> </classpath>

1 0

[orbot/master] added support back in for SDK4/Android 1.6
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit b1a02fb26d440ee149237d1e3d53abebe3f603db Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:10:42 2012 -0500 added support back in for SDK4/Android 1.6 --- AndroidManifest.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d072a76..36978bb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.3.10-orbot-1.0.7-RC6" - android:versionCode="29" + android:versionName="0.2.3.10-alpha-orbot-1.0.7-beta-20110125" + android:versionCode="30" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> + <uses-sdk android:minSdkVersion="4"/> <application android:theme="@style/DefaultTheme" android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false"> @@ -61,6 +62,5 @@ </application> - <uses-sdk android:minSdkVersion="8"/> </manifest>

1 0

[orbot/master] updated version
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit e4bedd19cfdf757421e643a77be446ee2f7101ac Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:11:35 2012 -0500 updated version --- AndroidManifest.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 36978bb..3055147 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.3.10-alpha-orbot-1.0.7-beta-20110125" - android:versionCode="30" + android:versionName="0.2.3.10-alpha-orbot-1.0.7-RC7" + android:versionCode="31" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" />

1 0

[orbot/master] added persist notify pref string
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 7410be63899784c137361669387b67e869e0248a Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:10:09 2012 -0500 added persist notify pref string --- res/values/strings.xml | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 6d3f0f0..0ea4089 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -253,4 +253,7 @@ <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> + +<string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> +<string name="pref_use_persistent_notifications_title">Always-On Notifications</string> </resources>

1 0

[orbot/master] sets the install chmod perms to 700 properly
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 2600519c4de58577877dfed179377a8cd795e07c Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Jan 15 10:43:49 2012 -0500 sets the install chmod perms to 700 properly --- .../android/service/TorBinaryInstaller.java | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java index 9a56004..68ce745 100644 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ b/src/org/torproject/android/service/TorBinaryInstaller.java @@ -34,7 +34,8 @@ public class TorBinaryInstaller implements TorServiceConstants { Context context; private static int isARMv6 = -1; - + private static String CHMOD_EXEC = "700"; + public TorBinaryInstaller (Context context, File installFolder) { this.installFolder = installFolder; @@ -116,7 +117,6 @@ public class TorBinaryInstaller implements TorServiceConstants { } while ((bytecount = stm.read(buffer)) > 0) - { stmOut.write(buffer, 0, bytecount); @@ -229,25 +229,16 @@ public class TorBinaryInstaller implements TorServiceConstants { File file = new File(ctx.getDir("bin",0), "iptables"); if ((!file.exists()) && isARMv6()) { - copyRawFile(ctx, R.raw.iptables_g1, file, "755"); + copyRawFile(ctx, R.raw.iptables_g1, file, CHMOD_EXEC); changed = true; } // Check iptables_n1 file = new File(ctx.getDir("bin",0), "iptables"); if ((!file.exists()) && (!isARMv6())) { - copyRawFile(ctx, R.raw.iptables_n1, file, "755"); - changed = true; - } - - // Check busybox - /* - file = new File(ctx.getDir("bin",0), "busybox_g1"); - if (!file.exists()) { - copyRawFile(ctx, R.raw.busybox_g1, file, "755"); + copyRawFile(ctx, R.raw.iptables_n1, file, CHMOD_EXEC); changed = true; } - */ return true;

1 0

[orbot/master] improves toolbar notifications
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit f18654a730c9960f21c8479442c9bdc7f56f1ffa Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Jan 15 10:44:50 2012 -0500 improves toolbar notifications --- src/org/torproject/android/service/TorService.java | 77 +++++++++++--------- 1 files changed, 42 insertions(+), 35 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 2d1698a..a61bb30 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -158,8 +158,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst } + private void clearNotifications () + { + NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + mNotificationManager.cancelAll(); + } - private void showToolbarNotification (String notifyMsg, int notifyId, int icon) + private void showToolbarNotification (String notifyMsg, int notifyId, int icon, int flags) { @@ -171,6 +176,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst Notification notification = new Notification(icon, tickerText, when); + if (flags != -1) + notification.flags |= flags; + Context context = getApplicationContext(); CharSequence contentTitle = getString(R.string.app_name); CharSequence contentText = notifyMsg; @@ -204,9 +212,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst _torInstance = this; - Log.i(TAG, "service started: " + intent.getAction()); - - Thread thread = new Thread () { @@ -217,7 +222,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { logNotice("unable to find tor binaries: " + e.getMessage()); - showToolbarNotification(getString(R.string.error_installing_binares), NOTIFY_ID, R.drawable.tornotificationerr); + showToolbarNotification(getString(R.string.error_installing_binares), NOTIFY_ID, R.drawable.tornotificationerr, -1); Log.e(TAG, "error checking tor binaries", e); } @@ -255,7 +260,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst catch (Exception e) { currentStatus = STATUS_OFF; - this.showToolbarNotification(getString(R.string.status_disabled), NOTIFY_ID, R.drawable.tornotificationerr); + this.showToolbarNotification(getString(R.string.status_disabled), NOTIFY_ID, R.drawable.tornotificationerr, -1); Log.d(TAG,"Unable to start Tor: " + e.getMessage(),e); } } @@ -283,7 +288,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst currentStatus = STATUS_OFF; - showToolbarNotification (getString(R.string.status_disabled),NOTIFY_ID,R.drawable.tornotificationoff); + clearNotifications(); + + //showToolbarNotification (getString(R.string.status_disabled),NOTIFY_ID,R.drawable.tornotificationoff); sendCallbackStatusMessage(getString(R.string.status_disabled)); disableTransparentProxy(); @@ -337,7 +344,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { try { String onionHostname = Utils.readString(new FileInputStream(file)); - showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, NOTIFY_ID, R.drawable.tornotification); + showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, NOTIFY_ID, R.drawable.tornotification, Notification.FLAG_ONGOING_EVENT); Editor pEdit = prefs.edit(); pEdit.putString("pref_hs_hostname",onionHostname); pEdit.commit(); @@ -345,13 +352,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), NOTIFY_ID, R.drawable.tornotificationerr); + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), NOTIFY_ID, R.drawable.tornotificationerr, -1); return; } } else { - showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), NOTIFY_ID, R.drawable.tornotificationerr); + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), NOTIFY_ID, R.drawable.tornotificationerr, -1); } @@ -423,6 +430,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private boolean checkTorBinaries (boolean forceInstall) throws Exception { + //android.os.Debug.waitForDebugger(); //check and install iptables TorBinaryInstaller.assertIpTablesBinaries(this, true); @@ -433,27 +441,34 @@ public class TorService extends Service implements TorServiceConstants, TorConst File fileTor = new File(appBinHome, TOR_BINARY_ASSET_KEY); File filePrivoxy = new File(appBinHome, PRIVOXY_ASSET_KEY); - File fileTorOld = null; - File filePrivoxyOld = null; - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); String currTorBinary = prefs.getString(TorServiceConstants.PREF_BINARY_TOR_VERSION_INSTALLED, null); String currPrivoxyBinary = prefs.getString(TorServiceConstants.PREF_BINARY_PRIVOXY_VERSION_INSTALLED, null); + StringBuilder cmdLog = new StringBuilder(); + int exitCode = -1; + if (currTorBinary == null || (!currTorBinary.equals(TorServiceConstants.BINARY_TOR_VERSION))) if (fileTor.exists()) { - killTorProcess (); - fileTorOld = new File(fileTor.getAbsolutePath() + ".old"); - fileTor.renameTo(fileTorOld); + if (currentStatus != STATUS_OFF) + stopTor(); + + String[] cmds = {"rm " + fileTor.getAbsolutePath()}; + exitCode = TorServiceUtils.doShellCommand(cmds, cmdLog, false, true); + } if (currPrivoxyBinary == null || (!currPrivoxyBinary.equals(TorServiceConstants.BINARY_PRIVOXY_VERSION))) if (filePrivoxy.exists()) { - killTorProcess (); - filePrivoxyOld = new File(filePrivoxy.getAbsolutePath() + ".old"); - filePrivoxy.renameTo(filePrivoxyOld); + if (currentStatus != STATUS_OFF) + stopTor(); + + + String[] cmds = {"rm " + filePrivoxy.getAbsolutePath()}; + exitCode = TorServiceUtils.doShellCommand(cmds, cmdLog, false, true); + } @@ -462,7 +477,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst if ((!(fileTor.exists() && filePrivoxy.exists())) || forceInstall) { - killTorProcess (); + if (currentStatus != STATUS_OFF) + stopTor(); TorBinaryInstaller installer = new TorBinaryInstaller(this, appBinHome); boolean success = installer.installFromRaw(); @@ -475,12 +491,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst edit.putString(TorServiceConstants.PREF_BINARY_PRIVOXY_VERSION_INSTALLED, TorServiceConstants.BINARY_PRIVOXY_VERSION); edit.commit(); - if (fileTorOld != null) - fileTorOld.delete(); - - if (filePrivoxyOld != null) - filePrivoxyOld.delete(); - logNotice(getString(R.string.status_install_success)); //showToolbarNotification(getString(R.string.status_install_success), NOTIFY_ID, R.drawable.tornotification); @@ -537,7 +547,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - enableTransparentProxy(); runTorShellCmd(); runPrivoxyShellCmd(); @@ -725,7 +734,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice("Tor process id=" + procId); - showToolbarNotification(getString(R.string.status_starting_up), NOTIFY_ID, R.drawable.tornotification); + //showToolbarNotification(getString(R.string.status_starting_up), NOTIFY_ID, R.drawable.tornotification); initControlConnection (); @@ -793,7 +802,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst return null; }*/ - public void initControlConnection () throws Exception, RuntimeException + private void initControlConnection () throws Exception, RuntimeException { while (true) { @@ -801,8 +810,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst { logNotice( "Connecting to control port: " + TOR_CONTROL_PORT); - String baseMessage = getString(R.string.tor_process_starting); - sendCallbackStatusMessage(baseMessage); torConnSocket = new Socket(IP_LOCALHOST, TOR_CONTROL_PORT); conn = TorControlConnection.getConnection(torConnSocket); @@ -962,8 +969,7 @@ 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); - + showToolbarNotification (getString(R.string.status_activated),NOTIFY_ID,R.drawable.tornotificationon, Notification.FLAG_ONGOING_EVENT); getHiddenServiceHostname (); @@ -977,7 +983,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void showAlert(String title, String msg) { - showToolbarNotification(msg, NOTIFY_ID, R.drawable.tornotification); + //showToolbarNotification(msg, NOTIFY_ID, R.drawable.tornotification); + sendCallbackStatusMessage(msg); + } public void newDescriptors(List<String> orList) { @@ -1135,7 +1143,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst applyPreferences(); - if (currentStatus == STATUS_ON) { //reset iptables rules in active mode

1 0

[orbot/master] fixes issue with progress dialog display and crashes
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 675afee9d2bc257a45ad804c01ad3969cb429de8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Jan 15 10:43:13 2012 -0500 fixes issue with progress dialog display and crashes --- src/org/torproject/android/Orbot.java | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index c2a7408..6b3e69b 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -514,7 +514,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants if (button) { - aDialog = new AlertDialog.Builder(this) + aDialog = new AlertDialog.Builder(Orbot.this) .setIcon(R.drawable.icon) .setTitle(title) .setMessage(msg) @@ -523,7 +523,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants } else { - aDialog = new AlertDialog.Builder(this) + aDialog = new AlertDialog.Builder(Orbot.this) .setIcon(R.drawable.icon) .setTitle(title) .setMessage(msg) @@ -634,18 +634,16 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants // not sure it really makes sense when what we want to say is just "startTor" mService.setProfile(TorServiceConstants.PROFILE_ON); //this means turn on - //here we update the UI which is a bit sloppy and mixed up code wise - //might be best to just call updateStatus() instead of directly manipulating UI in this method - yep makes sense - imgStatus.setImageResource(R.drawable.torstarting); - lblStatus.setText(getString(R.string.status_starting_up)); - + //here we update the UI which is a bit sloppy and mixed up code wise + //might be best to just call updateStatus() instead of directly manipulating UI in this method - yep makes sense + imgStatus.setImageResource(R.drawable.torstarting); + lblStatus.setText(getString(R.string.status_starting_up)); //we send a message here to the progressDialog i believe, but we can clarify that shortly Message msg = mHandler.obtainMessage(TorServiceConstants.ENABLE_TOR_MSG); + msg.getData().putString(HANDLER_TOR_MSG, getString(R.string.status_starting_up)); mHandler.sendMessage(msg); - - } //now we stop Tor! amazing! @@ -883,11 +881,14 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants private void createProgressDialog (String msg) { if (progressDialog != null && progressDialog.isShowing()) - return; - - progressDialog = ProgressDialog.show(Orbot.this, "", msg); + { + progressDialog.setMessage(msg); + } + else + { + progressDialog = ProgressDialog.show(Orbot.this, "", msg); progressDialog.setCancelable(true); - + } } private void hideProgressDialog () @@ -896,7 +897,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants if (progressDialog != null && progressDialog.isShowing()) { progressDialog.dismiss(); - + progressDialog = null; }

1 0

[orbot/master] zip file (renamed mp3 for compression issues) of 0.2.3.10 binary
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 6e83dd02988416e8a9e4dd5764e1bff28831b101 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Jan 15 10:46:13 2012 -0500 zip file (renamed mp3 for compression issues) of 0.2.3.10 binary --- res/raw/tor.mp3 | Bin 1637412 -> 3466275 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 index bc02210..2a99768 100644 Binary files a/res/raw/tor.mp3 and b/res/raw/tor.mp3 differ

1 0

[orbot/master] updating version number
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit d9fcd7274a895a5f4faa6cef5a91f14b6f672e55 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Jan 15 10:45:59 2012 -0500 updating version number --- AndroidManifest.xml | 8 ++++++-- res/values/strings.xml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1c3e67b..ed6d4e8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,12 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.3.10-alpha-orbot-1.0.7-RC4" android:versionCode="26"> + package="org.torproject.android" + android:versionName="0.2.3.10-orbot-1.0.7-RC5" + android:versionCode="28" + android:installLocation="auto" + > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <application android:theme="@style/DefaultTheme" android:icon="@drawable/icon" - android:label="@string/app_name" android:debuggable="false"> + android:label="@string/app_name" android:debuggable="true"> <activity android:name=".Orbot" android:theme="@android:style/Theme.NoTitleBar"> diff --git a/res/values/strings.xml b/res/values/strings.xml index 4e1ff74..797e8a7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -237,7 +237,7 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> -<string name="tor_version">Tor v0.2.3.10-alpha: https://www.torproject.org</string> +<string name="tor_version">Tor v0.2.3.7: https://www.torproject.org</string> <string name="libevent_version">LibEvent v1.4.13: 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>

1 0