[tor-commits] [orbot/master] added mobile martus to rec'd apps

[n8fr8 at torproject.org]

commit 9d541d8aadf7f5585e802d9db4d874f6c3b51ab3
Author: Nathan Freitas <nathan at freitas.net>
Date:   Wed Jul 16 17:06:50 2014 -0400

    added mobile martus to rec'd apps
---
 res/values/strings.xml                               |    9 ++++++---
 src/org/torproject/android/wizard/TipsAndTricks.java |   17 ++++++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d380579..69a0edf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -77,8 +77,8 @@
   <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 (http://tinyurl.com/getproxymob)</string>
-  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</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>
@@ -275,5 +275,8 @@
     <string name="pref_torrc_summary">EXPERTS ONLY: enter direct torrc config lines</string>
     <string name="pref_torrc_dialog">Custom Torrc</string>
     
-    
+    <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
+  <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string>
+  
+  
 </resources>
diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java
index 2fcf9d2..d10278b 100644
--- a/src/org/torproject/android/wizard/TipsAndTricks.java
+++ b/src/org/torproject/android/wizard/TipsAndTricks.java
@@ -124,7 +124,19 @@ public class TipsAndTricks extends Activity implements TorConstants {
 			}
 		});
         
-        /**
+        btnLink = (Button)findViewById(R.id.WizardRootButtonInstallMartus);
+
+        btnLink.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View view) {
+				
+				String url = getString(R.string.martus_url);
+				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+
+			}
+		});
+        
+        
         btnLink = (Button)findViewById(R.id.WizardRootButtonGooglePlay);
 
         btnLink.setOnClickListener(new OnClickListener() {
@@ -135,8 +147,7 @@ public class TipsAndTricks extends Activity implements TorConstants {
 				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
 
 			}
-		});
-        */
+		});        
         
         
         Button back = ((Button)findViewById(R.id.btnWizard1));