From a3340125cb06e6520fb501df45f1e5f81df3ddde Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 19 May 2022 16:36:15 +0200 Subject: [PATCH] Fixed crash reported on Crashlytics --- app/src/main/java/org/linphone/LinphoneApplication.kt | 4 ++++ app/src/main/java/org/linphone/core/BootReceiver.kt | 1 - app/src/main/java/org/linphone/core/CoreService.kt | 7 +++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/linphone/LinphoneApplication.kt b/app/src/main/java/org/linphone/LinphoneApplication.kt index 90978efa2..8f8b521e7 100644 --- a/app/src/main/java/org/linphone/LinphoneApplication.kt +++ b/app/src/main/java/org/linphone/LinphoneApplication.kt @@ -70,6 +70,10 @@ class LinphoneApplication : Application() { coreContext = CoreContext(context, corePreferences.config) coreContext.start() } + + fun contextExists(): Boolean { + return ::coreContext.isInitialized + } } override fun onCreate() { diff --git a/app/src/main/java/org/linphone/core/BootReceiver.kt b/app/src/main/java/org/linphone/core/BootReceiver.kt index dfd765237..951eacde0 100644 --- a/app/src/main/java/org/linphone/core/BootReceiver.kt +++ b/app/src/main/java/org/linphone/core/BootReceiver.kt @@ -23,7 +23,6 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import androidx.core.app.NotificationManagerCompat -import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.LinphoneApplication.Companion.corePreferences import org.linphone.R import org.linphone.compatibility.Compatibility diff --git a/app/src/main/java/org/linphone/core/CoreService.kt b/app/src/main/java/org/linphone/core/CoreService.kt index 4bfa33eea..9c9893d8a 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 @@ -79,8 +80,10 @@ class CoreService : CoreService() { } override fun onDestroy() { - Log.i("[Service] Stopping") - coreContext.notificationsManager.service = null + if (LinphoneApplication.contextExists()) { + Log.i("[Service] Stopping") + coreContext.notificationsManager.service = null + } super.onDestroy() }