wizardCleanupPatch_amoghbl1.patch

     						int arg2, long arg3) {
     					setLocalePref(arg2);
     					finish();
     					startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
+    				}
-...
     		    next.setOnClickListener(new View.OnClickListener() {
     				public void onClick(View v) {
     					finish();
     					startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
+    				}
+    -

     		    back.setOnClickListener(new View.OnClickListener() {
     				public void onClick(View v) {
     					finish();
     					startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
+    				}
     			});
-...
     		    next.setOnClickListener(new View.OnClickListener() {
     				public void onClick(View v) {
     					finish();
     					startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1);
+    				}
-...
+        		{
     				public void onClick(View v) {
     						finish();
     						context.startActivity(new Intent(context, AppManager.class));
+    -

         	btn2.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
+    			}
     		});
+    -

     						stepFour();
+    					}
+    				}
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), ConfigureTransProxy.class), 1);
-...
         	back.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
+    			}
     		});
-...
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1);
+    			}
     		});
-...
         	btn1.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
+    			}
     		});
-...
         	btn2.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1);
+    			}
     		});
+    -

     			public void onClick(View view) {
     				String url = getString(R.string.gibberbot_apk_url);
     				finish();
     				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+    			}
-...
     			public void onClick(View view) {
     				String url = getString(R.string.orweb_apk_url);
     				finish();
     				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+    			}
-...
     			public void onClick(View view) {
     				String url = getString(R.string.duckgo_apk_url);
     				finish();
     				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+    			}
-...
     			public void onClick(View view) {
     				String url = getString(R.string.proxymob_setup_url);
     				finish();
     				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+    			}
-...
     			public void onClick(View view) {
     				String url = getString(R.string.twitter_setup_url);
     				finish();
     				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+    			}
-...
     			public void onClick(View view) {
     				String url = getString(R.string.wizard_tips_play_url);
     				finish();
     				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+    			}
-...
             back.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
+    			}
     		});
-...
         	btn1.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
+    			}
-...
         	btn2.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1);
+    			}
-...
     			@Override
     			public void onClick(DialogInterface dialog, int which) {
     				finish();
     				context.startActivity(new Intent(context, Orbot.class));
+    			}
+    -

     						int arg2, long arg3) {
     					setLocalePref(arg2);
     					finish();
     					startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
+    				}
-...
     		    next.setOnClickListener(new View.OnClickListener() {
     				public void onClick(View v) {
     					finish();
     					startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
+    				}
+    -

src/org/torproject/android/wizard/ConfigureTransProxy.java
56	56	{
57	57	case RESULT_CLOSE_ALL:
58	58	setResult(RESULT_CLOSE_ALL);
59		finish();
	59
60	60	}
61	61	super.onActivityResult(requestCode, resultCode, data);
62	62	}
...	...
106	106	back.setOnClickListener(new View.OnClickListener() {
107	107
108	108	public void onClick(View v) {
109		finish();
	109
110	110	startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
111	111	}
112	112	});
...	...
114	114	next.setOnClickListener(new View.OnClickListener() {
115	115
116	116	public void onClick(View v) {
117		finish();
	117
118	118	startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1);
119	119
120	120	}
...	...
129	129	{
130	130
131	131	public void onClick(View v) {
132		finish();
	132
133	133	context.startActivity(new Intent(context, AppManager.class));
134	134
135	135
136		-

src/org/torproject/android/wizard/LotsaText.java
59	59	{
60	60	case RESULT_CLOSE_ALL:
61	61	setResult(RESULT_CLOSE_ALL);
62		finish();
	62
63	63	}
64	64	super.onActivityResult(requestCode, resultCode, data);
65	65	}
...	...
134	134	btn2.setOnClickListener(new View.OnClickListener() {
135	135
136	136	public void onClick(View v) {
137		finish();
	137
138	138	startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
139	139	}
140	140	});
141		-

src/org/torproject/android/wizard/Permissions.java
55	55	{
56	56	case RESULT_CLOSE_ALL:
57	57	setResult(RESULT_CLOSE_ALL);
58		finish();
	58
59	59	}
60	60	super.onActivityResult(requestCode, resultCode, data);
61	61	}
...	...
177	177	stepFour();
178	178	}
179	179	}
180		finish();
	180
181	181	startActivityForResult(new Intent(getBaseContext(), ConfigureTransProxy.class), 1);
182	182
183	183
...	...
187	187	back.setOnClickListener(new View.OnClickListener() {
188	188
189	189	public void onClick(View v) {
190		finish();
	190
191	191	startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
192	192	}
193	193	});
...	...
197	197
198	198
199	199	public void onClick(View v) {
200		finish();
	200
201	201	startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1);
202	202	}
203	203	});
...	...
235	235	btn1.setOnClickListener(new View.OnClickListener() {
236	236
237	237	public void onClick(View v) {
238		finish();
	238
239	239	startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
240	240	}
241	241	});
...	...
243	243	btn2.setOnClickListener(new View.OnClickListener() {
244	244
245	245	public void onClick(View v) {
246		finish();
	246
247	247	startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1);
248	248	}
249	249	});
250		-

     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1);
+    			}
     		});
-...
         	btn1.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
+    			}
     		});
-...
         	btn2.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1);
+    			}
     		});

     import android.content.Intent;
     import android.net.Uri;
     import android.os.Bundle;
     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;
     import android.widget.Toast;
     public class TipsAndTricks extends Activity implements TorConstants {
-...
     		super.onStart();
     		setContentView(R.layout.layout_wizard_tips);
     		Toast.makeText(getApplicationContext(), "here", 0).show();
     		stepFive();
+    	}
-...
             back.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
+    			}
     		});
-...
         	btn1.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
+    			}
-...
+    			}
     		});
+    	}
     	private void doBack(){
     		Log.i("myTag", "doBack!");
+    	}
     	//Code to override the back button!
     	@Override
     	public boolean onKeyDown(int keyCode, KeyEvent event)  {
     		Log.d("myTag", "IT HAS BEEN CLICKED :O"+keyCode+"    "+event);
     	    if(keyCode == KeyEvent.KEYCODE_BACK){
     	    	doBack();
     	    	return true;
+    	    }
     	    return true;
+    	}
     	/*
     	private void showWizardFinal ()
+    	{
+    -

     						int arg2, long arg3) {
     					setLocalePref(arg2);
     					finish();
     					startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
+    				}
-...
     		    next.setOnClickListener(new View.OnClickListener() {
     				public void onClick(View v) {
     					finish();
     					startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
+    				}
+    -

         	btn2.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
+    			}
     		});
+    -

     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;
-...
     						stepFour();
+    					}
+    				}
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), ConfigureTransProxy.class), 1);
-...
         	back.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
+    			}
     		});
-...
         	btn1.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
+    			}
     		});
-...
+    			}
     		});
+    	}
     	//Code to override the back button!
     	@Override
     	public boolean onKeyDown(int keyCode, KeyEvent event)  {
     		Log.d("myTag", "IT HAS BEEN CLICKED :O"+keyCode+"    "+event);
     	    if(keyCode == KeyEvent.KEYCODE_BACK){
     	    	finish();
     	    	startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);
     	    	return true;
+    	    }
     	    return true;
+    	}
+    }
+    -

     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.view.View.OnClickListener;
     import android.widget.Button;
-...
     		    back.setOnClickListener(new View.OnClickListener() {
     				public void onClick(View v) {
     					finish();
     					startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
+    				}
     			});
-...
     		    next.setOnClickListener(new View.OnClickListener() {
     				public void onClick(View v) {
     					finish();
     					startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1);
+    				}
-...
+        		{
     				public void onClick(View v) {
     						finish();
     						context.startActivity(new Intent(context, AppManager.class));
-...
+    	}
     	@Override
     	public boolean onKeyDown(int keyCode, KeyEvent event)  {
     		Log.d("myTag", "IT HAS BEEN CLICKED :O"+keyCode+"    "+event);
     	    if(keyCode == KeyEvent.KEYCODE_BACK){
     	    	finish();
     			startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
     	    	return true;
+    	    }
     	    return true;
+    	}
     	/*
     	private void showWizardFinal ()
+    	{

     	//Code to override the back button!
     	@Override
     	public boolean onKeyDown(int keyCode, KeyEvent event)  {
     		Log.d("myTag", "IT HAS BEEN CLICKED :O"+keyCode+"    "+event);
     	    if(keyCode == KeyEvent.KEYCODE_BACK){
     	    	doBack();
+    -

             back.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
+    			}
     		});
-...
         	btn1.setOnClickListener(new View.OnClickListener() {
     			public void onClick(View v) {
     				finish();
     				startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
+    			}
-...
+    			}
     		});
+    	}
     	private void doBack(){
     		Log.i("myTag", "doBack!");
+    	}
     	//Code to override the back button!
     	@Override
     	public boolean onKeyDown(int keyCode, KeyEvent event)  {
     		Log.d("myTag", "IT HAS BEEN CLICKED :O"+keyCode+"    "+event);
     	    if(keyCode == KeyEvent.KEYCODE_BACK){
     	    	doBack();
     	    	finish();
     			startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1);
     	    	return true;
+    	    }
     	    return true;
+    -

res/values/strings.xml
84	84	<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>
85	85	<string name="wizard_final">Orbot is ready!</string>
86	86	<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>
	87	<string name="wizard_exit_at_first_screen_toast">Please configure Orbot before you can start using it!</string>
87	88	<!--END Welcome Wizard strings (DJH)-->
88	89	<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>
89	90	<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
47	47	super.onResume();
48	48
49	49	setupUI();
50
51
52
53	50	}
54	51
55	52
56		-

     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.Button;
     import android.widget.ListView;
     import android.widget.Toast;
     public class ChooseLocaleWizardActivity extends Activity implements TorConstants {
-...
+    	}
     	@Override
     	public boolean onKeyDown(int keyCode, KeyEvent event)  {
     		Log.d("myTag", "IT HAS BEEN CLICKED :O"+keyCode+"    "+event);
     	    if(keyCode == KeyEvent.KEYCODE_BACK){
     	    	Toast.makeText(getApplicationContext(), R.string.wizard_exit_at_first_screen_toast, Toast.LENGTH_SHORT).show();
     	    	return true;
+    	    }
     	    return true;
+    	}
     	@Override
     	protected void onRestoreInstanceState(Bundle savedInstanceState) {
     		super.onRestoreInstanceState(savedInstanceState);
+    -

+    	}
     	//Code to override the back button!
     	@Override
     	public boolean onKeyDown(int keyCode, KeyEvent event)  {
     		Log.d("myTag", "IT HAS BEEN CLICKED :O"+keyCode+"    "+event);
     	    if(keyCode == KeyEvent.KEYCODE_BACK){
     	    	Toast.makeText(getApplicationContext(), R.string.wizard_exit_at_first_screen_toast, Toast.LENGTH_SHORT).show();
     	    	return true;

+    	}
     	//Code to override the back button!
     	@Override
     	public boolean onKeyDown(int keyCode, KeyEvent event)  {
     		Log.d("myTag", "IT HAS BEEN CLICKED :O"+keyCode+"    "+event);
     	    if(keyCode == KeyEvent.KEYCODE_BACK){
     	    	finish();
     			startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);

     import android.content.SharedPreferences.Editor;
     import android.os.Bundle;
     import android.preference.PreferenceManager;
     import android.view.KeyEvent;
     import android.view.View;
     import android.widget.Button;
     import android.widget.ImageView;
-...
     		});
+    	}
     	//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
253	253	//Code to override the back button!
254	254	@Override
255	255	public boolean onKeyDown(int keyCode, KeyEvent event) {
256		Log.d("myTag", "IT HAS BEEN CLICKED :O"+keyCode+" "+event);
257	256	if(keyCode == KeyEvent.KEYCODE_BACK){
258	257	finish();
259	258	startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1);

     	//Code to override the back button!
     	@Override
     	public boolean onKeyDown(int keyCode, KeyEvent event)  {
     		Log.d("myTag", "IT HAS BEEN CLICKED :O"+keyCode+"    "+event);
     	    if(keyCode == KeyEvent.KEYCODE_BACK){
     	    	finish();
     			startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1);
+    -

     		super.onStart();
     		setContentView(R.layout.layout_wizard_tips);
     		Toast.makeText(getApplicationContext(), "here", 0).show();
     		stepFive();
+    	}
-...
     	public boolean onKeyDown(int keyCode, KeyEvent event)  {
     	    if(keyCode == KeyEvent.KEYCODE_BACK){
     	    	finish();
     			startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1);
     			startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1);
     	    	return true;
+    	    }
     	    return true;
+    -

Core Apps » Orbot