From 980d91769f6b64d7753c57c2b551d5a031832468 Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Sat, 1 Mar 2014 02:31:42 +0530 Subject: [PATCH 50/68] clean ChooseLocaleWizardActivity --- src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java index 500b018..9ac813d 100644 --- a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java +++ b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java @@ -77,6 +77,7 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants int arg2, long arg3) { setLocalePref(arg2); + finish(); startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); } @@ -85,8 +86,7 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants next.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - - + finish(); startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); } -- 1.8.3.2 From 445d4f69d292aeb240409d13169776766dcb6534 Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Sat, 1 Mar 2014 02:32:29 +0530 Subject: [PATCH 51/68] clean ConfigureTransProxy --- src/org/torproject/android/wizard/ConfigureTransProxy.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java b/src/org/torproject/android/wizard/ConfigureTransProxy.java index 2a7a93b..abc7295 100644 --- a/src/org/torproject/android/wizard/ConfigureTransProxy.java +++ b/src/org/torproject/android/wizard/ConfigureTransProxy.java @@ -106,7 +106,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { back.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - + finish(); startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); } }); @@ -114,7 +114,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { next.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - + finish(); startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); } @@ -129,7 +129,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { { public void onClick(View v) { - + finish(); context.startActivity(new Intent(context, AppManager.class)); -- 1.8.3.2 From 2afe91522e928076c3d23ab5c73f299857f0117e Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Sat, 1 Mar 2014 02:33:19 +0530 Subject: [PATCH 52/68] clean LotsaText --- src/org/torproject/android/wizard/LotsaText.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org/torproject/android/wizard/LotsaText.java b/src/org/torproject/android/wizard/LotsaText.java index 7ec87cf..e713633 100644 --- a/src/org/torproject/android/wizard/LotsaText.java +++ b/src/org/torproject/android/wizard/LotsaText.java @@ -134,6 +134,7 @@ public class LotsaText extends Activity implements TorConstants{ btn2.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { + finish(); startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); } }); -- 1.8.3.2 From 7670ccc992f92d567fdf23b72fe5783e80d31d87 Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Sat, 1 Mar 2014 02:34:16 +0530 Subject: [PATCH 53/68] clean Permissions --- src/org/torproject/android/wizard/Permissions.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index c61e256..2472c04 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -177,7 +177,7 @@ public class Permissions extends Activity implements TorConstants { stepFour(); } } - + finish(); startActivityForResult(new Intent(getBaseContext(), ConfigureTransProxy.class), 1); @@ -187,7 +187,7 @@ public class Permissions extends Activity implements TorConstants { back.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - + finish(); startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); } }); @@ -197,6 +197,7 @@ public class Permissions extends Activity implements TorConstants { public void onClick(View v) { + finish(); startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); } }); @@ -234,7 +235,7 @@ public class Permissions extends Activity implements TorConstants { btn1.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - + finish(); startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); } }); @@ -242,6 +243,7 @@ public class Permissions extends Activity implements TorConstants { btn2.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { + finish(); startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); } }); -- 1.8.3.2 From d5df95dc3e01fd2588ad78099653f88cf0eb458f Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Sat, 1 Mar 2014 02:34:44 +0530 Subject: [PATCH 54/68] clean TipsAndTricks --- src/org/torproject/android/wizard/TipsAndTricks.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index 0d59d5d..0aafee3 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -67,6 +67,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))); } @@ -79,6 +80,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))); } @@ -91,6 +93,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))); } @@ -103,6 +106,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))); } @@ -115,6 +119,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))); } @@ -128,6 +133,7 @@ public class TipsAndTricks extends Activity implements TorConstants { public void onClick(View view) { String url = getString(R.string.wizard_tips_play_url); + finish(); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); } @@ -141,7 +147,7 @@ public class TipsAndTricks extends Activity implements TorConstants { back.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - + finish(); startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); } }); @@ -178,6 +184,7 @@ public class TipsAndTricks extends Activity implements TorConstants { btn1.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { + finish(); startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); } @@ -186,6 +193,7 @@ public class TipsAndTricks extends Activity implements TorConstants { btn2.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { + finish(); startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1); } @@ -205,6 +213,7 @@ public class TipsAndTricks extends Activity implements TorConstants { @Override public void onClick(DialogInterface dialog, int which) { + finish(); context.startActivity(new Intent(context, Orbot.class)); } -- 1.8.3.2 From 022b7e407d287a6ddb59013cc633a149d3d406c9 Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Sat, 1 Mar 2014 02:47:53 +0530 Subject: [PATCH 55/68] undo previos edit to ChooseLocaleWizardActivity --- src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java index 9ac813d..8eea47b 100644 --- a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java +++ b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java @@ -77,7 +77,7 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants int arg2, long arg3) { setLocalePref(arg2); - finish(); + startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); } @@ -86,7 +86,7 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants next.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - finish(); + startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); } -- 1.8.3.2 From 65f0062d2bbe3cab92fd0735a4a9a52566114538 Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Sat, 1 Mar 2014 02:48:25 +0530 Subject: [PATCH 56/68] undo previos edit to ConfigureTransProxy --- src/org/torproject/android/wizard/ConfigureTransProxy.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java b/src/org/torproject/android/wizard/ConfigureTransProxy.java index abc7295..a7bb746 100644 --- a/src/org/torproject/android/wizard/ConfigureTransProxy.java +++ b/src/org/torproject/android/wizard/ConfigureTransProxy.java @@ -56,7 +56,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { { case RESULT_CLOSE_ALL: setResult(RESULT_CLOSE_ALL); - finish(); + } super.onActivityResult(requestCode, resultCode, data); } @@ -106,7 +106,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { back.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - finish(); + startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); } }); @@ -114,7 +114,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { next.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - finish(); + startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); } @@ -129,7 +129,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { { public void onClick(View v) { - finish(); + context.startActivity(new Intent(context, AppManager.class)); -- 1.8.3.2 From 0fbc30073aae7cbaae08156ea4696928e0009159 Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Sat, 1 Mar 2014 02:49:01 +0530 Subject: [PATCH 57/68] undo previos edit to LotsaText --- src/org/torproject/android/wizard/LotsaText.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/wizard/LotsaText.java b/src/org/torproject/android/wizard/LotsaText.java index e713633..05f834e 100644 --- a/src/org/torproject/android/wizard/LotsaText.java +++ b/src/org/torproject/android/wizard/LotsaText.java @@ -59,7 +59,7 @@ public class LotsaText extends Activity implements TorConstants{ { case RESULT_CLOSE_ALL: setResult(RESULT_CLOSE_ALL); - finish(); + } super.onActivityResult(requestCode, resultCode, data); } @@ -134,7 +134,7 @@ public class LotsaText extends Activity implements TorConstants{ btn2.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - finish(); + startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); } }); -- 1.8.3.2 From fa85e9c5c7b00313e4bd3bc139690e37b4627834 Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Sat, 1 Mar 2014 02:49:25 +0530 Subject: [PATCH 58/68] undo previos edit to Permissions --- src/org/torproject/android/wizard/Permissions.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index 2472c04..abbe6f2 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -55,7 +55,7 @@ public class Permissions extends Activity implements TorConstants { { case RESULT_CLOSE_ALL: setResult(RESULT_CLOSE_ALL); - finish(); + } super.onActivityResult(requestCode, resultCode, data); } @@ -177,7 +177,7 @@ public class Permissions extends Activity implements TorConstants { stepFour(); } } - finish(); + startActivityForResult(new Intent(getBaseContext(), ConfigureTransProxy.class), 1); @@ -187,7 +187,7 @@ public class Permissions extends Activity implements TorConstants { back.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - finish(); + startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); } }); @@ -197,7 +197,7 @@ public class Permissions extends Activity implements TorConstants { public void onClick(View v) { - finish(); + startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); } }); @@ -235,7 +235,7 @@ public class Permissions extends Activity implements TorConstants { btn1.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - finish(); + startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); } }); @@ -243,7 +243,7 @@ public class Permissions extends Activity implements TorConstants { btn2.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - finish(); + startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); } }); -- 1.8.3.2 From 07280677219110bae567d6ef26dc52e849c00405 Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Thu, 6 Mar 2014 20:34:58 +0530 Subject: [PATCH 59/68] overriding the back button, works fine --- src/org/torproject/android/wizard/Permissions.java | 5 ++--- src/org/torproject/android/wizard/TipsAndTricks.java | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index abbe6f2..00f9a8b 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -197,7 +197,7 @@ public class Permissions extends Activity implements TorConstants { public void onClick(View v) { - + finish(); startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); } }); @@ -235,7 +235,6 @@ public class Permissions extends Activity implements TorConstants { btn1.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); } }); @@ -243,7 +242,7 @@ public class Permissions extends Activity implements TorConstants { btn2.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - + finish(); startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); } }); diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index 0aafee3..d045376 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -8,11 +8,14 @@ import android.app.Activity; 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 { @@ -27,7 +30,7 @@ public class TipsAndTricks extends Activity implements TorConstants { super.onStart(); setContentView(R.layout.layout_wizard_tips); - + Toast.makeText(getApplicationContext(), "here", 0).show(); stepFive(); } @@ -147,7 +150,6 @@ public class TipsAndTricks extends Activity implements TorConstants { back.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - finish(); startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); } }); @@ -184,7 +186,6 @@ public class TipsAndTricks extends Activity implements TorConstants { btn1.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - finish(); startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); } @@ -199,6 +200,19 @@ public class TipsAndTricks extends Activity implements TorConstants { } }); } + 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 () { -- 1.8.3.2 From 149425d7038323fe085fef010467332481a1be10 Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Thu, 6 Mar 2014 20:37:28 +0530 Subject: [PATCH 60/68] final changes to ChooseLocaleWizardActivity.java --- src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java index 8eea47b..9ac813d 100644 --- a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java +++ b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java @@ -77,7 +77,7 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants int arg2, long arg3) { setLocalePref(arg2); - + finish(); startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); } @@ -86,7 +86,7 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants next.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - + finish(); startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); } -- 1.8.3.2 From 53a286dae9f77ea83f936747ddf3c5b98f46e46b Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Thu, 6 Mar 2014 20:39:54 +0530 Subject: [PATCH 61/68] final changes to LotsaText.java --- src/org/torproject/android/wizard/LotsaText.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/torproject/android/wizard/LotsaText.java b/src/org/torproject/android/wizard/LotsaText.java index 05f834e..0133128 100644 --- a/src/org/torproject/android/wizard/LotsaText.java +++ b/src/org/torproject/android/wizard/LotsaText.java @@ -134,7 +134,7 @@ public class LotsaText extends Activity implements TorConstants{ btn2.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - + finish(); startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); } }); -- 1.8.3.2 From 15166aa81c3128375fdc8a22c1c8a63946ddb403 Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Thu, 6 Mar 2014 20:42:08 +0530 Subject: [PATCH 62/68] final changes to Permissions.java --- src/org/torproject/android/wizard/Permissions.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index 00f9a8b..8b63967 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -13,6 +13,7 @@ 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; @@ -177,7 +178,7 @@ public class Permissions extends Activity implements TorConstants { stepFour(); } } - + finish(); startActivityForResult(new Intent(getBaseContext(), ConfigureTransProxy.class), 1); @@ -187,7 +188,7 @@ public class Permissions extends Activity implements TorConstants { back.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - + finish(); startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); } }); @@ -235,6 +236,7 @@ public class Permissions extends Activity implements TorConstants { btn1.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { + finish(); startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); } }); @@ -247,6 +249,17 @@ public class Permissions extends Activity implements TorConstants { } }); } - + + //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; + } } \ No newline at end of file -- 1.8.3.2 From 4849e89cf1d623a47172bea0216466c1f5ba8f4a Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Thu, 6 Mar 2014 20:46:36 +0530 Subject: [PATCH 63/68] final changes to ConfigureTransProxy.java --- .../android/wizard/ConfigureTransProxy.java | 19 +++++++++++++++---- src/org/torproject/android/wizard/TipsAndTricks.java | 1 + 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java b/src/org/torproject/android/wizard/ConfigureTransProxy.java index a7bb746..ff78650 100644 --- a/src/org/torproject/android/wizard/ConfigureTransProxy.java +++ b/src/org/torproject/android/wizard/ConfigureTransProxy.java @@ -11,6 +11,8 @@ 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.view.View.OnClickListener; import android.widget.Button; @@ -106,7 +108,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { back.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - + finish(); startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); } }); @@ -114,7 +116,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { next.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - + finish(); startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); } @@ -129,7 +131,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { { public void onClick(View v) { - + finish(); context.startActivity(new Intent(context, AppManager.class)); @@ -184,7 +186,16 @@ public class ConfigureTransProxy 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){ + finish(); + startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); + return true; + } + return true; + } /* private void showWizardFinal () { diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index d045376..4b4d3d4 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -206,6 +206,7 @@ public class TipsAndTricks extends Activity implements TorConstants { //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(); -- 1.8.3.2 From e959b7975a88356d5696ac8c8b458bad06fc9fc3 Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Thu, 6 Mar 2014 20:48:42 +0530 Subject: [PATCH 64/68] final changes to TipsAndTricks.java --- src/org/torproject/android/wizard/TipsAndTricks.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index 4b4d3d4..5f45bd3 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -150,6 +150,7 @@ public class TipsAndTricks extends Activity implements TorConstants { back.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { + finish(); startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); } }); @@ -186,6 +187,7 @@ public class TipsAndTricks extends Activity implements TorConstants { btn1.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { + finish(); startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); } @@ -200,16 +202,15 @@ public class TipsAndTricks extends Activity implements TorConstants { } }); } - 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; -- 1.8.3.2 From 58f162e23831c4115c777bba51977292af0e8d56 Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Thu, 6 Mar 2014 20:52:57 +0530 Subject: [PATCH 65/68] extra toast text added for when a user clicks back on the first screen of the wizard. --- res/values/strings.xml | 1 + src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 8e40b05..a2c3910 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -84,6 +84,7 @@ 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 Orbot is ready! 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! + Please configure Orbot before you can start using it! 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. 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. diff --git a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java index 9ac813d..65a6d38 100644 --- a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java +++ b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java @@ -47,9 +47,6 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants super.onResume(); setupUI(); - - - } -- 1.8.3.2 From 2465c72d939e8700172ee10d36f2ab5104be70d2 Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Thu, 6 Mar 2014 20:54:12 +0530 Subject: [PATCH 66/68] ChooseLocalWizardActivity.java fixed and functionality for back button click implemented. --- .../android/wizard/ChooseLocaleWizardActivity.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java index 65a6d38..0438d98 100644 --- a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java +++ b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java @@ -13,11 +13,14 @@ 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.Button; import android.widget.ListView; +import android.widget.Toast; public class ChooseLocaleWizardActivity extends Activity implements TorConstants { @@ -125,7 +128,17 @@ 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); -- 1.8.3.2 From edfbfdc40caebd6a824f7a85a4786bcbcdcfaacf Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Thu, 6 Mar 2014 21:02:03 +0530 Subject: [PATCH 67/68] implemented back button for LotsaText.java, workflow must be fine now, also a few cleanup changes to the other files. --- .../android/wizard/ChooseLocaleWizardActivity.java | 2 +- src/org/torproject/android/wizard/ConfigureTransProxy.java | 3 ++- src/org/torproject/android/wizard/LotsaText.java | 12 +++++++++++- src/org/torproject/android/wizard/Permissions.java | 1 - src/org/torproject/android/wizard/TipsAndTricks.java | 2 -- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java index 0438d98..d148b2a 100644 --- a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java +++ b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java @@ -129,9 +129,9 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants } + //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; diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java b/src/org/torproject/android/wizard/ConfigureTransProxy.java index ff78650..80b7813 100644 --- a/src/org/torproject/android/wizard/ConfigureTransProxy.java +++ b/src/org/torproject/android/wizard/ConfigureTransProxy.java @@ -186,9 +186,10 @@ public class ConfigureTransProxy extends Activity implements TorConstants { } + + //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); diff --git a/src/org/torproject/android/wizard/LotsaText.java b/src/org/torproject/android/wizard/LotsaText.java index 0133128..ebdf894 100644 --- a/src/org/torproject/android/wizard/LotsaText.java +++ b/src/org/torproject/android/wizard/LotsaText.java @@ -10,6 +10,7 @@ import android.content.SharedPreferences; 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; @@ -140,6 +141,15 @@ public class LotsaText extends Activity implements TorConstants{ }); } - + //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; + } } \ No newline at end of file diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index 8b63967..cabc0eb 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -253,7 +253,6 @@ public class Permissions extends Activity implements TorConstants { //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); diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index 5f45bd3..5228d65 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -206,8 +206,6 @@ public class TipsAndTricks extends Activity implements TorConstants { //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); -- 1.8.3.2 From 18a506f39941007e57a7d71894c5c391304f3900 Mon Sep 17 00:00:00 2001 From: amoghbl1 Date: Thu, 6 Mar 2014 21:05:43 +0530 Subject: [PATCH 68/68] typo fixed :/ --- src/org/torproject/android/wizard/TipsAndTricks.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index 5228d65..1b99331 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -30,7 +30,7 @@ public class TipsAndTricks extends Activity implements TorConstants { super.onStart(); setContentView(R.layout.layout_wizard_tips); - Toast.makeText(getApplicationContext(), "here", 0).show(); + stepFive(); } @@ -208,7 +208,7 @@ public class TipsAndTricks extends Activity implements TorConstants { 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; -- 1.8.3.2