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

Fix wakelock not stopping early when notifications are disabled (#6424)

Browse source 
If notifications for a device are disabled when there is no connection with the HS, the push registration will still exist, so the device can still receive push notifications.

In that cases, we were running into an issue where the wakelock for push notifications was started immediately after receiving a push but was never stopped and it ran for 3 minutes until its timeout, keeping the device awake for no reason.

This patch changes `DefaultPushHandler` so if we don't need the wakelock it returns `false` and we can stop the wakelock early.
This commit is contained in:
Jorge Martin Espinosa 2026-03-23 18:07:25 +01:00 • committed by GitHub
parent 3a7faa8b76
commit f1708f6366
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 157 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt
View file

@ -64,7 +64,7 @@ class DefaultPushHandler(
* @param pushData the data received in the push.
* @param providerInfo the provider info.
*/
override suspend fun handle(pushData: PushData, providerInfo: String) {
override suspend fun handle(pushData: PushData, providerInfo: String): Boolean {
// Start measuring how long it takes to display a notification from when the push is received
Timber.d("Calculating push-to-notification for event ${pushData.eventId}")
val parent = analyticsService.startLongRunningTransaction(AnalyticsLongRunningTransaction.PushToNotification(pushData.eventId.value))
@ -81,9 +81,10 @@ class DefaultPushHandler(
}
// Diagnostic Push
if (pushData.eventId == DefaultTestPush.TEST_EVENT_ID) {
return if (pushData.eventId == DefaultTestPush.TEST_EVENT_ID) {
pushHistoryService.onDiagnosticPush(providerInfo)
diagnosticPushHandler.handlePush()
false
} else {
handleInternal(pushData, providerInfo)
}
@ -100,7 +101,7 @@ class DefaultPushHandler(
* @param pushData Object containing message data.
* @param providerInfo the provider info.
*/
private suspend fun handleInternal(pushData: PushData, providerInfo: String) {
private suspend fun handleInternal(pushData: PushData, providerInfo: String): Boolean {
try {
if (buildMeta.lowPrivacyLoggingEnabled) {
Timber.tag(loggerTag.value).d("## handleInternal() : $pushData")
@ -117,13 +118,13 @@ class DefaultPushHandler(
roomId = pushData.roomId,
reason = "Unable to get userId from client secret",
)
return
return false
}
val areNotificationsEnabled = userPushStoreFactory.getOrCreate(userId).getNotificationEnabledForDevice().first()
if (!areNotificationsEnabled) {
Timber.w("Push notification received when push notifications are disabled.")
return
return false
}
val pushRequest = PushRequest(
@ -144,8 +145,11 @@ class DefaultPushHandler(
Timber.d("No pending worker for push notifications found")
workManagerScheduler.submit(syncPendingNotificationsRequestFactory.create(userId))
}
return true
} catch (e: Exception) {
Timber.tag(loggerTag.value).e(e, "## handleInternal() failed")
return false
}
}
}