Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Set a sound to the noisy notification channel

Browse source
This commit is contained in:
Benoit Marty 2025-10-07 11:13:45 +02:00 • committed by Benoit Marty
parent e2c19a4993
commit 0fc9e148ab
2 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannels.kt
View file

@ -7,8 +7,12 @@
package io.element.android.libraries.push.impl.notifications.channels package io.element.android.libraries.push.impl.notifications.channels
import android.content.ContentResolver
import android.content.Context
import android.media.AudioAttributes import android.media.AudioAttributes
import android.media.AudioAttributes.USAGE_NOTIFICATION
import android.media.AudioManager import android.media.AudioManager
import android.net.Uri
import android.os.Build import android.os.Build
import android.provider.Settings import android.provider.Settings
import androidx.annotation.ChecksSdkIntAtLeast import androidx.annotation.ChecksSdkIntAtLeast
@ -19,6 +23,7 @@ import dev.zacsweers.metro.ContributesBinding
import dev.zacsweers.metro.Inject import dev.zacsweers.metro.Inject
import dev.zacsweers.metro.SingleIn import dev.zacsweers.metro.SingleIn
import io.element.android.appconfig.NotificationConfig import io.element.android.appconfig.NotificationConfig
import io.element.android.libraries.di.annotations.ApplicationContext
import io.element.android.libraries.push.impl.R import io.element.android.libraries.push.impl.R
import io.element.android.services.toolbox.api.strings.StringProvider import io.element.android.services.toolbox.api.strings.StringProvider
@ -26,7 +31,7 @@ import io.element.android.services.toolbox.api.strings.StringProvider
* IDs for channels * IDs for channels
* ========================================================================================== */ * ========================================================================================== */
internal const val SILENT_NOTIFICATION_CHANNEL_ID = "DEFAULT_SILENT_NOTIFICATION_CHANNEL_ID_V2" internal const val SILENT_NOTIFICATION_CHANNEL_ID = "DEFAULT_SILENT_NOTIFICATION_CHANNEL_ID_V2"
internal const val NOISY_NOTIFICATION_CHANNEL_ID = "DEFAULT_NOISY_NOTIFICATION_CHANNEL_ID" internal const val NOISY_NOTIFICATION_CHANNEL_ID = "DEFAULT_NOISY_NOTIFICATION_CHANNEL_ID_V2"
internal const val CALL_NOTIFICATION_CHANNEL_ID = "CALL_NOTIFICATION_CHANNEL_ID_V3" internal const val CALL_NOTIFICATION_CHANNEL_ID = "CALL_NOTIFICATION_CHANNEL_ID_V3"
internal const val RINGING_CALL_NOTIFICATION_CHANNEL_ID = "RINGING_CALL_NOTIFICATION_CHANNEL_ID" internal const val RINGING_CALL_NOTIFICATION_CHANNEL_ID = "RINGING_CALL_NOTIFICATION_CHANNEL_ID"
@ -61,6 +66,8 @@ private fun supportNotificationChannels() = Build.VERSION.SDK_INT >= Build.VERSI
class DefaultNotificationChannels( class DefaultNotificationChannels(
private val notificationManager: NotificationManagerCompat, private val notificationManager: NotificationManagerCompat,
private val stringProvider: StringProvider, private val stringProvider: StringProvider,
@ApplicationContext
private val context: Context,
) : NotificationChannels { ) : NotificationChannels {
init { init {
createNotificationChannels() createNotificationChannels()
@ -94,6 +101,7 @@ class DefaultNotificationChannels(
// Migration - Remove deprecated channels // Migration - Remove deprecated channels
for (channelId in listOf( for (channelId in listOf(
"DEFAULT_SILENT_NOTIFICATION_CHANNEL_ID", "DEFAULT_SILENT_NOTIFICATION_CHANNEL_ID",
"DEFAULT_NOISY_NOTIFICATION_CHANNEL_ID",
"CALL_NOTIFICATION_CHANNEL_ID", "CALL_NOTIFICATION_CHANNEL_ID",
"CALL_NOTIFICATION_CHANNEL_ID_V2", "CALL_NOTIFICATION_CHANNEL_ID_V2",
"LISTEN_FOR_EVENTS_NOTIFICATION_CHANNEL_ID", "LISTEN_FOR_EVENTS_NOTIFICATION_CHANNEL_ID",
@ -112,6 +120,17 @@ class DefaultNotificationChannels(
NOISY_NOTIFICATION_CHANNEL_ID, NOISY_NOTIFICATION_CHANNEL_ID,
NotificationManagerCompat.IMPORTANCE_DEFAULT NotificationManagerCompat.IMPORTANCE_DEFAULT
) )
.setSound(
Uri.Builder()
.scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
// Strangely wwe have to provide a "//" before the package name
.path("//" + context.packageName + "/" + R.raw.message)
.build(),
AudioAttributes.Builder()
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
.setUsage(USAGE_NOTIFICATION)
.build(),
)
.setName(stringProvider.getString(R.string.notification_channel_noisy).ifEmpty { "Noisy notifications" }) .setName(stringProvider.getString(R.string.notification_channel_noisy).ifEmpty { "Noisy notifications" })
.setDescription(stringProvider.getString(R.string.notification_channel_noisy)) .setDescription(stringProvider.getString(R.string.notification_channel_noisy))
.setVibrationEnabled(true) .setVibrationEnabled(true)

BIN
libraries/push/impl/src/main/res/raw/message.mp3 Normal file
View file

Binary file not shown.