diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 0cc0702ef..67466e288 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -257,7 +257,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick } }; - int missedCalls = LinphoneManager.getLc().getMissedCallsCount(); + int missedCalls = (LinphoneManager.getInstance() != null) ? LinphoneManager.getLc().getMissedCallsCount() : 0; displayMissedCalls(missedCalls); int rotation = getWindowManager().getDefaultDisplay().getRotation(); @@ -276,7 +276,9 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick break; } - LinphoneManager.getLc().setDeviceRotation(rotation); + if (LinphoneManager.getInstance() != null) { + LinphoneManager.getLc().setDeviceRotation(rotation); + } mAlwaysChangingPhoneAngle = rotation; } diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java index 36ecfca49..6a57d2acf 100644 --- a/src/org/linphone/LinphonePreferences.java +++ b/src/org/linphone/LinphonePreferences.java @@ -1269,7 +1269,8 @@ public class LinphonePreferences { // End of tunnel settings public boolean isProvisioningLoginViewEnabled() { - return getConfig().getBool("app", "show_login_view", false); + + return (getConfig() != null) ? getConfig().getBool("app", "show_login_view", false) : false; } public void disableProvisioningLoginView() {