June 2014 - tor-commits - lists.torproject.org

[orbot/master] update to 14.0.0-BETA-1
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit 2650fda101ddd61fa3436b1dc8a99f0050208a16 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jun 5 11:14:17 2014 -0400 update to 14.0.0-BETA-1 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 526134a..bc5cde2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.0.0-ALPHA-4" - android:versionCode="93" + android:versionName="14.0.0-BETA-1" + android:versionCode="94" android:installLocation="auto" >

1 0

[orbot/master] remove deletion of polipo folder
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit 148e7eb4bfb577b3773bd75a822e2055c0e1b5bf Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jun 5 11:08:06 2014 -0400 remove deletion of polipo folder --- external/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/external/Makefile b/external/Makefile index 96b75ed..1817783 100644 --- a/external/Makefile +++ b/external/Makefile @@ -294,7 +294,6 @@ polipo: polipo-build-stamp polipo-clean: -rm -f bin/polipo -rm -f polipo-build-stamp - -rm -rf polipo #------------------------------------------------------------------------------# # JTorControl library

1 0

[orbot/master] cleaned ChooseLocaleWizardActivity workflow, implemented override for back button and added toast warning message string
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit ea384f95f647eac148653b6e7e13f1cd35c77513 Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Sat May 24 02:31:57 2014 +0530 cleaned ChooseLocaleWizardActivity workflow, implemented override for back button and added toast warning message string --- res/values/strings.xml | 1 + .../android/wizard/ChooseLocaleWizardActivity.java | 20 ++++++++++++++++---- .../torproject/android/wizard/TipsAndTricks.java | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index c4c6143..4eb1294 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -84,6 +84,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… 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>  <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(a)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> diff --git a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java index 6385227..fe1d7cd 100644 --- a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java +++ b/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,15 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants super.onSaveInstanceState(outState); } + + //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; + } + return false; + } } \ No newline at end of file diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index 3d2437e..7b4fb2e 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -202,7 +202,7 @@ public class TipsAndTricks extends Activity implements TorConstants { startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1); return true; } - return true; + return false; } /*

1 0

[orbot/master] added icon for story maker button to be added to the hints and tips page
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit 23c689c8a1585f1125145a368b9ff0214f76885b Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Fri May 23 02:38:33 2014 +0530 added icon for story maker button to be added to the hints and tips page --- res/drawable/icon_story_maker.png | Bin 0 -> 4290 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable/icon_story_maker.png b/res/drawable/icon_story_maker.png new file mode 100755 index 0000000..9c54ca5 Binary files /dev/null and b/res/drawable/icon_story_maker.png differ

1 0

[orbot/master] cleaned TipsAndTricks workflow
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit ffcfce742bd0b5f8a29c043be74c466d1e33aacd Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Sat May 24 02:01:36 2014 +0530 cleaned TipsAndTricks workflow --- .../torproject/android/wizard/TipsAndTricks.java | 37 ++++++++++++-------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index 5d0872c..3d2437e 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/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))); } @@ -148,7 +144,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); } }); @@ -183,19 +179,32 @@ 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) { + Log.d("myTag", "IT HAS BEEN CLICKED :O"+keyCode+" "+event); + if(keyCode == KeyEvent.KEYCODE_BACK){ + finish(); + startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1); + return true; + } + return true; + } + /* private void showWizardFinal () {

1 0

[orbot/master] added the story maker button to the tips wizard page, also added tip string to the strings file.
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit 255623a1ddb32d03b41327e6a83585059966cc6c Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Fri May 23 02:45:57 2014 +0530 added the story maker button to the tips wizard page, also added tip string to the strings file. --- res/layout/layout_wizard_tips.xml | 11 ++++++++++- res/values/strings.xml | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml index 5129935..992dfd1 100644 --- a/res/layout/layout_wizard_tips.xml +++ b/res/layout/layout_wizard_tips.xml @@ -34,7 +34,7 @@ android:textColor="#ffffff" android:textSize="8pt" > </TextView> - + <Button android:id="@+id/WizardRootButtonInstallOrweb" android:layout_width="fill_parent" @@ -81,6 +81,15 @@ android:drawableLeft="@drawable/ic_twitter" android:text="@string/wizard_tips_twitter" /> + <Button + android:id="@+id/WizardRootButtonInstallStoryMaker" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginTop="10px" + android:drawableLeft="@drawable/icon_story_maker" + android:text="@string/wizard_tips_story_maker" /> + <!-- <Button android:id="@+id/WizardRootButtonGooglePlay" diff --git a/res/values/strings.xml b/res/values/strings.xml index c4c6143..52905ff 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -79,6 +79,7 @@ <string name="wizard_tips_firefox">Proxy Mobile add-on for Firefox (http://tinyurl.com/getproxymob)</string> <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> <string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</string> + <string name="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <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>

1 0

[orbot/master] cleaned ConfigureTransProxy workflow, implemented override for back button
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit f29a49439e9c0a0dbcde7f4dc524d54c7be7821f Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Sat May 24 02:38:19 2014 +0530 cleaned ConfigureTransProxy workflow, implemented override for back button --- .../android/wizard/ConfigureTransProxy.java | 26 ++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java b/src/org/torproject/android/wizard/ConfigureTransProxy.java index abbaee6..487d0a1 100644 --- a/src/org/torproject/android/wizard/ConfigureTransProxy.java +++ b/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) { - - context.startActivity(new Intent(context, AppManager.class)); - - - + finish(); + context.startActivity(new Intent(context, AppManager.class)); } }); @@ -239,4 +238,17 @@ public class ConfigureTransProxy extends Activity implements TorConstants { super.onSaveInstanceState(outState); } + + //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); + return true; + } + return false; + } + } \ No newline at end of file

1 0

[orbot/master] cleaned LotsaText workflow, implemented override for back button
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit 935fa911992c0082b1567b0276b88e650770829e Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Sat May 24 02:43:28 2014 +0530 cleaned LotsaText workflow, implemented override for back button --- src/org/torproject/android/wizard/LotsaText.java | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/android/wizard/LotsaText.java b/src/org/torproject/android/wizard/LotsaText.java index 3568779..9e28024 100644 --- a/src/org/torproject/android/wizard/LotsaText.java +++ b/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.support.v4.app.ActivityCompat; +import android.view.KeyEvent; 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; + } } \ No newline at end of file

1 0

[orbot/master] general cleanup, removed log.d's
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit 53e82b17697dee936adb10e61b18ee2b22e3cf4c Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Sat May 24 02:57:22 2014 +0530 general cleanup, removed log.d's --- src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java | 1 - src/org/torproject/android/wizard/ConfigureTransProxy.java | 1 - src/org/torproject/android/wizard/Permissions.java | 1 - src/org/torproject/android/wizard/TipsAndTricks.java | 3 +-- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java index fe1d7cd..3ebe441 100644 --- a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java +++ b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java @@ -140,7 +140,6 @@ 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 487d0a1..b6cad18 100644 --- a/src/org/torproject/android/wizard/ConfigureTransProxy.java +++ b/src/org/torproject/android/wizard/ConfigureTransProxy.java @@ -242,7 +242,6 @@ 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/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index 1df4212..5568df1 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -207,7 +207,6 @@ public class Permissions extends Activity implements TorConstants { //Code to override the back button! 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 7b4fb2e..31d6f20 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -196,10 +196,9 @@ 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); + startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); return true; } return false;

1 0

[orbot/master] cleaned Permissions workflow, implemented override for back button
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit 6488e6a699153a0e061cfed8385a0488999e86e2 Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Sat May 24 02:55:36 2014 +0530 cleaned Permissions workflow, implemented override for back button --- src/org/torproject/android/wizard/Permissions.java | 23 ++++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index 37db185..1df4212 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/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,21 @@ 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) { + 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 false; + } } \ No newline at end of file

1 0