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

[orbot/master] moved ip lookup into asynctask and also added some extra checking before the external ip is updated
by n8fr8＠torproject.org 14 Jul '14

14 Jul '14

commit ff8bf0bddf92cbb1fac9143dc118112ab944ce09 Author: amoghbl1 <amoghbl1(a)gmail.com> Date: Fri Jun 20 02:15:13 2014 +0530 moved ip lookup into asynctask and also added some extra checking before the external ip is updated --- src/org/torproject/android/service/TorService.java | 67 +++++++++++++------- 1 file changed, 45 insertions(+), 22 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index c2c86c0..5240f28 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -87,8 +87,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst private static final int HS_NOTIFY_ID = 4; private boolean prefPersistNotifications = true; - String IPADDRESS_PATTERN = + private String IPADDRESS_PATTERN = "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"; + private long exitIPTime = 0; private static final int MAX_START_TRIES = 3; @@ -1378,27 +1379,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst sb.append(nodeName); if(status.equals("BUILT") && currentStatus==STATUS_ON){ - Thread thread = new Thread() - { - @Override - public void run() { - try { - String nodeDetails = conn.getInfo("ns/name/"+nodeName); - Pattern pattern = Pattern.compile(IPADDRESS_PATTERN); - Matcher matcher = pattern.matcher(nodeDetails); - if (matcher.find()) { - Log.d(TAG, "ip: "+matcher.group()); - exitIP = matcher.group(); - } - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - }; - thread.start(); - - Log.d(TAG ,"Node name: "+nodeName+"IP: "+exitIP); + new getExternalIP().execute(nodeName); } if (st.hasMoreTokens()) @@ -1428,6 +1409,48 @@ public class TorService extends Service implements TorServiceConstants, TorConst } + private class getExternalIP extends AsyncTask<String, Void, Void>{ + + private long time; + private String nodeDetails; + + @Override + protected Void doInBackground(String... params) { + time = System.nanoTime(); + try { + nodeDetails = conn.getInfo("ns/name/"+params[0]); + if (ENABLE_DEBUG_LOG) + { + Log.d(TAG,"Node Details: "+nodeDetails); + sendCallbackLogMessage("Node Details: "+nodeDetails); + + } + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return null; + } + + @Override + protected void onPostExecute(Void result) { + // check if we need to update the exit IP + if(time > exitIPTime) { + exitIPTime = time; + + Pattern pattern = Pattern.compile(IPADDRESS_PATTERN); + Matcher matcher = null; + if(nodeDetails!=null) + matcher = pattern.matcher(nodeDetails); + if (matcher!=null && matcher.find()) { + Log.d(TAG, "ip: "+matcher.group()); + exitIP = matcher.group(); + } + } + } + + } + private String parseNodeName(String node) { if (node.indexOf('=')!=-1)

1 0

[orbot/master] matcher null pointer fix
by n8fr8＠torproject.org 14 Jul '14

14 Jul '14

commit 367002bf3d9ca6a1245afe8466eb7deb5087571d Author: amoghbl1 <amoghbl1(a)gmail.com> Date: Fri Jun 20 02:20:13 2014 +0530 matcher null pointer fix --- src/org/torproject/android/service/TorService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 5240f28..30bbd1a 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1440,11 +1440,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst Pattern pattern = Pattern.compile(IPADDRESS_PATTERN); Matcher matcher = null; - if(nodeDetails!=null) + if(nodeDetails!=null){ matcher = pattern.matcher(nodeDetails); - if (matcher!=null && matcher.find()) { - Log.d(TAG, "ip: "+matcher.group()); - exitIP = matcher.group(); + if (matcher.find()) { + Log.d(TAG, "ip: "+matcher.group()); + exitIP = matcher.group(); + } } } }

1 0

[orbot/master] update strings
by n8fr8＠torproject.org 14 Jul '14

14 Jul '14

commit a447bbf07e3e10b51cfeb17a64a1acbaac3528ea Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jul 10 11:03:56 2014 -0400 update strings --- res/values-nl/strings.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 954b632..e006e15 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -72,6 +72,7 @@ <string name="wizard_configure_select_apps">Selecteer individuele apps voor Tor</string> <string name="wizard_tips_tricks">Orbot-geschikte Apps</string> <string name="wizard_tips_msg">We raden je aan om apps te downloaden die zich automatisch verbinden met Orbot. Klik op de knoppen hieronder om te installeren.</string> + <string name="wizard_tips_otrchat">ChatSecure - Beveiligde instant messaging cliënt voor Andrdoid</string> <string name="wizard_tips_proxy">Proxy Instellingen - Leer hoe je apps te configureren voor Orbot</string> <string name="wizard_tips_duckgo">Duckduckgo Zoekmachine app</string> <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> @@ -103,7 +104,10 @@ <string name="wizard_permissions_no_root_msg">Je apparaat draait in standaard modus en ondersteunt geen root of \'superuser\' toegang.\n\nOm voordeel te hebben van Tor moet je gebruik maken van apps die gemaakt zijn om te werken met Tor, of die HTTP of SOCKS proxy instellingen ondersteunen.\n\n\n</string>  <string name="wizard_tips_title">Orbot geschikte Apps</string> + <string name="wizard_tips_gibberbot">ChatSecure: Beveiligde chat app met Off-the-Record versleuteling</string> + <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy & voor Orbot</string> + <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> <string name="wizard_tips_play">Vind alle Guardian Project apps op Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> @@ -197,8 +201,11 @@ <string name="the_tor_license">De Tor licentie</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">Software van derden: </string> + <string name="tor_version">Tor v0.2.4.21: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.0.9: 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.1g: http://www.openssl.org</string> <string name="hidden_service_request">Een app wil hidden service poort %S openen naar het Tor netwerk. Dit is veilig als je de app vertrouwd.</string> <string name="found_existing_tor_process">bestaand Tor proces gevonden...</string> <string name="something_bad_happened">Er is iets slechts gebeurt. Controleer de log</string> @@ -219,4 +226,14 @@ <string name="powered_by">mogelijk gemaakt door het Tor Project</string> <string name="btn_save_settings">Sla instellingen op</string> <string name="no_internet_connection_tor">Geen internet verbinding: Tor is in standby...</string> + <string name="bandwidth_">Bandbreedte:</string> + <string name="pref_disable_network_title">Geen Netwerk Automatisch Slapen</string> + <string name="pref_disable_network_summary">Laat Tor slapen als er geen internet verbinding is</string> + <string name="newnym">Je bent naar een nieuwe Tor identiteit gewisseld!</string> + <string name="menu_verify_browser">Controleer Browser</string> + <string name="menu_use_chatsecure">Gebruik ChatSecure</string> + <string name="permission_manage_tor_label">Beheer Tor</string> + <string name="permission_manage_tor_description">Deze app toestaan om de Tor dienst te bedienen</string> + <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Het lijkt alsof je Orweb niet geïnstalleerd hebt. Wil je er hulp bij of moeten we gewoon de browser openen?</string> + <string name="install_apps_">Apps installeren?</string> </resources>

1 0

[orbot/master] if service is null, please start it
by n8fr8＠torproject.org 14 Jul '14

14 Jul '14

commit f9b38e637975cdb0b74512bb72d05b4d328167fd Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jul 10 11:04:11 2014 -0400 if service is null, please start it --- src/org/torproject/android/Orbot.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 106c20b..f55474c 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -985,6 +985,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic else { showAlert(getString(R.string.error),"Tor Service has not started yet. Please wait and try again.",false); + startService (); }

1 0

[orbot/master] don't close socket, and use HALT for shutdown
by n8fr8＠torproject.org 14 Jul '14

14 Jul '14

commit 8a934c9cabba35c678b3837f87b58a46156adccb Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jul 10 11:04:21 2014 -0400 don't close socket, and use HALT for shutdown --- src/org/torproject/android/service/TorService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 358e717..a983812 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -452,11 +452,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - logNotice("sending SHUTDOWN signal to Tor process"); - conn.shutdownTor("SHUTDOWN"); + logNotice("sending HALT signal to Tor process"); + conn.shutdownTor("HALT"); - logNotice("closing tor socket"); - torConnSocket.close(); + //logNotice("closing tor socket"); + // torConnSocket.close(); } catch (Exception e) { Log.d(TAG,"error shutting down Tor via connection",e);

1 0

[orbot/master] remove unnecessary jar file
by n8fr8＠torproject.org 14 Jul '14

14 Jul '14

commit a82d2e46953a2ce8a023983f125c25e49039628f Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jul 10 11:23:25 2014 -0400 remove unnecessary jar file --- .classpath | 1 - 1 file changed, 1 deletion(-) diff --git a/.classpath b/.classpath index 5e3f5cc..5176974 100644 --- a/.classpath +++ b/.classpath @@ -5,6 +5,5 @@ <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="gen"/> - <classpathentry kind="lib" path="/home/amoghbl1/git/n8fr8/jtorctl.jar"/> <classpathentry kind="output" path="bin/classes"/> </classpath>

1 0

[orbot/master] Merge branch 'new_notification_expanded' of github.com:amoghbl1/orbot-1 into amoghbl1-new_notification_expanded
by n8fr8＠torproject.org 14 Jul '14

14 Jul '14

commit 3bc8760beb47eae482bfe086a106cc65d08522ee Merge: 41064d8 367002b Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jul 10 11:05:59 2014 -0400 Merge branch 'new_notification_expanded' of github.com:amoghbl1/orbot-1 into amoghbl1-new_notification_expanded .classpath | 2 +- AndroidManifest.xml | 2 +- external/libevent | 2 +- external/openssl | 2 +- external/polipo | 2 +- external/tor | 2 +- res/drawable/icon_orweb.png | Bin 6596 -> 6596 bytes res/drawable/icon_story_maker.png | Bin 4290 -> 4290 bytes res/drawable/torerror.png | Bin 14633 -> 14633 bytes res/layout/layout_notification_expanded.xml | 136 ++++++++ .../notification_template_part_chronometer.xml | 25 ++ res/layout/notification_template_part_time.xml | 25 ++ res/values/dimens.xml | 361 ++++++++++++++++++++ res/values/styles.xml | 5 + src/org/torproject/android/Orbot.java | 1 + src/org/torproject/android/service/TorService.java | 105 +++++- 16 files changed, 647 insertions(+), 23 deletions(-) diff --cc res/menu/main.xml index a42eb1f,df929ab..a42eb1f mode 100755,100644..100644 --- a/res/menu/main.xml +++ b/res/menu/main.xml

1 0

[orbot/master] update transifex config
by n8fr8＠torproject.org 14 Jul '14

14 Jul '14

commit b4079f4c79672ff46ea7897a16238e7300f469eb Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jul 10 11:04:36 2014 -0400 update transifex config --- external/.tx/config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/external/.tx/config b/external/.tx/config index 5c8ede9..8f5c518 100644 --- a/external/.tx/config +++ b/external/.tx/config @@ -8,3 +8,8 @@ host = https://www.transifex.com source_file = ../res/values/strings.xml source_lang = en +[orbot.description] +file_filter = ../releases/assets/<lang>-description.txt +host = https://www.transifex.com +source_file = ../releases/assets/description.txt +source_lang = en

1 0

[orbot/master] add persistent flag
by n8fr8＠torproject.org 14 Jul '14

14 Jul '14

commit 41064d8548fb06360053a62363187cc1dfd7d018 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jul 10 11:04:46 2014 -0400 add persistent flag --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1cf449a..efeaae1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -24,6 +24,7 @@ android:allowBackup="false" android:allowClearUserData="true" android:largeHeap="true" + android:persistent="true" > <activity android:name=".Orbot" android:configChanges="orientation|screenSize"

1 0

[orbot/master] make the notification larger for more display room!
by n8fr8＠torproject.org 14 Jul '14

14 Jul '14

commit 181b92276a1c7150e8cb4d7aaaa139b4dc2a350e Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jul 10 11:23:34 2014 -0400 make the notification larger for more display room! --- res/layout/layout_notification_expanded.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/res/layout/layout_notification_expanded.xml b/res/layout/layout_notification_expanded.xml index e3c6dc5..c038cc8 100644 --- a/res/layout/layout_notification_expanded.xml +++ b/res/layout/layout_notification_expanded.xml @@ -18,9 +18,9 @@ xmlns:internal="http://schemas.android.com/apk/prv/res/android" android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" - android:layout_height="64dp" - internal:layout_minHeight="64dp" - internal:layout_maxHeight="64dp" + android:layout_height="128dp" + internal:layout_minHeight="128dp" + internal:layout_maxHeight="128dp" > <ImageView android:id="@+id/icon" android:layout_width="@dimen/notification_large_icon_width"

1 0