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

fixed primary activity bugs with displaying help resources 

svn:r22300
This commit is contained in:
Nathan Freitas 2010-05-08 04:54:52 +00:00
parent 33bd25a33d
commit 087495ff48
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Orbot/src/org/torproject/android/Orbot.java
View File

@ -427,21 +427,21 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
View view = li.inflate(R.layout.layout_help, null); View view = li.inflate(R.layout.layout_help, null);
StringBuilder msg = new StringBuilder(); StringBuilder msg = new StringBuilder();
msg.append(R.string.help_text_1); msg.append(getString(R.string.help_text_1));
msg.append("\n\n"); msg.append("\n\n");
msg.append(R.string.help_text_2); msg.append(getString(R.string.help_text_2));
msg.append("\n\n"); msg.append("\n\n");
msg.append(R.string.help_text_3); msg.append(getString(R.string.help_text_3));
msg.append("\n\n"); msg.append("\n\n");
msg.append(R.string.help_text_4); msg.append(getString(R.string.help_text_4));
msg.append("\n\n"); msg.append("\n\n");
msg.append(R.string.help_text_5); msg.append(getString(R.string.help_text_5));
msg.append("\n\n"); msg.append("\n\n");
new AlertDialog.Builder(this) new AlertDialog.Builder(this)
.setTitle(getString(R.string.menu_info)) .setTitle(getString(R.string.menu_info))
.setMessage(msg) .setMessage(msg.toString())
.setView(view) .setView(view)
.setNeutralButton(getString(R.string.button_about), new DialogInterface.OnClickListener() { .setNeutralButton(getString(R.string.button_about), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) { public void onClick(DialogInterface dialog, int whichButton) {
@ -536,7 +536,7 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
if (bridgeList == null || bridgeList.length() == 0) if (bridgeList == null || bridgeList.length() == 0)
{ {
showAlert("In order to use the bridge feature, you must enter at least one bridge IP address." + showAlert("Bridge Error","In order to use the bridge feature, you must enter at least one bridge IP address." +
"Send an email to bridges@torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account."); "Send an email to bridges@torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.");
showSettings(); showSettings();
@ -591,7 +591,7 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
} }
catch (Exception e) catch (Exception e)
{ {
showAlert("Your ReachableAddresses settings caused an exception!"); showAlert("Config Error","Your ReachableAddresses settings caused an exception!");
} }
try try
@ -615,7 +615,7 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
} }
catch (Exception e) catch (Exception e)
{ {
showAlert("Your relay settings caused an exception!"); showAlert("Uh-oh!","Your relay settings caused an exception!");
showSettings(); showSettings();
return; return;
} }
@ -623,14 +623,14 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
Utils.saveTextFile(TorServiceConstants.TORRC_INSTALL_PATH, torrcText.toString()); Utils.saveTextFile(TorServiceConstants.TORRC_INSTALL_PATH, torrcText.toString());
} }
private void showAlert(String msg) private void showAlert(String title, String msg)
{ {
AlertDialog.Builder builder = new AlertDialog.Builder(this); new AlertDialog.Builder(this)
builder.setMessage(msg); .setTitle(title)
.setMessage(msg)
AlertDialog alert = builder.create(); .setPositiveButton(android.R.string.ok, null)
.show();
} }
/* /*
* Set the state of the running/not running graphic and label * Set the state of the running/not running graphic and label
@ -662,7 +662,7 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
if (!enableTransparentProxy) if (!enableTransparentProxy)
{ {
showAlert(getString(R.string.not_anonymous_yet)); showAlert("Configure",getString(R.string.not_anonymous_yet));
} }
} }