commit bfcebdaba28e142e521e962c1c6aab0cef175074
Author: n8fr8 <[email protected]>
Date: Sun Sep 30 18:14:25 2012 +0530
small updates for datastats merge
---
res/layout/layout_main.xml | 4 +---
src/org/torproject/android/Orbot.java | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml
index 1a25feb..a9444e1 100644
--- a/res/layout/layout_main.xml
+++ b/res/layout/layout_main.xml
@@ -104,9 +104,7 @@
android:textSize="24sp"
android:gravity="center_vertical|center_horizontal"
android:textStyle="bold" />
- </RelativeLayout>
-</RelativeLayout>
-
+ </RelativeLayout>
</LinearLayout>
</FrameLayout>
diff --git a/src/org/torproject/android/Orbot.java
b/src/org/torproject/android/Orbot.java
index f9c949d..c51b104 100644
--- a/src/org/torproject/android/Orbot.java
+++ b/src/org/torproject/android/Orbot.java
@@ -57,7 +57,7 @@ public class Orbot extends Activity implements TorConstants,
OnLongClickListener
private TextView uploadText = null;
/* Some tracking bits */
- private int torStatus = STATUS_READY; //latest status reported from the
tor service
+ private int torStatus = TorServiceConstants.STATUS_OFF; //latest status
reported from the tor service
/* Tor Service interaction */
/* The primary interface we will be calling on the service. */
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
