Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 21:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 725380 - CrashReporter can call doFinish twice r=kats

Browse Source
This commit is contained in:
Mark Finkle 2012-02-08 15:32:40 -05:00
parent d4955c75c9
commit 1b15734142
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
embedding/android/CrashReporter.java.in
View File

@ -101,7 +101,12 @@ public class CrashReporter extends Activity
@Override @Override
public void finish() public void finish()
{ {
mProgressDialog.dismiss(); try {
if (mProgressDialog.isShowing()) {
mProgressDialog.dismiss();
}
} catch (Exception e) {
}
super.finish(); super.finish();
} }
@ -230,8 +235,10 @@ public class CrashReporter extends Activity
final CheckBox includeURLCheckbox = (CheckBox) findViewById(R.id.include_url); final CheckBox includeURLCheckbox = (CheckBox) findViewById(R.id.include_url);
String spec = extras.get("ServerURL"); String spec = extras.get("ServerURL");
if (spec == null) if (spec == null) {
doFinish(); doFinish();
return;
}
Log.i("GeckoCrashReport", "server url: " + spec); Log.i("GeckoCrashReport", "server url: " + spec);
try { try {

4
mobile/android/base/CrashReporter.java.in
View File

@ -241,8 +241,10 @@ public class CrashReporter extends Activity
final CheckBox includeURLCheckbox = (CheckBox) findViewById(R.id.include_url); final CheckBox includeURLCheckbox = (CheckBox) findViewById(R.id.include_url);
String spec = extras.get(SERVER_URL_KEY); String spec = extras.get(SERVER_URL_KEY);
if (spec == null) if (spec == null) {
doFinish(); doFinish();
return;
}
Log.i(LOGTAG, "server url: " + spec); Log.i(LOGTAG, "server url: " + spec);
try { try {