June 2015 - tor-commits - lists.torproject.org

[orbot/master] enable background starts by default only for Service intent calls
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 765bc61deded5fdd662a5d0c2f19a8c57e32203a Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jun 22 12:57:59 2015 -0400 enable background starts by default only for Service intent calls --- res/xml/preferences.xml | 2 +- src/org/torproject/android/OrbotMainActivity.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 08eddfa..e1e1828 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -23,7 +23,7 @@ android:enabled="true" android:title="@string/pref_use_expanded_notifications_title"/> <CheckBoxPreference -android:defaultValue="false" +android:defaultValue="true" android:key="pref_allow_background_starts" android:summary="@string/pref_allow_background_starts_summary" android:title="@string/pref_allow_background_starts_title"/> diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index cf4600b..d4ed148 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -570,6 +570,9 @@ public class OrbotMainActivity extends Activity startTor(); + //never allow backgrounds start from this type of intent start + //app devs who want background starts, can use the service intents + /** if (Prefs.allowBackgroundStarts()) { Intent resultIntent; @@ -581,7 +584,7 @@ public class OrbotMainActivity extends Activity resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus); setResult(RESULT_OK, resultIntent); finish(); - } + }*/ } else if (action.equals(Intent.ACTION_VIEW))

1 0

[orbot/master] update submodule pin
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 76e424e695de0a9090483ade5b7ed3ee7d2ba0d4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jun 25 10:35:28 2015 -0400 update submodule pin --- external/badvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/badvpn b/external/badvpn index ff125be..d065d0f 160000 --- a/external/badvpn +++ b/external/badvpn @@ -1 +1 @@ -Subproject commit ff125bea79e7edc939af83ca7703eecf21b89e53 +Subproject commit d065d0f501a08068587c5aa2285cd28adf79c8b5

1 0

[orbot/master] v15.0.1 beta 2
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit c56e5d635f758f2ed5ab4e20e0805777686b4536 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jun 25 10:53:01 2015 -0400 v15.0.1 beta 2 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b210735..328d57e 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="15.0.1-beta-1" - android:versionCode="150011" + android:versionName="15.0.1-beta-2" + android:versionCode="150012" android:installLocation="auto" >

1 0

[orbot/master] don't try to build external folders in eclipse
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit f558a0a67c31862ca48a5d98f7e999f085c15837 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jun 25 10:37:48 2015 -0400 don't try to build external folders in eclipse --- .project | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.project b/.project index 2db7e21..4d1444b 100644 --- a/.project +++ b/.project @@ -52,4 +52,15 @@ <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature> <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature> </natures> + <filteredResources> + <filter> + <id>1435241696221</id> + <name></name> + <type>30</type> + <matcher> + <id>org.eclipse.ui.ide.multiFilter</id> + <arguments>1.0-name-matches-false-false-external</arguments> + </matcher> + </filter> + </filteredResources> </projectDescription>

1 0

[orbot/master] update changelog for v15.0.1
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit f98f7b4a338b80edc37d2d83bf5f587a6fa4d06a Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jun 25 10:59:23 2015 -0400 update changelog for v15.0.1 --- CHANGELOG | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index c4688d1..8da5abe 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,131 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** 15.0.1 BETA 2 / 25-Jun-2015 / c56e5d635f758f2ed5ab4e20e0805777686b4536 **/ + +* VPN Mode Improvements +1b6126e Enable support for app selection to work with VPN mode on Lollipop+ For now we will re-use/overload the app selection transpro +fa427a2 update tun2socks binaries + +* Build Cleanup +bf8113c update to sdk 22 +f558a0a don't try to build external folders in eclipse +67d1652 update tor to 0.2.6.9 + +* Intent API improvements +765bc61 enable background starts by default only for Service intent calls +e11cae8 Merge branch 'the-big-start-stop-makeover' of https://github.com/eighthave/orbot into eighthave-the-big-start-stop-makeover +a8384bd Merge branch 'eighthave-the-big-start-stop-makeover' +225ad9d fix handling of foreground intent starts, and set bg start off by default +e132a79 improve status request/callback interaction and status UI layout +aa87e67 on start, check for running tor daemon, and if TorService stopped, then start +a81c000 init file path variables (tor, polipo, etc) when the app starts +943edf0 "Allow Background Starts" prefs also controls the old START_TOR Intent +adf7c09 remove delayed handling of Intents in OrbotMainActivity +c9e3102 prevent a status request from starting TorService +e5c2e1a when OrbotMainActivity starts, query TorService for current status +232098e set STATUS_STARTING in TorService.onCreate(), that's where it begins +ff04bde announce Orbot is ON once the first circuit is complete +8f57b42 rename TorStarter to IncomingIntentRouter, it handles all Intents +b620f82 include dynamic proxy config info in ACTION_STATUS replies +0937c88 use constants for setting default ports, and variables when running +6230845 standardize network port constant variables +ac8329c create a new pref: "Allow Background Starts" +775135d let the requesting app know that the user has disabled starting via Intent +77b1bdf on receiving ACTION_START, only send status reply if EXTRA_PACKAGE_NAME set +f433a5e expose start action via a BroadcastReceiver that any app can send to +90b731c strictly target local broadcasts +bf3572e use the same action string for local and broadcast status +65d8801 rename mMessageReceiver to mLocalBroadcastReceiver +4d8a9da broadcast Tor state to any app that might want to know +fa533e9 fix handle intent for hidden service API request + +* User Interface +f16394b include all status messages with "start" in them in the starting sequence +ddaae1d drive main screen UI updated entirely from TorService status updates +13d2987 a couple tweaks to make the long press feel more responsive +25a6bb6 force all UI status updates through mStatusUpdateHandler +5c2d450 make updateStatus() more closely match the state given from TorService +f09379d create String constants for Intent actions and extras +fd23da5 purge troublesome half-disabled Wizard, rename menu to "Get Apps..." + +* Localization +6352bd4 convert app description to XLIFF to make translation management easier +96b5d90 remove empty translations +aebf3b0 fixed directory names for Indonesian and Hebrew +5c7171b add config for transifex-client aka tx +a721199 rename zh to zh_CN following convention +9a786d4 Merge pull request #10 from eighthave/fix-translations +fbf9932 rework setting locale from pref to have a lighter touch and be dynamic +d43a6cd switch language/locale preference to use Languages utility class +d85a2e8 remove global NumberFormat for more flexible Locale handling +7787a3f run ./fix-translations +d55c7b7 ./fix-translations script to fix common problems in the strings.xml + +* General Cleanup +2f1d52f purge unused code from OrbotMainActivity +2f7ddc4 purge unused OrbotLogActivity +21c3bfb use "SIGNAL HUP" to request Tor re-read its config +6ac9a2c use context.stopService() to shutdown TorService instead of custom message +bfb0a80 rename mHandler to mStatusUpdateHandler +3580cbe only set mCurrentStatus in sendCallbackStatus(), the one stop shop +780abf0 rework start/stop procedure to have clear points for ON, OFF, STARTING, STOPPING +4470771 rename startService() to sendIntentToService() to reflect what it does +82f82e1 mark TorService methods from EventHandler as overridden +86593df rename status to STARTING and STOPPING since it also starts/stops daemons +cf0adc2 on start and tor daemon not running, kill all daemons before starting again +2bc85a4 rework killing all daemons to continue trying after a failure +73658ce use Java methods for setting permissions on native executables +a3d37e8 make prefs called directly when needed instead of requiring refresh +6e13a7e purge dead and unused code from TorService +12d92f4 handle logging native process Exceptions closer to the source +ae83f01 purge CMD_INIT/initialize() from TorService, an IntentService doesn't need it +a336a29 convert status variable to String for easy sharing in Intents +356e79a remove unused IntentFilter from TorService +807b51f include proxy config info when returning from START_TOR Intent +fba0926 update SettingsActivity to use simpler findPreferences() method +237366c no need to override methods with nothing +2f1ad74 put up error notification if Orbot cannot kill a process +81cf67f remove unused icons to save space + +* Repro Builds Progress +5414104 Merge pull request #9 from eighthave/reboot-and-reproducible +2372b18 add script to compare APKs for the reproducible process +cd48dd2 ignore build products in the submodules (ignore = dirty) +6989f9b add standard ./make-release-build script +6775f86 add custom ant rules for automating the release process +e66b5a0 ignore all build products from submodules +cf43fa2 switch to standard NDK env var: ANDROID_NDK_HOME +663cade ./jenkins-build script for standard Guardian Project Jenkins build +3c26f67 update ant setup script to get all settings from their original sources +77d1b82 adding patch for iptables building on x86 +20bf4c7 update Makefile +d6ff413 update Makefile with a few tweaks + +* Misc +333343f remove Firefox ProxyMob recommendation, ProxyMob is no longer supported +e58a15e Promo Apps: choose "all apps" URL based on which app store is installed +545afe7 Promo Apps: use Play or FDroid links, fallback to https://f-droid.org +0e6ba61 remove Firefox ProxyMob recommendation, ProxyMob is no longer supported +2f8c130 update to 15.0.1-beta-1 and update openssl to 1.0.2a +d6bfed0 update for 15.0.1 + +* Native build fixes +3a3f701 Merge branch 'aelmahmoudy-build_system' +4163fc1 Merge branch 'build_system' of https://github.com/aelmahmoudy/orbot into aelmahmoudy-build_system +d5e937d Fix build for mips* archs. +8d7c32c Update OpenSSL to 1.0.2a +81a945e Patch libevent to compile for 64-bit archs. +ebe85e5 Add iptables-clean prerequisite to clean target +adb9a19 Add support for variable arch builds to support mips & 64-bit archs +84c6645 fixing flag typo +dbe3024 fix PIE_FLAGS variable to allow for override also, standardize use of STRIP command +1bc427b handle NPE on number format instance +ec24428 fix NPE crash if VPN prepare Intent is null on boot +ddecd0c update changelog for v15 rc 3 +b941a1c show warning about bridge limits on Intel x86/ATOM devices +325ca1f only ARM chips can support the new Obfs4, Meek bridges so hide the UI options that promote them, and just request standard bri + + /** 15.0.0 RC 3 / 13-Apr-2015 / b941a1c7d5588db7efd9fab672ec518a69f76f84 **/ b941a1c show warning about bridge limits on Intel x86/ATOM devices

1 0

[orbot/master] Enable support for app selection to work with VPN mode on Lollipop+
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 1b6126e3d0b5941b98cbd6db866b6e68cafb2118 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jun 25 10:48:50 2015 -0400 Enable support for app selection to work with VPN mode on Lollipop+ For now we will re-use/overload the app selection transproxy UI in Settings --- res/xml/preferences.xml | 3 -- src/org/torproject/android/OrbotMainActivity.java | 2 +- .../android/settings/SettingsPreferences.java | 31 +++++++++++++++----- .../torproject/android/vpn/OrbotVpnService.java | 31 +++++++++++++++++--- 4 files changed, 51 insertions(+), 16 deletions(-) diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index e1e1828..f34548e 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -50,7 +50,6 @@ android:defaultValue="false" android:key="pref_transparent" android:title="@string/pref_trans_proxy_title" android:summary="@string/pref_trans_proxy_summary" -android:dependency="has_root" android:enabled="true"/> <CheckBoxPreference @@ -58,7 +57,6 @@ android:defaultValue="false" android:key="pref_transparent_all" android:summary="@string/pref_transparent_all_summary" android:enabled="true" -android:dependency="has_root" android:title="@string/pref_transparent_all_title"/> <Preference @@ -66,7 +64,6 @@ android:defaultValue="" android:key="pref_transparent_app_list" android:title="@string/pref_select_apps" android:summary="@string/pref_select_apps_summary" -android:dependency="has_root" android:enabled="true"/> <CheckBoxPreference diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index d4ed148..7ff6068 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -965,7 +965,7 @@ public class OrbotMainActivity extends Activity }) - .setNegativeButton(android.R.string.cancel, new Dialog.OnClickListener () + .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener () { @Override diff --git a/src/org/torproject/android/settings/SettingsPreferences.java b/src/org/torproject/android/settings/SettingsPreferences.java index 5c02d2b..d7a976f 100644 --- a/src/org/torproject/android/settings/SettingsPreferences.java +++ b/src/org/torproject/android/settings/SettingsPreferences.java @@ -6,6 +6,7 @@ package org.torproject.android.settings; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.os.Build; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.EditTextPreference; @@ -21,6 +22,7 @@ import info.guardianproject.util.Languages; import org.sufficientlysecure.rootcommands.RootCommands; import org.sufficientlysecure.rootcommands.Shell; import org.torproject.android.OrbotApp; +import org.torproject.android.Prefs; import org.torproject.android.R; import org.torproject.android.service.TorServiceUtils; @@ -97,21 +99,33 @@ public class SettingsPreferences }); + prefTransProxyApps = findPreference("pref_transparent_app_list"); prefTransProxyApps.setOnPreferenceClickListener(this); - prefTransProxyApps.setEnabled(prefCBTransProxy.isChecked() - && (!prefcBTransProxyAll.isChecked())); - prefCBTransProxy.setOnPreferenceClickListener(this); prefcBTransProxyAll.setOnPreferenceClickListener(this); - prefcBTransProxyAll.setEnabled(prefCBTransProxy.isChecked()); - prefHiddenServices = (CheckBoxPreference) findPreference("pref_hs_enable"); prefHiddenServices.setOnPreferenceClickListener(this); - prefHiddenServicesPorts = (EditTextPreference) findPreference("pref_hs_ports"); - prefHiddenServicesPorts.setEnabled(prefHiddenServices.isChecked()); prefHiddenServicesHostname = (EditTextPreference) findPreference("pref_hs_hostname"); + + + prefCBTransProxy.setEnabled(prefRequestRoot.isChecked()); + + prefcBTransProxyAll.setEnabled(prefCBTransProxy.isChecked()); + + if (prefCBTransProxy.isChecked()) + prefTransProxyApps.setEnabled((!prefcBTransProxyAll.isChecked())); + + prefHiddenServicesPorts = (EditTextPreference) findPreference("pref_hs_ports"); prefHiddenServicesHostname.setEnabled(prefHiddenServices.isChecked()); + prefHiddenServicesPorts.setEnabled(prefHiddenServices.isChecked()); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) + { + prefTransProxyApps.setEnabled(true); + } + + } public boolean onPreferenceClick(Preference preference) { @@ -134,7 +148,8 @@ public class SettingsPreferences shell.close(); prefRequestRoot.setChecked(true); - + prefCBTransProxy.setEnabled(true); + } catch (Exception e) { diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index e202078..2fe3daa 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -17,10 +17,13 @@ package org.torproject.android.vpn; import java.net.InetAddress; +import java.util.ArrayList; import java.util.Locale; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.TorServiceUtils; +import org.torproject.android.settings.AppManager; +import org.torproject.android.settings.TorifiedApp; import android.annotation.TargetApi; import android.app.PendingIntent; @@ -178,9 +181,6 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { private void stopVPN () { - - Tun2Socks.Stop(); - //stopSocksBypass (); if (mInterface != null){ @@ -202,8 +202,14 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { } } + Tun2Socks.Stop(); + mThreadVPN = null; + + // Tun2Socks.Stop(); + + } @Override @@ -293,7 +299,24 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { @TargetApi(Build.VERSION_CODES.LOLLIPOP) private void doLollipopAppRouting (Builder builder) throws NameNotFoundException { - builder.addDisallowedApplication("org.torproject.android"); + + ArrayList<TorifiedApp> apps = AppManager.getApps(this, TorServiceUtils.getSharedPrefs(getApplicationContext())); + + boolean appAllowed = false; + + for (TorifiedApp app : apps) + { + if (app.isTorified()) + { + builder.addAllowedApplication(app.getUsername()); + appAllowed = true; + } + + } + + if (!appAllowed) + builder.addDisallowedApplication(getPackageName()); + } @Override

1 0

[orbot/master] update tun2socks binaries
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit fa427a26f27ca555ad95ec6cb24ca1bdc448b2cb Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jun 25 10:37:29 2015 -0400 update tun2socks binaries --- libs/armeabi-v7a/libtun2socks.so | Bin 117192 -> 117192 bytes libs/armeabi/libtun2socks.so | Bin 125376 -> 125376 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/armeabi-v7a/libtun2socks.so b/libs/armeabi-v7a/libtun2socks.so index 9e0c5af..af0f3e1 100755 Binary files a/libs/armeabi-v7a/libtun2socks.so and b/libs/armeabi-v7a/libtun2socks.so differ diff --git a/libs/armeabi/libtun2socks.so b/libs/armeabi/libtun2socks.so index 6231024..dfa59ee 100755 Binary files a/libs/armeabi/libtun2socks.so and b/libs/armeabi/libtun2socks.so differ

1 0

[orbot/master] on start, check for running tor daemon, and if TorService stopped, then start
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit aa87e6712a34e6fe9629a93649aa01cee7be6d04 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 17 12:08:52 2015 -0400 on start, check for running tor daemon, and if TorService stopped, then start If Orbot was killed when the tor daemon was running, the tor daemon will still be running when Orbot starts again. OrbotMainActivity then checks to see if tor daemon is running while TorService is stopped. If so, TorService is started so that the state of everything is in sync. --- src/org/torproject/android/OrbotMainActivity.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 0bc0f7e..dd9427e 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -59,6 +59,7 @@ import org.torproject.android.ui.ImageProgressView; import org.torproject.android.ui.PromoAppsActivity; import org.torproject.android.ui.Rotate3dAnimation; +import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; @@ -1010,6 +1011,22 @@ public class OrbotMainActivity extends Activity mBtnBridges.setChecked(Prefs.bridgesEnabled()); } + /* + * Check if the tor daemon is running and if TorService is stopped. If + * so, automatically start TorService to represent it + */ + try { + if (TorServiceUtils.findProcessId(OrbotApp.fileTor.getAbsolutePath()) != -1 + && !isTorServiceRunning()) { + Log.i(TAG, "Found tor daemon without TorService: starting TorService"); + startTor(); + } + } catch (IOException e) { + e.printStackTrace(); + } catch (RemoteException e) { + e.printStackTrace(); + } + handleIntents(); }

1 0

[orbot/master] Merge branch 'the-big-start-stop-makeover' of https://github.com/eighthave/orbot into eighthave-the-big-start-stop-makeover
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit e11cae883ee5f850780660f9222f21fbe74e6fee Merge: a8384bd aa87e67 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jun 22 12:43:42 2015 -0400 Merge branch 'the-big-start-stop-makeover' of https://github.com/eighthave/orbot into eighthave-the-big-start-stop-makeover Conflicts: src/org/torproject/android/OrbotMainActivity.java src/org/torproject/android/service/TorService.java src/org/torproject/android/OrbotApp.java | 23 +++ src/org/torproject/android/OrbotMainActivity.java | 41 +++-- src/org/torproject/android/service/TorService.java | 177 +++++++++----------- .../android/service/TorServiceConstants.java | 1 + 4 files changed, 129 insertions(+), 113 deletions(-) diff --cc src/org/torproject/android/OrbotMainActivity.java index 2fd68d3,dd9427e..cf4600b --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@@ -1142,32 -1134,32 +1145,42 @@@ public class OrbotMainActivity extends * {@link TorServiceConstants#ACTION_START} {@link Intent} to * {@link TorService} */ - private void startTor() throws RemoteException { + private void startTor() { sendIntentToService(TorServiceConstants.ACTION_START); } + + /** + * Request tor status without starting it + * {@link TorServiceConstants#ACTION_START} {@link Intent} to + * {@link TorService} + */ + private void requestTorStatus() { + sendIntentToService(TorServiceConstants.ACTION_STATUS); + } + private boolean isTorServiceRunning() { + ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE); + for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) { + if (TorService.class.getName().equals(service.service.getClassName())) { + return true; + } + } + return false; + } + public boolean onLongClick(View view) { - try { - if (torStatus == TorServiceConstants.STATUS_OFF) { - startTor(); - } else { - stopTor(); - } - return true; - } catch (RemoteException e) { - Log.d(TAG, "error onclick", e); + + if (torStatus == TorServiceConstants.STATUS_OFF) { + lblStatus.setText(getString(R.string.status_starting_up)); + startTor(); + } else { + lblStatus.setText(getString(R.string.status_shutting_down)); + + stopTor(); } - return false; + + return true; + } // this is what takes messages or values from the callback threads or other non-mainUI threads diff --cc src/org/torproject/android/service/TorService.java index bf065c3,464382e..a515333 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@@ -802,13 -766,9 +769,13 @@@ public class TorService extends Servic // make sure there are no stray daemons running killAllDaemons(); + sendCallbackStatus(STATUS_STARTING); + sendCallbackLogMessage(getString(R.string.status_starting_up)); + logNotice(getString(R.string.status_starting_up)); + try { - if (fileTor == null) - initBinariesAndDirectories(); + if (!isTorUpgradeAndConfigComplete) + torUpgradeAndConfig(); ArrayList<String> customEnv = new ArrayList<String>();

1 0

[orbot/master] when OrbotMainActivity starts, query TorService for current status
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit e5c2e1a040045781507fca48138d4bdaa672be10 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 17 11:00:48 2015 -0400 when OrbotMainActivity starts, query TorService for current status If OrbotMainActivity gets killed while TorService is running, then when OrbotMainActivity starts again, it needs to get the current status from TorService to correctly represent things to the user. --- src/org/torproject/android/OrbotMainActivity.java | 6 ++++- src/org/torproject/android/service/TorService.java | 28 +++++++++++++++----- .../android/service/TorServiceConstants.java | 1 + 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index e13f55d..b1ea635 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -589,7 +589,11 @@ public class OrbotMainActivity extends Activity } } } - + else if (action.equals(Intent.ACTION_MAIN)) + { + // OrbotMainActivity was restarted after being killed + sendIntentToService(TorServiceConstants.CMD_STATUS); + } updateStatus(""); setIntent(null); diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index f5fe6e1..7830e5e 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -16,6 +16,7 @@ import android.app.PendingIntent; import android.app.Service; import android.content.BroadcastReceiver; import android.content.Context; +import android.content.ContextWrapper; import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; @@ -346,6 +347,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon replyWithStatus(mIntent); startTor(); // stopTor() is called when the Service is destroyed + } else if (action.equals(CMD_STATUS)) { + Intent intent = getActionStatusIntent(mCurrentStatus); + sendBroadcastOnlyToOrbot(intent); } else if (action.equals(CMD_SIGNAL_HUP)) { requestTorRereadConfig(); } else if (action.equals(CMD_NEWNYM)) { @@ -1901,20 +1905,32 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private void sendCallbackStatus(String currentStatus) { mCurrentStatus = currentStatus; - - Intent intent = new Intent(ACTION_STATUS); - intent.putExtra(EXTRA_STATUS, currentStatus); + Intent intent = getActionStatusIntent(currentStatus); // send for Orbot internals, using secure local broadcast - LocalBroadcastManager.getInstance(this).sendBroadcast(intent); + sendBroadcastOnlyToOrbot(intent); // send for any apps that are interested sendBroadcast(intent); } - + + /** + * Send a secure broadcast only to Orbot itself + * @see {@link ContextWrapper#sendBroadcast(Intent)} + * @see {@link LocalBroadcastManager} + */ + private boolean sendBroadcastOnlyToOrbot(Intent intent) { + return LocalBroadcastManager.getInstance(this).sendBroadcast(intent); + } + + private Intent getActionStatusIntent(String currentStatus) { + Intent intent = new Intent(ACTION_STATUS); + intent.putExtra(EXTRA_STATUS, currentStatus); + return intent; + } + /* * Another way to do this would be to use the Observer pattern by defining the * BroadcastReciever in the Android manifest. */ - private final BroadcastReceiver mNetworkStateReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index adaa674..fa26e10 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -119,6 +119,7 @@ public interface TorServiceConstants { // actions for internal command Intents public static final String CMD_SIGNAL_HUP = "signal_hup"; + public static final String CMD_STATUS = "status"; public static final String CMD_FLUSH = "flush"; public static final String CMD_NEWNYM = "newnym"; public static final String CMD_VPN = "vpn";

1 0