WIP: Icon (2909d877) · Commits · e / os / Ntfy Android

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

+9 −3

Original line number	Diff line number	Diff line
		@@ -2,11 +2,11 @@
		"formatVersion": 1,
		"database": {
		"version": 11,
		"identityHash": "9a26b356f0d51f2c63fd3e4570b7e645",
		"identityHash": "31f8e6a2032d1d404fad4307abf23e1b",
		"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, `minPriority` INTEGER NOT NULL, `autoDelete` INTEGER NOT NULL, `upAppId` TEXT, `upConnectorToken` TEXT, PRIMARY KEY(`id`))",
		"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, `minPriority` INTEGER NOT NULL, `autoDelete` INTEGER NOT NULL, `icon` TEXT, `upAppId` TEXT, `upConnectorToken` TEXT, PRIMARY KEY(`id`))",
		"fields": [
		{
		"fieldPath": "id",
		@@ -50,6 +50,12 @@
		"affinity": "INTEGER",
		"notNull": true
		},
		{
		"fieldPath": "icon",
		"columnName": "icon",
		"affinity": "TEXT",
		"notNull": false
		},
		{
		"fieldPath": "upAppId",
		"columnName": "upAppId",
		@@ -308,7 +314,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, '9a26b356f0d51f2c63fd3e4570b7e645')"
		"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '31f8e6a2032d1d404fad4307abf23e1b')"
		]
		}
		}
		No newline at end of file

app/src/main/java/io/heckel/ntfy/backup/Backuper.kt

+3 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@ class Backuper(val context: Context) {
		mutedUntil = s.mutedUntil,
		minPriority = s.minPriority ?: Repository.MIN_PRIORITY_USE_GLOBAL,
		autoDelete = s.autoDelete ?: Repository.AUTO_DELETE_USE_GLOBAL,
		icon = s.icon,
		upAppId = s.upAppId,
		upConnectorToken = s.upConnectorToken
		))
		@@ -219,6 +220,7 @@ class Backuper(val context: Context) {
		mutedUntil = s.mutedUntil,
		minPriority = s.minPriority,
		autoDelete = s.autoDelete,
		icon = s.icon,
		upAppId = s.upAppId,
		upConnectorToken = s.upConnectorToken
		)
		@@ -324,6 +326,7 @@ data class Subscription(
		val mutedUntil: Long,
		val minPriority: Int?,
		val autoDelete: Long?,
		val icon: String?,
		val upAppId: String?,
		val upConnectorToken: String?
		)

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

+10 −7

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ data class Subscription(
		@ColumnInfo(name = "mutedUntil") val mutedUntil: Long,
		@ColumnInfo(name = "minPriority") val minPriority: Int,
		@ColumnInfo(name = "autoDelete") val autoDelete: Long, // Seconds
		@ColumnInfo(name = "icon") val icon: String?, // content://-URI (or later other identifier)
		@ColumnInfo(name = "upAppId") val upAppId: String?, // UnifiedPush application package name
		@ColumnInfo(name = "upConnectorToken") val upConnectorToken: String?, // UnifiedPush connector token
		@Ignore val totalCount: Int = 0, // Total notifications
		@@ -25,8 +26,8 @@ data class Subscription(
		@Ignore val lastActive: Long = 0, // Unix timestamp
		@Ignore val state: ConnectionState = ConnectionState.NOT_APPLICABLE
		) {
		constructor(id: Long, baseUrl: String, topic: String, instant: Boolean, mutedUntil: Long, minPriority: Int, autoDelete: Long, upAppId: String, upConnectorToken: String) :
		this(id, baseUrl, topic, instant, mutedUntil, minPriority, autoDelete, upAppId, upConnectorToken, 0, 0, 0, ConnectionState.NOT_APPLICABLE)
		constructor(id: Long, baseUrl: String, topic: String, instant: Boolean, mutedUntil: Long, minPriority: Int, autoDelete: Long, icon: String, upAppId: String, upConnectorToken: String) :
		this(id, baseUrl, topic, instant, mutedUntil, minPriority, autoDelete, icon, upAppId, upConnectorToken, 0, 0, 0, ConnectionState.NOT_APPLICABLE)
		}

		enum class ConnectionState {
		@@ -41,6 +42,7 @@ data class SubscriptionWithMetadata(
		val mutedUntil: Long,
		val autoDelete: Long,
		val minPriority: Int,
		val icon: String?,
		val upAppId: String?,
		val upConnectorToken: String?,
		val totalCount: Int,
		@@ -254,6 +256,7 @@ abstract class Database : RoomDatabase() {
		override fun migrate(db: SupportSQLiteDatabase) {
		db.execSQL("ALTER TABLE Subscription ADD COLUMN minPriority INT NOT NULL DEFAULT (0)") // = Repository.MIN_PRIORITY_USE_GLOBAL
		db.execSQL("ALTER TABLE Subscription ADD COLUMN autoDelete INT NOT NULL DEFAULT (-1)") // = Repository.AUTO_DELETE_USE_GLOBAL
		db.execSQL("ALTER TABLE Subscription ADD COLUMN icon TEXT")
		}
		}
		}
		@@ -263,7 +266,7 @@ abstract class Database : RoomDatabase() {
		interface SubscriptionDao {
		@Query("""
		SELECT
		s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.upAppId, s.upConnectorToken,
		s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.icon, s.upAppId, s.upConnectorToken,
		COUNT(n.id) totalCount,
		COUNT(CASE n.notificationId WHEN 0 THEN NULL ELSE n.id END) newCount,
		IFNULL(MAX(n.timestamp),0) AS lastActive
		@@ -276,7 +279,7 @@ interface SubscriptionDao {

		@Query("""
		SELECT
		s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.upAppId, s.upConnectorToken,
		s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.icon, s.upAppId, s.upConnectorToken,
		COUNT(n.id) totalCount,
		COUNT(CASE n.notificationId WHEN 0 THEN NULL ELSE n.id END) newCount,
		IFNULL(MAX(n.timestamp),0) AS lastActive
		@@ -289,7 +292,7 @@ interface SubscriptionDao {

		@Query("""
		SELECT
		s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.upAppId, s.upConnectorToken,
		s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.icon, s.upAppId, s.upConnectorToken,
		COUNT(n.id) totalCount,
		COUNT(CASE n.notificationId WHEN 0 THEN NULL ELSE n.id END) newCount,
		IFNULL(MAX(n.timestamp),0) AS lastActive
		@@ -302,7 +305,7 @@ interface SubscriptionDao {

		@Query("""
		SELECT
		s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.upAppId, s.upConnectorToken,
		s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.icon, s.upAppId, s.upConnectorToken,
		COUNT(n.id) totalCount,
		COUNT(CASE n.notificationId WHEN 0 THEN NULL ELSE n.id END) newCount,
		IFNULL(MAX(n.timestamp),0) AS lastActive
		@@ -315,7 +318,7 @@ interface SubscriptionDao {

		@Query("""
		SELECT
		s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.upAppId, s.upConnectorToken,
		s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.icon, s.upAppId, s.upConnectorToken,
		COUNT(n.id) totalCount,
		COUNT(CASE n.notificationId WHEN 0 THEN NULL ELSE n.id END) newCount,
		IFNULL(MAX(n.timestamp),0) AS lastActive

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -379,6 +379,7 @@ class Repository(private val sharedPrefs: SharedPreferences, private val databas
		mutedUntil = s.mutedUntil,
		minPriority = s.minPriority,
		autoDelete = s.autoDelete,
		icon = s.icon,
		upAppId = s.upAppId,
		upConnectorToken = s.upConnectorToken,
		totalCount = s.totalCount,
		@@ -401,6 +402,7 @@ class Repository(private val sharedPrefs: SharedPreferences, private val databas
		mutedUntil = s.mutedUntil,
		minPriority = s.minPriority,
		autoDelete = s.autoDelete,
		icon = s.icon,
		upAppId = s.upAppId,
		upConnectorToken = s.upConnectorToken,
		totalCount = s.totalCount,

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ class NotificationService(val context: Context) {
		.setAutoCancel(true) // Cancel when notification is clicked
		setStyleAndText(builder, notification) // Preview picture or big text style
		setClickAction(builder, subscription, notification)
		maybeSetIcon(builder, subscription)
		maybeSetSound(builder, update)
		maybeSetProgress(builder, notification)
		maybeAddOpenAction(builder, notification)
		@@ -84,6 +85,18 @@ class NotificationService(val context: Context) {
		notificationManager.notify(notification.notificationId, builder.build())
		}

		private fun maybeSetIcon(builder: NotificationCompat.Builder, subscription: Subscription) {
		val icon = subscription.icon ?: return
		try {
		val resolver = context.applicationContext.contentResolver
		val bitmapStream = resolver.openInputStream(Uri.parse(icon))
		val bitmap = BitmapFactory.decodeStream(bitmapStream)
		builder.setLargeIcon(bitmap)
		} catch (e: Exception) {
		Log.w(TAG, "Cannot load subscription icon", e)
		}
		}

		private fun maybeSetSound(builder: NotificationCompat.Builder, update: Boolean) {
		if (!update) {
		val defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)