Karl/BobStore
1
0
複製 0
程式碼 問題管理 合併請求 Actions Packages Projects 版本發佈 Wiki Activity

Merge branch 'simplify-crash-activity' into 'master'

瀏覽代碼 
Fix crash report activity theme and behavior

Use proper theme, fix crash on sending and comment loss on device rotation.

See merge request !191
This commit is contained in:
Peter Serwylo 2016-01-08 02:44:31 +00:00
當前提交 9aca7da375
共有 2 個文件被更改，包括 16 次插入 和 4 次删除
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
F-Droid/AndroidManifest.xml
查看文件

@ -378,7 +378,7 @@
</activity>
<activity
android:name="org.fdroid.fdroid.CrashReportActivity"
android:theme="@style/AlertDialogThemeDark"
android:theme="@style/AppThemeDark"
android:process=":error_report"
android:launchMode="singleInstance"
android:excludeFromRecents="true"

18
F-Droid/src/org/fdroid/fdroid/CrashReportActivity.java
查看文件

@ -9,6 +9,9 @@ import org.acra.BaseCrashReportDialog;
public class CrashReportActivity extends BaseCrashReportDialog implements DialogInterface.OnDismissListener, DialogInterface.OnClickListener {
private static final String STATE_COMMENT = "comment";
private EditText comment;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -23,6 +26,11 @@ public class CrashReportActivity extends BaseCrashReportDialog implements Dialog
dialog.setCanceledOnTouchOutside(false);
dialog.setOnDismissListener(this);
dialog.show();
comment = (EditText) dialog.findViewById(android.R.id.input);
if (savedInstanceState != null) {
comment.setText(savedInstanceState.getString(STATE_COMMENT));
}
}
@Override
@ -33,12 +41,16 @@ public class CrashReportActivity extends BaseCrashReportDialog implements Dialog
@Override
public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_POSITIVE) {
final String comment = ((EditText) findViewById(android.R.id.input)).getText().toString();
sendCrash(comment, "");
sendCrash(comment.getText().toString(), "");
} else {
cancelReports();
}
finish();
}
}
@Override
protected void onSaveInstanceState(Bundle outState) {
outState.putString(STATE_COMMENT, comment.getText().toString());
super.onSaveInstanceState(outState);
}
}