[tor-commits] [orbot/master] include all status messages with "start" in them in the starting sequence

[n8fr8 at torproject.org]

commit f16394b7dba6ba6ed216c669eb75b4fd2fee9755
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Fri Jun 12 14:55:17 2015 -0400

    include all status messages with "start" in them in the starting sequence
    
    Before, the startup sequence showed "Orbot is starting..." for a long time,
    then quickly showed the final tor percentage messages.  This adds a few
    more messages to provide useful feedback.
---
 src/org/torproject/android/OrbotMainActivity.java |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java
index 5707960..e13f55d 100644
--- a/src/org/torproject/android/OrbotMainActivity.java
+++ b/src/org/torproject/android/OrbotMainActivity.java
@@ -1090,8 +1090,11 @@ public class OrbotMainActivity extends Activity
             imgStatus.setImageResource(R.drawable.torstarting);
 
             // only show Tor daemon's percentage complete messages
-            if (torServiceMsg.indexOf('%') != -1)
+            if (torServiceMsg.indexOf('%') != -1) {
                 lblStatus.setText(torServiceMsg);
+            } else if (torServiceMsg.contains("tart")) { // Start and start
+                lblStatus.setText(torServiceMsg);
+            }
             mBtnBrowser.setEnabled(false);
 
         } else if (torStatus == TorServiceConstants.STATUS_STOPPING) {