Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Prevent crash when background mode is enabled & service notification channel is disabled

Browse source
This commit is contained in:
Sylvain Berfini 2022-02-14 10:10:08 +01:00
parent a5658bf5ea
commit 34ca235d7b
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/org/linphone/core/BootReceiver.kt
View file

@ -22,8 +22,11 @@ package org.linphone.core
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import androidx.core.app.NotificationManagerCompat
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import org.linphone.LinphoneApplication.Companion.corePreferences import org.linphone.LinphoneApplication.Companion.corePreferences
import org.linphone.R
import org.linphone.compatibility.Compatibility
import org.linphone.core.tools.Log import org.linphone.core.tools.Log
class BootReceiver : BroadcastReceiver() { class BootReceiver : BroadcastReceiver() {
@ -32,18 +35,27 @@ class BootReceiver : BroadcastReceiver() {
val autoStart = corePreferences.autoStart val autoStart = corePreferences.autoStart
Log.i("[Boot Receiver] Device is starting, autoStart is $autoStart") Log.i("[Boot Receiver] Device is starting, autoStart is $autoStart")
if (autoStart) { if (autoStart) {
val serviceIntent = Intent(Intent.ACTION_MAIN).setClass(context, CoreService::class.java) startService(context)
serviceIntent.putExtra("StartForeground", true)
ContextCompat.startForegroundService(context, serviceIntent)
} }
} else if (intent.action.equals(Intent.ACTION_MY_PACKAGE_REPLACED, ignoreCase = true)) { } else if (intent.action.equals(Intent.ACTION_MY_PACKAGE_REPLACED, ignoreCase = true)) {
val autoStart = corePreferences.autoStart val autoStart = corePreferences.autoStart
Log.i("[Boot Receiver] App has been updated, autoStart is $autoStart") Log.i("[Boot Receiver] App has been updated, autoStart is $autoStart")
if (autoStart) { if (autoStart) {
val serviceIntent = Intent(Intent.ACTION_MAIN).setClass(context, CoreService::class.java) startService(context)
serviceIntent.putExtra("StartForeground", true)
ContextCompat.startForegroundService(context, serviceIntent)
} }
} }
} }
private fun startService(context: Context) {
val serviceChannel = context.getString(R.string.notification_channel_service_id)
val notificationManager = NotificationManagerCompat.from(context)
if (Compatibility.getChannelImportance(notificationManager, serviceChannel) == NotificationManagerCompat.IMPORTANCE_NONE) {
Log.w("[Boot Receiver] Service channel is disabled!")
return
}
val serviceIntent = Intent(Intent.ACTION_MAIN).setClass(context, CoreService::class.java)
serviceIntent.putExtra("StartForeground", true)
ContextCompat.startForegroundService(context, serviceIntent)
}
} }

6
app/src/main/java/org/linphone/notifications/NotificationsManager.kt
View file

@ -279,6 +279,12 @@ class NotificationsManager(private val context: Context) {
/* Service related */ /* Service related */
fun startForeground() { fun startForeground() {
val serviceChannel = context.getString(R.string.notification_channel_service_id)
if (Compatibility.getChannelImportance(notificationManager, serviceChannel) == NotificationManagerCompat.IMPORTANCE_NONE) {
Log.w("[Notifications Manager] Service channel is disabled!")
return
}
val coreService = service val coreService = service
if (coreService != null) { if (coreService != null) {
startForeground(coreService, useAutoStartDescription = false) startForeground(coreService, useAutoStartDescription = false)