Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e8ba28e authored by Philipp Heckel's avatar Philipp Heckel
Browse files

Merge branch 'constant-ring' into custom_notification_channels

parents c36e80c1 b4b3263d

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

+9 −3
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 
  "formatVersion": 1,

  "database": {

    "version": 13,

    "identityHash": "39849793e1ed04fe89f0d71a59a56956",

    "identityHash": "44fc291d937fdf02b9bc2d0abb10d2e0",

    "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, `lastNotificationId` TEXT, `icon` TEXT, `upAppId` TEXT, `upConnectorToken` TEXT, `displayName` TEXT, `dedicatedChannels` INTEGER NOT NULL, 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, `insistent` INTEGER NOT NULL, `lastNotificationId` TEXT, `icon` TEXT, `upAppId` TEXT, `upConnectorToken` TEXT, `displayName` TEXT, `dedicatedChannels` INTEGER NOT NULL, PRIMARY KEY(`id`))",

        "fields": [

          {

            "fieldPath": "id",
@@ -50,6 +50,12 @@ 
            "affinity": "INTEGER",

            "notNull": true

          },

          {

            "fieldPath": "insistent",

            "columnName": "insistent",

            "affinity": "INTEGER",

            "notNull": true

          },

          {

            "fieldPath": "lastNotificationId",

            "columnName": "lastNotificationId",
@@ -344,7 +350,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, '39849793e1ed04fe89f0d71a59a56956')"

      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '44fc291d937fdf02b9bc2d0abb10d2e0')"

    ]

  }

}
 
 No newline at end of file

app/src/main/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -142,6 +142,13 @@ 
                android:exported="false">

        </receiver>



        <!-- Broadcast receiver for when the notification is swiped away (currently only to cancel the insistent sound) -->

        <receiver

                android:name=".msg.NotificationService$DeleteBroadcastReceiver"

                android:enabled="true"

                android:exported="false">

        </receiver>



        <!-- Firebase messaging (note that this is empty in the F-Droid flavor) -->

        <service

                android:name=".firebase.FirebaseService"

app/src/main/java/io/heckel/ntfy/app/Application.kt

+0 −5
Original line number Diff line number Diff line 
package io.heckel.ntfy.app



import android.app.Application

import io.heckel.ntfy.db.Database

import io.heckel.ntfy.db.Repository

import io.heckel.ntfy.util.Log



class Application : Application() {

    private val database by lazy {

        Log.init(this) // What a hack, but this is super early and used everywhere

        Database.getInstance(this)

    }

    val repository by lazy {

        val repository = Repository.getInstance(applicationContext)

        if (repository.getRecordLogs()) {

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

+3 −0
Original line number Diff line number Diff line
@@ -103,6 +103,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,

                    insistent = s.insistent ?: Repository.INSISTENT_MAX_PRIORITY_USE_GLOBAL,

                    lastNotificationId = s.lastNotificationId,

                    icon = s.icon,

                    upAppId = s.upAppId,
@@ -241,6 +242,7 @@ class Backuper(val context: Context) { 
                mutedUntil = s.mutedUntil,

                minPriority = s.minPriority,

                autoDelete = s.autoDelete,

                insistent = s.insistent,

                lastNotificationId = s.lastNotificationId,

                icon = s.icon,

                upAppId = s.upAppId,
@@ -359,6 +361,7 @@ data class Subscription( 
    val mutedUntil: Long,

    val minPriority: Int?,

    val autoDelete: Long?,

    val insistent: Int?,

    val lastNotificationId: String?,

    val icon: String?,

    val upAppId: String?,

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

+45 −8
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 = "insistent") val insistent: Int, // Ring constantly for max priority notifications (-1 = use global, 0 = off, 1 = on)

    @ColumnInfo(name = "lastNotificationId") val lastNotificationId: String?, // Used for polling, with since=<id>

    @ColumnInfo(name = "icon") val icon: String?, // content://-URI (or later other identifier)

    @ColumnInfo(name = "upAppId") val upAppId: String?, // UnifiedPush application package name
@@ -29,8 +30,42 @@ 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, lastNotificationId: String, icon: String, upAppId: String, upConnectorToken: String, displayName: String?, dedicatedChannels: Boolean?) :

            this(id, baseUrl, topic, instant, mutedUntil, minPriority, autoDelete, lastNotificationId, icon, upAppId, upConnectorToken, displayName, dedicatedChannels == true, 0, 0, 0, ConnectionState.NOT_APPLICABLE)

    constructor(

        id: Long,

        baseUrl: String,

        topic: String,

        instant: Boolean,

        mutedUntil: Long,

        minPriority: Int,

        autoDelete: Long,

        insistent: Int,

        lastNotificationId: String,

        icon: String,

        upAppId: String,

        upConnectorToken: String,

        displayName: String?,

        dedicatedChannels: Boolean

    ) :

            this(

                id,

                baseUrl,

                topic,

                instant,

                mutedUntil,

                minPriority,

                autoDelete,

                insistent,

                lastNotificationId,

                icon,

                upAppId,

                upConnectorToken,

                displayName,

                dedicatedChannels,

                totalCount = 0,

                newCount = 0,

                lastActive = 0,

                state = ConnectionState.NOT_APPLICABLE

            )

}



enum class ConnectionState {
@@ -45,6 +80,7 @@ data class SubscriptionWithMetadata( 
    val mutedUntil: Long,

    val autoDelete: Long,

    val minPriority: Int,

    val insistent: Int,

    val lastNotificationId: String?,

    val icon: String?,

    val upAppId: String?,
@@ -289,7 +325,8 @@ abstract class Database : RoomDatabase() { 


        private val MIGRATION_12_13 = object : Migration(12, 13) {

            override fun migrate(db: SupportSQLiteDatabase) {

                db.execSQL("ALTER TABLE Subscription ADD COLUMN dedicatedChannels INTEGER NOT NULL DEFAULT('0')")

                db.execSQL("ALTER TABLE Subscription ADD COLUMN insistent INTEGER NOT NULL DEFAULT (-1)") // = Repository.INSISTENT_MAX_PRIORITY_USE_GLOBAL

                db.execSQL("ALTER TABLE Subscription ADD COLUMN dedicatedChannels INTEGER NOT NULL DEFAULT (0)")

            }

        }

    }
@@ -299,7 +336,7 @@ abstract class Database : RoomDatabase() { 
interface SubscriptionDao {

    @Query("""

        SELECT 

          s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.lastNotificationId, s.icon, s.upAppId, s.upConnectorToken, s.displayName, s.dedicatedChannels,

          s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.insistent, s.lastNotificationId, s.icon, s.upAppId, s.upConnectorToken, s.displayName, s.dedicatedChannels,

          COUNT(n.id) totalCount, 

          COUNT(CASE n.notificationId WHEN 0 THEN NULL ELSE n.id END) newCount, 

          IFNULL(MAX(n.timestamp),0) AS lastActive
@@ -312,7 +349,7 @@ interface SubscriptionDao { 


    @Query("""

        SELECT 

          s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.lastNotificationId, s.icon, s.upAppId, s.upConnectorToken, s.displayName, s.dedicatedChannels,

          s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.insistent, s.lastNotificationId, s.icon, s.upAppId, s.upConnectorToken, s.displayName, s.dedicatedChannels,

          COUNT(n.id) totalCount, 

          COUNT(CASE n.notificationId WHEN 0 THEN NULL ELSE n.id END) newCount, 

          IFNULL(MAX(n.timestamp),0) AS lastActive
@@ -325,7 +362,7 @@ interface SubscriptionDao { 


    @Query("""

        SELECT 

          s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.lastNotificationId, s.icon, s.upAppId, s.upConnectorToken, s.displayName, s.dedicatedChannels,

          s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.insistent, s.lastNotificationId, s.icon, s.upAppId, s.upConnectorToken, s.displayName, s.dedicatedChannels,

          COUNT(n.id) totalCount, 

          COUNT(CASE n.notificationId WHEN 0 THEN NULL ELSE n.id END) newCount, 

          IFNULL(MAX(n.timestamp),0) AS lastActive
@@ -338,7 +375,7 @@ interface SubscriptionDao { 


    @Query("""

        SELECT 

          s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.lastNotificationId, s.icon, s.upAppId, s.upConnectorToken, s.displayName, s.dedicatedChannels,

          s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.insistent, s.lastNotificationId, s.icon, s.upAppId, s.upConnectorToken, s.displayName, s.dedicatedChannels,

          COUNT(n.id) totalCount, 

          COUNT(CASE n.notificationId WHEN 0 THEN NULL ELSE n.id END) newCount, 

          IFNULL(MAX(n.timestamp),0) AS lastActive
@@ -351,7 +388,7 @@ interface SubscriptionDao { 


    @Query("""

        SELECT 

          s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.lastNotificationId, s.icon, s.upAppId, s.upConnectorToken, s.displayName, s.dedicatedChannels,

          s.id, s.baseUrl, s.topic, s.instant, s.mutedUntil, s.minPriority, s.autoDelete, s.insistent, s.lastNotificationId, s.icon, s.upAppId, s.upConnectorToken, s.displayName, s.dedicatedChannels,

          COUNT(n.id) totalCount, 

          COUNT(CASE n.notificationId WHEN 0 THEN NULL ELSE n.id END) newCount, 

          IFNULL(MAX(n.timestamp),0) AS lastActive