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

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
by nickm＠torproject.org 25 Jun '15

25 Jun '15

commit bd731683070351d640e40f1a4d6320e0fe4b727e Merge: 07e1e75 1c1d71f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 25 11:14:53 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/bug16013 | 5 +++++ src/or/circuituse.c | 12 ++++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/master] Avoid crashing on busy/NEWNYM+hidden service clients
by nickm＠torproject.org 25 Jun '15

25 Jun '15

commit 68eaaed7982b63abedfcfba33f7e2656c68e3e4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 25 11:10:43 2015 -0400 Avoid crashing on busy/NEWNYM+hidden service clients When we ran out of intro points for a hidden service (which could happen on a newnym), we would change the connection's state back to "waiting for hidden service descriptor." But this would make an assertion fail if we went on to call circuit_get_open_circ_or_launch again. … [View More]

1 0

[tor/maint-0.2.6] Avoid crashing on busy/NEWNYM+hidden service clients
by nickm＠torproject.org 25 Jun '15

25 Jun '15

commit 68eaaed7982b63abedfcfba33f7e2656c68e3e4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 25 11:10:43 2015 -0400 Avoid crashing on busy/NEWNYM+hidden service clients When we ran out of intro points for a hidden service (which could happen on a newnym), we would change the connection's state back to "waiting for hidden service descriptor." But this would make an assertion fail if we went on to call circuit_get_open_circ_or_launch again. … [View More]

1 0

[tor/maint-0.2.6] Merge remote-tracking branch 'public/bug16013_025' into maint-0.2.6
by nickm＠torproject.org 25 Jun '15

25 Jun '15

commit 1c1d71fe1adf9202a1e0c9e4aa35c2cb7ce1fe7b Merge: 03e3cf6 68eaaed Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 25 11:14:44 2015 -0400 Merge remote-tracking branch 'public/bug16013_025' into maint-0.2.6 changes/bug16013 | 5 +++++ src/or/circuituse.c | 12 ++++++++++++ 2 files changed, 17 insertions(+)

1 0

[orbot/master] rename status to STARTING and STOPPING since it also starts/stops daemons
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 86593df6fb40ded939891011b32755ed48bbf791 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 11:23:56 2015 -0400 rename status to STARTING and STOPPING since it also starts/stops daemons The CONNECTING status also is starting up daemons as well as connecting to the tor daemon. --- src/org/torproject/android/OrbotMainActivity.java | 4 ++-- src/org/torproject/android/service/TorService.java | 6 +++--- src/org/torproject/… [View More]android/service/TorServiceConstants.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index b68c9aa..417e866 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -1181,7 +1181,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon Log.e(TAG, "autoStartFromIntent finish"); } } - else if (torStatus == TorServiceConstants.STATUS_CONNECTING) + else if (torStatus == TorServiceConstants.STATUS_STARTING) { imgStatus.setImageResource(R.drawable.torstarting); @@ -1225,7 +1225,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon startService (TorServiceConstants.CMD_START); - torStatus = TorServiceConstants.STATUS_CONNECTING; + torStatus = TorServiceConstants.STATUS_STARTING; mTxtOrbotLog.setText(""); diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index d56d09a..b119a5e 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -751,7 +751,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private void startTor () throws Exception { - mCurrentStatus = STATUS_CONNECTING; + mCurrentStatus = STATUS_STARTING; sendCallbackStatus(mCurrentStatus); if (fileTor == null) @@ -1110,7 +1110,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon conn.setConf("Log", "debug file " + fileLog2.getCanonicalPath()); }*/ - mCurrentStatus = STATUS_CONNECTING; + mCurrentStatus = STATUS_STARTING; sendCallbackStatus(mCurrentStatus); String confSocks = conn.getInfo("net/listeners/socks"); @@ -1563,7 +1563,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon else if(status.equals("BUILT")) { - if (mCurrentStatus == STATUS_CONNECTING) + if (mCurrentStatus == STATUS_STARTING) mCurrentStatus = STATUS_ON; sendCallbackStatus(mCurrentStatus); diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index f466dae..fdf5e77 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -75,8 +75,8 @@ public interface TorServiceConstants { public final static String STATUS_OFF = "OFF"; public final static String STATUS_ON = "ON"; - public final static String STATUS_CONNECTING = "CONNECTING"; - public final static String STATUS_DISCONNECTING = "DISCONNECTING"; + public final static String STATUS_STARTING = "STARTING"; + public final static String STATUS_STOPPING = "STOPPING"; public static final int STATUS_MSG = 1; public static final int ENABLE_TOR_MSG = 2; [View Less]

1 0

[orbot/master] mark TorService methods from EventHandler as overridden
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 82f82e1c1032519356b11acaa26206ce02084671 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 12:16:17 2015 -0400 mark TorService methods from EventHandler as overridden This keeps me from getting confused... --- src/org/torproject/android/service/TorService.java | 28 +++++--------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.… [View More]java index b119a5e..fad50a8 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1401,35 +1401,28 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon startService(intent); } - - + @Override public void message(String severity, String msg) { - logNotice(severity + ": " + msg); if (msg.indexOf(TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE)!=-1) { mCurrentStatus = STATUS_ON; sendCallbackStatus(mCurrentStatus); - showToolbarNotification(getString(R.string.status_activated), NOTIFY_ID, R.drawable.ic_stat_tor); } - - - } - + @Override public void newDescriptors(List<String> orList) { } - + @Override public void orConnStatus(String status, String orName) { - StringBuilder sb = new StringBuilder(); sb.append("orConnStatus ("); sb.append(parseNodeName(orName) ); @@ -1437,10 +1430,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon sb.append(status); debug(sb.toString()); - } - + @Override public void streamStatus(String status, String streamID, String target) { StringBuilder sb = new StringBuilder(); @@ -1450,10 +1442,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon sb.append(status); logNotice(sb.toString()); - } - + @Override public void unrecognized(String type, String msg) { StringBuilder sb = new StringBuilder(); @@ -1463,10 +1454,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon sb.append(msg); logNotice(sb.toString()); - - } - + + @Override public void bandwidthUsed(long read, long written) { if (read != lastRead || written != lastWritten) @@ -1488,15 +1478,12 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon mTotalTrafficWritten += written; mTotalTrafficRead += read; - - } lastWritten = written; lastRead = read; sendCallbackStatusMessage(lastWritten, lastRead, mTotalTrafficWritten, mTotalTrafficRead); - } private String formatCount(long count) { @@ -1516,7 +1503,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon public void circuitStatus(String status, String circID, String path) { - StringBuilder sb = new StringBuilder(); sb.append("Circuit ("); sb.append((circID)); [View Less]

1 0

[orbot/master] on start and tor daemon not running, kill all daemons before starting again
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit cf0adc27d6fb4e83816622bcfbf0ba53d0a6d7be Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 10:49:10 2015 -0400 on start and tor daemon not running, kill all daemons before starting again To make sure there are not any other daemons still running when trying to start the whole thing again, kill all daemons before starting tor afresh. --- src/org/torproject/android/service/TorService.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 … [View More]

1 0

[orbot/master] only set mCurrentStatus in sendCallbackStatus(), the one stop shop
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 3580cbe05d76924ef0f83d1fed47c85346736de8 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 13:33:57 2015 -0400 only set mCurrentStatus in sendCallbackStatus(), the one stop shop Make sendCallbackStatus() the one thing that updates the all of the bits related to running status. --- src/org/torproject/android/service/TorService.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/android/… [View More]service/TorService.java b/src/org/torproject/android/service/TorService.java index db2216e..a345e54 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -178,10 +178,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (mLastProcessId != -1 && conn != null) { sendCallbackLogMessage (getString(R.string.found_existing_tor_process)); - - mCurrentStatus = STATUS_ON; - sendCallbackStatus(mCurrentStatus); - + sendCallbackStatus(STATUS_ON); return true; } @@ -394,8 +391,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private void stopTor() { Log.i("TorService", "stopTor"); try { - mCurrentStatus = STATUS_STOPPING; - sendCallbackStatus(mCurrentStatus); + sendCallbackStatus(STATUS_STOPPING); sendCallbackLogMessage(getString(R.string.status_shutting_down)); Log.d(TAG,"Tor is stopping NOW"); @@ -431,8 +427,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon sendCallbackLogMessage(getString(R.string.something_bad_happened)); } - mCurrentStatus = STATUS_OFF; - sendCallbackStatus(mCurrentStatus); + sendCallbackStatus(STATUS_OFF); } @@ -758,8 +753,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon return; } - mCurrentStatus = STATUS_STARTING; - sendCallbackStatus(mCurrentStatus); + sendCallbackStatus(STATUS_STARTING); sendCallbackLogMessage(getString(R.string.status_starting_up)); logNotice(getString(R.string.status_starting_up)); @@ -814,8 +808,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } shellUser.close(); - mCurrentStatus = STATUS_ON; - sendCallbackStatus(mCurrentStatus); + sendCallbackStatus(STATUS_ON); } catch (CannotKillException e) { logException(e.getMessage(), e); showToolbarNotification(getString(R.string.unable_to_reset_tor), @@ -1885,6 +1878,8 @@ 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); LocalBroadcastManager.getInstance(this).sendBroadcast(intent); [View Less]

1 0

[orbot/master] rework start/stop procedure to have clear points for ON, OFF, STARTING, STOPPING
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 780abf003ed38830b2140c4753312fc405c964f0 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 13:20:38 2015 -0400 rework start/stop procedure to have clear points for ON, OFF, STARTING, STOPPING In order to send reliable information to any app using Tor, Orbot itself needs reliable state broadcasts. Before, there the ON/OFF/STARTING state were being set multiple times during the process, and sometimes not even in a useful order (i.e. STARTING … [View More]ON STARTING ON ON). This reworks the start/stop procedure into startTor() and stopTor(). --- src/org/torproject/android/service/TorService.java | 225 ++++++++------------ 1 file changed, 86 insertions(+), 139 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index fad50a8..db2216e 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -8,7 +8,45 @@ package org.torproject.android.service; +import android.annotation.SuppressLint; +import android.app.Application; +import android.app.Notification; +import android.app.NotificationManager; +import android.app.PendingIntent; +import android.app.Service; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.content.SharedPreferences; +import android.content.SharedPreferences.Editor; +import android.net.ConnectivityManager; +import android.net.NetworkInfo; +import android.os.Build; +import android.os.IBinder; +import android.os.RemoteException; +import android.support.v4.app.NotificationCompat; +import android.support.v4.app.NotificationCompat.Builder; +import android.support.v4.content.LocalBroadcastManager; +import android.util.Log; +import android.widget.RemoteViews; + +import net.freehaven.tor.control.ConfigEntry; +import net.freehaven.tor.control.EventHandler; +import net.freehaven.tor.control.TorControlConnection; + +import org.json.JSONArray; +import org.json.JSONObject; +import org.sufficientlysecure.rootcommands.Shell; +import org.sufficientlysecure.rootcommands.command.SimpleCommand; +import org.torproject.android.OrbotConstants; +import org.torproject.android.OrbotMainActivity; import org.torproject.android.Prefs; +import org.torproject.android.R; +import org.torproject.android.settings.AppManager; +import org.torproject.android.settings.TorifiedApp; +import org.torproject.android.vpn.OrbotVpnService; + import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; @@ -42,44 +80,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; -import net.freehaven.tor.control.ConfigEntry; -import net.freehaven.tor.control.EventHandler; -import net.freehaven.tor.control.TorControlConnection; - -import org.json.JSONArray; -import org.json.JSONObject; -import org.sufficientlysecure.rootcommands.Shell; -import org.sufficientlysecure.rootcommands.command.SimpleCommand; -import org.torproject.android.OrbotConstants; -import org.torproject.android.OrbotMainActivity; -import org.torproject.android.R; -import org.torproject.android.settings.AppManager; -import org.torproject.android.settings.TorifiedApp; -import org.torproject.android.vpn.OrbotVpnService; - -import android.annotation.SuppressLint; -import android.app.Application; -import android.app.Notification; -import android.app.NotificationManager; -import android.app.PendingIntent; -import android.app.Service; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; -import android.os.Build; -import android.os.IBinder; -import android.os.RemoteException; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationCompat.Builder; -import android.support.v4.content.LocalBroadcastManager; -import android.util.Log; -import android.widget.RemoteViews; - public class TorService extends Service implements TorServiceConstants, OrbotConstants, EventHandler { @@ -344,10 +344,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon String action = mIntent.getAction(); if (action != null) { - if (action.equals(Intent.ACTION_BOOT_COMPLETED) || action.equals(CMD_START)) { - setTorProfile(STATUS_ON); + if (action.equals(CMD_START)) { + startTor(); } else if (action.equals(CMD_STOP)) { - setTorProfile(STATUS_OFF); + stopTor(); } else if (action.equals(CMD_NEWNYM)) { newIdentity(); } else if (action.equals(CMD_FLUSH)) { @@ -391,21 +391,20 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon super.onDestroy(); } - private void stopTor () - { + private void stopTor() { + Log.i("TorService", "stopTor"); + try { + mCurrentStatus = STATUS_STOPPING; + sendCallbackStatus(mCurrentStatus); - try - { + sendCallbackLogMessage(getString(R.string.status_shutting_down)); Log.d(TAG,"Tor is stopping NOW"); - killAllDaemons (); + killAllDaemons(); //stop the foreground priority and make sure to remove the persistant notification stopForeground(true); - mCurrentStatus = STATUS_OFF; - sendCallbackStatus(mCurrentStatus); - if (Prefs.useRoot() && Prefs.useTransparentProxying()) { Shell shellRoot = Shell.startRootShell(); @@ -416,7 +415,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon clearNotifications(); sendCallbackLogMessage(getString(R.string.status_disabled)); - } catch (CannotKillException e) { @@ -431,8 +429,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon Log.d(TAG, "An error occured stopping Tor",e); logNotice("An error occured stopping Tor: " + e.getMessage()); sendCallbackLogMessage(getString(R.string.something_bad_happened)); - } + + mCurrentStatus = STATUS_OFF; + sendCallbackStatus(mCurrentStatus); } @@ -748,17 +748,31 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon return success; } - private void startTor () throws Exception - { + private void startTor() { + if (mCurrentStatus == STATUS_STARTING || mCurrentStatus == STATUS_STOPPING) { + // these states should probably be handled better + sendCallbackLogMessage("Ignoring start request, currently " + mCurrentStatus); + return; + } else if (mCurrentStatus == STATUS_ON) { + sendCallbackLogMessage("Ignoring start request, already started."); + return; + } mCurrentStatus = STATUS_STARTING; sendCallbackStatus(mCurrentStatus); - + sendCallbackLogMessage(getString(R.string.status_starting_up)); + logNotice(getString(R.string.status_starting_up)); + + if (findExistingTorDaemon()) { + return; // an old tor is already running, nothing to do + } + + // make sure there are no stray daemons running + killAllDaemons(); + + try { if (fileTor == null) initBinariesAndDirectories(); - - logNotice(getString(R.string.status_starting_up)); - sendCallbackLogMessage(getString(R.string.status_starting_up)); ArrayList<String> customEnv = new ArrayList<String>(); @@ -797,10 +811,23 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon else { showToolbarNotification(getString(R.string.unable_to_start_tor), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr); - } - shellUser.close(); + + mCurrentStatus = STATUS_ON; + sendCallbackStatus(mCurrentStatus); + } catch (CannotKillException e) { + logException(e.getMessage(), e); + showToolbarNotification(getString(R.string.unable_to_reset_tor), + ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + stopTor(); + } catch (Exception e) { + logException("Unable to start Tor: " + e.toString(), e); + showToolbarNotification( + getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), + ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + stopTor(); + } } private boolean flushTransparentProxyRules () { @@ -1110,9 +1137,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon conn.setConf("Log", "debug file " + fileLog2.getCanonicalPath()); }*/ - mCurrentStatus = STATUS_STARTING; - sendCallbackStatus(mCurrentStatus); - String confSocks = conn.getInfo("net/listeners/socks"); StringTokenizer st = new StringTokenizer(confSocks," "); @@ -1290,60 +1314,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon public int getSOCKSPort() throws RemoteException { return mPortSOCKS; } - - public void setTorProfile(String newState) { - - if (newState == STATUS_ON) - { - - if (mCurrentStatus == STATUS_OFF) - { - sendCallbackLogMessage (getString(R.string.status_starting_up)); - - - try - { - - boolean found = findExistingTorDaemon(); - - if (!found) - { - killAllDaemons(); - startTor(); - } - } - catch (CannotKillException e) - { - logException(e.getMessage(), e); - mCurrentStatus = STATUS_OFF; - sendCallbackStatus(mCurrentStatus); - showToolbarNotification(getString(R.string.unable_to_reset_tor), - ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr); - stopTor(); - } - catch (Exception e) - { - - logException("Unable to start Tor: " + e.toString(),e); - mCurrentStatus = STATUS_OFF; - sendCallbackStatus(mCurrentStatus); - - showToolbarNotification(getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr); - stopTor(); - } - - } - } - else if (newState == STATUS_OFF) - { - sendCallbackLogMessage (getString(R.string.status_shutting_down)); - - stopTor(); - - mCurrentStatus = STATUS_OFF; - sendCallbackStatus(mCurrentStatus); - } - } public void enableVpnProxy () { debug ("enabling VPN Proxy"); @@ -1403,21 +1373,11 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon @Override public void message(String severity, String msg) { - logNotice(severity + ": " + msg); - - if (msg.indexOf(TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE)!=-1) - { - mCurrentStatus = STATUS_ON; - sendCallbackStatus(mCurrentStatus); - - showToolbarNotification(getString(R.string.status_activated), NOTIFY_ID, R.drawable.ic_stat_tor); - } } @Override public void newDescriptors(List<String> orList) { - } @Override @@ -1547,23 +1507,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (Prefs.useDebugLogging()) debug(sb.toString()); else if(status.equals("BUILT")) - { - - if (mCurrentStatus == STATUS_STARTING) - mCurrentStatus = STATUS_ON; - - sendCallbackStatus(mCurrentStatus); - - logNotice(sb.toString()); - - } else if (status.equals("CLOSED")) - { logNotice(sb.toString()); - } - if (Prefs.expandedNotifications()) { //get IP from last nodename [View Less]

1 0

[orbot/master] use context.stopService() to shutdown TorService instead of custom message
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 6ac9a2cee6e4b0635c69706e184b66acae048eda Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 14:01:01 2015 -0400 use context.stopService() to shutdown TorService instead of custom message Since running stopService() automatically triggers Service.onDestroy(), there is a nice way to hook in and run the shutdown procedure. This provides an obvious point of entry as well as simplifying the shutdown procedure. --- res/values/strings.xml … [View More] | 2 +- src/org/torproject/android/OrbotMainActivity.java | 114 ++++++-------------- src/org/torproject/android/service/TorService.java | 26 +---- .../android/service/TorServiceConstants.java | 1 - 4 files changed, 38 insertions(+), 105 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 7030a37..87aa35f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11,7 +11,7 @@ <string name="status_starting_up">Orbot is starting…</string> <string name="status_activated">Connected to the Tor network</string> <string name="status_disabled">Orbot is deactivated</string> - <string name="status_shutting_down">Orbot is shutting down</string> + <string name="status_shutting_down">TorService is shutting down</string> <string name="tor_process_starting">Starting Tor client…</string> <string name="tor_process_complete">complete.</string> <string name="tor_process_waiting">waiting.</string> diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index d286c47..7b0bb31 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -121,22 +121,16 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon torService.setAction(action); startService(torService); } - - private void stopService () - { - - Intent torService = new Intent(this, TorService.class); - stopService(torService); - - } - - + + private void stopTor() { + Intent torService = new Intent(this, TorService.class); + stopService(torService); + } + // Our handler for received Intents. This will be called whenever an Intent // with an action named "custom-event-name" is broadcasted. private BroadcastReceiver mMessageReceiver = new BroadcastReceiver() { - - - + @Override public void onReceive(Context context, Intent intent) { // Get extra data included in the Intent @@ -425,34 +419,21 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon } - - /** - * This is our attempt to REALLY exit Orbot, and stop the background service - * However, Android doesn't like people "quitting" apps, and/or our code may not - * be quite right b/c no matter what we do, it seems like the TorService still exists - **/ - private void doExit () - { - try { - - //one of the confusing things about all of this code is the multiple - //places where things like "stopTor" are called, both in the Activity and the Service - //not something to tackle in your first iteration, but i thin we can talk about fixing - //terminology but also making sure there are clear distinctions in control - stopTor(); - stopService (); - - - } catch (RemoteException e) { - Log.w(TAG, e); - } - - //Kill all the wizard activities - setResult(RESULT_CLOSE_ALL); - finish(); - - } - + + /** + * This is our attempt to REALLY exit Orbot, and stop the background service + * However, Android doesn't like people "quitting" apps, and/or our code may + * not be quite right b/c no matter what we do, it seems like the TorService + * still exists + **/ + private void doExit() { + stopTor(); + + // Kill all the wizard activities + setResult(RESULT_CLOSE_ALL); + finish(); + } + protected void onPause() { try { @@ -1223,49 +1204,20 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon msg.getData().putString(HANDLER_TOR_MSG, getString(R.string.status_starting_up)); mStatusUpdateHandler.sendMessage(msg); } - - //now we stop Tor! amazing! - private void stopTor () throws RemoteException - { - sendIntentToService (TorServiceConstants.CMD_STOP); - torStatus = TorServiceConstants.STATUS_OFF; - Message msg = mStatusUpdateHandler.obtainMessage(TorServiceConstants.DISABLE_TOR_MSG); - mStatusUpdateHandler.sendMessage(msg); - } - - /* - * (non-Javadoc) - * @see android.view.View.OnClickListener#onClick(android.view.View) - */ - public boolean onLongClick(View view) { - - try - { - - if (torStatus == TorServiceConstants.STATUS_OFF) - { - startTor(); - } - else - { - - stopTor(); - stopService (); - - } - - return true; - - } - catch (Exception e) - { - Log.d(TAG,"error onclick",e); + public boolean onLongClick(View view) { + try { + if (torStatus == TorServiceConstants.STATUS_OFF) { + startTor(); + } else { + stopTor(); } - - return false; - + return true; + } catch (RemoteException e) { + Log.d(TAG, "error onclick", e); } + return false; + } // this is what takes messages or values from the callback threads or other non-mainUI threads //and passes them back into the main UI thread for display to the user diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 58aa9ce..5884f62 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -343,8 +343,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (action != null) { if (action.equals(CMD_START)) { startTor(); - } else if (action.equals(CMD_STOP)) { - stopTor(); + // stopTor() is called when the Service is destroyed } else if (action.equals(CMD_NEWNYM)) { newIdentity(); } else if (action.equals(CMD_FLUSH)) { @@ -371,20 +370,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } @Override - public boolean stopService(Intent name) { - logNotice("TorService is being stopped: " + name); - return super.stopService(name); - } - - @Override - public void onDestroy () - { - Log.i("TorService", "onDestroy"); - String msg = ("TorService is being DESTROYED... shutting down!"); - Log.d(TAG, msg); - sendCallbackLogMessage(msg); + public void onDestroy() { + stopTor(); unregisterReceiver(mNetworkStateReceiver); - clearNotifications (); super.onDestroy(); } @@ -392,9 +380,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon Log.i("TorService", "stopTor"); try { sendCallbackStatus(STATUS_STOPPING); - sendCallbackLogMessage(getString(R.string.status_shutting_down)); - Log.d(TAG,"Tor is stopping NOW"); killAllDaemons(); @@ -408,13 +394,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon shellRoot.close(); } - clearNotifications(); - sendCallbackLogMessage(getString(R.string.status_disabled)); } catch (CannotKillException e) { - Log.d(TAG, "An error occured stopping Tor", e); logNotice("An error occured stopping Tor: " + e.getMessage()); sendCallbackLogMessage(getString(R.string.unable_to_reset_tor)); showToolbarNotification(getString(R.string.unable_to_reset_tor), @@ -422,11 +405,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } catch (Exception e) { - Log.d(TAG, "An error occured stopping Tor",e); logNotice("An error occured stopping Tor: " + e.getMessage()); sendCallbackLogMessage(getString(R.string.something_bad_happened)); } - + clearNotifications(); sendCallbackStatus(STATUS_OFF); } diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index fdf5e77..7a5a14a 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -84,7 +84,6 @@ public interface TorServiceConstants { public static final int LOG_MSG = 4; public static final String CMD_START = "start"; - public static final String CMD_STOP = "stop"; public static final String CMD_FLUSH = "flush"; public static final String CMD_NEWNYM = "newnym"; public static final String CMD_VPN = "vpn"; [View Less]

1 0