commit 993e2a0c1847f99ba9361c16df4ac9cf1264a896 Author: n8fr8 nathan@freitas.net Date: Sun Oct 21 23:43:52 2012 +0530

display % complete status messages on main screen --- src/org/torproject/android/Orbot.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 3a58487..6f4e2ac 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -58,7 +58,6 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick private ImageProgressView imgStatus = null; //the main touchable image for activating Orbot // private ProgressDialog progressDialog; private MenuItem mItemOnOff = null; - private RelativeLayout trafficRow = null; // the row showing the traffic private TextView downloadText = null; private TextView uploadText = null; private TextView mTxtOrbotLog = null; @@ -103,7 +102,7 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick lblStatus.setOnLongClickListener(this); imgStatus = (ImageProgressView)findViewById(R.id.imgStatus); imgStatus.setOnLongClickListener(this); - trafficRow = (RelativeLayout)findViewById(R.id.trafficRow); + downloadText = (TextView)findViewById(R.id.trafficDown); uploadText = (TextView)findViewById(R.id.trafficUp); mTxtOrbotLog = (TextView)findViewById(R.id.orbotLog); @@ -618,8 +617,9 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick

imgStatus.setImageResource(R.drawable.torstarting);

- // if (progressDialog != null) - // progressDialog.setMessage(torServiceMsg); + if (lblStatus != null && torServiceMsg != null) + if (torServiceMsg.indexOf('%')!=-1) + lblStatus.setText(torServiceMsg);

appendLogTextAndScroll(torServiceMsg);