Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-09 02:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Switched to native sqlite

Browse Source
This commit is contained in:
M66B
2022-09-26 09:01:55 +02:00
parent c30a1c60fe
commit 8ee88255ac
62 changed files with 38 additions and 14296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/eu/faircode/email/DB.java
View File

@@ -6,6 +6,7 @@ import android.app.ActivityManager;
import android.content.Context;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteDatabaseCorruptException;
import android.net.Uri;
import android.os.Build;
@@ -47,9 +48,6 @@ import java.util.concurrent.ExecutorService;
import javax.mail.Address;
import javax.mail.internet.InternetAddress;
import io.requery.android.database.sqlite.RequerySQLiteOpenHelperFactory;
import io.requery.android.database.sqlite.SQLiteDatabase;
/*
This file is part of FairEmail.
@@ -422,7 +420,7 @@ public abstract class DB extends RoomDatabase {
return Room
.databaseBuilder(context, DB.class, DB_NAME)
.openHelperFactory(new RequerySQLiteOpenHelperFactory())
//.openHelperFactory(new RequerySQLiteOpenHelperFactory())
.setQueryExecutor(executorQuery)
.setTransactionExecutor(executorTransaction)
.setJournalMode(wal ? JournalMode.WRITE_AHEAD_LOGGING : JournalMode.TRUNCATE) // using the latest sqlite
@@ -2561,7 +2559,14 @@ public abstract class DB extends RoomDatabase {
@Override
@SuppressWarnings("deprecation")
public void endTransaction() {
super.endTransaction();
try {
super.endTransaction();
} catch (IllegalStateException ex) {
if ("Cannot perform this operation because there is no current transaction.".equals(ex.getMessage()))
Log.w(ex);
else
throw ex;
}
}
public static class Converters {