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

Merge pull request #6547 from element-hq/feature/bma/fixCrashInFetchPushForegroundService

Browse source 
Fix crash in FetchPushForegroundService: No super method onTimeout
This commit is contained in:
Benoit Marty 2026-04-09 12:14:47 +02:00 • committed by GitHub
commit 89fd194fe2
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/FetchPushForegroundService.kt
View file

@ -106,7 +106,7 @@ class FetchPushForegroundService : Service() {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
coroutineScope.launch { coroutineScope.launch {
delay(wakelockTimeout) delay(wakelockTimeout)
onTimeout(startId) onTimeoutAction(calledByTheSystem = false)
} }
} }
@ -124,7 +124,11 @@ class FetchPushForegroundService : Service() {
override fun onTimeout(startId: Int) { override fun onTimeout(startId: Int) {
super.onTimeout(startId) super.onTimeout(startId)
onTimeoutAction(calledByTheSystem = true)
}
private fun onTimeoutAction(calledByTheSystem: Boolean) {
Timber.d("onTimeoutAction, calledByTheSystem: $calledByTheSystem, isOnForeground: $isOnForeground")
if (isOnForeground) { if (isOnForeground) {
Timber.d("Wakelock timeout reached, stopping FetchPushForegroundService") Timber.d("Wakelock timeout reached, stopping FetchPushForegroundService")
coroutineScope.launch { pushHandlingWakeLock.unlock() } coroutineScope.launch { pushHandlingWakeLock.unlock() }