commit 86593df6fb40ded939891011b32755ed48bbf791 Author: Hans-Christoph Steiner hans@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/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;