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

Workaround crash

This commit is contained in:
M66B 2018-09-26 12:53:04 +00:00
parent 359a65d818
commit 002ff209f0
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/DaoMessage.java
View File

@ -192,7 +192,7 @@ public interface DaoMessage {
long insertMessage(EntityMessage message);
@Update
void updateMessage(EntityMessage message);
int updateMessage(EntityMessage message);
@Query("UPDATE message SET uid = :uid WHERE id = :id")
int setMessageUid(long id, Long uid);

12
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -1181,11 +1181,15 @@ public class FragmentCompose extends FragmentEx {
draft.write(context, body);
// Check data
if (draft.identity == null)
if (draft.identity == null) {
db.setTransactionSuccessful();
throw new IllegalArgumentException(context.getString(R.string.title_from_missing));
}
if (draft.to == null && draft.cc == null && draft.bcc == null)
if (draft.to == null && draft.cc == null && draft.bcc == null) {
db.setTransactionSuccessful();
throw new IllegalArgumentException(context.getString(R.string.title_to_missing));
}
// Save message ID
String msgid = draft.msgid;
@ -1193,8 +1197,10 @@ public class FragmentCompose extends FragmentEx {
// Save attachments
List<EntityAttachment> attachments = db.attachment().getAttachments(draft.id);
for (EntityAttachment attachment : attachments)
if (!attachment.available)
if (!attachment.available) {
db.setTransactionSuccessful();
throw new IllegalArgumentException(context.getString(R.string.title_attachments_missing));
}
// Delete draft (cannot move to outbox)
draft.msgid = null;