[tor-commits] [orbot/master] tune first-time experience (No more wizard!)

[n8fr8 at torproject.org]

commit 6fd6a5a8590c2143ad7cca6de6172d66b59a46b0
Author: Nathan Freitas <nathan at freitas.net>
Date:   Fri Apr 3 13:01:29 2015 -0400

    tune first-time experience (No more wizard!)
---
 res/values/strings.xml                            |    2 +-
 src/org/torproject/android/OrbotMainActivity.java |   13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e76ce28..d48d1dc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -88,7 +88,7 @@
   <string name="wizard_proxy_help_info">Proxy Settings</string>
   <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n    The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n    \n\n\n    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Orbot is ready!</string>
-  <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens… and now you are ready to, as well!</string>
+  <string name="wizard_final_msg">Millions of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens… and now you are ready to, as well!</string>
   <string name="wizard_exit_at_first_screen_toast">Please configure Orbot before you can start using it!</string>
   <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help at guardianproject.info to learn more.</string>
diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java
index 2e22fb2..7e211e5 100644
--- a/src/org/torproject/android/OrbotMainActivity.java
+++ b/src/org/torproject/android/OrbotMainActivity.java
@@ -626,7 +626,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
 			showWizard = mPrefs.getBoolean("show_wizard",showWizard);
 			
 			//let's not show the wizard now for new users
-			/**
+			
 			if (showWizard)
 			{
 				Editor pEdit = mPrefs.edit();
@@ -634,15 +634,17 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
 				pEdit.commit();				
 				showWizard = false;
 
-				startActivity(new Intent(this, ChooseLocaleWizardActivity.class));
 
-			}**/
+				showAlert(getString(R.string.app_name),getString(R.string.wizard_final_msg),true);
+				
+			}
 			
 		}
 		
+		updateStatus("");
+		
 		setIntent(null);
 		
-		updateStatus ("");
 		
 	}
 		
@@ -1242,8 +1244,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
                     else if (torStatus == TorServiceConstants.STATUS_OFF)
                     {
                         imgStatus.setImageResource(R.drawable.toroff);
-                        lblStatus.setText("");
-                        //lblStatus.setText(getString(R.string.status_disabled) + "\n" + getString(R.string.press_to_start));
+                        lblStatus.setText(getString(R.string.press_to_start));
                         mBtnBrowser.setEnabled(false);
                         
                         if (mItemOnOff != null)