Revert "Reset FTS on disabling account"

This reverts commit 0403c81bd5.

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 {

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) {

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" +
+    @Query("UPDATE message SET fts = 0 WHERE NOT (fts IS 0)")
-            " WHERE NOT (fts IS 0)" +
+    int resetFts();
-            " AND (:account IS NULL OR message.account = :account)")
-    int resetFts(Long account);
 
     @Query("DELETE FROM message WHERE id = :id")
     int deleteMessage(long id);

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)
+                    else
-                            db.message().resetFts(account.id);
-                    } 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 {

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];

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)

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;
                         }

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)
+                    else
-                            db.message().resetFts(account.id);
-                    } else
                         account.id = db.account().insertAccount(account);
 
                     args.putLong("account", account.id);

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) {

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) {