From 5c7363f843b6bace7670254b0ac8161274217990 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 9 Jan 2020 20:11:43 +0100
Subject: [PATCH] Mark single messages found

---
 .../faircode/email/BoundaryCallbackMessages.java   | 14 ++------------
 .../main/java/eu/faircode/email/DaoMessage.java    |  5 -----
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 954572932b..75f2c4ecb5 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -164,9 +164,6 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
     private int load_device(State state) {
         DB db = DB.getInstance(context);
 
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        boolean threading = prefs.getBoolean("threading", true);
-
         Boolean seen = null;
         Boolean flagged = null;
         Boolean snoozed = null;
@@ -237,10 +234,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
 
                     if (match.matched != null && match.matched) {
                         found++;
-                        if (threading)
-                            db.message().setMessageFound(match.account, match.thread);
-                        else
-                            db.message().setMessageFound(match.id);
+                        db.message().setMessageFound(match.id);
                     }
                 }
             }
@@ -261,7 +255,6 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         DB db = DB.getInstance(context);
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        final boolean threading = prefs.getBoolean("threading", true);
         final boolean search_text = prefs.getBoolean("search_text", true);
         final boolean debug = (prefs.getBoolean("debug", false) || BuildConfig.BETA_RELEASE);
 
@@ -495,10 +488,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                             found++;
                         }
                         if (message != null && query != null)
-                            if (threading)
-                                db.message().setMessageFound(message.account, message.thread);
-                            else
-                                db.message().setMessageFound(message.id);
+                            db.message().setMessageFound(message.id);
                     } catch (MessageRemovedException ex) {
                         Log.w(browsable.name + " boundary server", ex);
                     } catch (FolderClosedException ex) {
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index f1ba1ec9d2..5f20da0540 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -516,11 +516,6 @@ public interface DaoMessage {
     @Query("UPDATE message SET ui_found = 1 WHERE id = :id")
     int setMessageFound(long id);
 
-    @Query("UPDATE message SET ui_found = 1" +
-            " WHERE account = :account" +
-            " AND thread = :thread")
-    int setMessageFound(long account, String thread);
-
     @Query("UPDATE message SET ui_found = 0")
     int resetSearch();