commit cbf4e99d32c9aa68b254c0137be5dc873e3ba3e3
Author: Nathan Freitas <[email protected]>
Date: Sat Jul 19 20:39:55 2014 -0400
handle CONNECTING state properly
---
src/org/torproject/android/Orbot.java | 36 ++++++++++++++-------------------
1 file changed, 15 insertions(+), 21 deletions(-)
diff --git a/src/org/torproject/android/Orbot.java
b/src/org/torproject/android/Orbot.java
index 2c63711..f444921 100644
--- a/src/org/torproject/android/Orbot.java
+++ b/src/org/torproject/android/Orbot.java
@@ -878,19 +878,16 @@ public class Orbot extends ActionBarActivity implements
TorConstants, OnLongClic
if (newTorStatus == TorServiceConstants.STATUS_ON)
{
- //if (torStatus != newTorStatus)
- //{
-
imgStatus.setImageResource(R.drawable.toron);
- //
mViewMain.setBackgroundResource(R.drawable.onionrootonly);
-
- String lblMsg =
getString(R.string.status_activated);
- lblStatus.setText(lblMsg);
-
- if (mItemOnOff != null)
-
mItemOnOff.setTitle(R.string.menu_stop);
-
- //}
+
+
imgStatus.setImageResource(R.drawable.toron);
+
+ String lblMsg =
getString(R.string.status_activated);
+ lblStatus.setText(lblMsg);
+
+ if (mItemOnOff != null)
+
mItemOnOff.setTitle(R.string.menu_stop);
+
if (mTorServiceMsg != null &&
mTorServiceMsg.length() > 0)
{
appendLogTextAndScroll(mTorServiceMsg);
@@ -921,14 +918,12 @@ public class Orbot extends ActionBarActivity implements
TorConstants, OnLongClic
}
else if (newTorStatus ==
TorServiceConstants.STATUS_CONNECTING)
{
- if (torStatus != newTorStatus)
- {
-
imgStatus.setImageResource(R.drawable.torstarting);
- //
mViewMain.setBackgroundResource(R.drawable.onionrootonlygold);
-
- if (mItemOnOff != null)
-
mItemOnOff.setTitle(R.string.menu_stop);
- }
+
+
imgStatus.setImageResource(R.drawable.torstarting);
+
+ if (mItemOnOff != null)
+
mItemOnOff.setTitle(R.string.menu_stop);
+
if (lblStatus != null && mTorServiceMsg !=
null)
if (mTorServiceMsg.indexOf('%')!=-1)
@@ -940,7 +935,6 @@ public class Orbot extends ActionBarActivity implements
TorConstants, OnLongClic
}
else if (newTorStatus ==
TorServiceConstants.STATUS_OFF)
{
- //
mViewMain.setBackgroundResource(R.drawable.onionrootonlygrey);
imgStatus.setImageResource(R.drawable.toroff);
lblStatus.setText(getString(R.string.status_disabled) + "\n" +
getString(R.string.press_to_start));
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
