mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplification

This commit is contained in:
M66B 2020-01-18 20:05:24 +01:00
parent 49b3f936c2
commit a12ca82b4c
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import android.text.TextUtils;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
import androidx.room.Database; import androidx.room.Database;
import androidx.room.DatabaseConfiguration;
import androidx.room.InvalidationTracker; import androidx.room.InvalidationTracker;
import androidx.room.Room; import androidx.room.Room;
import androidx.room.RoomDatabase; import androidx.room.RoomDatabase;
@ -110,8 +111,6 @@ public abstract class DB extends RoomDatabase {
sInstance = migrate(acontext, getBuilder(acontext)); sInstance = migrate(acontext, getBuilder(acontext));
//sInstance.getOpenHelper().getWritableDatabase().execSQL("PRAGMA wal_autocheckpoint=100;");
// https://www.sqlite.org/lang_vacuum.html // https://www.sqlite.org/lang_vacuum.html
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean vacuum = prefs.getBoolean("vacuum", false); boolean vacuum = prefs.getBoolean("vacuum", false);
@ -165,7 +164,8 @@ public abstract class DB extends RoomDatabase {
.addCallback(new Callback() { .addCallback(new Callback() {
@Override @Override
public void onOpen(@NonNull SupportSQLiteDatabase db) { public void onOpen(@NonNull SupportSQLiteDatabase db) {
Log.i("Creating triggers"); Log.i("Database version=" + db.getVersion());
db.execSQL("CREATE TRIGGER IF NOT EXISTS attachment_insert" + db.execSQL("CREATE TRIGGER IF NOT EXISTS attachment_insert" +
" AFTER INSERT ON attachment" + " AFTER INSERT ON attachment" +
" BEGIN UPDATE message SET attachments = attachments + 1 WHERE message.id = NEW.message; END"); " BEGIN UPDATE message SET attachments = attachments + 1 WHERE message.id = NEW.message; END");
@ -179,13 +179,6 @@ public abstract class DB extends RoomDatabase {
private static DB migrate(final Context context, RoomDatabase.Builder<DB> builder) { private static DB migrate(final Context context, RoomDatabase.Builder<DB> builder) {
// https://www.sqlite.org/lang_altertable.html // https://www.sqlite.org/lang_altertable.html
return builder return builder
.addCallback(new Callback() {
@Override
public void onOpen(@NonNull SupportSQLiteDatabase db) {
Log.i("Database version=" + db.getVersion());
super.onOpen(db);
}
})
.addMigrations(new Migration(1, 2) { .addMigrations(new Migration(1, 2) {
@Override @Override
public void migrate(@NonNull SupportSQLiteDatabase db) { public void migrate(@NonNull SupportSQLiteDatabase db) {