Operation fixes

This commit is contained in:
M66B
2018-08-10 06:24:39 +00:00
parent ec1f2e5a6c
commit 7376362d21
4 changed files with 71 additions and 66 deletions

View File

@@ -563,13 +563,9 @@ public class FragmentCompose extends FragmentEx {
if ("save".equals(action)) {
// Delete previous draft
if (draft.uid == null)
db.message().deleteMessage(draft.id);
else {
draft.ui_hide = true;
db.message().updateMessage(draft);
EntityOperation.queue(db, draft, EntityOperation.DELETE);
}
draft.ui_hide = true;
db.message().updateMessage(draft);
EntityOperation.queue(db, draft, EntityOperation.DELETE);
// Create new draft
draft.id = null;
@@ -597,13 +593,9 @@ public class FragmentCompose extends FragmentEx {
throw new IllegalArgumentException(getContext().getString(R.string.title_to_missing));
// Delete draft (cannot move to outbox)
if (draft.uid == null)
db.message().deleteMessage(draft.id);
else {
draft.ui_hide = true;
db.message().updateMessage(draft);
EntityOperation.queue(db, draft, EntityOperation.DELETE);
}
draft.ui_hide = true;
db.message().updateMessage(draft);
EntityOperation.queue(db, draft, EntityOperation.DELETE);
// Copy message to outbox
draft.id = null;
@@ -615,7 +607,6 @@ public class FragmentCompose extends FragmentEx {
EntityOperation.queue(db, draft, EntityOperation.SEND);
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();