- tor-commits - lists.torproject.org

[tor/master] Fix clang warning on d4285f03df475dc. Not in any released tor.
by nickm＠torproject.org 29 Jun '12

29 Jun '12

commit da3edc4df0783778833b6f8660f73047a280e308 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 00:22:57 2012 -0400 Fix clang warning on d4285f03df475dc. Not in any released tor. --- src/common/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 4850e04..492ea32 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2872,7 +2872,7 @@ tor_vsscanf(const char *buf, const char *pattern, va_list ap) unsigned *out = va_arg(ap, unsigned *); if (u > UINT_MAX) return n_matched; - *out = u; + *out = (unsigned) u; } ++pattern; ++n_matched;

1 0

[orbot/master] updated manifest version
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit 7ab5fae52258fc8c49f429e6278cd7b9e3b1ff0d Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jun 28 22:54:07 2012 -0400 updated manifest version --- AndroidManifest.xml | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b913ef8..99dff50 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.17-beta-1.0.9-rc3" - android:versionCode="41" + android:versionName="0.2.3.17-beta-1.0.9-rc4" + android:versionCode="42" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> @@ -11,7 +11,8 @@ <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="15"/> <application android:name=".OrbotApp" android:icon="@drawable/icon" android:label="@string/app_name" - android:configChanges="locale|orientation"> + android:configChanges="locale" + > <activity android:name=".Orbot"> <intent-filter>

1 0

[orbot/master] fixed check for tor binary and install process
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit 2d4ebe27ee98501dc2924af89179cea126bf86a6 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jun 28 22:02:09 2012 -0400 fixed check for tor binary and install process --- src/org/torproject/android/service/TorService.java | 40 +++++++++++--------- 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 85095ee..74a91cf 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -205,25 +205,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst initTorPaths(); - //if Tor was deleted for some reason, do this again! - if (!fileTor.exists()) - { - new Thread () - { - public void run () - { - try { - checkTorBinaries (false); - } catch (Exception e) { - logNotice("unable to find tor binaries: " + e.getMessage()); - showToolbarNotification(getString(R.string.error_installing_binares), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1); - - Log.e(TAG, "error checking tor binaries", e); - } - } - }.start(); - } } @@ -1157,6 +1139,28 @@ public class TorService extends Service implements TorServiceConstants, TorConst _torInstance = this; initTorPaths(); + //android.os.Debug.waitForDebugger(); + + //if Tor was deleted for some reason, do this again! + if (!fileTor.exists()) + { + new Thread () + { + public void run () + { + try { + checkTorBinaries (false); + } catch (Exception e) { + + logNotice("unable to find tor binaries: " + e.getMessage()); + showToolbarNotification(getString(R.string.error_installing_binares), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1); + + Log.e(TAG, "error checking tor binaries", e); + } + } + }.start(); + } + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);

1 0

[orbot/master] transproxy app manager reset to show all apps
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit ecf3c79b726bad91c4ca7636c65fe47dad1c83eb Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jun 28 17:00:41 2012 -0400 transproxy app manager reset to show all apps attempted to 'detect' if an app had internet permissions but that was not working --- .../torproject/android/settings/AppManager.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java index a88a4d7..db641ae 100644 --- a/src/org/torproject/android/settings/AppManager.java +++ b/src/org/torproject/android/settings/AppManager.java @@ -237,12 +237,15 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC } + /* + * TODO n8fr8 June 2012: adding all apps for now b/c the Internet permission concept is not really working if (!app.usesInternet()) continue; else { apps.add(app); - } + }*/ + apps.add(app); app.setEnabled(aInfo.enabled); app.setUid(aInfo.uid);

1 0

[orbot/master] cleaned up background view, removed unused thread
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit eb2b7531c9c38b4e81743a86cd3bd8b9771e58da Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jun 28 17:01:24 2012 -0400 cleaned up background view, removed unused thread --- src/org/torproject/android/AnimatedBlockView.java | 41 ++++----------------- 1 files changed, 8 insertions(+), 33 deletions(-) diff --git a/src/org/torproject/android/AnimatedBlockView.java b/src/org/torproject/android/AnimatedBlockView.java index 1599ccd..7ba4e63 100644 --- a/src/org/torproject/android/AnimatedBlockView.java +++ b/src/org/torproject/android/AnimatedBlockView.java @@ -13,7 +13,8 @@ import android.view.MotionEvent; import android.view.View; import android.view.View.MeasureSpec; -public class AnimatedBlockView extends View implements Runnable { +public class AnimatedBlockView extends View +{ private Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); @@ -22,14 +23,6 @@ public class AnimatedBlockView extends View implements Runnable { Random rand = new Random(); - private Handler mHandler = new Handler() - { - public void handleMessage(Message msg) { - - invalidate(); - } - }; - public AnimatedBlockView(Context context) { super(context); @@ -54,15 +47,15 @@ public class AnimatedBlockView extends View implements Runnable { paint.setColor(Color.WHITE); paint.setAntiAlias(true); - new Thread (this).start(); - } @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - // TODO Auto-generated method stub - setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + + setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec)); + } int a1 = 30; @@ -71,6 +64,7 @@ public class AnimatedBlockView extends View implements Runnable { @Override protected void onDraw(Canvas canvas) { + super.onDraw(canvas); for (int i = 0; i < 20; i++) { @@ -104,26 +98,6 @@ public class AnimatedBlockView extends View implements Runnable { } - - public void run () - { - - - /*while (true) - { - - - try - { - Thread.sleep(10); - } - catch (Exception e) - {} - - mHandler.sendEmptyMessage(0); - - }*/ - } @Override public boolean onTouchEvent(MotionEvent event) { @@ -155,6 +129,7 @@ public class AnimatedBlockView extends View implements Runnable { } return true; + } } \ No newline at end of file

1 0

[orbot/master] updated strings, removing unneeded values & layouts
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit 6d654db37ae357514d0b12189625ed932b84f712 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jun 28 17:00:14 2012 -0400 updated strings, removing unneeded values & layouts --- res/layout-xlarge/layout_main.xml | 55 ------------------------------------- res/values-ar/strings.xml | 5 --- res/values-ca/strings.xml | 5 --- res/values-cs/strings.xml | 5 --- res/values-de/strings.xml | 6 +--- res/values-el/strings.xml | 5 --- res/values-es/strings.xml | 5 --- res/values-eu/strings.xml | 5 --- res/values-fa/strings.xml | 5 --- res/values-fr/strings.xml | 5 --- res/values-zh/strings.xml | 5 --- res/values/strings.xml | 6 +++- 12 files changed, 5 insertions(+), 107 deletions(-) diff --git a/res/layout-xlarge/layout_main.xml b/res/layout-xlarge/layout_main.xml deleted file mode 100644 index 6e89e2c..0000000 --- a/res/layout-xlarge/layout_main.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="@drawable/bgtitanium" android:orientation="vertical"> - - <RelativeLayout android:id="@+id/layoutHeaderMain" - android:layout_width="fill_parent" - android:layout_height="30dp" - android:layout_gravity="center_horizontal" - android:background="#A0909090"> - <ImageView android:id="@+id/radioModeImage" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="3px" - android:layout_marginRight="3px" - android:gravity="right" - android:layout_toRightOf="@+id/radioModeLabel" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:src="@drawable/tor25" - /> - <TextView android:id="@+id/radioModeText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/powered_by" - android:layout_marginTop="8px" - android:layout_marginRight="0px" - android:gravity="right" - android:layout_toLeftOf="@+id/radioModeImage" - android:textColor="#cccccc" /> - </RelativeLayout> - - <ImageView - android:id="@+id/imgStatus" - android:layout_width="fill_parent" - android:layout_margin="15dip" - android:layout_height="400dp" - android:layout_gravity="center_horizontal" - android:src="@drawable/toroff" android:layout_weight="1"/> - - <TextView android:id="@+id/lblStatus" - android:text="@string/press_to_start" - android:layout_gravity="center_horizontal" - android:textStyle="bold" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - - android:textColor="#ffffff" - /> - - - -</LinearLayout> - diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 01a6a12..9f07aa8 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -183,11 +183,6 @@ <string name="the_tor_license">رخصة استخدام تور</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">برامج من جهات أخرى:</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> - <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> <string name="hidden_service_request">أحد البرامج يحاول تشغيل خدمة مخفية بمنفذ %S على شبكة تور. هذه الميزة آمنة فقط اذا كنت تثق بالبرنامج</string> <string name="found_existing_tor_process">تم العثور على برنامج تور </string> <string name="something_bad_happened">حصل خطأ ما. افحص السجل</string> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 6a63bb1..f9e06d2 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -183,11 +183,6 @@ Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu elect <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: 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> - <string name="openssl_version">OpenSSL v1.0.0f: 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/res/values-cs/strings.xml b/res/values-cs/strings.xml index 027de60..4f20278 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -177,11 +177,6 @@ <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: 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> - <string name="openssl_version">OpenSSL v1.0.0f: 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/res/values-de/strings.xml b/res/values-de/strings.xml index 9b75c7f..a9d4b83 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -184,11 +184,7 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="the_tor_license">Die Tor Lizenz</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">Drittanbieter-Software:</string> - <string name="tor_version">Tor v0.2.3.7-alpha: 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> - <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> + <string name="hidden_service_request">Eine Anwendungen möchte den Port für versteckte Dienste %S öffnen. Dies ist sicher wenn Sie der Anwendung vertrauen.</string> <string name="found_existing_tor_process">existierender Tor Prozess gefunden...</string> <string name="something_bad_happened">Etwasist schief gelaufen. Bitte Log prüfen</string> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 9ad6ffb..2705a38 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -177,11 +177,6 @@ <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: 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> - <string name="openssl_version">OpenSSL v1.0.0f: 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/res/values-es/strings.xml b/res/values-es/strings.xml index a5d0ca8..28fa0a1 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -183,11 +183,6 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <string name="the_tor_license">Licencia de uso Tor</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">Software de terceras partes</string> - <string name="tor_version">Tor v0.2.3.7-alfa: 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> - <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> <string name="hidden_service_request">Una aplicación esta intentando abrir el siguiente puerto %S a la red Tor. Esto es seguro, si confía en la aplicación, que lo esta intentando abrir.</string> <string name="found_existing_tor_process">Se ha encontrado proceso activo de Tor ...</string> <string name="something_bad_happened">Algo ha ocurrido con el normal funcionamiento de la aplicacion. Compruebe el log de registro del sistema Tor</string> diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 72c9865..678af25 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -177,11 +177,6 @@ <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: 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> - <string name="openssl_version">OpenSSL v1.0.0f: 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/res/values-fa/strings.xml b/res/values-fa/strings.xml index ec83d4d..1bdbfa2 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -178,11 +178,6 @@ Orbot اگر فقط <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: 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> - <string name="openssl_version">OpenSSL v1.0.0f: 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">اتفاق بدی افتاد. وقایع ثبت شده را چک کنید</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index ee3d796..98b07b5 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -178,11 +178,6 @@ <string name="the_tor_license">La licence de Tor</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">Logiciels tierce-partie :</string> - <string name="tor_version">Tor v0.2.3.7-alpha: 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> - <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> <string name="hidden_service_request">Une application veut ouvrir le port %S du serveur caché sur le réseau Tor. C\'est sécuritaire si vous faites confiance à l\'application.</string> <string name="found_existing_tor_process">trouvé un processus existant de Tor ...</string> <string name="something_bad_happened">Quelque chose d\'incorrect s\'est passé. Vérifiez le journal</string> diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml index 8d55b45..3e90dbc 100644 --- a/res/values-zh/strings.xml +++ b/res/values-zh/strings.xml @@ -176,11 +176,6 @@ <string name="the_tor_license">Tor许可证</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: 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> - <string name="openssl_version">OpenSSL v1.0.0f: 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/res/values/strings.xml b/res/values/strings.xml index 911caf6..10e51eb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -238,11 +238,13 @@ <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.17: https://www.torproject.org</string> + + <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</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="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> -<string name="openssl_version">OpenSSL v0.9.8c: http://www.openssl.org</string> +<string name="openssl_version">OpenSSL v0.9.8h: 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>

1 0

[orbot/master] attempted to address leaking bound service
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit 3de5d664402d37d1bf6372184e2a1f222a3cfcd6 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jun 28 17:01:35 2012 -0400 attempted to address leaking bound service --- src/org/torproject/android/Orbot.java | 43 ++++++-------------- src/org/torproject/android/service/TorService.java | 42 ++++++++++++------- 2 files changed, 40 insertions(+), 45 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 654aea6..e10f9af 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -82,9 +82,6 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener setLocale(); - bindService(); - startService(new Intent(INTENT_TOR_SERVICE)); - prefs = PreferenceManager.getDefaultSharedPreferences(this); setContentView(R.layout.layout_main); @@ -94,8 +91,6 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener imgStatus = (ImageView)findViewById(R.id.imgStatus); imgStatus.setOnLongClickListener(this); - - } @@ -244,26 +239,13 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener protected void onPause() { super.onPause(); + unbindService(); + hideProgressDialog(); if (aDialog != null) aDialog.dismiss(); } - - public void onSaveInstanceState(Bundle savedInstanceState) { - // Save UI state changes to the savedInstanceState. - // This bundle will be passed to onCreate if the process is - // killed and restarted. - // etc. - super.onSaveInstanceState(savedInstanceState); - } - - public void onRestoreInstanceState(Bundle savedInstanceState) { - super.onRestoreInstanceState(savedInstanceState); - // Restore UI state from the savedInstanceState. - // This bundle has also been passed to onCreate. - - } private void doTorCheck () { @@ -327,6 +309,11 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener setLocale(); + bindService(); + // startService(new Intent(INTENT_TOR_SERVICE)); + + + if (getIntent() == null) return; @@ -425,7 +412,7 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener protected void onStop() { super.onStop(); - //unbindService(); + unbindService(); } @@ -607,9 +594,6 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener // to start Tor private void startTor () throws RemoteException { - // here we bind AGAIN - at some point i think we had to bind multiple times just in case - // but i would love to clarify, clean this up - bindService(); // this is a bit of a strange/old/borrowed code/design i used to change the service state // not sure it really makes sense when what we want to say is just "startTor" @@ -877,12 +861,11 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener private void hideProgressDialog () { - if (progressDialog != null && progressDialog.isShowing()) - { - progressDialog.dismiss(); - progressDialog = null; - } - + if (progressDialog != null && progressDialog.isShowing()) + { + progressDialog.dismiss(); + progressDialog = null; + } } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index b07026a..85095ee 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -77,11 +77,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst private File filePrivoxy; private File fileObfsProxy; - /** Called when the activity is first created. */ - public void onCreate() { - super.onCreate(); - - } public static void logMessage(String msg) { @@ -168,6 +163,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst { NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); mNotificationManager.cancelAll(); + + } private void showToolbarNotification (String notifyMsg, int notifyId, int icon, int flags) @@ -322,7 +319,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { killTorProcess (); - + + //stop the foreground priority and make sure to remove the persistant notification + stopForeground(true); + currentStatus = STATUS_OFF; clearNotifications(); @@ -793,7 +793,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst initControlConnection (); - applyPreferences(); + updateTorConfiguration(); } } @@ -1033,6 +1033,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst startForeground(NOTIFY_ID,notice); + } @@ -1156,6 +1157,15 @@ public class TorService extends Service implements TorServiceConstants, TorConst _torInstance = this; initTorPaths(); + + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + + ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); + Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); + + prefPersistNotifications = prefs.getBoolean(TorConstants.PREF_PERSIST_NOTIFICATIONS, true); + + new Thread () { @@ -1208,8 +1218,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - applyPreferences(); - + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(TorService.this); + + ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); + Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); + + prefPersistNotifications = prefs.getBoolean(TorConstants.PREF_PERSIST_NOTIFICATIONS, true); + + updateTorConfiguration(); if (currentStatus == STATUS_ON) { @@ -1411,14 +1427,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - private boolean applyPreferences () throws RemoteException + private boolean updateTorConfiguration () throws RemoteException { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - - ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); - Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); - prefPersistNotifications = prefs.getBoolean(TorConstants.PREF_PERSIST_NOTIFICATIONS, true); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false);

1 0

[orbot/master] fixed relay resolv.conf DNS error #2069 in tor trac
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit c6b6cd3d66ddb88f676f22675ac36cbaba52532b Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jun 28 22:50:18 2012 -0400 fixed relay resolv.conf DNS error #2069 in tor trac --- res/raw/torrc | 3 ++ src/org/torproject/android/service/TorService.java | 37 +++++++++++++++---- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/res/raw/torrc b/res/raw/torrc index 5366ce8..c86ad2b 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -11,3 +11,6 @@ TransListenAddress 127.0.0.1 TransPort 9040 DNSListenAddress 127.0.0.1 DNSPort 5400 +HardwareAccel 1 +SafeLogging 1 +TestSocks 1 \ No newline at end of file diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 74a91cf..1cbb93c 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -8,10 +8,13 @@ package org.torproject.android.service; +import java.io.BufferedWriter; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.FileWriter; import java.io.IOException; +import java.io.PrintWriter; import java.net.Socket; import java.util.ArrayList; import java.util.Arrays; @@ -734,7 +737,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst int procId = -1; int attempts = 0; - int torRetryWaitTimeMS = 5000; + int torRetryWaitTimeMS = 2000; while (procId == -1 && attempts < MAX_START_TRIES) { @@ -748,22 +751,25 @@ public class TorService extends Service implements TorServiceConstants, TorConst procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath()); - logNotice("got tor proc id: " + procId); - if (procId == -1) { - - sendCallbackStatusMessage(getString(R.string.couldn_t_start_tor_process_)); Thread.sleep(torRetryWaitTimeMS); + procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath()); attempts++; } - - if (waitForProcess) - logNotice(log.toString()); + else + { + logNotice("got tor proc id: " + procId); + + } } if (procId == -1) { + + logNotice(log.toString()); + sendCallbackStatusMessage(getString(R.string.couldn_t_start_tor_process_)); + throw new Exception ("Unable to start Tor"); } else @@ -1572,6 +1578,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst int ORPort = Integer.parseInt(prefs.getString(TorConstants.PREF_OR_PORT, "9001")); String nickname = prefs.getString(TorConstants.PREF_OR_NICKNAME, "Orbot"); + String dnsFile = writeDNSFile (); + + mBinder.updateConfiguration("ServerDNSResolvConfFile", dnsFile, false); mBinder.updateConfiguration("ORPort", ORPort + "", false); mBinder.updateConfiguration("Nickname", nickname, false); mBinder.updateConfiguration("ExitPolicy", "reject *:*", false); @@ -1626,6 +1635,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst return true; } + //using Google DNS for now as the public DNS server + private String writeDNSFile () throws IOException + { + File file = new File(appBinHome,"resolv.conf"); + + PrintWriter bw = new PrintWriter(new FileWriter(file)); + bw.println("nameserver 8.8.8.8"); + bw.println("nameserver 8.8.4.4"); + bw.close(); + + return file.getAbsolutePath(); + } }

1 0

[vidalia/alpha] Disable run at start for TBB users
by chiiph＠torproject.org 29 Jun '12

29 Jun '12

commit 6413757565ca17293d9c9a13820fdbcba3e40aa2 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon May 28 20:53:40 2012 -0300 Disable run at start for TBB users --- changes/disableRunAtStart | 3 +++ src/vidalia/config/GeneralPage.cpp | 5 +++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/disableRunAtStart b/changes/disableRunAtStart new file mode 100644 index 0000000..f8890fc --- /dev/null +++ b/changes/disableRunAtStart @@ -0,0 +1,3 @@ + o Disable "Run Vidalia when my system starts" if the + BrowserExecutable config option is set. This will avoid issues with + TBB users starting Vidalia the wrong way. \ No newline at end of file diff --git a/src/vidalia/config/GeneralPage.cpp b/src/vidalia/config/GeneralPage.cpp index 1450cf3..f6d2668 100644 --- a/src/vidalia/config/GeneralPage.cpp +++ b/src/vidalia/config/GeneralPage.cpp @@ -45,6 +45,11 @@ GeneralPage::GeneralPage(QWidget *parent) #if !defined(USE_AUTOUPDATE) ui.grpSoftwareUpdates->setVisible(false); #endif + + if (_vidaliaSettings->getBrowserExecutable().length() > 0) { + ui.lineHorizontalSeparator->setVisible(false); + ui.chkRunVidaliaAtSystemStartup->setVisible(false); + } } /** Destructor */

1 0

[vidalia/alpha] Save what version of Vidalia wrote the configuration file
by chiiph＠torproject.org 29 Jun '12

29 Jun '12

commit c9e4c5a1ab46896cf187d7f18138537dac999373 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Jun 28 21:32:31 2012 -0300 Save what version of Vidalia wrote the configuration file --- changes/bug5123 | 3 +++ src/vidalia/config/VidaliaSettings.cpp | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug5123 b/changes/bug5123 new file mode 100644 index 0000000..6abe02c --- /dev/null +++ b/changes/bug5123 @@ -0,0 +1,3 @@ + New features: + o Set what version of Vidalia wrote the configuration file. Resolves ticket + 5123. diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp index 03dde13..4c92a1f 100644 --- a/src/vidalia/config/VidaliaSettings.cpp +++ b/src/vidalia/config/VidaliaSettings.cpp @@ -41,6 +41,7 @@ #define SETTING_ALLOW_PANIC "AllowPanic" #define SETTING_PANIC_PATH "PanicPath" #define SETTING_FIRST_RUN "FirstRun" +#define SETTING_VIDALIA_VERSION "VidaliaVersion" #if defined(Q_OS_WIN32) #define STARTUP_REG_KEY "Software\\Microsoft\\Windows\\CurrentVersion\\Run" @@ -91,6 +92,8 @@ VidaliaSettings::VidaliaSettings() setDefault(SETTING_PANIC_PATH, ""); setDefault(SETTING_FIRST_RUN, true); setDefault(SETTING_REMEMBER_DONTWARNEXIT, true); + + setValue(SETTING_VIDALIA_VERSION, Vidalia::version()); } /** Gets the currently preferred language code for Vidalia. */

1 0