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

Widget: fixed showing unified account messages (QA)

This commit is contained in:
M66B 2020-01-24 15:32:35 +01:00
parent aed65976ca
commit 2ba5a88cea
2 changed files with 6 additions and 8 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

@ -384,6 +384,7 @@ public interface DaoMessage {
" JOIN account_view AS account ON account.id = message.account" + " JOIN account_view AS account ON account.id = message.account" +
" JOIN folder_view AS folder ON folder.id = message.folder" + " JOIN folder_view AS folder ON folder.id = message.folder" +
" WHERE account.`synchronize`" + " WHERE account.`synchronize`" +
" AND (:account IS NULL OR account.id = :account)" +
" AND ((:folder IS NULL AND folder.unified) OR folder.id = :folder)" + " AND ((:folder IS NULL AND folder.unified) OR folder.id = :folder)" +
" AND NOT message.ui_hide" + " AND NOT message.ui_hide" +
" AND message.ui_snoozed IS NULL" + " AND message.ui_snoozed IS NULL" +
@ -393,7 +394,7 @@ public interface DaoMessage {
", CASE WHEN message.thread IS NULL OR NOT :threading THEN message.id ELSE message.thread END" + ", CASE WHEN message.thread IS NULL OR NOT :threading THEN message.id ELSE message.thread END" +
" ORDER BY message.received DESC") " ORDER BY message.received DESC")
@SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
List<TupleMessageWidget> getWidgetUnified(Long folder, boolean threading, boolean unseen, boolean flagged); List<TupleMessageWidget> getWidgetUnified(Long account, Long folder, boolean threading, boolean unseen, boolean flagged);
@Query("SELECT uid FROM message" + @Query("SELECT uid FROM message" +
" WHERE folder = :folder" + " WHERE folder = :folder" +

11
app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java
View File

@ -84,13 +84,10 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot
try { try {
db.beginTransaction(); db.beginTransaction();
if (folder < 0 && account > 0) { messages = db.message().getWidgetUnified(
EntityFolder inbox = db.folder().getFolderByType(account, EntityFolder.INBOX); account < 0 ? null : account,
if (inbox != null) folder < 0 ? null : folder,
folder = inbox.id; threading, unseen, flagged);
}
messages = db.message().getWidgetUnified(folder < 0 ? null : folder, threading, unseen, flagged);
db.setTransactionSuccessful(); db.setTransactionSuccessful();
} finally { } finally {