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

tune first-time experience (No more wizard!)

This commit is contained in:
Nathan Freitas 2015-04-03 13:01:29 -04:00
parent b318e6bb69
commit 6fd6a5a859
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@ -88,7 +88,7 @@
<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>
<string name="wizard_final">Orbot is ready!</string> <string name="wizard_final">Orbot is ready!</string>
<string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens&#8230; and now you are ready to, as well!</string> <string name="wizard_final_msg">Millions of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens&#8230; and now you are ready to, as well!</string>
<string name="wizard_exit_at_first_screen_toast">Please configure Orbot before you can start using it!</string> <string name="wizard_exit_at_first_screen_toast">Please configure Orbot before you can start using it!</string>
<!--END Welcome Wizard strings (DJH)--> <!--END Welcome Wizard strings (DJH)-->
<string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@guardianproject.info to learn more.</string> <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@guardianproject.info to learn more.</string>

13
src/org/torproject/android/OrbotMainActivity.java
View File

@ -626,7 +626,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
showWizard = mPrefs.getBoolean("show_wizard",showWizard); showWizard = mPrefs.getBoolean("show_wizard",showWizard);
//let's not show the wizard now for new users //let's not show the wizard now for new users
/**
if (showWizard) if (showWizard)
{ {
Editor pEdit = mPrefs.edit(); Editor pEdit = mPrefs.edit();
@ -634,16 +634,18 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
pEdit.commit(); pEdit.commit();
showWizard = false; showWizard = false;
startActivity(new Intent(this, ChooseLocaleWizardActivity.class));
}**/ showAlert(getString(R.string.app_name),getString(R.string.wizard_final_msg),true);
} }
setIntent(null); }
updateStatus(""); updateStatus("");
setIntent(null);
} }
private void setNewBridges (String newBridgeValue) private void setNewBridges (String newBridgeValue)
@ -1242,8 +1244,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
else if (torStatus == TorServiceConstants.STATUS_OFF) else if (torStatus == TorServiceConstants.STATUS_OFF)
{ {
imgStatus.setImageResource(R.drawable.toroff); imgStatus.setImageResource(R.drawable.toroff);
lblStatus.setText(""); lblStatus.setText(getString(R.string.press_to_start));
//lblStatus.setText(getString(R.string.status_disabled) + "\n" + getString(R.string.press_to_start));
mBtnBrowser.setEnabled(false); mBtnBrowser.setEnabled(false);
if (mItemOnOff != null) if (mItemOnOff != null)