mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-25 17:27:00 +00:00
Code Issues Releases Wiki Activity

Fixed saving drafts with selected identity

Browse source
This commit is contained in:
M66B 2018-08-28 16:51:22 +00:00
parent d97261796a
commit 2b5dd74721
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/DaoIdentity.java
View file

@ -48,6 +48,9 @@ public interface DaoIdentity {
@Query("SELECT * FROM identity WHERE id = :id")
LiveData<EntityIdentity> liveIdentity(long id);
@Query("SELECT * FROM identity WHERE account = :account AND `primary`")
EntityIdentity getPrimaryIdentity(long account);
@Insert
long insertIdentity(EntityIdentity identity);

4
app/src/main/java/eu/faircode/email/FragmentCompose.java
View file

@ -1054,7 +1054,9 @@ public class FragmentCompose extends FragmentEx {
EntityOperation.queue(db, draft, EntityOperation.MOVE, trash.id);
} else if (action == R.id.action_save) {
if (ato == null && acc == null && abcc == null &&
EntityIdentity primary = db.identity().getPrimaryIdentity(draft.account);
if ((primary == null || draft.identity == primary.id) &&
ato == null && acc == null && abcc == null &&
TextUtils.isEmpty(subject) &&
TextUtils.isEmpty(body) &&
db.attachment().getAttachmentCount(draft.id) == 0)