Implement UnifiedPush 2.0 spec (untested, #130) (bd8d6199) · Commits · e / os / Ntfy Android

app/build.gradle

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ dependencies {
		implementation 'com.squareup.okhttp3:okhttp:4.9.3'

		// Firebase, sigh ... (only Google Play)
		playImplementation 'com.google.firebase:firebase-messaging:23.0.1'
		playImplementation 'com.google.firebase:firebase-messaging:23.0.0'

		// RecyclerView
		implementation "androidx.recyclerview:recyclerview:1.3.0-alpha01"

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

+9 −3

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		"formatVersion": 1,
		"database": {
		"version": 8,
		"identityHash": "eda2cb9740c4542f24462779eb6ff81d",
		"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, `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`))",
		"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",
		@@ -114,6 +114,12 @@
		"affinity": "TEXT",
		"notNull": true
		},
		{
		"fieldPath": "encoding",
		"columnName": "encoding",
		"affinity": "TEXT",
		"notNull": true
		},
		{
		"fieldPath": "notificationId",
		"columnName": "notificationId",
		@@ -284,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, 'eda2cb9740c4542f24462779eb6ff81d')"
		"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '5bab75c3b41c53c9855fe3a7ef8f0669')"
		]
		}
		}
		No newline at end of file

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

0 → 100644

+296 −0

Original line number	Diff line number	Diff line
		{
		"formatVersion": 1,
		"database": {
		"version": 9,
		"identityHash": "5bab75c3b41c53c9855fe3a7ef8f0669",
		"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, `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": "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, '5bab75c3b41c53c9855fe3a7ef8f0669')"
		]
		}
		}
		No newline at end of file

app/src/main/AndroidManifest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,7 @@
		<intent-filter>
		<action android:name="org.unifiedpush.android.distributor.REGISTER"/>
		<action android:name="org.unifiedpush.android.distributor.UNREGISTER"/>
		<action android:name="org.unifiedpush.android.distributor.feature.BYTES_MESSAGE"/>
		</intent-filter>
		</receiver>

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ data class Notification(
		@ColumnInfo(name = "timestamp") val timestamp: Long, // Unix timestamp
		@ColumnInfo(name = "title") val title: String,
		@ColumnInfo(name = "message") val message: String,
		@ColumnInfo(name = "encoding") val encoding: String, // "base64" or ""
		@ColumnInfo(name = "notificationId") val notificationId: Int, // Android notification popup ID
		@ColumnInfo(name = "priority", defaultValue = "3") val priority: Int, // 1=min, 3=default, 5=max
		@ColumnInfo(name = "tags") val tags: String,
		@@ -100,7 +101,7 @@ data class LogEntry(
		this(0, timestamp, tag, level, message, exception)
		}

		@androidx.room.Database(entities = [Subscription::class, Notification::class, User::class, LogEntry::class], version = 8)
		@androidx.room.Database(entities = [Subscription::class, Notification::class, User::class, LogEntry::class], version = 9)
		abstract class Database : RoomDatabase() {
		abstract fun subscriptionDao(): SubscriptionDao
		abstract fun notificationDao(): NotificationDao
		@@ -122,6 +123,7 @@ abstract class Database : RoomDatabase() {
		.addMigrations(MIGRATION_5_6)
		.addMigrations(MIGRATION_6_7)
		.addMigrations(MIGRATION_7_8)
		.addMigrations(MIGRATION_8_9)
		.fallbackToDestructiveMigration()
		.build()
		this.instance = instance
		@@ -191,6 +193,12 @@ abstract class Database : RoomDatabase() {
		db.execSQL("CREATE TABLE User (baseUrl TEXT NOT NULL, username TEXT NOT NULL, password TEXT NOT NULL, PRIMARY KEY(baseUrl))")
		}
		}

		private val MIGRATION_8_9 = object : Migration(8, 9) {
		override fun migrate(db: SupportSQLiteDatabase) {
		db.execSQL("ALTER TABLE Notification ADD COLUMN encoding TEXT NOT NULL DEFAULT('')")
		}
		}
		}
		}