[tor-commits] [orbot/master] remove Firefox ProxyMob recommendation, ProxyMob is no longer supported

[n8fr8 at torproject.org]

commit 0e6ba61ac0369072b6ff83a5df124b931b7f73f6
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Wed Jun 3 16:35:43 2015 -0400

    remove Firefox ProxyMob recommendation, ProxyMob is no longer supported
---
 res/layout/layout_wizard_tips.xml                         |    9 ---------
 res/values/strings.xml                                    |    6 ------
 .../torproject/android/ui/wizard/PromoAppsActivity.java   |   13 -------------
 3 files changed, 28 deletions(-)

diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml
index f42a603..43afc43 100644
--- a/res/layout/layout_wizard_tips.xml
+++ b/res/layout/layout_wizard_tips.xml
@@ -64,15 +64,6 @@
         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
         android:id="@+id/WizardRootButtonInstallTwitter"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 64ab5fc..4844d42 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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_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 (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_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>
@@ -116,10 +114,6 @@
   <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_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-->
   <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>
diff --git a/src/org/torproject/android/ui/wizard/PromoAppsActivity.java b/src/org/torproject/android/ui/wizard/PromoAppsActivity.java
index 0a61d71..b049625 100644
--- a/src/org/torproject/android/ui/wizard/PromoAppsActivity.java
+++ b/src/org/torproject/android/ui/wizard/PromoAppsActivity.java
@@ -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.setOnClickListener(new OnClickListener() {