Keep flagged POP3 messages on device

app/src/main/java/eu/faircode/email/Core.java

@@ -3019,10 +3019,11 @@ class Core {
                                 known.remove(uidl);
                         }
 
-                        for (TupleUidl uidl : known.values()) {
+                        for (TupleUidl uidl : known.values())
-                            EntityLog.log(context, account.name + " POP purging uidl=" + uidl.uidl);
+                            if (!uidl.ui_flagged) {
-                            db.message().deleteMessage(uidl.id);
+                                EntityLog.log(context, account.name + " POP purging uidl=" + uidl.uidl);
-                        }
+                                db.message().deleteMessage(uidl.id);
+                            }
                     } else {
                         Map<String, TupleUidl> known = new HashMap<>();
                         for (TupleUidl id : ids)
@@ -3037,10 +3038,11 @@ class Core {
                                 known.remove(msgid);
                         }
 
-                        for (TupleUidl uidl : known.values()) {
+                        for (TupleUidl uidl : known.values())
-                            EntityLog.log(context, account.name + " POP purging msgid=" + uidl.msgid);
+                            if (!uidl.ui_flagged) {
-                            db.message().deleteMessage(uidl.id);
+                                EntityLog.log(context, account.name + " POP purging msgid=" + uidl.msgid);
-                        }
+                                db.message().deleteMessage(uidl.id);
+                            }
                     }
                 }
 

app/src/main/java/eu/faircode/email/DaoMessage.java

@@ -651,7 +651,7 @@ public interface DaoMessage {
             " AND NOT uid IS NULL")
     List<Long> getBusyUids(long folder, long time);
 
-    @Query("SELECT id, uidl, msgid, thread, ui_hide, ui_busy FROM message" +
+    @Query("SELECT id, uidl, msgid, ui_hide, ui_busy, ui_flagged FROM message" +
             " WHERE folder = :folder")
     List<TupleUidl> getUidls(long folder);
 

app/src/main/java/eu/faircode/email/TupleUidl.java

@@ -23,7 +23,7 @@ public class TupleUidl {
     long id;
     String uidl;
     String msgid;
-    String thread;
     boolean ui_hide;
     Long ui_busy;
+    boolean ui_flagged;
 }