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

remove Firefox ProxyMob recommendation, ProxyMob is no longer supported

This commit is contained in:
Hans-Christoph Steiner 2015-06-03 16:35:43 -04:00
parent cf43fa247d
commit 0e6ba61ac0
3 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
res/layout/layout_wizard_tips.xml
View File

@ -63,15 +63,6 @@
android:drawableLeft="@drawable/ic_duckduckgo" android:drawableLeft="@drawable/ic_duckduckgo"
android:text="@string/wizard_tips_duckgo" /> android:text="@string/wizard_tips_duckgo" />
<Button
android:id="@+id/WizardRootButtonInstallFirefox"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_marginTop="10px"
android:drawableLeft="@drawable/icon_firefox"
android:text="@string/wizard_tips_firefox" />
<Button <Button
android:id="@+id/WizardRootButtonInstallTwitter" android:id="@+id/WizardRootButtonInstallTwitter"
android:layout_width="fill_parent" android:layout_width="fill_parent"

6
res/values/strings.xml
View File

@ -79,8 +79,6 @@
<string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</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_duckgo">DuckDuckGo Search Engine app</string>
<string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
<string name="wizard_tips_firefox">Proxy Mobile add-on for Firefox (https://guardianproject.info/apps/firefoxprivacy)</string>
<string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string>
<string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</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="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string>
<string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string> <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string>
@ -116,10 +114,6 @@
<string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string>
<string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string>
<string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
<!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
<string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
<string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
<!--Transparent Proxy screen--> <!--Transparent Proxy screen-->
<string name="wizard_transproxy_title">Transparent Proxying</string> <string name="wizard_transproxy_title">Transparent Proxying</string>
<string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>

13
src/org/torproject/android/ui/wizard/PromoAppsActivity.java
View File

@ -83,20 +83,7 @@ public class PromoAppsActivity extends Activity implements OrbotConstants {
} }
}); });
btnLink = (Button)findViewById(R.id.WizardRootButtonInstallFirefox);
btnLink.setOnClickListener(new OnClickListener() {
public void onClick(View view) {
String url = getString(R.string.proxymob_setup_url);
finish();
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
}
});
btnLink = (Button)findViewById(R.id.WizardRootButtonInstallTwitter); btnLink = (Button)findViewById(R.id.WizardRootButtonInstallTwitter);
btnLink.setOnClickListener(new OnClickListener() { btnLink.setOnClickListener(new OnClickListener() {