Merge branch 'master' of github.com:n8fr8/orbot

This commit is contained in:
Nathan Freitas 2014-05-30 10:37:14 -04:00
commit 25f6499f6b
4 changed files with 24 additions and 1 deletions

BIN
res/drawable/icon_story_maker.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -81,6 +81,15 @@
android:drawableLeft="@drawable/ic_twitter" android:drawableLeft="@drawable/ic_twitter"
android:text="@string/wizard_tips_twitter" /> android:text="@string/wizard_tips_twitter" />
<Button
android:id="@+id/WizardRootButtonInstallStoryMaker"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_marginTop="10px"
android:drawableLeft="@drawable/icon_story_maker"
android:text="@string/wizard_tips_story_maker" />
<!-- <!--
<Button <Button
android:id="@+id/WizardRootButtonGooglePlay" android:id="@+id/WizardRootButtonGooglePlay"

View File

@ -80,6 +80,8 @@
<string name="wizard_tips_firefox">Proxy Mobile add-on for Firefox (http://tinyurl.com/getproxymob)</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="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</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="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string>
<string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</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_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\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.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </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\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.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string>

View File

@ -127,6 +127,18 @@ public class TipsAndTricks extends Activity implements TorConstants {
} }
}); });
btnLink = (Button)findViewById(R.id.WizardRootButtonInstallStoryMaker);
btnLink.setOnClickListener(new OnClickListener() {
public void onClick(View view) {
String url = getString(R.string.story_maker_url);
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
}
});
/** /**
btnLink = (Button)findViewById(R.id.WizardRootButtonGooglePlay); btnLink = (Button)findViewById(R.id.WizardRootButtonGooglePlay);