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

fixes issue with progress dialog display and crashes

This commit is contained in:
Nathan Freitas 2012-01-15 10:43:13 -05:00
parent edcaeee231
commit 675afee9d2
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -514,7 +514,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants
if (button) if (button)
{ {
aDialog = new AlertDialog.Builder(this) aDialog = new AlertDialog.Builder(Orbot.this)
.setIcon(R.drawable.icon) .setIcon(R.drawable.icon)
.setTitle(title) .setTitle(title)
.setMessage(msg) .setMessage(msg)
@ -523,7 +523,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants
} }
else else
{ {
aDialog = new AlertDialog.Builder(this) aDialog = new AlertDialog.Builder(Orbot.this)
.setIcon(R.drawable.icon) .setIcon(R.drawable.icon)
.setTitle(title) .setTitle(title)
.setMessage(msg) .setMessage(msg)
@ -634,18 +634,16 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants
// not sure it really makes sense when what we want to say is just "startTor" // not sure it really makes sense when what we want to say is just "startTor"
mService.setProfile(TorServiceConstants.PROFILE_ON); //this means turn on mService.setProfile(TorServiceConstants.PROFILE_ON); //this means turn on
//here we update the UI which is a bit sloppy and mixed up code wise //here we update the UI which is a bit sloppy and mixed up code wise
//might be best to just call updateStatus() instead of directly manipulating UI in this method - yep makes sense //might be best to just call updateStatus() instead of directly manipulating UI in this method - yep makes sense
imgStatus.setImageResource(R.drawable.torstarting); imgStatus.setImageResource(R.drawable.torstarting);
lblStatus.setText(getString(R.string.status_starting_up)); lblStatus.setText(getString(R.string.status_starting_up));
//we send a message here to the progressDialog i believe, but we can clarify that shortly //we send a message here to the progressDialog i believe, but we can clarify that shortly
Message msg = mHandler.obtainMessage(TorServiceConstants.ENABLE_TOR_MSG); Message msg = mHandler.obtainMessage(TorServiceConstants.ENABLE_TOR_MSG);
msg.getData().putString(HANDLER_TOR_MSG, getString(R.string.status_starting_up));
mHandler.sendMessage(msg); mHandler.sendMessage(msg);
} }
//now we stop Tor! amazing! //now we stop Tor! amazing!
@ -883,11 +881,14 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants
private void createProgressDialog (String msg) private void createProgressDialog (String msg)
{ {
if (progressDialog != null && progressDialog.isShowing()) if (progressDialog != null && progressDialog.isShowing())
return; {
progressDialog.setMessage(msg);
progressDialog = ProgressDialog.show(Orbot.this, "", msg); }
else
{
progressDialog = ProgressDialog.show(Orbot.this, "", msg);
progressDialog.setCancelable(true); progressDialog.setCancelable(true);
}
} }
private void hideProgressDialog () private void hideProgressDialog ()
@ -896,7 +897,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants
if (progressDialog != null && progressDialog.isShowing()) if (progressDialog != null && progressDialog.isShowing())
{ {
progressDialog.dismiss(); progressDialog.dismiss();
progressDialog = null;
} }