From b99d7dd4ebea5b77761cb4f6cb0865cbd9dd1316 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 18 Mar 2019 09:41:46 +0000
Subject: [PATCH] Prevent browsed orphans

---
 app/src/main/java/eu/faircode/email/DaoMessage.java      | 4 ----
 app/src/main/java/eu/faircode/email/EntityOperation.java | 3 +++
 2 files changed, 3 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 6970ec9041..c43265b5a3 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -297,9 +297,6 @@ public interface DaoMessage {
     @Query("UPDATE message SET ui_hide = :ui_hide WHERE id = :id")
     int setMessageUiHide(long id, boolean ui_hide);
 
-    @Query("UPDATE message SET ui_browsed = :ui_browsed WHERE id = :id")
-    int setMessageUiBrowsed(long id, boolean ui_browsed);
-
     @Query("UPDATE message SET ui_ignored = :ui_ignored WHERE id = :id")
     int setMessageUiIgnored(long id, boolean ui_ignored);
 
@@ -363,7 +360,6 @@ public interface DaoMessage {
     @Query("DELETE FROM message" +
             " WHERE folder = :folder" +
             " AND uid IS NULL" +
-            " AND NOT ui_browsed" +
             " AND NOT EXISTS" +
             "  (SELECT * FROM operation" +
             "  WHERE operation.message = message.id" +
diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index d1a94c1146..0d93c75d7f 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -147,6 +147,7 @@ public class EntityOperation {
                     long uid = message.uid;
                     boolean seen = message.seen;
                     boolean ui_seen = message.ui_seen;
+                    boolean ui_browsed = message.ui_browsed;
                     message.id = null;
                     message.account = target.account;
                     message.folder = target.id;
@@ -155,6 +156,7 @@ public class EntityOperation {
                         message.seen = true;
                         message.ui_seen = true;
                     }
+                    message.ui_browsed = false;
                     message.id = db.message().insertMessage(message);
                     File mtarget = message.getFile(context);
                     tmpid = message.id;
@@ -165,6 +167,7 @@ public class EntityOperation {
                     message.uid = uid;
                     message.seen = seen;
                     message.ui_seen = ui_seen;
+                    message.ui_browsed = ui_browsed;
 
                     if (message.content)
                         try {