From 1f454909d367f8444b6d8268d0e6cbc37aaf9026 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 20 Dec 2023 21:02:59 +0100
Subject: [PATCH] Revert "Reset FTS on disabling account"

This reverts commit 0403c81bd56867e07d710689efde73b963868b2a.
---
 app/src/main/java/eu/faircode/email/AdapterAccount.java   | 2 --
 app/src/main/java/eu/faircode/email/CloudSync.java        | 2 --
 app/src/main/java/eu/faircode/email/DaoMessage.java       | 6 ++----
 app/src/main/java/eu/faircode/email/FragmentAccount.java  | 8 ++------
 app/src/main/java/eu/faircode/email/FragmentGmail.java    | 2 --
 app/src/main/java/eu/faircode/email/FragmentOAuth.java    | 2 --
 .../main/java/eu/faircode/email/FragmentOptionsMisc.java  | 2 +-
 app/src/main/java/eu/faircode/email/FragmentPop.java      | 6 ++----
 app/src/main/java/eu/faircode/email/Fts4DbHelper.java     | 4 ++--
 app/src/main/java/eu/faircode/email/Fts5DbHelper.java     | 2 +-
 10 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index 7130188fef..e57888a1a7 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -514,8 +514,6 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                                 }
 
                                 db.account().setAccountSynchronize(id, sync);
-                                if (!sync)
-                                    db.message().resetFts(id);
 
                                 db.setTransactionSuccessful();
                             } finally {
diff --git a/app/src/main/java/eu/faircode/email/CloudSync.java b/app/src/main/java/eu/faircode/email/CloudSync.java
index fc329f7ea4..c0350e71ac 100644
--- a/app/src/main/java/eu/faircode/email/CloudSync.java
+++ b/app/src/main/java/eu/faircode/email/CloudSync.java
@@ -478,8 +478,6 @@ public class CloudSync {
                         }
                         raccount.move_to = laccount.move_to; // TODO
                         db.account().updateAccount(raccount);
-                        if (!raccount.synchronize)
-                            db.message().resetFts(raccount.id);
                     }
 
                     if (raccount.id != null) {
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index ee8c015db8..3456d89e7e 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -946,10 +946,8 @@ public interface DaoMessage {
             " AND account IN (SELECT id FROM account WHERE pop = " + EntityAccount.TYPE_IMAP + ")")
     int clearRawMessages();
 
-    @Query("UPDATE message SET fts = 0" +
-            " WHERE NOT (fts IS 0)" +
-            " AND (:account IS NULL OR message.account = :account)")
-    int resetFts(Long account);
+    @Query("UPDATE message SET fts = 0 WHERE NOT (fts IS 0)")
+    int resetFts();
 
     @Query("DELETE FROM message WHERE id = :id")
     int deleteMessage(long id);
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 2bbabd786f..2531b9dfdb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -1329,11 +1329,9 @@ public class FragmentAccount extends FragmentBase {
                     if (account.primary)
                         db.account().resetPrimary();
 
-                    if (update) {
+                    if (update)
                         db.account().updateAccount(account);
-                        if (!account.synchronize)
-                            db.message().resetFts(account.id);
-                    } else
+                    else
                         account.id = db.account().insertAccount(account);
 
                     args.putLong("account", account.id);
@@ -1455,8 +1453,6 @@ public class FragmentAccount extends FragmentBase {
                     account.swipe_right = (right == null ? null : right.id);
                     account.move_to = (move == null ? null : move.id);
                     db.account().updateAccount(account);
-                    if (!account.synchronize)
-                        db.message().resetFts(account.id);
 
                     db.setTransactionSuccessful();
                 } finally {
diff --git a/app/src/main/java/eu/faircode/email/FragmentGmail.java b/app/src/main/java/eu/faircode/email/FragmentGmail.java
index 3000b4e5c3..18c1f00f27 100644
--- a/app/src/main/java/eu/faircode/email/FragmentGmail.java
+++ b/app/src/main/java/eu/faircode/email/FragmentGmail.java
@@ -571,8 +571,6 @@ public class FragmentGmail extends FragmentBase {
                             FragmentDialogSwipes.setDefaultFolderActions(context, account);
 
                         db.account().updateAccount(account);
-                        if (!account.synchronize)
-                            db.message().resetFts(account.id);
 
                         if (TextUtils.isEmpty(name))
                             name = user.split("@")[0];
diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
index 6d1bc56f23..add6530c1e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
@@ -995,8 +995,6 @@ public class FragmentOAuth extends FragmentBase {
                             FragmentDialogSwipes.setDefaultFolderActions(context, account);
 
                         db.account().updateAccount(account);
-                        if (!account.synchronize)
-                            db.message().resetFts(account.id);
 
                         // Create identities
                         if (!inbound_only)
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index 259823a832..7140bffee2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -588,7 +588,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
                             }
 
                             DB db = DB.getInstance(context);
-                            db.message().resetFts(null);
+                            db.message().resetFts();
 
                             return null;
                         }
diff --git a/app/src/main/java/eu/faircode/email/FragmentPop.java b/app/src/main/java/eu/faircode/email/FragmentPop.java
index d58dbc3b43..dcafc8e8ce 100644
--- a/app/src/main/java/eu/faircode/email/FragmentPop.java
+++ b/app/src/main/java/eu/faircode/email/FragmentPop.java
@@ -670,11 +670,9 @@ public class FragmentPop extends FragmentBase {
                     if (account.primary)
                         db.account().resetPrimary();
 
-                    if (update) {
+                    if (update)
                         db.account().updateAccount(account);
-                        if (!account.synchronize)
-                            db.message().resetFts(account.id);
-                    } else
+                    else
                         account.id = db.account().insertAccount(account);
 
                     args.putLong("account", account.id);
diff --git a/app/src/main/java/eu/faircode/email/Fts4DbHelper.java b/app/src/main/java/eu/faircode/email/Fts4DbHelper.java
index be56cd2335..4d1f625bb4 100644
--- a/app/src/main/java/eu/faircode/email/Fts4DbHelper.java
+++ b/app/src/main/java/eu/faircode/email/Fts4DbHelper.java
@@ -57,7 +57,7 @@ public class Fts4DbHelper extends SQLiteOpenHelper {
         boolean has = context.getDatabasePath(DATABASE_NAME).exists();
         if (instance == null || !has) {
             if (!has)
-                DB.getInstance(context).message().resetFts(null);
+                DB.getInstance(context).message().resetFts();
             instance = new Fts4DbHelper(context);
         }
         return instance.getWritableDatabase();
@@ -96,7 +96,7 @@ public class Fts4DbHelper extends SQLiteOpenHelper {
 
         onCreate(db);
 
-        DB.getInstance(context).message().resetFts(null);
+        DB.getInstance(context).message().resetFts();
     }
 
     static void insert(SQLiteDatabase db, EntityMessage message, List<EntityAttachment> attachments, String text) {
diff --git a/app/src/main/java/eu/faircode/email/Fts5DbHelper.java b/app/src/main/java/eu/faircode/email/Fts5DbHelper.java
index 4167f0f08a..5a72989fe0 100644
--- a/app/src/main/java/eu/faircode/email/Fts5DbHelper.java
+++ b/app/src/main/java/eu/faircode/email/Fts5DbHelper.java
@@ -85,7 +85,7 @@ public class Fts5DbHelper extends SQLiteOpenHelper {
 
         onCreate(db);
 
-        DB.getInstance(context).message().resetFts(null);
+        DB.getInstance(context).message().resetFts();
     }
 
     static void insert(SQLiteDatabase db, EntityMessage message, String text) {