mirror of https://github.com/M66B/FairEmail.git
Move store sent option to identy
This commit is contained in:
parent
5a4b19fc42
commit
1914d45dce
|
@ -0,0 +1,800 @@
|
||||||
|
{
|
||||||
|
"formatVersion": 1,
|
||||||
|
"database": {
|
||||||
|
"version": 3,
|
||||||
|
"identityHash": "ec9474ecd53268ea20f0363e444d9fc1",
|
||||||
|
"entities": [
|
||||||
|
{
|
||||||
|
"tableName": "identity",
|
||||||
|
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT NOT NULL, `email` TEXT NOT NULL, `replyto` TEXT, `account` INTEGER NOT NULL, `host` TEXT NOT NULL, `port` INTEGER NOT NULL, `starttls` INTEGER NOT NULL, `user` TEXT NOT NULL, `password` TEXT NOT NULL, `primary` INTEGER NOT NULL, `synchronize` INTEGER NOT NULL, `store_sent` INTEGER NOT NULL, `state` TEXT, `error` TEXT, FOREIGN KEY(`account`) REFERENCES `account`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"fieldPath": "id",
|
||||||
|
"columnName": "id",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "name",
|
||||||
|
"columnName": "name",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "email",
|
||||||
|
"columnName": "email",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "replyto",
|
||||||
|
"columnName": "replyto",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "account",
|
||||||
|
"columnName": "account",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "host",
|
||||||
|
"columnName": "host",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "port",
|
||||||
|
"columnName": "port",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "starttls",
|
||||||
|
"columnName": "starttls",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "user",
|
||||||
|
"columnName": "user",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "password",
|
||||||
|
"columnName": "password",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "primary",
|
||||||
|
"columnName": "primary",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "synchronize",
|
||||||
|
"columnName": "synchronize",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "store_sent",
|
||||||
|
"columnName": "store_sent",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "state",
|
||||||
|
"columnName": "state",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "error",
|
||||||
|
"columnName": "error",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"primaryKey": {
|
||||||
|
"columnNames": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"autoGenerate": true
|
||||||
|
},
|
||||||
|
"indices": [
|
||||||
|
{
|
||||||
|
"name": "index_identity_account",
|
||||||
|
"unique": false,
|
||||||
|
"columnNames": [
|
||||||
|
"account"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE INDEX `index_identity_account` ON `${TABLE_NAME}` (`account`)"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"foreignKeys": [
|
||||||
|
{
|
||||||
|
"table": "account",
|
||||||
|
"onDelete": "CASCADE",
|
||||||
|
"onUpdate": "NO ACTION",
|
||||||
|
"columns": [
|
||||||
|
"account"
|
||||||
|
],
|
||||||
|
"referencedColumns": [
|
||||||
|
"id"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tableName": "account",
|
||||||
|
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `host` TEXT NOT NULL, `port` INTEGER NOT NULL, `user` TEXT NOT NULL, `password` TEXT NOT NULL, `primary` INTEGER NOT NULL, `synchronize` INTEGER NOT NULL, `store_sent` INTEGER NOT NULL, `poll_interval` INTEGER NOT NULL, `seen_until` INTEGER, `state` TEXT, `error` TEXT)",
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"fieldPath": "id",
|
||||||
|
"columnName": "id",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "name",
|
||||||
|
"columnName": "name",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "host",
|
||||||
|
"columnName": "host",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "port",
|
||||||
|
"columnName": "port",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "user",
|
||||||
|
"columnName": "user",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "password",
|
||||||
|
"columnName": "password",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "primary",
|
||||||
|
"columnName": "primary",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "synchronize",
|
||||||
|
"columnName": "synchronize",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "store_sent",
|
||||||
|
"columnName": "store_sent",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "poll_interval",
|
||||||
|
"columnName": "poll_interval",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "seen_until",
|
||||||
|
"columnName": "seen_until",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "state",
|
||||||
|
"columnName": "state",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "error",
|
||||||
|
"columnName": "error",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"primaryKey": {
|
||||||
|
"columnNames": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"autoGenerate": true
|
||||||
|
},
|
||||||
|
"indices": [],
|
||||||
|
"foreignKeys": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tableName": "folder",
|
||||||
|
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `account` INTEGER, `name` TEXT NOT NULL, `type` TEXT NOT NULL, `synchronize` INTEGER NOT NULL, `after` INTEGER NOT NULL, `state` TEXT, `error` TEXT, FOREIGN KEY(`account`) REFERENCES `account`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"fieldPath": "id",
|
||||||
|
"columnName": "id",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "account",
|
||||||
|
"columnName": "account",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "name",
|
||||||
|
"columnName": "name",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "type",
|
||||||
|
"columnName": "type",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "synchronize",
|
||||||
|
"columnName": "synchronize",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "after",
|
||||||
|
"columnName": "after",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "state",
|
||||||
|
"columnName": "state",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "error",
|
||||||
|
"columnName": "error",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"primaryKey": {
|
||||||
|
"columnNames": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"autoGenerate": true
|
||||||
|
},
|
||||||
|
"indices": [
|
||||||
|
{
|
||||||
|
"name": "index_folder_account_name",
|
||||||
|
"unique": true,
|
||||||
|
"columnNames": [
|
||||||
|
"account",
|
||||||
|
"name"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE UNIQUE INDEX `index_folder_account_name` ON `${TABLE_NAME}` (`account`, `name`)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "index_folder_account",
|
||||||
|
"unique": false,
|
||||||
|
"columnNames": [
|
||||||
|
"account"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE INDEX `index_folder_account` ON `${TABLE_NAME}` (`account`)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "index_folder_name",
|
||||||
|
"unique": false,
|
||||||
|
"columnNames": [
|
||||||
|
"name"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE INDEX `index_folder_name` ON `${TABLE_NAME}` (`name`)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "index_folder_type",
|
||||||
|
"unique": false,
|
||||||
|
"columnNames": [
|
||||||
|
"type"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE INDEX `index_folder_type` ON `${TABLE_NAME}` (`type`)"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"foreignKeys": [
|
||||||
|
{
|
||||||
|
"table": "account",
|
||||||
|
"onDelete": "CASCADE",
|
||||||
|
"onUpdate": "NO ACTION",
|
||||||
|
"columns": [
|
||||||
|
"account"
|
||||||
|
],
|
||||||
|
"referencedColumns": [
|
||||||
|
"id"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tableName": "message",
|
||||||
|
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `account` INTEGER, `folder` INTEGER NOT NULL, `identity` INTEGER, `replying` INTEGER, `uid` INTEGER, `msgid` TEXT, `references` TEXT, `inreplyto` TEXT, `thread` TEXT, `from` TEXT, `to` TEXT, `cc` TEXT, `bcc` TEXT, `reply` TEXT, `subject` TEXT, `sent` INTEGER, `received` INTEGER NOT NULL, `stored` INTEGER NOT NULL, `seen` INTEGER NOT NULL, `ui_seen` INTEGER NOT NULL, `ui_hide` INTEGER NOT NULL, `error` TEXT, FOREIGN KEY(`account`) REFERENCES `account`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`folder`) REFERENCES `folder`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`identity`) REFERENCES `identity`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`replying`) REFERENCES `message`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"fieldPath": "id",
|
||||||
|
"columnName": "id",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "account",
|
||||||
|
"columnName": "account",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "folder",
|
||||||
|
"columnName": "folder",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "identity",
|
||||||
|
"columnName": "identity",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "replying",
|
||||||
|
"columnName": "replying",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "uid",
|
||||||
|
"columnName": "uid",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "msgid",
|
||||||
|
"columnName": "msgid",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "references",
|
||||||
|
"columnName": "references",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "inreplyto",
|
||||||
|
"columnName": "inreplyto",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "thread",
|
||||||
|
"columnName": "thread",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "from",
|
||||||
|
"columnName": "from",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "to",
|
||||||
|
"columnName": "to",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "cc",
|
||||||
|
"columnName": "cc",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "bcc",
|
||||||
|
"columnName": "bcc",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "reply",
|
||||||
|
"columnName": "reply",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "subject",
|
||||||
|
"columnName": "subject",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "sent",
|
||||||
|
"columnName": "sent",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "received",
|
||||||
|
"columnName": "received",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "stored",
|
||||||
|
"columnName": "stored",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "seen",
|
||||||
|
"columnName": "seen",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "ui_seen",
|
||||||
|
"columnName": "ui_seen",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "ui_hide",
|
||||||
|
"columnName": "ui_hide",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "error",
|
||||||
|
"columnName": "error",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"primaryKey": {
|
||||||
|
"columnNames": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"autoGenerate": true
|
||||||
|
},
|
||||||
|
"indices": [
|
||||||
|
{
|
||||||
|
"name": "index_message_account",
|
||||||
|
"unique": false,
|
||||||
|
"columnNames": [
|
||||||
|
"account"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE INDEX `index_message_account` ON `${TABLE_NAME}` (`account`)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "index_message_folder",
|
||||||
|
"unique": false,
|
||||||
|
"columnNames": [
|
||||||
|
"folder"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE INDEX `index_message_folder` ON `${TABLE_NAME}` (`folder`)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "index_message_identity",
|
||||||
|
"unique": false,
|
||||||
|
"columnNames": [
|
||||||
|
"identity"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE INDEX `index_message_identity` ON `${TABLE_NAME}` (`identity`)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "index_message_replying",
|
||||||
|
"unique": false,
|
||||||
|
"columnNames": [
|
||||||
|
"replying"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE INDEX `index_message_replying` ON `${TABLE_NAME}` (`replying`)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "index_message_folder_uid",
|
||||||
|
"unique": true,
|
||||||
|
"columnNames": [
|
||||||
|
"folder",
|
||||||
|
"uid"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE UNIQUE INDEX `index_message_folder_uid` ON `${TABLE_NAME}` (`folder`, `uid`)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "index_message_msgid_folder",
|
||||||
|
"unique": true,
|
||||||
|
"columnNames": [
|
||||||
|
"msgid",
|
||||||
|
"folder"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE UNIQUE INDEX `index_message_msgid_folder` ON `${TABLE_NAME}` (`msgid`, `folder`)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "index_message_thread",
|
||||||
|
"unique": false,
|
||||||
|
"columnNames": [
|
||||||
|
"thread"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE INDEX `index_message_thread` ON `${TABLE_NAME}` (`thread`)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "index_message_received",
|
||||||
|
"unique": false,
|
||||||
|
"columnNames": [
|
||||||
|
"received"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE INDEX `index_message_received` ON `${TABLE_NAME}` (`received`)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "index_message_ui_seen",
|
||||||
|
"unique": false,
|
||||||
|
"columnNames": [
|
||||||
|
"ui_seen"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE INDEX `index_message_ui_seen` ON `${TABLE_NAME}` (`ui_seen`)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "index_message_ui_hide",
|
||||||
|
"unique": false,
|
||||||
|
"columnNames": [
|
||||||
|
"ui_hide"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE INDEX `index_message_ui_hide` ON `${TABLE_NAME}` (`ui_hide`)"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"foreignKeys": [
|
||||||
|
{
|
||||||
|
"table": "account",
|
||||||
|
"onDelete": "CASCADE",
|
||||||
|
"onUpdate": "NO ACTION",
|
||||||
|
"columns": [
|
||||||
|
"account"
|
||||||
|
],
|
||||||
|
"referencedColumns": [
|
||||||
|
"id"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"table": "folder",
|
||||||
|
"onDelete": "CASCADE",
|
||||||
|
"onUpdate": "NO ACTION",
|
||||||
|
"columns": [
|
||||||
|
"folder"
|
||||||
|
],
|
||||||
|
"referencedColumns": [
|
||||||
|
"id"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"table": "identity",
|
||||||
|
"onDelete": "CASCADE",
|
||||||
|
"onUpdate": "NO ACTION",
|
||||||
|
"columns": [
|
||||||
|
"identity"
|
||||||
|
],
|
||||||
|
"referencedColumns": [
|
||||||
|
"id"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"table": "message",
|
||||||
|
"onDelete": "CASCADE",
|
||||||
|
"onUpdate": "NO ACTION",
|
||||||
|
"columns": [
|
||||||
|
"replying"
|
||||||
|
],
|
||||||
|
"referencedColumns": [
|
||||||
|
"id"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tableName": "attachment",
|
||||||
|
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `message` INTEGER NOT NULL, `sequence` INTEGER NOT NULL, `name` TEXT, `type` TEXT NOT NULL, `size` INTEGER, `progress` INTEGER, `available` INTEGER NOT NULL, FOREIGN KEY(`message`) REFERENCES `message`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"fieldPath": "id",
|
||||||
|
"columnName": "id",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "message",
|
||||||
|
"columnName": "message",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "sequence",
|
||||||
|
"columnName": "sequence",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "name",
|
||||||
|
"columnName": "name",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "type",
|
||||||
|
"columnName": "type",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "size",
|
||||||
|
"columnName": "size",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "progress",
|
||||||
|
"columnName": "progress",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "available",
|
||||||
|
"columnName": "available",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"primaryKey": {
|
||||||
|
"columnNames": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"autoGenerate": true
|
||||||
|
},
|
||||||
|
"indices": [
|
||||||
|
{
|
||||||
|
"name": "index_attachment_message",
|
||||||
|
"unique": false,
|
||||||
|
"columnNames": [
|
||||||
|
"message"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE INDEX `index_attachment_message` ON `${TABLE_NAME}` (`message`)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "index_attachment_message_sequence",
|
||||||
|
"unique": true,
|
||||||
|
"columnNames": [
|
||||||
|
"message",
|
||||||
|
"sequence"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE UNIQUE INDEX `index_attachment_message_sequence` ON `${TABLE_NAME}` (`message`, `sequence`)"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"foreignKeys": [
|
||||||
|
{
|
||||||
|
"table": "message",
|
||||||
|
"onDelete": "CASCADE",
|
||||||
|
"onUpdate": "NO ACTION",
|
||||||
|
"columns": [
|
||||||
|
"message"
|
||||||
|
],
|
||||||
|
"referencedColumns": [
|
||||||
|
"id"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tableName": "operation",
|
||||||
|
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `folder` INTEGER NOT NULL, `message` INTEGER NOT NULL, `name` TEXT NOT NULL, `args` TEXT NOT NULL, `created` INTEGER NOT NULL, FOREIGN KEY(`folder`) REFERENCES `folder`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`message`) REFERENCES `message`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"fieldPath": "id",
|
||||||
|
"columnName": "id",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "folder",
|
||||||
|
"columnName": "folder",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "message",
|
||||||
|
"columnName": "message",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "name",
|
||||||
|
"columnName": "name",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "args",
|
||||||
|
"columnName": "args",
|
||||||
|
"affinity": "TEXT",
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldPath": "created",
|
||||||
|
"columnName": "created",
|
||||||
|
"affinity": "INTEGER",
|
||||||
|
"notNull": true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"primaryKey": {
|
||||||
|
"columnNames": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"autoGenerate": true
|
||||||
|
},
|
||||||
|
"indices": [
|
||||||
|
{
|
||||||
|
"name": "index_operation_folder",
|
||||||
|
"unique": false,
|
||||||
|
"columnNames": [
|
||||||
|
"folder"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE INDEX `index_operation_folder` ON `${TABLE_NAME}` (`folder`)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "index_operation_message",
|
||||||
|
"unique": false,
|
||||||
|
"columnNames": [
|
||||||
|
"message"
|
||||||
|
],
|
||||||
|
"createSql": "CREATE INDEX `index_operation_message` ON `${TABLE_NAME}` (`message`)"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"foreignKeys": [
|
||||||
|
{
|
||||||
|
"table": "folder",
|
||||||
|
"onDelete": "CASCADE",
|
||||||
|
"onUpdate": "NO ACTION",
|
||||||
|
"columns": [
|
||||||
|
"folder"
|
||||||
|
],
|
||||||
|
"referencedColumns": [
|
||||||
|
"id"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"table": "message",
|
||||||
|
"onDelete": "CASCADE",
|
||||||
|
"onUpdate": "NO ACTION",
|
||||||
|
"columns": [
|
||||||
|
"message"
|
||||||
|
],
|
||||||
|
"referencedColumns": [
|
||||||
|
"id"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"setupQueries": [
|
||||||
|
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
|
||||||
|
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"ec9474ecd53268ea20f0363e444d9fc1\")"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -45,7 +45,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase;
|
||||||
// https://developer.android.com/topic/libraries/architecture/room.html
|
// https://developer.android.com/topic/libraries/architecture/room.html
|
||||||
|
|
||||||
@Database(
|
@Database(
|
||||||
version = 2,
|
version = 3,
|
||||||
entities = {
|
entities = {
|
||||||
EntityIdentity.class,
|
EntityIdentity.class,
|
||||||
EntityAccount.class,
|
EntityAccount.class,
|
||||||
|
@ -118,6 +118,13 @@ public abstract class DB extends RoomDatabase {
|
||||||
db.execSQL("ALTER TABLE `account` ADD COLUMN `poll_interval` INTEGER NOT NULL DEFAULT 9");
|
db.execSQL("ALTER TABLE `account` ADD COLUMN `poll_interval` INTEGER NOT NULL DEFAULT 9");
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
.addMigrations(new Migration(2, 3) {
|
||||||
|
@Override
|
||||||
|
public void migrate(SupportSQLiteDatabase db) {
|
||||||
|
Log.i(Helper.TAG, "DB migration from version " + startVersion + " to " + endVersion);
|
||||||
|
db.execSQL("ALTER TABLE `identity` ADD COLUMN `store_sent` INTEGER NOT NULL DEFAULT 0");
|
||||||
|
}
|
||||||
|
})
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ public class EntityAccount {
|
||||||
@NonNull
|
@NonNull
|
||||||
public Boolean synchronize;
|
public Boolean synchronize;
|
||||||
@NonNull
|
@NonNull
|
||||||
public Boolean store_sent;
|
public Boolean store_sent; // obsolete
|
||||||
@NonNull
|
@NonNull
|
||||||
public Integer poll_interval;
|
public Integer poll_interval;
|
||||||
public Long seen_until;
|
public Long seen_until;
|
||||||
|
@ -65,6 +65,7 @@ public class EntityAccount {
|
||||||
this.password.equals(other.password) &&
|
this.password.equals(other.password) &&
|
||||||
this.primary.equals(other.primary) &&
|
this.primary.equals(other.primary) &&
|
||||||
this.synchronize.equals(other.synchronize) &&
|
this.synchronize.equals(other.synchronize) &&
|
||||||
|
this.poll_interval.equals(other.poll_interval) &&
|
||||||
(this.seen_until == null ? other.seen_until == null : this.seen_until.equals(other.seen_until)) &&
|
(this.seen_until == null ? other.seen_until == null : this.seen_until.equals(other.seen_until)) &&
|
||||||
(this.state == null ? other.state == null : this.state.equals(other.state)) &&
|
(this.state == null ? other.state == null : this.state.equals(other.state)) &&
|
||||||
(this.error == null ? other.error == null : this.error.equals(other.error)));
|
(this.error == null ? other.error == null : this.error.equals(other.error)));
|
||||||
|
|
|
@ -62,6 +62,8 @@ public class EntityIdentity {
|
||||||
public Boolean primary;
|
public Boolean primary;
|
||||||
@NonNull
|
@NonNull
|
||||||
public Boolean synchronize;
|
public Boolean synchronize;
|
||||||
|
@NonNull
|
||||||
|
public Boolean store_sent;
|
||||||
public String state;
|
public String state;
|
||||||
public String error;
|
public String error;
|
||||||
|
|
||||||
|
@ -80,6 +82,7 @@ public class EntityIdentity {
|
||||||
this.password.equals(other.password) &&
|
this.password.equals(other.password) &&
|
||||||
this.primary.equals(other.primary) &&
|
this.primary.equals(other.primary) &&
|
||||||
this.synchronize.equals(other.synchronize) &&
|
this.synchronize.equals(other.synchronize) &&
|
||||||
|
this.store_sent.equals(other.store_sent) &&
|
||||||
(this.state == null ? other.state == null : this.state.equals(other.state)) &&
|
(this.state == null ? other.state == null : this.state.equals(other.state)) &&
|
||||||
(this.error == null ? other.error == null : this.error.equals(other.error)));
|
(this.error == null ? other.error == null : this.error.equals(other.error)));
|
||||||
} else
|
} else
|
||||||
|
|
|
@ -75,7 +75,6 @@ public class FragmentAccount extends FragmentEx {
|
||||||
private TextView tvLink;
|
private TextView tvLink;
|
||||||
private CheckBox cbSynchronize;
|
private CheckBox cbSynchronize;
|
||||||
private CheckBox cbPrimary;
|
private CheckBox cbPrimary;
|
||||||
private CheckBox cbStoreSent;
|
|
||||||
private EditText etInterval;
|
private EditText etInterval;
|
||||||
private Button btnCheck;
|
private Button btnCheck;
|
||||||
private ProgressBar pbCheck;
|
private ProgressBar pbCheck;
|
||||||
|
@ -113,7 +112,6 @@ public class FragmentAccount extends FragmentEx {
|
||||||
tvLink = view.findViewById(R.id.tvLink);
|
tvLink = view.findViewById(R.id.tvLink);
|
||||||
cbSynchronize = view.findViewById(R.id.cbSynchronize);
|
cbSynchronize = view.findViewById(R.id.cbSynchronize);
|
||||||
cbPrimary = view.findViewById(R.id.cbPrimary);
|
cbPrimary = view.findViewById(R.id.cbPrimary);
|
||||||
cbStoreSent = view.findViewById(R.id.cbStoreSent);
|
|
||||||
etInterval = view.findViewById(R.id.etInterval);
|
etInterval = view.findViewById(R.id.etInterval);
|
||||||
btnCheck = view.findViewById(R.id.btnCheck);
|
btnCheck = view.findViewById(R.id.btnCheck);
|
||||||
pbCheck = view.findViewById(R.id.pbCheck);
|
pbCheck = view.findViewById(R.id.pbCheck);
|
||||||
|
@ -383,7 +381,6 @@ public class FragmentAccount extends FragmentEx {
|
||||||
args.putString("password", tilPassword.getEditText().getText().toString());
|
args.putString("password", tilPassword.getEditText().getText().toString());
|
||||||
args.putBoolean("synchronize", cbSynchronize.isChecked());
|
args.putBoolean("synchronize", cbSynchronize.isChecked());
|
||||||
args.putBoolean("primary", cbPrimary.isChecked());
|
args.putBoolean("primary", cbPrimary.isChecked());
|
||||||
args.putBoolean("store_sent", cbStoreSent.isChecked());
|
|
||||||
args.putString("poll_interval", etInterval.getText().toString());
|
args.putString("poll_interval", etInterval.getText().toString());
|
||||||
args.putParcelable("drafts", drafts);
|
args.putParcelable("drafts", drafts);
|
||||||
args.putParcelable("sent", sent);
|
args.putParcelable("sent", sent);
|
||||||
|
@ -401,7 +398,6 @@ public class FragmentAccount extends FragmentEx {
|
||||||
String password = args.getString("password");
|
String password = args.getString("password");
|
||||||
boolean synchronize = args.getBoolean("synchronize");
|
boolean synchronize = args.getBoolean("synchronize");
|
||||||
boolean primary = args.getBoolean("primary");
|
boolean primary = args.getBoolean("primary");
|
||||||
boolean store_sent = args.getBoolean("store_sent");
|
|
||||||
String poll_interval = args.getString("poll_interval");
|
String poll_interval = args.getString("poll_interval");
|
||||||
EntityFolder drafts = args.getParcelable("drafts");
|
EntityFolder drafts = args.getParcelable("drafts");
|
||||||
EntityFolder sent = args.getParcelable("sent");
|
EntityFolder sent = args.getParcelable("sent");
|
||||||
|
@ -457,7 +453,6 @@ public class FragmentAccount extends FragmentEx {
|
||||||
account.password = password;
|
account.password = password;
|
||||||
account.synchronize = synchronize;
|
account.synchronize = synchronize;
|
||||||
account.primary = (account.synchronize && primary);
|
account.primary = (account.synchronize && primary);
|
||||||
account.store_sent = store_sent;
|
|
||||||
account.poll_interval = Integer.parseInt(poll_interval);
|
account.poll_interval = Integer.parseInt(poll_interval);
|
||||||
|
|
||||||
if (!synchronize)
|
if (!synchronize)
|
||||||
|
@ -642,7 +637,6 @@ public class FragmentAccount extends FragmentEx {
|
||||||
tilPassword.getEditText().setText(account == null ? null : account.password);
|
tilPassword.getEditText().setText(account == null ? null : account.password);
|
||||||
cbSynchronize.setChecked(account == null ? true : account.synchronize);
|
cbSynchronize.setChecked(account == null ? true : account.synchronize);
|
||||||
cbPrimary.setChecked(account == null ? true : account.primary);
|
cbPrimary.setChecked(account == null ? true : account.primary);
|
||||||
cbStoreSent.setChecked(account == null ? false : account.store_sent);
|
|
||||||
etInterval.setText(account == null ? "9" : Integer.toString(account.poll_interval));
|
etInterval.setText(account == null ? "9" : Integer.toString(account.poll_interval));
|
||||||
} else {
|
} else {
|
||||||
int provider = savedInstanceState.getInt("provider");
|
int provider = savedInstanceState.getInt("provider");
|
||||||
|
|
|
@ -72,6 +72,7 @@ public class FragmentIdentity extends FragmentEx {
|
||||||
private TextView tvLink;
|
private TextView tvLink;
|
||||||
private CheckBox cbSynchronize;
|
private CheckBox cbSynchronize;
|
||||||
private CheckBox cbPrimary;
|
private CheckBox cbPrimary;
|
||||||
|
private CheckBox cbStoreSent;
|
||||||
private Button btnSave;
|
private Button btnSave;
|
||||||
private ProgressBar pbSave;
|
private ProgressBar pbSave;
|
||||||
private ImageButton ibDelete;
|
private ImageButton ibDelete;
|
||||||
|
@ -103,6 +104,7 @@ public class FragmentIdentity extends FragmentEx {
|
||||||
tvLink = view.findViewById(R.id.tvLink);
|
tvLink = view.findViewById(R.id.tvLink);
|
||||||
cbSynchronize = view.findViewById(R.id.cbSynchronize);
|
cbSynchronize = view.findViewById(R.id.cbSynchronize);
|
||||||
cbPrimary = view.findViewById(R.id.cbPrimary);
|
cbPrimary = view.findViewById(R.id.cbPrimary);
|
||||||
|
cbStoreSent = view.findViewById(R.id.cbStoreSent);
|
||||||
btnSave = view.findViewById(R.id.btnSave);
|
btnSave = view.findViewById(R.id.btnSave);
|
||||||
pbSave = view.findViewById(R.id.pbSave);
|
pbSave = view.findViewById(R.id.pbSave);
|
||||||
ibDelete = view.findViewById(R.id.ibDelete);
|
ibDelete = view.findViewById(R.id.ibDelete);
|
||||||
|
@ -219,6 +221,7 @@ public class FragmentIdentity extends FragmentEx {
|
||||||
args.putString("password", tilPassword.getEditText().getText().toString());
|
args.putString("password", tilPassword.getEditText().getText().toString());
|
||||||
args.putBoolean("synchronize", cbSynchronize.isChecked());
|
args.putBoolean("synchronize", cbSynchronize.isChecked());
|
||||||
args.putBoolean("primary", cbPrimary.isChecked());
|
args.putBoolean("primary", cbPrimary.isChecked());
|
||||||
|
args.putBoolean("store_sent", cbStoreSent.isChecked());
|
||||||
|
|
||||||
new SimpleTask<Void>() {
|
new SimpleTask<Void>() {
|
||||||
@Override
|
@Override
|
||||||
|
@ -234,6 +237,8 @@ public class FragmentIdentity extends FragmentEx {
|
||||||
String user = args.getString("user");
|
String user = args.getString("user");
|
||||||
String password = args.getString("password");
|
String password = args.getString("password");
|
||||||
boolean synchronize = args.getBoolean("synchronize");
|
boolean synchronize = args.getBoolean("synchronize");
|
||||||
|
boolean primary = args.getBoolean("primary");
|
||||||
|
boolean store_sent = args.getBoolean("store_sent");
|
||||||
|
|
||||||
if (TextUtils.isEmpty(name))
|
if (TextUtils.isEmpty(name))
|
||||||
throw new IllegalArgumentException(getContext().getString(R.string.title_no_name));
|
throw new IllegalArgumentException(getContext().getString(R.string.title_no_name));
|
||||||
|
@ -283,7 +288,8 @@ public class FragmentIdentity extends FragmentEx {
|
||||||
identity.user = user;
|
identity.user = user;
|
||||||
identity.password = password;
|
identity.password = password;
|
||||||
identity.synchronize = synchronize;
|
identity.synchronize = synchronize;
|
||||||
identity.primary = (identity.synchronize && args.getBoolean("primary"));
|
identity.primary = (identity.synchronize && primary);
|
||||||
|
identity.store_sent = store_sent;
|
||||||
|
|
||||||
if (!identity.synchronize)
|
if (!identity.synchronize)
|
||||||
identity.error = null;
|
identity.error = null;
|
||||||
|
@ -311,7 +317,6 @@ public class FragmentIdentity extends FragmentEx {
|
||||||
getFragmentManager().popBackStack();
|
getFragmentManager().popBackStack();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onException(Bundle args, Throwable ex) {
|
protected void onException(Bundle args, Throwable ex) {
|
||||||
Helper.setViewsEnabled(view, true);
|
Helper.setViewsEnabled(view, true);
|
||||||
|
@ -417,6 +422,7 @@ public class FragmentIdentity extends FragmentEx {
|
||||||
tilPassword.getEditText().setText(identity == null ? null : identity.password);
|
tilPassword.getEditText().setText(identity == null ? null : identity.password);
|
||||||
cbSynchronize.setChecked(identity == null ? true : identity.synchronize);
|
cbSynchronize.setChecked(identity == null ? true : identity.synchronize);
|
||||||
cbPrimary.setChecked(identity == null ? true : identity.primary);
|
cbPrimary.setChecked(identity == null ? true : identity.primary);
|
||||||
|
cbStoreSent.setChecked(identity == null ? false : identity.store_sent);
|
||||||
|
|
||||||
etName.requestFocus();
|
etName.requestFocus();
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -953,7 +953,6 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
|
|
||||||
private void doSend(Session isession, EntityMessage message, DB db) throws MessagingException, IOException {
|
private void doSend(Session isession, EntityMessage message, DB db) throws MessagingException, IOException {
|
||||||
// Send message
|
// Send message
|
||||||
EntityAccount account = db.account().getAccount(message.account);
|
|
||||||
EntityIdentity ident = db.identity().getIdentity(message.identity);
|
EntityIdentity ident = db.identity().getIdentity(message.identity);
|
||||||
EntityMessage reply = (message.replying == null ? null : db.message().getMessage(message.replying));
|
EntityMessage reply = (message.replying == null ? null : db.message().getMessage(message.replying));
|
||||||
List<EntityAttachment> attachments = db.attachment().getAttachments(message.id);
|
List<EntityAttachment> attachments = db.attachment().getAttachments(message.id);
|
||||||
|
@ -998,7 +997,7 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
message.ui_seen = true;
|
message.ui_seen = true;
|
||||||
db.message().updateMessage(message);
|
db.message().updateMessage(message);
|
||||||
|
|
||||||
if (account.store_sent) {
|
if (ident.store_sent) {
|
||||||
EntityFolder sent = db.folder().getFolderByType(ident.account, EntityFolder.SENT);
|
EntityFolder sent = db.folder().getFolderByType(ident.account, EntityFolder.SENT);
|
||||||
if (sent != null) {
|
if (sent != null) {
|
||||||
message.folder = sent.id;
|
message.folder = sent.id;
|
||||||
|
|
|
@ -198,15 +198,6 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/cbSynchronize" />
|
app:layout_constraintTop_toBottomOf="@id/cbSynchronize" />
|
||||||
|
|
||||||
<CheckBox
|
|
||||||
android:id="@+id/cbStoreSent"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:text="@string/title_store_sent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/cbPrimary" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tvInterval"
|
android:id="@+id/tvInterval"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -215,15 +206,14 @@
|
||||||
android:text="@string/title_interval"
|
android:text="@string/title_interval"
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/cbStoreSent" />
|
app:layout_constraintTop_toBottomOf="@id/cbPrimary" />
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
android:id="@+id/etInterval"
|
android:id="@+id/etInterval"
|
||||||
android:layout_width="60dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:inputType="number"
|
android:inputType="number"
|
||||||
android:text="9"
|
android:text="9"
|
||||||
android:textAlignment="textEnd"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvInterval" />
|
app:layout_constraintTop_toBottomOf="@id/tvInterval" />
|
||||||
|
|
|
@ -270,6 +270,15 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/cbSynchronize" />
|
app:layout_constraintTop_toBottomOf="@id/cbSynchronize" />
|
||||||
|
|
||||||
|
<CheckBox
|
||||||
|
android:id="@+id/cbStoreSent"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:text="@string/title_store_sent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/cbPrimary" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/btnSave"
|
android:id="@+id/btnSave"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -277,7 +286,7 @@
|
||||||
android:layout_marginTop="12dp"
|
android:layout_marginTop="12dp"
|
||||||
android:text="@string/title_save"
|
android:text="@string/title_save"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/cbPrimary" />
|
app:layout_constraintTop_toBottomOf="@id/cbStoreSent" />
|
||||||
|
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
android:id="@+id/pbSave"
|
android:id="@+id/pbSave"
|
||||||
|
@ -297,7 +306,7 @@
|
||||||
android:layout_marginTop="12dp"
|
android:layout_marginTop="12dp"
|
||||||
android:src="@drawable/baseline_delete_24"
|
android:src="@drawable/baseline_delete_24"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/cbPrimary" />
|
app:layout_constraintTop_toBottomOf="@id/cbStoreSent" />
|
||||||
|
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
android:id="@+id/pbWait"
|
android:id="@+id/pbWait"
|
||||||
|
|
Loading…
Reference in New Issue