From 053ada283325fae8cc681ba77c9b781565b2cc02 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 26 Sep 2019 17:52:22 +0200 Subject: [PATCH] Prevent crash that happens sometimes --- app/src/main/java/org/linphone/LinphoneManager.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/linphone/LinphoneManager.java b/app/src/main/java/org/linphone/LinphoneManager.java index 71d115973..71773fc4b 100644 --- a/app/src/main/java/org/linphone/LinphoneManager.java +++ b/app/src/main/java/org/linphone/LinphoneManager.java @@ -414,12 +414,14 @@ public class LinphoneManager implements SensorEventListener { Log.w("[Manager] Destroying Manager"); changeStatusToOffline(); - Log.i("[Manager] Unregistering phone state listener"); - mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE); + if (mTelephonyManager != null) { + Log.i("[Manager] Unregistering phone state listener"); + mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE); + } - mCallManager.destroy(); - mMediaScanner.destroy(); - mAudioManager.destroy(); + if (mCallManager != null) mCallManager.destroy(); + if (mMediaScanner != null) mMediaScanner.destroy(); + if (mAudioManager != null) mAudioManager.destroy(); try { mTimer.cancel();