diff --git a/app/src/main/java/org/linphone/LinphoneApplication.kt b/app/src/main/java/org/linphone/LinphoneApplication.kt index c1386461b..2d66cd129 100644 --- a/app/src/main/java/org/linphone/LinphoneApplication.kt +++ b/app/src/main/java/org/linphone/LinphoneApplication.kt @@ -88,6 +88,10 @@ class LinphoneApplication : Application(), ImageLoaderFactory { coreContext.start() return true } + + fun contextExists(): Boolean { + return ::coreContext.isInitialized + } } override fun onCreate() { diff --git a/app/src/main/java/org/linphone/core/CoreService.kt b/app/src/main/java/org/linphone/core/CoreService.kt index 70fa441b6..ab6215882 100644 --- a/app/src/main/java/org/linphone/core/CoreService.kt +++ b/app/src/main/java/org/linphone/core/CoreService.kt @@ -20,6 +20,7 @@ package org.linphone.core import android.content.Intent +import org.linphone.LinphoneApplication import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.LinphoneApplication.Companion.corePreferences import org.linphone.LinphoneApplication.Companion.ensureCoreExists @@ -80,8 +81,10 @@ class CoreService : CoreService() { } override fun onDestroy() { - Log.i("[Service] Stopping") - coreContext.notificationsManager.serviceDestroyed() + if (LinphoneApplication.contextExists()) { + Log.i("[Service] Stopping") + coreContext.notificationsManager.serviceDestroyed() + } super.onDestroy() }