修正选择发送方式会被下个 Activity 掩盖错误。

This commit is contained in:
seven332 committed 2014-03-23 16:48:28 +08:00
1 parent 6137e851cd
commit 22e042d11d
9 files changed
+207 -187

No files matched your search

+41 -29
View File
@@ -42,7 +42,7 @@ public class StartActivity extends Activity {
((AlertButton)v).dialog.dismiss();
Config.allowed();
check(CHECK_CRESH);
check(CHECK_NETWORK);
}
}).setNegativeButton(R.string.dailog_waring_no,
new View.OnClickListener() {
@@ -54,6 +54,28 @@ public class StartActivity extends Activity {
}).create();
}
private AlertDialog createNetworkErrorDialog() {
return new DialogBuilder(this).setCancelable(false)
.setTitle(R.string.error).setMessage(R.string.em_no_network)
.setPositiveButton(R.string.dailog_network_error_yes,
new View.OnClickListener() {
@Override
public void onClick(View v) {
((AlertButton)v).dialog.dismiss();
check(CHECK_CRESH);
}
})
.setNegativeButton(R.string.dailog_network_error_no,
new View.OnClickListener() {
@Override
public void onClick(View v) {
((AlertButton)v).dialog.dismiss();
finish();
}
}).create();
}
private AlertDialog createSendCrashDialog() {
return new DialogBuilder(this).setCancelable(false)
.setTitle(R.string.dialog_send_crash_title)
@@ -62,14 +84,25 @@ public class StartActivity extends Activity {
@Override
public void onClick(View v) {
((AlertButton)v).dialog.dismiss();
new DialogBuilder(StartActivity.this).setCancelable(false)
.setTitle(R.string.wait)
.setMessage(R.string.dialog_wait_send_crash_msg)
.setPositiveButton(android.R.string.ok,
new View.OnClickListener() {
@Override
public void onClick(View v) {
((AlertButton)v).dialog.dismiss();
checkOver();
}
}).show();
Intent i = new Intent(Intent.ACTION_SENDTO);
i.setData(Uri.parse("mailto:ehviewersu@gmail.com"));
i.putExtra(Intent.EXTRA_SUBJECT, "I found a bug in EhViewer !");
i.putExtra(Intent.EXTRA_TEXT, lastCrash);
startActivity(i);
lastCrash = null;
check(CHECK_NETWORK);
}
}).setNegativeButton(R.string.dialog_send_crash_no, new View.OnClickListener() {
@@ -78,29 +111,8 @@ public class StartActivity extends Activity {
((AlertButton)v).dialog.dismiss();
lastCrash = null;
check(CHECK_NETWORK);
}
}).create();
}
private AlertDialog createNetworkErrorDialog() {
return new DialogBuilder(this).setCancelable(false)
.setTitle(R.string.error).setMessage(R.string.em_no_network)
.setPositiveButton(R.string.dailog_network_error_yes,
new View.OnClickListener() {
@Override
public void onClick(View v) {
((AlertButton)v).dialog.dismiss();
checkOver();
}
})
.setNegativeButton(R.string.dailog_network_error_no,
new View.OnClickListener() {
@Override
public void onClick(View v) {
((AlertButton)v).dialog.dismiss();
finish();
}
}).create();
}
@@ -138,16 +150,16 @@ public class StartActivity extends Activity {
createWarningDialog().show();
return;
}
case CHECK_CRESH:
if ((lastCrash = Crash.getLastCrash()) != null) {
createSendCrashDialog().show();
return;
}
case CHECK_NETWORK:
if (!isNetworkAvailable()) {
createNetworkErrorDialog().show();
return;
}
case CHECK_CRESH:
if ((lastCrash = Crash.getLastCrash()) != null) {
createSendCrashDialog().show();
return;
}
}
checkOver();
}