Merge branch 'amoghbl1-issue_3014_wizard_workflow'

res/values/strings.xml

@@ -87,6 +87,7 @@
   <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&#8230; 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@guardianproject.info to learn more.</string>
   <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>

src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java

@@ -7,19 +7,20 @@ import org.torproject.android.TorConstants;
 import org.torproject.android.service.TorServiceUtils;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.KeyEvent;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ListView;
+import android.widget.Toast;
 
 public class ChooseLocaleWizardActivity extends Activity implements TorConstants {
 
@@ -73,6 +74,7 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants
 						int arg2, long arg3) {
 					
 					setLocalePref(arg2);
+					finish();
 					startActivityForResult(new Intent(ChooseLocaleWizardActivity.this, LotsaText.class), 1);
 					
 				}
@@ -81,8 +83,7 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants
 		    next.setOnClickListener(new View.OnClickListener() {
 				
 				public void onClick(View v) {
-					
+					finish();
-					
 					startActivityForResult(new Intent(ChooseLocaleWizardActivity.this, LotsaText.class), 1);
 
 				}
@@ -135,4 +136,14 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants
 		super.onSaveInstanceState(outState);
 		
 	}
+	
+	//Code to override the back button!
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event)  {
+	    if(keyCode == KeyEvent.KEYCODE_BACK){
+	    	Toast.makeText(getApplicationContext(), R.string.wizard_exit_at_first_screen_toast, Toast.LENGTH_SHORT).show();
+	    	return true;
+	    }
+	    return false;
+	}
 }

src/org/torproject/android/wizard/ConfigureTransProxy.java

@@ -20,6 +20,8 @@ import android.content.SharedPreferences.Editor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ -119,7 +121,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants {
 		    back.setOnClickListener(new View.OnClickListener() {
 					
 				public void onClick(View v) {
-						
+					finish();	
 					startActivityForResult(new Intent(ConfigureTransProxy.this, Permissions.class), 1);
 				}
 			});
@@ -127,7 +129,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants {
 		    next.setOnClickListener(new View.OnClickListener() {
 				
 				public void onClick(View v) {
-					
+					finish();
 					startActivityForResult(new Intent(ConfigureTransProxy.this, TipsAndTricks.class), 1);
 
 				}
@@ -142,11 +144,8 @@ public class ConfigureTransProxy extends Activity implements TorConstants {
     		{
 
 				public void onClick(View v) {
-					
+					finish();
-						context.startActivity(new Intent(context, AppManager.class));							
+					context.startActivity(new Intent(context, AppManager.class));
-					
-					
-					
 				}
     			
     		});
@@ -239,4 +238,16 @@ public class ConfigureTransProxy extends Activity implements TorConstants {
 		super.onSaveInstanceState(outState);
 		
 	}
+	
+	//Code to override the back button!
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event)  {
+	    if(keyCode == KeyEvent.KEYCODE_BACK){
+	    	finish();
+	    	startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
+	    	return true;
+	    }
+	    return false;
+	}
+		
 }

src/org/torproject/android/wizard/LotsaText.java

@@ -2,10 +2,6 @@ package org.torproject.android.wizard;
 
 import org.torproject.android.R;
 import org.torproject.android.TorConstants;
-import org.torproject.android.R.drawable;
-import org.torproject.android.R.id;
-import org.torproject.android.R.layout;
-import org.torproject.android.R.string;
 import org.torproject.android.service.TorServiceUtils;
 
 import android.app.Activity;
@@ -14,11 +10,9 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
+import android.view.KeyEvent;
-import android.support.v4.app.ActivityCompat;
 import android.view.View;
 import android.widget.Button;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 public class LotsaText extends Activity implements TorConstants{
@@ -135,11 +129,22 @@ public class LotsaText extends Activity implements TorConstants{
     	btn2.setOnClickListener(new View.OnClickListener() {
 			
 			public void onClick(View v) {
+				finish();
 				startActivityForResult(new Intent(LotsaText.this, Permissions.class), 1);
 			}
 		});
 		
 	}
 	
+	//Code to override the back button!
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event)  {
+	    if(keyCode == KeyEvent.KEYCODE_BACK){
+	    	finish();
+	    	startActivityForResult(new Intent(getBaseContext(), ChooseLocaleWizardActivity.class), 1);
+	    	return true;
+	    }
+	    return true;
+	}
 	
 }

src/org/torproject/android/wizard/Permissions.java

@@ -3,7 +3,6 @@ package org.torproject.android.wizard;
 import org.sufficientlysecure.rootcommands.RootCommands;
 import org.torproject.android.R;
 import org.torproject.android.TorConstants;
-import org.torproject.android.service.TorService;
 import org.torproject.android.service.TorServiceUtils;
 
 import android.app.Activity;
@@ -12,14 +11,13 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 public class Permissions extends Activity implements TorConstants {
@@ -138,9 +136,8 @@ public class Permissions extends Activity implements TorConstants {
 				}
 				else
 				{
+					finish();
 					startActivityForResult(new Intent(Permissions.this, ConfigureTransProxy.class), 1);
-
-					
 				}
 
 				
@@ -150,7 +147,7 @@ public class Permissions extends Activity implements TorConstants {
     	back.setOnClickListener(new View.OnClickListener() {
 			
 			public void onClick(View v) {
-				
+				finish();
 				startActivityForResult(new Intent(Permissions.this, LotsaText.class), 1);
 			}
 		});
@@ -160,6 +157,7 @@ public class Permissions extends Activity implements TorConstants {
     	 
 			
 			public void onClick(View v) {
+				finish();
 				startActivityForResult(new Intent(Permissions.this, TipsAndTricks.class), 1);
 			}
 		});
@@ -193,7 +191,7 @@ public class Permissions extends Activity implements TorConstants {
     	btn1.setOnClickListener(new View.OnClickListener() {
 			
 			public void onClick(View v) {
-				
+				finish();
 				startActivityForResult(new Intent(Permissions.this, LotsaText.class), 1);
 			}
 		});
@@ -201,10 +199,20 @@ public class Permissions extends Activity implements TorConstants {
     	btn2.setOnClickListener(new View.OnClickListener() {
 			
 			public void onClick(View v) {
+				finish();
 				startActivityForResult(new Intent(Permissions.this, TipsAndTricks.class), 1);
 			}
 		});
 	}
 		
+	//Code to override the back button!
+	public boolean onKeyDown(int keyCode, KeyEvent event)  {
+	    if(keyCode == KeyEvent.KEYCODE_BACK){
+	    	finish();
+	    	startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
+	    	return true;
+	    }
+	    return false;
+	}
 	
 }

src/org/torproject/android/wizard/TipsAndTricks.java

@@ -3,25 +3,16 @@ package org.torproject.android.wizard;
 import org.torproject.android.Orbot;
 import org.torproject.android.R;
 import org.torproject.android.TorConstants;
-import org.torproject.android.R.drawable;
-import org.torproject.android.R.id;
-import org.torproject.android.R.layout;
-import org.torproject.android.R.string;
 
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 public class TipsAndTricks extends Activity implements TorConstants {
@@ -74,6 +65,7 @@ public class TipsAndTricks extends Activity implements TorConstants {
 			public void onClick(View view) {
 
 				String url = getString(R.string.gibberbot_apk_url);
+				finish();
 				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
 
 			}
@@ -86,6 +78,7 @@ public class TipsAndTricks extends Activity implements TorConstants {
 			public void onClick(View view) {
 				
 				String url = getString(R.string.orweb_apk_url);
+				finish();
 				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
 
 			}
@@ -98,6 +91,7 @@ public class TipsAndTricks extends Activity implements TorConstants {
 			public void onClick(View view) {
 				
 				String url = getString(R.string.duckgo_apk_url);
+				finish();
 				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
 
 			}
@@ -110,6 +104,7 @@ public class TipsAndTricks extends Activity implements TorConstants {
 			public void onClick(View view) {
 				
 				String url = getString(R.string.proxymob_setup_url);
+				finish();
 				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
 
 			}
@@ -122,6 +117,7 @@ public class TipsAndTricks extends Activity implements TorConstants {
 			public void onClick(View view) {
 				
 				String url = getString(R.string.twitter_setup_url);
+				finish();
 				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
 
 			}
@@ -160,7 +156,7 @@ public class TipsAndTricks extends Activity implements TorConstants {
         back.setOnClickListener(new View.OnClickListener() {
 			
 			public void onClick(View v) {
-				
+				finish();
 				startActivityForResult(new Intent(TipsAndTricks.this, Permissions.class), 1);
 			}
 		});
@@ -195,19 +191,31 @@ public class TipsAndTricks extends Activity implements TorConstants {
     	btn1.setOnClickListener(new View.OnClickListener() {
 			
 			public void onClick(View v) {
+				finish();
 				startActivityForResult(new Intent(TipsAndTricks.this, Permissions.class), 1);
-
 			}
 		});
     	
     	btn2.setOnClickListener(new View.OnClickListener() {
 			
 			public void onClick(View v) {
+				finish();
 				startActivityForResult(new Intent(TipsAndTricks.this, Orbot.class), 1);
-
 			}
 		});
 	}
+	
+	//Code to override the back button!
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event)  {
+	    if(keyCode == KeyEvent.KEYCODE_BACK){
+	    	finish();
+	    	startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
+	    	return true;
+	    }
+	    return false;
+	}
+	
 	/*
 	private void showWizardFinal ()
 	{