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

Move single messages in single message mode

This commit is contained in:
M66B 2018-11-29 17:18:37 +01:00
parent 3bf1f2b2e5
commit 5e6692f972
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,8 +163,9 @@ public interface DaoMessage {
" FROM message" + " FROM message" +
" WHERE account = :account" + " WHERE account = :account" +
" AND thread = :thread" + " AND thread = :thread" +
" AND (:id IS NULL OR message.id = :id)" +
" AND ui_found = :found") " AND ui_found = :found")
List<EntityMessage> getMessageByThread(long account, String thread, boolean found); List<EntityMessage> getMessageByThread(long account, String thread, Long id, boolean found);
@Query("SELECT message.* FROM message" + @Query("SELECT message.* FROM message" +
" JOIN folder ON folder.id = message.folder" + " JOIN folder ON folder.id = message.folder" +

6
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -486,7 +486,7 @@ public class FragmentMessages extends FragmentEx {
if (thread) { if (thread) {
List<EntityMessage> messages = db.message().getMessageByThread( List<EntityMessage> messages = db.message().getMessageByThread(
message.account, message.thread, message.ui_found); message.account, message.thread, threading ? null : id, message.ui_found);
for (EntityMessage threaded : messages) { for (EntityMessage threaded : messages) {
if (!threaded.ui_hide && threaded.folder.equals(message.folder)) if (!threaded.ui_hide && threaded.folder.equals(message.folder))
result.ids.add(threaded.id); result.ids.add(threaded.id);
@ -751,7 +751,7 @@ public class FragmentMessages extends FragmentEx {
for (long id : ids) { for (long id : ids) {
EntityMessage message = db.message().getMessage(id); EntityMessage message = db.message().getMessage(id);
List<EntityMessage> messages = db.message().getMessageByThread( List<EntityMessage> messages = db.message().getMessageByThread(
message.account, message.thread, message.ui_found); message.account, message.thread, threading ? null : id, message.ui_found);
for (EntityMessage threaded : messages) for (EntityMessage threaded : messages)
if (threaded.folder.equals(message.folder)) { if (threaded.folder.equals(message.folder)) {
result.ids.add(threaded.id); result.ids.add(threaded.id);
@ -1469,7 +1469,7 @@ public class FragmentMessages extends FragmentEx {
result.target = db.folder().getFolderByType(account, folderType); result.target = db.folder().getFolderByType(account, folderType);
List<EntityMessage> messages = db.message().getMessageByThread(account, thread, found); List<EntityMessage> messages = db.message().getMessageByThread(account, thread, threading ? null : id, found);
for (EntityMessage message : messages) for (EntityMessage message : messages)
if (message.uid != null && !result.target.id.equals(message.folder)) { if (message.uid != null && !result.target.id.equals(message.folder)) {
result.ids.add(message.id); result.ids.add(message.id);