Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 01:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make FTS recovery more resiliant.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-09-12 15:40:33 -04:00
committed by Cody Henthorne
parent 5c6644d1a1
commit 850515b363
2 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/util/SignalUncaughtExceptionHandler.java
View File

@@ -1,6 +1,7 @@
package org.thoughtcrime.securesms.util;
import android.database.sqlite.SQLiteDatabaseCorruptException;
import android.database.sqlite.SQLiteException;
import androidx.annotation.NonNull;
@@ -40,7 +41,7 @@ public class SignalUncaughtExceptionHandler implements Thread.UncaughtExceptionH
}
if (e instanceof SQLiteDatabaseCorruptException) {
if (e.getMessage().indexOf("message_fts") >= 0) {
if (e.getMessage() != null && e.getMessage().contains("message_fts")) {
Log.w(TAG, "FTS corrupted! Resetting FTS index.");
SignalDatabase.messageSearch().fullyResetTables();
} else {
@@ -48,6 +49,16 @@ public class SignalUncaughtExceptionHandler implements Thread.UncaughtExceptionH
}
}
if (e instanceof SQLiteException && e.getMessage() != null) {
if (e.getMessage().contains("invalid fts5 file format")) {
Log.w(TAG, "FTS in invalid state! Resetting FTS index.");
SignalDatabase.messageSearch().fullyResetTables();
} else if (e.getMessage().contains("no such table: message_fts")) {
Log.w(TAG, "FTS table not found! Resetting FTS index.");
SignalDatabase.messageSearch().fullyResetTables();
}
}
if (e instanceof OnErrorNotImplementedException && e.getCause() != null) {
e = e.getCause();
}