dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updates to "tips" wizard page for orbot-enabled apps

This commit is contained in:
n8fr8 2012-10-22 02:03:26 +05:30
parent 993e2a0c18
commit 4791e4e93f
7 changed files with 58 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable/ic_duckduckgo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
res/drawable/ic_launcher_gibberbot.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
res/drawable/ic_twitter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
res/drawable/icon_firefox.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

14
res/layout/layout_wizard_tips.xml
View File

@ -68,7 +68,7 @@
<Button
android:id="@+id/WizardRootButtonInstallOrweb"
android:layout_width="wrap_content"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_marginTop="10px"
@ -77,7 +77,7 @@
<Button
android:id="@+id/WizardRootButtonInstallGibberbot"
android:layout_width="wrap_content"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_marginTop="10px"
@ -87,16 +87,16 @@
<Button
android:id="@+id/WizardRootButtonInstallDuckgo"
android:layout_width="wrap_content"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_marginTop="10px"
android:drawableLeft="@drawable/icon_firefox"
android:drawableLeft="@drawable/ic_duckduckgo"
android:text="@string/wizard_tips_duckgo" />
<Button
android:id="@+id/WizardRootButtonInstallFirefox"
android:layout_width="wrap_content"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_marginTop="10px"
@ -105,11 +105,11 @@
<Button
android:id="@+id/WizardRootButtonInstallTwitter"
android:layout_width="wrap_content"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_marginTop="10px"
android:drawableLeft="@drawable/icon_firefox"
android:drawableLeft="@drawable/ic_twitter"
android:text="@string/wizard_tips_twitter" />

17
res/values/strings.xml
View File

@ -97,15 +97,18 @@
<string name="wizard_tips_tricks">Orbot-enabled Apps</string>
<string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string>
<string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string>
<string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
<string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
<string name="wizard_tips_duckgo">Duckduckgo Search Engine app</string>
<string name="wizard_tips_firefox">Firefox with Proxy Mobile add-on (extra install after)</string>
<string name="wizard_tips_twitter">Twitter supports http proxy "localhost:8118"</string>
<string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string>
<string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
<string name="wizard_tips_firefox">Proxy Mobile add-on for Firefox (http://tinyurl.com/getproxymob)</string>
<string name="proxymob_setup_url">http://tinyurl.com/getproxymob</string>
<string name="wizard_tips_twitter">Set Twitter proxy to host "localhost" and port 8118</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
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.
@ -142,7 +145,9 @@
<!-- TipsAndTricks screen -->
<string name="wizard_tips_title">Orbot-Enabled Apps</string>
<string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
<string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
<string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
<string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>

44
src/org/torproject/android/wizard/TipsAndTricks.java
View File

@ -70,9 +70,9 @@ public class TipsAndTricks extends Activity implements TorConstants {
img.setImageResource(R.drawable.icon);
Button btn1 = (Button)findViewById(R.id.WizardRootButtonInstallGibberbot);
Button btnLink = (Button)findViewById(R.id.WizardRootButtonInstallGibberbot);
btn1.setOnClickListener(new OnClickListener() {
btnLink.setOnClickListener(new OnClickListener() {
public void onClick(View view) {
@ -82,9 +82,9 @@ public class TipsAndTricks extends Activity implements TorConstants {
}
});
Button btn2 = (Button)findViewById(R.id.WizardRootButtonInstallOrweb);
btnLink = (Button)findViewById(R.id.WizardRootButtonInstallOrweb);
btn2.setOnClickListener(new OnClickListener() {
btnLink.setOnClickListener(new OnClickListener() {
public void onClick(View view) {
@ -94,6 +94,42 @@ public class TipsAndTricks extends Activity implements TorConstants {
}
});
btnLink = (Button)findViewById(R.id.WizardRootButtonInstallDuckgo);
btnLink.setOnClickListener(new OnClickListener() {
public void onClick(View view) {
String url = getString(R.string.duckgo_apk_url);
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
}
});
btnLink = (Button)findViewById(R.id.WizardRootButtonInstallFirefox);
btnLink.setOnClickListener(new OnClickListener() {
public void onClick(View view) {
String url = getString(R.string.proxymob_setup_url);
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
}
});
btnLink = (Button)findViewById(R.id.WizardRootButtonInstallTwitter);
btnLink.setOnClickListener(new OnClickListener() {
public void onClick(View view) {
String url = getString(R.string.twitter_setup_url);
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
}
});
Button back = ((Button)findViewById(R.id.btnWizard1));
Button next = ((Button)findViewById(R.id.btnWizard2));