commit b6e2507580b4898b1d065c31c2ca3ca8bb1fd481
Author: n8fr8 <nat...@freitas.net>
Date: Wed Apr 3 15:47:55 2013 -0400
UI and flow updates
---
src/org/torproject/android/Orbot.java | 59 ++++++++++++--------
.../torproject/android/RandomColorCircleView.java | 8 ++-
2 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/src/org/torproject/android/Orbot.java
b/src/org/torproject/android/Orbot.java
index 790d555..002ddd8 100644
--- a/src/org/torproject/android/Orbot.java
+++ b/src/org/torproject/android/Orbot.java
@@ -108,12 +108,11 @@ public class Orbot extends SherlockActivity implements
TorConstants, OnLongClick
setLocale();
- startService(new Intent(INTENT_TOR_SERVICE));
+ startService(new Intent(INTENT_TOR_SERVICE));
prefs = PreferenceManager.getDefaultSharedPreferences(this);
-
-
+ doLayout();
}
private void doLayout ()
@@ -167,7 +166,7 @@ public class Orbot extends SherlockActivity implements
TorConstants, OnLongClick
downloadText.setText(formatCount(0) + " / " + formatTotal(0));
uploadText.setText(formatCount(0) + " / " + formatTotal(0));
- //updateStatus("");
+ updateStatus("");
}
private void appendLogTextAndScroll(String text)
@@ -330,7 +329,7 @@ public class Orbot extends SherlockActivity implements
TorConstants, OnLongClick
protected void onPause() {
super.onPause();
- unbindService();
+ //unbindService();
//hideProgressDialog();
@@ -416,11 +415,21 @@ public class Orbot extends SherlockActivity implements
TorConstants, OnLongClick
super.onResume();
bindService();
-
- doLayout ();
-
+
+ updateStatus("");
}
+
+
+ @Override
+ protected void onNewIntent(Intent intent) {
+
+ super.onNewIntent(intent);
+
+ updateStatus("");
+ handleIntents();
+ }
+
private void handleIntents ()
{
if (getIntent() == null)
@@ -553,7 +562,7 @@ public class Orbot extends SherlockActivity implements
TorConstants, OnLongClick
protected void onStop() {
super.onStop();
- unbindService();
+ //unbindService();
}
@@ -564,6 +573,7 @@ public class Orbot extends SherlockActivity implements
TorConstants, OnLongClick
private void openBrowser(String url)
{
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+
intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
}
@@ -597,16 +607,15 @@ public class Orbot extends SherlockActivity implements
TorConstants, OnLongClick
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent
data) {
- super.onActivityResult(requestCode, resultCode, data);
-
- //if we get a response from an activity we launched (like from
line 527 where we launch the Settings/Prefs screen)
- //and the resultCode matches our arbitrary 1010 value, AND Tor is
running
- //then update the preferences in an async background task
- if (requestCode == 1 && resultCode == 1010 && mService != null)
- {
- new ProcessSettingsAsyncTask().execute(mService);
- setLocale();
- }
+ super.onActivityResult(requestCode, resultCode, data);
+
+
+ if (requestCode == 1 && mService != null)
+ {
+ new ProcessSettingsAsyncTask().execute(mService);
+ setLocale();
+ }
+
}
AlertDialog aDialog = null;
@@ -922,6 +931,10 @@ public class Orbot extends SherlockActivity implements
TorConstants, OnLongClick
downloadText.setText(formatCount(datacount.Download) + " / " +
formatTotal(totalRead));
uploadText.setText(formatCount(datacount.Upload) + " /
" + formatTotal(totalWrite));
+ if (torStatus != TorServiceConstants.STATUS_ON)
+ {
+ updateStatus("");
+ }
default:
super.handleMessage(msg);
@@ -1021,13 +1034,15 @@ public class Orbot extends SherlockActivity implements
TorConstants, OnLongClick
}
}
- //maybe needs this?
- mService = null;
-
// Detach our existing connection.
unbindService(mConnection);
mIsBound = false;
+
+ //maybe needs this?
+ mService = null;
+
+
}
}
diff --git a/src/org/torproject/android/RandomColorCircleView.java
b/src/org/torproject/android/RandomColorCircleView.java
index 16e4da2..6e9a839 100644
--- a/src/org/torproject/android/RandomColorCircleView.java
+++ b/src/org/torproject/android/RandomColorCircleView.java
@@ -40,9 +40,10 @@ public class RandomColorCircleView extends View
}
private void init(){
- paint.setStyle(Paint.Style.FILL);
+ paint.setStyle(Paint.Style.STROKE);
paint.setColor(Color.WHITE);
- // paint.setAntiAlias(true);
+ paint.setAntiAlias(false);
+ paint.setStrokeWidth(6);
}
@@ -96,6 +97,7 @@ public class RandomColorCircleView extends View
}
+ /*
@Override
public boolean onTouchEvent(MotionEvent event) {
@@ -127,6 +129,6 @@ public class RandomColorCircleView extends View
return true;
- }
+ }*/
}
\ No newline at end of file
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
