mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-24 15:11:03 +00:00
Code Issues Releases Wiki Activity

Revert "Reset FTS on disabling account"

Browse source 
This reverts commit 0403c81bd5.
This commit is contained in:
M66B 2023-12-20 21:02:59 +01:00
parent 435aa733d6
commit 1f454909d3
10 changed files with 10 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/AdapterAccount.java
View file

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

2
app/src/main/java/eu/faircode/email/CloudSync.java
View file

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

6
app/src/main/java/eu/faircode/email/DaoMessage.java
View file

@ -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);

8
app/src/main/java/eu/faircode/email/FragmentAccount.java
View file

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

2
app/src/main/java/eu/faircode/email/FragmentGmail.java
View file

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

2
app/src/main/java/eu/faircode/email/FragmentOAuth.java
View file

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

2
app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
View file

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

6
app/src/main/java/eu/faircode/email/FragmentPop.java
View file

@ -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);

4
app/src/main/java/eu/faircode/email/Fts4DbHelper.java
View file

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

2
app/src/main/java/eu/faircode/email/Fts5DbHelper.java
View file

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