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

Assume attachment when not inline

This commit is contained in:
M66B 2020-06-14 17:30:00 +02:00
parent 5c1b5352be
commit 3dac4d407e
3 changed files with 4531 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2255
app/schemas/eu.faircode.email.DB/163.json Normal file
View File

File diff suppressed because it is too large Load Diff

2255
app/schemas/eu.faircode.email.DB/164.json Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -60,7 +60,7 @@ import io.requery.android.database.sqlite.SQLiteDatabase;
// https://developer.android.com/topic/libraries/architecture/room.html
@Database(
version = 162,
version = 164,
entities = {
EntityIdentity.class,
EntityAccount.class,
@ -282,7 +282,7 @@ public abstract class DB extends RoomDatabase {
" BEGIN" +
" UPDATE message SET attachments = attachments + 1" +
" WHERE message.id = NEW.message" +
" AND NEW.disposition = 'attachment'" +
" AND (NEW.disposition IS NULL OR NEW.disposition <> 'inline')" +
" AND (NEW.encryption IS NULL OR NEW.encryption = 0);" +
" END");
db.execSQL("CREATE TRIGGER IF NOT EXISTS attachment_delete" +
@ -290,7 +290,7 @@ public abstract class DB extends RoomDatabase {
" BEGIN" +
" UPDATE message SET attachments = attachments - 1" +
" WHERE message.id = OLD.message" +
" AND OLD.disposition = 'attachment'" +
" AND (OLD.disposition IS NULL OR OLD.disposition <> 'inline')" +
" AND (OLD.encryption IS NULL OR OLD.encryption = 0);" +
" END");
}
@ -1607,6 +1607,24 @@ public abstract class DB extends RoomDatabase {
Log.i("DB migration from version " + startVersion + " to " + endVersion);
db.execSQL("ALTER TABLE `message` ADD COLUMN `verified` INTEGER NOT NULL DEFAULT 0");
}
})
.addMigrations(new Migration(162, 163) {
@Override
public void migrate(@NonNull SupportSQLiteDatabase db) {
Log.i("DB migration from version " + startVersion + " to " + endVersion);
db.execSQL("DROP TRIGGER attachment_insert");
db.execSQL("DROP TRIGGER attachment_delete");
createTriggers(db);
}
})
.addMigrations(new Migration(163, 164) {
@Override
public void migrate(@NonNull SupportSQLiteDatabase db) {
Log.i("DB migration from version " + startVersion + " to " + endVersion);
db.execSQL("DROP TRIGGER attachment_insert");
db.execSQL("DROP TRIGGER attachment_delete");
createTriggers(db);
}
});
}