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

Prevent duplicate attachment sequence numbers

This commit is contained in:
M66B 2018-10-29 07:51:02 +00:00
parent ebf953c291
commit e9b91c049a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/DaoAttachment.java
View File

@ -34,10 +34,10 @@ public interface DaoAttachment {
" ORDER BY sequence")
LiveData<List<EntityAttachment>> liveAttachments(long message);
@Query("SELECT COUNT(id)" +
@Query("SELECT ifnull(MAX(sequence), 0)" +
" FROM attachment" +
" WHERE message = :message")
int getAttachmentCount(long message);
int getAttachmentSequence(long message);
@Query("SELECT COUNT(id)" +
" FROM attachment" +

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

@ -578,7 +578,7 @@ public class FragmentCompose extends FragmentEx {
try {
db.beginTransaction();
int seq = db.attachment().getAttachmentCount(id);
int seq = db.attachment().getAttachmentSequence(id);
attachment1.message = id;
attachment1.sequence = seq + 1;
@ -868,7 +868,7 @@ public class FragmentCompose extends FragmentEx {
Log.i(Helper.TAG, "Attaching to id=" + id);
attachment.message = draft.id;
attachment.sequence = db.attachment().getAttachmentCount(draft.id) + 1;
attachment.sequence = db.attachment().getAttachmentSequence(draft.id) + 1;
attachment.name = name;
String extension = Helper.getExtension(attachment.name);