kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement optional separate app notification channels

Browse Source
This commit is contained in:
Niko Diamadis
2023-02-13 12:24:40 +01:00
parent 8bae62cc24
commit ddd902e17e
8 changed files with 238 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/kotlin/com/github/gotify/service/WebSocketService.kt
View File

@@ -5,6 +5,7 @@ import android.app.Notification
import android.app.NotificationManager
import android.app.PendingIntent
import android.app.Service
import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.graphics.Color
@@ -312,13 +313,26 @@ internal class WebSocketService : Service() {
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
val b = NotificationCompat.Builder(
this,
NotificationSupport.convertPriorityToChannel(priority)
)
val channelId: String
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
NotificationSupport.areAppChannelsRequested(this)
) {
channelId = NotificationSupport.getChannelID(priority, appId.toString())
NotificationSupport.createChannelIfNonexistent(
this,
(this.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager),
appId.toString(),
appId.toString(),
channelId
)
} else {
channelId = NotificationSupport.convertPriorityToChannel(priority)
}
val b = NotificationCompat.Builder(this, channelId)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
showNotificationGroup(priority)
showNotificationGroup(channelId)
}
b.setAutoCancel(true)
@@ -365,7 +379,7 @@ internal class WebSocketService : Service() {
}
@RequiresApi(Build.VERSION_CODES.N)
fun showNotificationGroup(priority: Long) {
fun showNotificationGroup(channelId: String) {
val intent = Intent(this, MessagesActivity::class.java)
val contentIntent = PendingIntent.getActivity(
this,
@@ -376,7 +390,7 @@ internal class WebSocketService : Service() {
val builder = NotificationCompat.Builder(
this,
NotificationSupport.convertPriorityToChannel(priority)
channelId
)
builder.setAutoCancel(true)