From 9cbc99018e26496139ede25bd91ef766ab04b635 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 11 Mar 2022 08:53:40 +0100 Subject: [PATCH] Oops --- app/src/main/java/eu/faircode/email/DaoMessage.java | 4 ++-- app/src/main/java/eu/faircode/email/MessageHelper.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java index c31b6dd76f..e587225642 100644 --- a/app/src/main/java/eu/faircode/email/DaoMessage.java +++ b/app/src/main/java/eu/faircode/email/DaoMessage.java @@ -425,8 +425,8 @@ public interface DaoMessage { @Query("SELECT thread, msgid, hash, inreplyto FROM message" + " WHERE account = :account" + " AND (msgid IN (:msgids) OR inreplyto IN (:msgids))" + - " AND (:from IS NULL || received > :from)" + - " AND (:to IS NULL || received < :to)") + " AND (:from IS NULL OR received IS NULL OR received > :from)" + + " AND (:to IS NULL OR received IS NULL OR received < :to)") List getThreadInfo(long account, List msgids, Long from, Long to); @Query("SELECT * FROM message" + diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 96a6717ecc..19d38bdad4 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -1489,8 +1489,8 @@ public class MessageHelper { int thread_range = prefs.getInt("thread_range", MessageHelper.DEFAULT_THREAD_RANGE); int range = (int) Math.pow(2, thread_range); - Long start = (received == 0 ? null : received - range * 24 * 3600L); - Long end = (received == 0 ? null : received + range * 24 * 3600L); + Long start = (received == 0 ? null : received - range * 24 * 3600 * 1000L); + Long end = (received == 0 ? null : received + range * 24 * 3600 * 1000L); List infos = (all.size() == 0 ? new ArrayList<>()