dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Hans-Christoph Steiner 2015-06-09 11:23:56 -04:00
parent cf0adc27d6
commit 86593df6fb
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/torproject/android/OrbotMainActivity.java
View File

@ -1181,7 +1181,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
Log.e(TAG, "autoStartFromIntent finish"); Log.e(TAG, "autoStartFromIntent finish");
} }
} }
else if (torStatus == TorServiceConstants.STATUS_CONNECTING) else if (torStatus == TorServiceConstants.STATUS_STARTING)
{ {
imgStatus.setImageResource(R.drawable.torstarting); imgStatus.setImageResource(R.drawable.torstarting);
@ -1225,7 +1225,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
startService (TorServiceConstants.CMD_START); startService (TorServiceConstants.CMD_START);
torStatus = TorServiceConstants.STATUS_CONNECTING; torStatus = TorServiceConstants.STATUS_STARTING;
mTxtOrbotLog.setText(""); mTxtOrbotLog.setText("");

6
src/org/torproject/android/service/TorService.java
View File

@ -751,7 +751,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
private void startTor () throws Exception private void startTor () throws Exception
{ {
mCurrentStatus = STATUS_CONNECTING; mCurrentStatus = STATUS_STARTING;
sendCallbackStatus(mCurrentStatus); sendCallbackStatus(mCurrentStatus);
if (fileTor == null) if (fileTor == null)
@ -1110,7 +1110,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
conn.setConf("Log", "debug file " + fileLog2.getCanonicalPath()); conn.setConf("Log", "debug file " + fileLog2.getCanonicalPath());
}*/ }*/
mCurrentStatus = STATUS_CONNECTING; mCurrentStatus = STATUS_STARTING;
sendCallbackStatus(mCurrentStatus); sendCallbackStatus(mCurrentStatus);
String confSocks = conn.getInfo("net/listeners/socks"); String confSocks = conn.getInfo("net/listeners/socks");
@ -1563,7 +1563,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
else if(status.equals("BUILT")) else if(status.equals("BUILT"))
{ {
if (mCurrentStatus == STATUS_CONNECTING) if (mCurrentStatus == STATUS_STARTING)
mCurrentStatus = STATUS_ON; mCurrentStatus = STATUS_ON;
sendCallbackStatus(mCurrentStatus); sendCallbackStatus(mCurrentStatus);

4
src/org/torproject/android/service/TorServiceConstants.java
View File

@ -75,8 +75,8 @@ public interface TorServiceConstants {
public final static String STATUS_OFF = "OFF"; public final static String STATUS_OFF = "OFF";
public final static String STATUS_ON = "ON"; public final static String STATUS_ON = "ON";
public final static String STATUS_CONNECTING = "CONNECTING"; public final static String STATUS_STARTING = "STARTING";
public final static String STATUS_DISCONNECTING = "DISCONNECTING"; public final static String STATUS_STOPPING = "STOPPING";
public static final int STATUS_MSG = 1; public static final int STATUS_MSG = 1;
public static final int ENABLE_TOR_MSG = 2; public static final int ENABLE_TOR_MSG = 2;