WIP (686616d4) · Commits · e / os / Ntfy Android

app/schemas/io.heckel.ntfy.db.Database/10.json

0 → 100644

+302 −0

Original line number	Diff line number	Diff line
		{
		"formatVersion": 1,
		"database": {
		"version": 10,
		"identityHash": "c1b4f54d1d3111dc5c8f02e8fa960ceb",
		"entities": [
		{
		"tableName": "Subscription",
		"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `baseUrl` TEXT NOT NULL, `topic` TEXT NOT NULL, `instant` INTEGER NOT NULL, `mutedUntil` INTEGER NOT NULL, `upAppId` TEXT, `upConnectorToken` TEXT, PRIMARY KEY(`id`))",
		"fields": [
		{
		"fieldPath": "id",
		"columnName": "id",
		"affinity": "INTEGER",
		"notNull": true
		},
		{
		"fieldPath": "baseUrl",
		"columnName": "baseUrl",
		"affinity": "TEXT",
		"notNull": true
		},
		{
		"fieldPath": "topic",
		"columnName": "topic",
		"affinity": "TEXT",
		"notNull": true
		},
		{
		"fieldPath": "instant",
		"columnName": "instant",
		"affinity": "INTEGER",
		"notNull": true
		},
		{
		"fieldPath": "mutedUntil",
		"columnName": "mutedUntil",
		"affinity": "INTEGER",
		"notNull": true
		},
		{
		"fieldPath": "upAppId",
		"columnName": "upAppId",
		"affinity": "TEXT",
		"notNull": false
		},
		{
		"fieldPath": "upConnectorToken",
		"columnName": "upConnectorToken",
		"affinity": "TEXT",
		"notNull": false
		}
		],
		"primaryKey": {
		"columnNames": [
		"id"
		],
		"autoGenerate": false
		},
		"indices": [
		{
		"name": "index_Subscription_baseUrl_topic",
		"unique": true,
		"columnNames": [
		"baseUrl",
		"topic"
		],
		"orders": [],
		"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Subscription_baseUrl_topic` ON `${TABLE_NAME}` (`baseUrl`, `topic`)"
		},
		{
		"name": "index_Subscription_upConnectorToken",
		"unique": true,
		"columnNames": [
		"upConnectorToken"
		],
		"orders": [],
		"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Subscription_upConnectorToken` ON `${TABLE_NAME}` (`upConnectorToken`)"
		}
		],
		"foreignKeys": []
		},
		{
		"tableName": "Notification",
		"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `title` TEXT NOT NULL, `message` TEXT NOT NULL, `encoding` TEXT NOT NULL, `notificationId` INTEGER NOT NULL, `priority` INTEGER NOT NULL DEFAULT 3, `tags` TEXT NOT NULL, `click` TEXT NOT NULL, `actions` TEXT, `deleted` INTEGER NOT NULL, `attachment_name` TEXT, `attachment_type` TEXT, `attachment_size` INTEGER, `attachment_expires` INTEGER, `attachment_url` TEXT, `attachment_contentUri` TEXT, `attachment_progress` INTEGER, PRIMARY KEY(`id`, `subscriptionId`))",
		"fields": [
		{
		"fieldPath": "id",
		"columnName": "id",
		"affinity": "TEXT",
		"notNull": true
		},
		{
		"fieldPath": "subscriptionId",
		"columnName": "subscriptionId",
		"affinity": "INTEGER",
		"notNull": true
		},
		{
		"fieldPath": "timestamp",
		"columnName": "timestamp",
		"affinity": "INTEGER",
		"notNull": true
		},
		{
		"fieldPath": "title",
		"columnName": "title",
		"affinity": "TEXT",
		"notNull": true
		},
		{
		"fieldPath": "message",
		"columnName": "message",
		"affinity": "TEXT",
		"notNull": true
		},
		{
		"fieldPath": "encoding",
		"columnName": "encoding",
		"affinity": "TEXT",
		"notNull": true
		},
		{
		"fieldPath": "notificationId",
		"columnName": "notificationId",
		"affinity": "INTEGER",
		"notNull": true
		},
		{
		"fieldPath": "priority",
		"columnName": "priority",
		"affinity": "INTEGER",
		"notNull": true,
		"defaultValue": "3"
		},
		{
		"fieldPath": "tags",
		"columnName": "tags",
		"affinity": "TEXT",
		"notNull": true
		},
		{
		"fieldPath": "click",
		"columnName": "click",
		"affinity": "TEXT",
		"notNull": true
		},
		{
		"fieldPath": "actions",
		"columnName": "actions",
		"affinity": "TEXT",
		"notNull": false
		},
		{
		"fieldPath": "deleted",
		"columnName": "deleted",
		"affinity": "INTEGER",
		"notNull": true
		},
		{
		"fieldPath": "attachment.name",
		"columnName": "attachment_name",
		"affinity": "TEXT",
		"notNull": false
		},
		{
		"fieldPath": "attachment.type",
		"columnName": "attachment_type",
		"affinity": "TEXT",
		"notNull": false
		},
		{
		"fieldPath": "attachment.size",
		"columnName": "attachment_size",
		"affinity": "INTEGER",
		"notNull": false
		},
		{
		"fieldPath": "attachment.expires",
		"columnName": "attachment_expires",
		"affinity": "INTEGER",
		"notNull": false
		},
		{
		"fieldPath": "attachment.url",
		"columnName": "attachment_url",
		"affinity": "TEXT",
		"notNull": false
		},
		{
		"fieldPath": "attachment.contentUri",
		"columnName": "attachment_contentUri",
		"affinity": "TEXT",
		"notNull": false
		},
		{
		"fieldPath": "attachment.progress",
		"columnName": "attachment_progress",
		"affinity": "INTEGER",
		"notNull": false
		}
		],
		"primaryKey": {
		"columnNames": [
		"id",
		"subscriptionId"
		],
		"autoGenerate": false
		},
		"indices": [],
		"foreignKeys": []
		},
		{
		"tableName": "User",
		"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`baseUrl` TEXT NOT NULL, `username` TEXT NOT NULL, `password` TEXT NOT NULL, PRIMARY KEY(`baseUrl`))",
		"fields": [
		{
		"fieldPath": "baseUrl",
		"columnName": "baseUrl",
		"affinity": "TEXT",
		"notNull": true
		},
		{
		"fieldPath": "username",
		"columnName": "username",
		"affinity": "TEXT",
		"notNull": true
		},
		{
		"fieldPath": "password",
		"columnName": "password",
		"affinity": "TEXT",
		"notNull": true
		}
		],
		"primaryKey": {
		"columnNames": [
		"baseUrl"
		],
		"autoGenerate": false
		},
		"indices": [],
		"foreignKeys": []
		},
		{
		"tableName": "Log",
		"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `timestamp` INTEGER NOT NULL, `tag` TEXT NOT NULL, `level` INTEGER NOT NULL, `message` TEXT NOT NULL, `exception` TEXT)",
		"fields": [
		{
		"fieldPath": "id",
		"columnName": "id",
		"affinity": "INTEGER",
		"notNull": true
		},
		{
		"fieldPath": "timestamp",
		"columnName": "timestamp",
		"affinity": "INTEGER",
		"notNull": true
		},
		{
		"fieldPath": "tag",
		"columnName": "tag",
		"affinity": "TEXT",
		"notNull": true
		},
		{
		"fieldPath": "level",
		"columnName": "level",
		"affinity": "INTEGER",
		"notNull": true
		},
		{
		"fieldPath": "message",
		"columnName": "message",
		"affinity": "TEXT",
		"notNull": true
		},
		{
		"fieldPath": "exception",
		"columnName": "exception",
		"affinity": "TEXT",
		"notNull": false
		}
		],
		"primaryKey": {
		"columnNames": [
		"id"
		],
		"autoGenerate": true
		},
		"indices": [],
		"foreignKeys": []
		}
		],
		"views": [],
		"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, 'c1b4f54d1d3111dc5c8f02e8fa960ceb')"
		]
		}
		}
		No newline at end of file

app/schemas/io.heckel.ntfy.db.Database/9.json

+3 −9

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		"formatVersion": 1,
		"database": {
		"version": 9,
		"identityHash": "c1b4f54d1d3111dc5c8f02e8fa960ceb",
		"identityHash": "5bab75c3b41c53c9855fe3a7ef8f0669",
		"entities": [
		{
		"tableName": "Subscription",
		@@ -82,7 +82,7 @@
		},
		{
		"tableName": "Notification",
		"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `title` TEXT NOT NULL, `message` TEXT NOT NULL, `encoding` TEXT NOT NULL, `notificationId` INTEGER NOT NULL, `priority` INTEGER NOT NULL DEFAULT 3, `tags` TEXT NOT NULL, `click` TEXT NOT NULL, `actions` TEXT, `deleted` INTEGER NOT NULL, `attachment_name` TEXT, `attachment_type` TEXT, `attachment_size` INTEGER, `attachment_expires` INTEGER, `attachment_url` TEXT, `attachment_contentUri` TEXT, `attachment_progress` INTEGER, PRIMARY KEY(`id`, `subscriptionId`))",
		"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `title` TEXT NOT NULL, `message` TEXT NOT NULL, `encoding` TEXT NOT NULL, `notificationId` INTEGER NOT NULL, `priority` INTEGER NOT NULL DEFAULT 3, `tags` TEXT NOT NULL, `click` TEXT NOT NULL, `deleted` INTEGER NOT NULL, `attachment_name` TEXT, `attachment_type` TEXT, `attachment_size` INTEGER, `attachment_expires` INTEGER, `attachment_url` TEXT, `attachment_contentUri` TEXT, `attachment_progress` INTEGER, PRIMARY KEY(`id`, `subscriptionId`))",
		"fields": [
		{
		"fieldPath": "id",
		@@ -145,12 +145,6 @@
		"affinity": "TEXT",
		"notNull": true
		},
		{
		"fieldPath": "actions",
		"columnName": "actions",
		"affinity": "TEXT",
		"notNull": false
		},
		{
		"fieldPath": "deleted",
		"columnName": "deleted",
		@@ -296,7 +290,7 @@
		"views": [],
		"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, 'c1b4f54d1d3111dc5c8f02e8fa960ceb')"
		"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '5bab75c3b41c53c9855fe3a7ef8f0669')"
		]
		}
		}
		No newline at end of file

app/src/main/java/io/heckel/ntfy/db/Database.kt

+6 −2

Original line number	Diff line number	Diff line
		@@ -78,9 +78,13 @@ data class Attachment(

		@Entity
		data class Action(
		@ColumnInfo(name = "id") val id: String, // Synthetic ID to identify result, and easily pass via Broadcast and WorkManager
		@ColumnInfo(name = "action") val action: String,
		@ColumnInfo(name = "label") val label: String,
		@ColumnInfo(name = "url") val url: String?,
		@ColumnInfo(name = "url") val url: String?, // used in "view" and "http"
		@ColumnInfo(name = "method") val method: String?, // used in "http"
		@ColumnInfo(name = "headers") val headers: Map<String,String>?, // used in "http"
		@ColumnInfo(name = "body") val body: String?, // used in "http"
		)

		class Converters {
		@@ -126,7 +130,7 @@ data class LogEntry(
		this(0, timestamp, tag, level, message, exception)
		}

		@androidx.room.Database(entities = [Subscription::class, Notification::class, User::class, LogEntry::class], version = 9)
		@androidx.room.Database(entities = [Subscription::class, Notification::class, User::class, LogEntry::class], version = 10)
		@TypeConverters(Converters::class)
		abstract class Database : RoomDatabase() {
		abstract fun subscriptionDao(): SubscriptionDao

app/src/main/java/io/heckel/ntfy/msg/Message.kt

+5 −1

Original line number	Diff line number	Diff line
		@@ -32,9 +32,13 @@ data class MessageAttachment(

		@Keep
		data class MessageAction(
		val id: String,
		val action: String,
		val label: String,
		val url: String?,
		val url: String?, // used in "view" and "http"
		val method: String?, // used in "http"
		val headers: Map<String,String>?, // used in "http"
		val body: String?, // used in "http"
		)

		const val MESSAGE_ENCODING_BASE64 = "base64"

app/src/main/java/io/heckel/ntfy/msg/NotificationParser.kt

+3 −2

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ import io.heckel.ntfy.db.Action
		import io.heckel.ntfy.db.Attachment
		import io.heckel.ntfy.db.Notification
		import io.heckel.ntfy.util.joinTags
		import io.heckel.ntfy.util.randomString
		import io.heckel.ntfy.util.toPriority

		class NotificationParser {
		@@ -31,8 +32,8 @@ class NotificationParser {
		)
		} else null
		val actions = if (message.actions != null) {
		message.actions.map { action ->
		Action(action.action, action.label, action.url)
		message.actions.map { a ->
		Action(a.id, a.action, a.label, a.url, a.method, a.headers, a.body)
		}
		} else null
		val notification = Notification(