Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 13:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure SqlCipherDeletingErrorHandler runs delete.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-06-21 10:24:12 -04:00
parent 07bd8b2fa3
commit 36418bec59
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherDeletingErrorHandler.java
View File

@@ -28,26 +28,29 @@ public final class SqlCipherDeletingErrorHandler implements DatabaseErrorHandler
@Override
public void onCorruption(SQLiteDatabase db, String message) {
Log.e(TAG, "Database '" + databaseName + "' corrupted! Message: " + message + ". Going to try to run some diagnostics.");
try {
Log.e(TAG, "Database '" + databaseName + "' corrupted! Message: " + message + ". Going to try to run some diagnostics.");
Log.w(TAG, " ===== PRAGMA integrity_check =====");
try (Cursor cursor = db.rawQuery("PRAGMA integrity_check", null)) {
while (cursor.moveToNext()) {
Log.w(TAG, CursorUtil.readRowAsString(cursor));
Log.w(TAG, " ===== PRAGMA integrity_check =====");
try (Cursor cursor = db.rawQuery("PRAGMA integrity_check", null)) {
while (cursor.moveToNext()) {
Log.w(TAG, CursorUtil.readRowAsString(cursor));
}
} catch (Throwable t) {
Log.e(TAG, "Failed to do integrity_check!", t);
}
} catch (Throwable t) {
Log.e(TAG, "Failed to do integrity_check!", t);
}
Log.w(TAG, "===== PRAGMA cipher_integrity_check =====");
try (Cursor cursor = db.rawQuery("PRAGMA cipher_integrity_check", null)) {
while (cursor.moveToNext()) {
Log.w(TAG, CursorUtil.readRowAsString(cursor));
Log.w(TAG, "===== PRAGMA cipher_integrity_check =====");
try (Cursor cursor = db.rawQuery("PRAGMA cipher_integrity_check", null)) {
while (cursor.moveToNext()) {
Log.w(TAG, CursorUtil.readRowAsString(cursor));
}
} catch (Throwable t) {
Log.e(TAG, "Failed to do cipher_integrity_check!", t);
}
} catch (Throwable t) {
Log.e(TAG, "Failed to do cipher_integrity_check!", t);
} finally {
Log.w(TAG, "Deleting database " + databaseName);
ApplicationDependencies.getApplication().deleteDatabase(databaseName);
}
ApplicationDependencies.getApplication().deleteDatabase(databaseName);
}
}