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

Check disposition for attachment count

This commit is contained in:
M66B 2020-05-20 07:55:21 +02:00
parent 60c01d1714
commit 77d840c39c
1 changed files with 12 additions and 1 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

@ -60,7 +60,7 @@ import io.requery.android.database.sqlite.SQLiteDatabase;
// https://developer.android.com/topic/libraries/architecture/room.html // https://developer.android.com/topic/libraries/architecture/room.html
@Database( @Database(
version = 159, version = 160,
entities = { entities = {
EntityIdentity.class, EntityIdentity.class,
EntityAccount.class, EntityAccount.class,
@ -282,6 +282,7 @@ public abstract class DB extends RoomDatabase {
" BEGIN" + " BEGIN" +
" UPDATE message SET attachments = attachments + 1" + " UPDATE message SET attachments = attachments + 1" +
" WHERE message.id = NEW.message" + " WHERE message.id = NEW.message" +
" AND NEW.disposition = 'attachment'" +
" AND (NEW.encryption IS NULL OR NEW.encryption = 0);" + " AND (NEW.encryption IS NULL OR NEW.encryption = 0);" +
" END"); " END");
db.execSQL("CREATE TRIGGER IF NOT EXISTS attachment_delete" + db.execSQL("CREATE TRIGGER IF NOT EXISTS attachment_delete" +
@ -289,6 +290,7 @@ public abstract class DB extends RoomDatabase {
" BEGIN" + " BEGIN" +
" UPDATE message SET attachments = attachments - 1" + " UPDATE message SET attachments = attachments - 1" +
" WHERE message.id = OLD.message" + " WHERE message.id = OLD.message" +
" AND OLD.disposition = 'attachment'" +
" AND (OLD.encryption IS NULL OR OLD.encryption = 0);" + " AND (OLD.encryption IS NULL OR OLD.encryption = 0);" +
" END"); " END");
} }
@ -1579,6 +1581,15 @@ public abstract class DB extends RoomDatabase {
Log.i("DB migration from version " + startVersion + " to " + endVersion); Log.i("DB migration from version " + startVersion + " to " + endVersion);
db.execSQL("ALTER TABLE `message` ADD COLUMN `ui_unsnoozed` INTEGER NOT NULL DEFAULT 0"); db.execSQL("ALTER TABLE `message` ADD COLUMN `ui_unsnoozed` INTEGER NOT NULL DEFAULT 0");
} }
})
.addMigrations(new Migration(159, 160) {
@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);
}
}); });
} }