From 22118bc38280bdf3d375018dac1c0de743b75ec0 Mon Sep 17 00:00:00 2001 From: Sathyanarayanan Gunasekaran Date: Mon, 6 Jun 2011 02:25:18 +0530 Subject: [PATCH] Tips and Tricks screen added --- res/drawable/icon_otrchat.png | Bin 4610 -> 0 bytes res/layout/layout_wizard_tips.xml | 63 +++++++++-- res/values/strings.xml | 13 ++- src/org/torproject/android/Permissions.java | 4 +- src/org/torproject/android/TipsAndTricks.java | 103 ++++++++++++++++++ 5 files changed, 168 insertions(+), 15 deletions(-) delete mode 100755 res/drawable/icon_otrchat.png create mode 100644 src/org/torproject/android/TipsAndTricks.java diff --git a/res/drawable/icon_otrchat.png b/res/drawable/icon_otrchat.png deleted file mode 100755 index 08171aba53ddb0d2c3c71d9cbe9b33b58495f263..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4610 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 diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml index 19aaef06..60cba512 100644 --- a/res/layout/layout_wizard_tips.xml +++ b/res/layout/layout_wizard_tips.xml @@ -1,15 +1,54 @@ - + android:layout_height="fill_parent" + android:background="@drawable/background"> + + + + + + + + + + + + - + + - + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index f4ca03c4..25e253d8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -99,7 +99,6 @@ Orbot-enabled Apps We encourage you to download & use apps that know how to connect directly to Orbot. Click on the buttons below to install. - Gibberbot - Secure instant messaging client for Android ORWEB (Android 1.x Only) - Browser designed for privacy & for Orbot Proxy Settings - Learn how to configure apps to work with Orbot @@ -113,8 +112,6 @@ Orbot is ready! Hundreds of thousands of people around the world use Tor for a wide variety of reasons: journalists and bloggers, human rights workers, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well! - market://search?q=pname:info.guardianproject.otr.app.im - market://search?q=pname:nfo.guardianproject.browser @@ -140,6 +137,12 @@ Orbot has detected that you have root permissions enabled. To enable \'Transparent Proxying\', please grant superuser privileges to Orbot If you choose to continue without providing superuser privileges, make sure to use apps made to work with orbot Orbot has detected that you do not have root permissions.\nTransparent Proxying is not possible without superuser privileges.\nMake sure to use apps that have been configured to work with Orbot - - + + Gibberbot - Secure instant messaging client for Android + Firefox - Android browser - To be used along with ProxyMob Add-on + ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings + https://market.android.com/details?id=info.guardianproject.otr.app.im + https://market.android.com/details?id=org.mozilla.firefox + https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail + diff --git a/src/org/torproject/android/Permissions.java b/src/org/torproject/android/Permissions.java index bd96e56b..996a1dc8 100644 --- a/src/org/torproject/android/Permissions.java +++ b/src/org/torproject/android/Permissions.java @@ -133,7 +133,7 @@ public class Permissions extends Activity implements TorConstants { @Override public void onClick(View v) { - //Tips Screen + startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); } }); @@ -167,7 +167,7 @@ public class Permissions extends Activity implements TorConstants { @Override public void onClick(View v) { - //Tips Screen + startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); } }); } diff --git a/src/org/torproject/android/TipsAndTricks.java b/src/org/torproject/android/TipsAndTricks.java new file mode 100644 index 00000000..c4aba967 --- /dev/null +++ b/src/org/torproject/android/TipsAndTricks.java @@ -0,0 +1,103 @@ +package org.torproject.android; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; +import android.view.View; +import android.view.View.OnClickListener; +import android.widget.Button; + +public class TipsAndTricks extends Activity implements TorConstants { + + private Context context; + + protected void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + context = this; + + } + + @Override + protected void onStart() { + + super.onStart(); + setContentView(R.layout.layout_wizard_tips); + + //stepFive(); + + } + + @Override + protected void onResume() { + super.onResume(); + + + } + + void stepFive(){ + + + + Button btn1 = (Button)findViewById(R.id.WizardRootButtonInstallGibberbot); + + btn1.setOnClickListener(new OnClickListener() { + + @Override + public void onClick(View view) { + + String url = context.getString(R.string.gibberbot_apk_url); + context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + + } + }); + + Button btn2 = (Button)findViewById(R.id.WizardRootButtonInstallFirefox); + + btn2.setOnClickListener(new OnClickListener() { + + @Override + public void onClick(View view) { + + String url = context.getString(R.string.firefox_apk_url); + context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + + } + }); + + Button btn3 = (Button)findViewById(R.id.WizardRootButtonInstallProxyMob); + + btn3.setOnClickListener(new OnClickListener() { + + @Override + public void onClick(View view) { + + String url = context.getString(R.string.proxymob_url); + context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + } + }); + + Button back = ((Button)findViewById(R.id.btnWizard1)); + Button next = ((Button)findViewById(R.id.btnWizard2)); + + back.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View v) { + + startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); + } + }); + + next.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View v) { + //Finsh Screen + } + }); + + } +} \ No newline at end of file