diff --git a/src/android/org/linphone/BootReceiver.java b/src/android/org/linphone/BootReceiver.java index 3ec7f2148..87e4fc84b 100644 --- a/src/android/org/linphone/BootReceiver.java +++ b/src/android/org/linphone/BootReceiver.java @@ -42,7 +42,11 @@ public class BootReceiver extends BroadcastReceiver { if (autostart) { Intent lLinphoneServiceIntent = new Intent(Intent.ACTION_MAIN); lLinphoneServiceIntent.setClass(context, LinphoneService.class); - context.startService(lLinphoneServiceIntent); + try { + context.startService(lLinphoneServiceIntent); + } catch (RuntimeException e) { + Log.e(e); + } } } } diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java index d78212bf9..76e1267bb 100644 --- a/src/android/org/linphone/LinphoneManager.java +++ b/src/android/org/linphone/LinphoneManager.java @@ -1401,8 +1401,11 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag try { if (mLc.getCallsNb() > 0) { mLc.acceptCall(call); - LinphoneManager.getInstance().routeAudioToReceiver(); - LinphoneActivity.instance().startIncallActivity(call); + if (LinphoneManager.getInstance() != null) { + LinphoneManager.getInstance().routeAudioToReceiver(); + if (LinphoneActivity.instance() != null) + LinphoneActivity.instance().startIncallActivity(call); + } } } catch (LinphoneCoreException e) { Log.e(e); diff --git a/src/android/org/linphone/LinphoneUtils.java b/src/android/org/linphone/LinphoneUtils.java index c189f47fc..02aa76f85 100644 --- a/src/android/org/linphone/LinphoneUtils.java +++ b/src/android/org/linphone/LinphoneUtils.java @@ -728,7 +728,7 @@ public final class LinphoneUtils { } public static void displayErrorAlert(String msg, Context ctxt) { - if (ctxt != null) { + if (ctxt != null && msg != null) { AlertDialog.Builder builder = new AlertDialog.Builder(ctxt); builder.setMessage(msg) .setCancelable(false) diff --git a/src/android/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java index 90db60512..fc4127b4c 100644 --- a/src/android/org/linphone/assistant/AssistantActivity.java +++ b/src/android/org/linphone/assistant/AssistantActivity.java @@ -138,8 +138,10 @@ private static AssistantActivity instance; mPrefs = LinphonePreferences.instance(); status.enableSideMenu(false); - accountCreator = LinphoneCoreFactory.instance().createAccountCreator(LinphoneManager.getLc(), LinphonePreferences.instance().getXmlrpcUrl()); - accountCreator.setListener(this); + if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) { + accountCreator = LinphoneCoreFactory.instance().createAccountCreator(LinphoneManager.getLc(), LinphonePreferences.instance().getXmlrpcUrl()); + accountCreator.setListener(this); + } countryListAdapter = new CountryListAdapter(getApplicationContext()); mListener = new LinphoneCoreListenerBase() {