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

Unverified Commit c18662dd authored by Markus Doits's avatar Markus Doits
Browse files

use subscription topic short url for notification group name

parent b63e5e8b

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

+2 −3
Original line number Diff line number Diff line
@@ -71,9 +71,8 @@ class NotificationService(val context: Context) { 
    fun createSubscriptionNotificationChannels(subscription: Subscription) {

        val notificationScope = dedicatedNotificationScope(subscription)

        val groupId = dedicatedGroupId(subscription)

        val displayName = displayName(subscription)



        maybeCreateNotificationGroup(groupId, displayName)

        maybeCreateNotificationGroup(groupId, subscriptionTopicShortUrl(subscription))



        (1..5).forEach { priority -> maybeCreateNotificationChannel(notificationScope, priority, groupId) }

    }
@@ -116,7 +115,7 @@ class NotificationService(val context: Context) { 
        maybeAddUserActions(builder, notification)



        if (groupId != null) {

            maybeCreateNotificationGroup(groupId, displayName(subscription))

            maybeCreateNotificationGroup(groupId, subscriptionTopicShortUrl(subscription))

        }



        maybeCreateNotificationChannel(scope, notification.priority, groupId)

app/src/main/java/io/heckel/ntfy/util/Util.kt

+5 −1
Original line number Diff line number Diff line
@@ -56,8 +56,12 @@ fun topicUrlAuth(baseUrl: String, topic: String) = "${topicUrl(baseUrl, topic)}/ 
fun topicUrlJsonPoll(baseUrl: String, topic: String, since: String) = "${topicUrl(baseUrl, topic)}/json?poll=1&since=$since"

fun topicShortUrl(baseUrl: String, topic: String) = shortUrl(topicUrl(baseUrl, topic))



fun subscriptionTopicShortUrl(subscription: Subscription) : String {

    return topicShortUrl(subscription.baseUrl, subscription.topic)

}



fun displayName(subscription: Subscription) : String {

    return subscription.displayName ?: topicShortUrl(subscription.baseUrl, subscription.topic)

    return subscription.displayName ?: subscriptionTopicShortUrl(subscription)

}



fun shortUrl(url: String) = url