mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed debug/crash info

This commit is contained in:
M66B 2018-08-13 06:00:59 +00:00
parent 1e17cb5124
commit 4050350a0e
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@ -202,15 +202,18 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
file.delete();
EntityMessage draft = null;
DB db = DB.getInstance(context);
try {
db.beginTransaction();
EntityFolder drafts = db.folder().getPrimaryDrafts();
if (drafts != null) {
EntityMessage draft = new EntityMessage();
draft = new EntityMessage();
draft.account = drafts.account;
draft.folder = drafts.id;
draft.msgid = draft.generateMessageId();
draft.to = new Address[]{to};
draft.subject = context.getString(R.string.app_name) + " crash log";
draft.body = "<pre>" + sb.toString().replaceAll("\\r?\\n", "<br />") + "</pre>";
@ -219,14 +222,18 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
draft.ui_seen = false;
draft.ui_hide = false;
draft.id = db.message().insertMessage(draft);
return draft.id;
}
EntityOperation.queue(db, draft, EntityOperation.ADD);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
EntityOperation.process(context);
return (draft == null ? null : draft.id);
}
return null;

13
app/src/main/java/eu/faircode/email/FragmentAbout.java
View File

@ -63,6 +63,8 @@ public class FragmentAbout extends FragmentEx {
Address to = new InternetAddress("marcel+email@faircode.eu", "FairCode");
EntityMessage draft;
DB db = DB.getInstance(context);
try {
db.beginTransaction();
@ -71,9 +73,10 @@ public class FragmentAbout extends FragmentEx {
if (drafts == null)
throw new IllegalArgumentException(context.getString(R.string.title_no_drafts));
EntityMessage draft = new EntityMessage();
draft = new EntityMessage();
draft.account = drafts.account;
draft.folder = drafts.id;
draft.msgid = draft.generateMessageId();
draft.to = new Address[]{to};
draft.subject = BuildConfig.APPLICATION_ID + " debug info";
draft.body = "<pre>" + info.toString().replaceAll("\\r?\\n", "<br />") + "</pre>";
@ -83,12 +86,16 @@ public class FragmentAbout extends FragmentEx {
draft.ui_hide = false;
draft.id = db.message().insertMessage(draft);
db.setTransactionSuccessful();
EntityOperation.queue(db, draft, EntityOperation.ADD);
return draft.id;
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
EntityOperation.process(context);
return draft.id;
}
@Override

1
app/src/main/java/eu/faircode/email/FragmentMessage.java
View File

@ -468,7 +468,6 @@ public class FragmentMessage extends FragmentEx {
EntityOperation.queue(db, draft, EntityOperation.ADD);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}