From 30168a6fdbb14ddff28919f05ba1d05585a30ee7 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 5 Dec 2019 10:43:57 +0100
Subject: [PATCH] Fixed various crashes reported on play store

---
 .../java/org/linphone/LinphoneManager.java    |  2 +-
 .../activities/LinphoneGenericActivity.java   |  6 +-
 .../org/linphone/activities/MainActivity.java |  2 +-
 .../linphone/assistant/AssistantActivity.java |  4 +-
 .../linphone/call/CallIncomingActivity.java   |  1 +
 .../contacts/AsyncContactsLoader.java         | 40 ++++++----
 .../linphone/contacts/ContactsManager.java    | 11 ++-
 .../linphone/contacts/LinphoneContact.java    | 15 ++--
 .../settings/LinphonePreferences.java         | 80 +++++++++++++++++++
 .../java/org/linphone/utils/DeviceUtils.java  | 17 +++-
 10 files changed, 145 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/org/linphone/LinphoneManager.java b/app/src/main/java/org/linphone/LinphoneManager.java
index 0f184b6f9..624f6aa1b 100644
--- a/app/src/main/java/org/linphone/LinphoneManager.java
+++ b/app/src/main/java/org/linphone/LinphoneManager.java
@@ -825,7 +825,7 @@ public class LinphoneManager implements SensorEventListener {
 
     public void setCallGsmON(boolean on) {
         mCallGsmON = on;
-        if (on) {
+        if (on && mCore != null) {
             mCore.pauseAllCalls();
         }
     }
diff --git a/app/src/main/java/org/linphone/activities/LinphoneGenericActivity.java b/app/src/main/java/org/linphone/activities/LinphoneGenericActivity.java
index 1a218083f..100fe0c41 100644
--- a/app/src/main/java/org/linphone/activities/LinphoneGenericActivity.java
+++ b/app/src/main/java/org/linphone/activities/LinphoneGenericActivity.java
@@ -84,7 +84,11 @@ public abstract class LinphoneGenericActivity extends ThemeableActivity {
             }
 
             Log.i("[Generic Activity] Starting Service");
-            startService(new Intent().setClass(this, LinphoneService.class));
+            try {
+                startService(new Intent().setClass(this, LinphoneService.class));
+            } catch (IllegalStateException ise) {
+                Log.e("[Generic Activity] Couldn't start service, exception: ", ise);
+            }
         }
     }
 }
diff --git a/app/src/main/java/org/linphone/activities/MainActivity.java b/app/src/main/java/org/linphone/activities/MainActivity.java
index ca1d15f46..694878b8d 100644
--- a/app/src/main/java/org/linphone/activities/MainActivity.java
+++ b/app/src/main/java/org/linphone/activities/MainActivity.java
@@ -424,8 +424,8 @@ public abstract class MainActivity extends LinphoneGenericActivity
     }
 
     private void quit() {
-        goHomeAndClearStack();
         stopService(new Intent(Intent.ACTION_MAIN).setClass(this, LinphoneService.class));
+        goHomeAndClearStack();
         /*ActivityManager am = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
         am.killBackgroundProcesses(getString(R.string.sync_account_type));
         android.os.Process.killProcess(android.os.Process.myPid());*/
diff --git a/app/src/main/java/org/linphone/assistant/AssistantActivity.java b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
index 996f356e5..a18883829 100644
--- a/app/src/main/java/org/linphone/assistant/AssistantActivity.java
+++ b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
@@ -154,7 +154,9 @@ public abstract class AssistantActivity extends LinphoneGenericActivity
             } else {
                 // If this isn't a sip.linphone.org account, disable push notifications and enable
                 // service notification, otherwise incoming calls won't work (most probably)
-                proxyConfig.setPushNotificationAllowed(false);
+                if (proxyConfig != null) {
+                    proxyConfig.setPushNotificationAllowed(false);
+                }
                 Log.w(
                         "[Assistant] Unknown domain used, push probably won't work, enable service mode");
                 LinphonePreferences.instance().setServiceNotificationVisibility(true);
diff --git a/app/src/main/java/org/linphone/call/CallIncomingActivity.java b/app/src/main/java/org/linphone/call/CallIncomingActivity.java
index 37ec97182..a21d50187 100644
--- a/app/src/main/java/org/linphone/call/CallIncomingActivity.java
+++ b/app/src/main/java/org/linphone/call/CallIncomingActivity.java
@@ -280,6 +280,7 @@ public class CallIncomingActivity extends LinphoneGenericActivity {
             permissionsList.add(Manifest.permission.READ_PHONE_STATE);
         }
         if (LinphonePreferences.instance().shouldAutomaticallyAcceptVideoRequests()
+                && mCall != null
                 && mCall.getRemoteParams().videoEnabled()) {
             if (camera != PackageManager.PERMISSION_GRANTED) {
                 Log.i("[Permission] Asking for camera");
diff --git a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
index d8614fabd..c4941371a 100644
--- a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
+++ b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
@@ -144,25 +144,31 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
                         return data;
                     }
 
-                    String id = c.getString(c.getColumnIndex(ContactsContract.Data.CONTACT_ID));
-                    boolean starred =
-                            c.getInt(c.getColumnIndex(ContactsContract.Contacts.STARRED)) == 1;
+                    try {
+                        String id = c.getString(c.getColumnIndex(ContactsContract.Data.CONTACT_ID));
+                        boolean starred =
+                                c.getInt(c.getColumnIndex(ContactsContract.Contacts.STARRED)) == 1;
 
-                    LinphoneContact contact = androidContactsCache.get(id);
-                    if (contact == null) {
-                        Log.d(
-                                "[Contacts Manager] Creating LinphoneContact with native ID "
-                                        + id
-                                        + ", favorite flag is "
-                                        + starred);
-                        nativeIds.add(id);
-                        contact = new LinphoneContact();
-                        contact.setAndroidId(id);
-                        contact.setIsFavourite(starred);
-                        androidContactsCache.put(id, contact);
+                        LinphoneContact contact = androidContactsCache.get(id);
+                        if (contact == null) {
+                            Log.d(
+                                    "[Contacts Manager] Creating LinphoneContact with native ID "
+                                            + id
+                                            + ", favorite flag is "
+                                            + starred);
+                            nativeIds.add(id);
+                            contact = new LinphoneContact();
+                            contact.setAndroidId(id);
+                            contact.setIsFavourite(starred);
+                            androidContactsCache.put(id, contact);
+                        }
+
+                        contact.syncValuesFromAndroidCusor(c);
+                    } catch (IllegalStateException ise) {
+                        Log.e(
+                                "[Contacts Manager] Couldn't get values from cursor, exception: ",
+                                ise);
                     }
-
-                    contact.syncValuesFromAndroidCusor(c);
                 }
                 c.close();
             }
diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.java b/app/src/main/java/org/linphone/contacts/ContactsManager.java
index 4d1d3dffa..1cedbcf05 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsManager.java
+++ b/app/src/main/java/org/linphone/contacts/ContactsManager.java
@@ -225,6 +225,7 @@ public class ContactsManager extends ContentObserver
         if (mContext == null) {
             return false;
         }
+
         boolean contactsR =
                 (PackageManager.PERMISSION_GRANTED
                         == mContext.getPackageManager()
@@ -239,6 +240,7 @@ public class ContactsManager extends ContentObserver
         if (mContext == null) {
             return false;
         }
+
         return (PackageManager.PERMISSION_GRANTED
                 == mContext.getPackageManager()
                         .checkPermission(
@@ -249,6 +251,7 @@ public class ContactsManager extends ContentObserver
         if (mContext == null) {
             return false;
         }
+
         return (PackageManager.PERMISSION_GRANTED
                 == mContext.getPackageManager()
                         .checkPermission(
@@ -435,6 +438,8 @@ public class ContactsManager extends ContentObserver
     }
 
     public String getAddressOrNumberForAndroidContact(ContentResolver resolver, Uri contactUri) {
+        if (resolver == null || contactUri == null) return null;
+
         // Phone Numbers
         String[] projection = new String[] {ContactsContract.CommonDataKinds.Phone.NUMBER};
         Cursor c = resolver.query(contactUri, projection, null, null, null);
@@ -445,8 +450,8 @@ public class ContactsManager extends ContentObserver
                 c.close();
                 return number;
             }
+            c.close();
         }
-        c.close();
 
         projection = new String[] {ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS};
         c = resolver.query(contactUri, projection, null, null, null);
@@ -458,12 +463,14 @@ public class ContactsManager extends ContentObserver
                 c.close();
                 return address;
             }
+            c.close();
         }
-        c.close();
+
         return null;
     }
 
     private synchronized boolean refreshSipContact(Friend lf) {
+        if (lf == null) return false;
         LinphoneContact contact = (LinphoneContact) lf.getUserData();
 
         if (contact != null) {
diff --git a/app/src/main/java/org/linphone/contacts/LinphoneContact.java b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
index b4641b986..23e257bcc 100644
--- a/app/src/main/java/org/linphone/contacts/LinphoneContact.java
+++ b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
@@ -456,18 +456,21 @@ public class LinphoneContact extends AndroidContact
     }
 
     public boolean hasPresenceModelForUriOrTelCapability(String uri, FriendCapability capability) {
-        if (mFriend == null) return false;
+        if (mFriend == null || uri == null) return false;
 
         PresenceModel presence = mFriend.getPresenceModelForUriOrTel(uri);
         if (presence != null) {
             return presence.hasCapability(capability);
         } else {
             for (LinphoneNumberOrAddress noa : getNumbersOrAddresses()) {
-                String contact = getContactFromPresenceModelForUriOrTel(noa.getValue());
-                if (contact != null && contact.equals(uri)) {
-                    presence = mFriend.getPresenceModelForUriOrTel(noa.getValue());
-                    if (presence != null) {
-                        return presence.hasCapability(capability);
+                String value = noa.getValue();
+                if (value != null) {
+                    String contact = getContactFromPresenceModelForUriOrTel(value);
+                    if (contact != null && contact.equals(uri)) {
+                        presence = mFriend.getPresenceModelForUriOrTel(value);
+                        if (presence != null) {
+                            return presence.hasCapability(capability);
+                        }
                     }
                 }
             }
diff --git a/app/src/main/java/org/linphone/settings/LinphonePreferences.java b/app/src/main/java/org/linphone/settings/LinphonePreferences.java
index 1a9b8aa29..db442941d 100644
--- a/app/src/main/java/org/linphone/settings/LinphonePreferences.java
+++ b/app/src/main/java/org/linphone/settings/LinphonePreferences.java
@@ -320,10 +320,12 @@ public class LinphonePreferences {
 
     // Video settings
     public boolean useFrontCam() {
+        if (getConfig() == null) return false;
         return getConfig().getBool("app", "front_camera_default", true);
     }
 
     public void setFrontCamAsDefault(boolean frontcam) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "front_camera_default", frontcam);
     }
 
@@ -425,6 +427,7 @@ public class LinphonePreferences {
 
     // Contact settings
     public boolean isFriendlistsubscriptionEnabled() {
+        if (getConfig() == null) return false;
         if (getConfig().getBool("app", "friendlist_subscription_enabled", false)) {
             // Old setting, do migration
             getConfig().setBool("app", "friendlist_subscription_enabled", false);
@@ -434,18 +437,22 @@ public class LinphonePreferences {
     }
 
     public void enabledFriendlistSubscription(boolean enabled) {
+        if (getLc() == null) return;
         getLc().enableFriendListSubscription(enabled);
     }
 
     public boolean isPresenceStorageInNativeAndroidContactEnabled() {
+        if (getConfig() == null) return false;
         return getConfig().getBool("app", "store_presence_in_native_contact", false);
     }
 
     public void enabledPresenceStorageInNativeAndroidContact(boolean enabled) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "store_presence_in_native_contact", enabled);
     }
 
     public boolean isDisplayContactOrganization() {
+        if (getConfig() == null) return false;
         return getConfig()
                 .getBool(
                         "app",
@@ -454,24 +461,29 @@ public class LinphonePreferences {
     }
 
     public void enabledDisplayContactOrganization(boolean enabled) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "display_contact_organization", enabled);
     }
     // End of contact settings
 
     // Call settings
     public boolean isMediaEncryptionMandatory() {
+        if (getLc() == null) return false;
         return getLc().isMediaEncryptionMandatory();
     }
 
     public void setMediaEncryptionMandatory(boolean accept) {
+        if (getLc() == null) return;
         getLc().setMediaEncryptionMandatory(accept);
     }
 
     public boolean acceptIncomingEarlyMedia() {
+        if (getConfig() == null) return false;
         return getConfig().getBool("sip", "incoming_calls_early_media", false);
     }
 
     public void setAcceptIncomingEarlyMedia(boolean accept) {
+        if (getConfig() == null) return;
         getConfig().setBool("sip", "incoming_calls_early_media", accept);
     }
 
@@ -506,28 +518,34 @@ public class LinphonePreferences {
     }
 
     public String getVoiceMailUri() {
+        if (getConfig() == null) return null;
         return getConfig().getString("app", "voice_mail", null);
     }
 
     public void setVoiceMailUri(String uri) {
+        if (getConfig() == null) return;
         getConfig().setString("app", "voice_mail", uri);
     }
 
     public boolean getNativeDialerCall() {
+        if (getConfig() == null) return false;
         return getConfig().getBool("app", "native_dialer_call", false);
     }
 
     public void setNativeDialerCall(boolean use) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "native_dialer_call", use);
     }
     // End of call settings
 
     public boolean isWifiOnlyEnabled() {
+        if (getLc() == null) return false;
         return getLc().wifiOnlyEnabled();
     }
 
     // Network settings
     public void setWifiOnlyEnabled(Boolean enable) {
+        if (getLc() == null) return;
         getLc().enableWifiOnly(enable);
     }
 
@@ -536,6 +554,7 @@ public class LinphonePreferences {
     }
 
     private void useRandomPort(boolean enabled, boolean apply) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "random_port", enabled);
         if (apply) {
             if (enabled) {
@@ -547,6 +566,7 @@ public class LinphonePreferences {
     }
 
     public boolean isUsingRandomPort() {
+        if (getConfig() == null) return true;
         return getConfig().getBool("app", "random_port", true);
     }
 
@@ -677,10 +697,12 @@ public class LinphonePreferences {
     }
 
     public boolean isPushNotificationEnabled() {
+        if (getConfig() == null) return true;
         return getConfig().getBool("app", "push_notification", true);
     }
 
     public void setPushNotificationEnabled(boolean enable) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "push_notification", enable);
 
         Core core = getLc();
@@ -748,6 +770,7 @@ public class LinphonePreferences {
     }
 
     private String getPushNotificationRegistrationID() {
+        if (getConfig() == null) return null;
         return getConfig().getString("app", "push_notification_regid", null);
     }
 
@@ -770,30 +793,36 @@ public class LinphonePreferences {
     // End of network settings
 
     public boolean isDebugEnabled() {
+        if (getConfig() == null) return false;
         return getConfig().getBool("app", "debug", false);
     }
 
     // Advanced settings
     public void setDebugEnabled(boolean enabled) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "debug", enabled);
         LinphoneUtils.configureLoggingService(enabled, mContext.getString(R.string.app_name));
     }
 
     public void setJavaLogger(boolean enabled) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "java_logger", enabled);
         LinphoneUtils.configureLoggingService(
                 isDebugEnabled(), mContext.getString(R.string.app_name));
     }
 
     public boolean useJavaLogger() {
+        if (getConfig() == null) return false;
         return getConfig().getBool("app", "java_logger", false);
     }
 
     public boolean isAutoStartEnabled() {
+        if (getConfig() == null) return false;
         return getConfig().getBool("app", "auto_start", false);
     }
 
     public void setAutoStart(boolean autoStartEnabled) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "auto_start", autoStartEnabled);
     }
 
@@ -975,80 +1004,99 @@ public class LinphonePreferences {
     }
 
     public int getCodecBitrateLimit() {
+        if (getConfig() == null) return 36;
         return getConfig().getInt("audio", "codec_bitrate_limit", 36);
     }
 
     public void setCodecBitrateLimit(int bitrate) {
+        if (getConfig() == null) return;
         getConfig().setInt("audio", "codec_bitrate_limit", bitrate);
     }
 
     public String getXmlrpcUrl() {
+        if (getConfig() == null) return null;
         return getConfig().getString("assistant", "xmlrpc_url", null);
     }
 
     public String getLinkPopupTime() {
+        if (getConfig() == null) return null;
         return getConfig().getString("app", "link_popup_time", null);
     }
 
     public void setLinkPopupTime(String date) {
+        if (getConfig() == null) return;
         getConfig().setString("app", "link_popup_time", date);
     }
 
     public boolean isLinkPopupEnabled() {
+        if (getConfig() == null) return true;
         return getConfig().getBool("app", "link_popup_enabled", true);
     }
 
     public void enableLinkPopup(boolean enable) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "link_popup_enabled", enable);
     }
 
     public boolean isDNDSettingsPopupEnabled() {
+        if (getConfig() == null) return true;
         return getConfig().getBool("app", "dnd_settings_popup_enabled", true);
     }
 
     public void enableDNDSettingsPopup(boolean enable) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "dnd_settings_popup_enabled", enable);
     }
 
     public boolean isLimeSecurityPopupEnabled() {
+        if (getConfig() == null) return true;
         return getConfig().getBool("app", "lime_security_popup_enabled", true);
     }
 
     public void enableLimeSecurityPopup(boolean enable) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "lime_security_popup_enabled", enable);
     }
 
     public String getDebugPopupAddress() {
+        if (getConfig() == null) return null;
         return getConfig().getString("app", "debug_popup_magic", null);
     }
 
     public String getActivityToLaunchOnIncomingReceived() {
+        if (getConfig() == null) return "org.linphone.call.CallIncomingActivity";
         return getConfig()
                 .getString(
                         "app", "incoming_call_activity", "org.linphone.call.CallIncomingActivity");
     }
 
     public void setActivityToLaunchOnIncomingReceived(String name) {
+        if (getConfig() == null) return;
         getConfig().setString("app", "incoming_call_activity", name);
     }
 
     public boolean getServiceNotificationVisibility() {
+        if (getConfig() == null) return false;
         return getConfig().getBool("app", "show_service_notification", false);
     }
 
     public void setServiceNotificationVisibility(boolean enable) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "show_service_notification", enable);
     }
 
     public String getCheckReleaseUrl() {
+        if (getConfig() == null) return null;
         return getConfig().getString("misc", "version_check_url_root", null);
     }
 
     public int getLastCheckReleaseTimestamp() {
+        if (getConfig() == null) return 0;
         return getConfig().getInt("app", "version_check_url_last_timestamp", 0);
     }
 
     public void setLastCheckReleaseTimestamp(int timestamp) {
+        if (getConfig() == null) return;
         getConfig().setInt("app", "version_check_url_last_timestamp", timestamp);
     }
 
@@ -1058,10 +1106,12 @@ public class LinphonePreferences {
             // Disable overlay and use PIP feature
             return false;
         }
+        if (getConfig() == null) return false;
         return getConfig().getBool("app", "display_overlay", false);
     }
 
     public void enableOverlay(boolean enable) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "display_overlay", enable);
     }
 
@@ -1071,66 +1121,81 @@ public class LinphonePreferences {
                         .checkPermission(
                                 Manifest.permission.READ_EXTERNAL_STORAGE,
                                 mContext.getPackageName());
+        if (getConfig() == null) return readExternalStorage == PackageManager.PERMISSION_GRANTED;
         return getConfig().getBool("app", "device_ringtone", true)
                 && readExternalStorage == PackageManager.PERMISSION_GRANTED;
     }
 
     public void enableDeviceRingtone(boolean enable) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "device_ringtone", enable);
         LinphoneManager.getInstance().enableDeviceRingtone(enable);
     }
 
     public boolean isIncomingCallVibrationEnabled() {
+        if (getConfig() == null) return true;
         return getConfig().getBool("app", "incoming_call_vibration", true);
     }
 
     public void enableIncomingCallVibration(boolean enable) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "incoming_call_vibration", enable);
     }
 
     public boolean isBisFeatureEnabled() {
+        if (getConfig() == null) return true;
         return getConfig().getBool("app", "bis_feature", true);
     }
 
     public boolean isAutoAnswerEnabled() {
+        if (getConfig() == null) return false;
         return getConfig().getBool("app", "auto_answer", false);
     }
 
     public void enableAutoAnswer(boolean enable) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "auto_answer", enable);
     }
 
     public int getAutoAnswerTime() {
+        if (getConfig() == null) return 0;
         return getConfig().getInt("app", "auto_answer_delay", 0);
     }
 
     public void setAutoAnswerTime(int time) {
+        if (getConfig() == null) return;
         getConfig().setInt("app", "auto_answer_delay", time);
     }
 
     public void disableFriendsStorage() {
+        if (getConfig() == null) return;
         getConfig().setBool("misc", "store_friends", false);
     }
 
     public boolean useBasicChatRoomFor1To1() {
+        if (getConfig() == null) return false;
         return getConfig().getBool("app", "prefer_basic_chat_room", false);
     }
 
     // 0 is download all, -1 is disable feature, else size is bytes
     public int getAutoDownloadFileMaxSize() {
+        if (getLc() == null) return -1;
         return getLc().getMaxSizeForAutoDownloadIncomingFiles();
     }
 
     // 0 is download all, -1 is disable feature, else size is bytes
     public void setAutoDownloadFileMaxSize(int size) {
+        if (getLc() == null) return;
         getLc().setMaxSizeForAutoDownloadIncomingFiles(size);
     }
 
     public boolean hasPowerSaverDialogBeenPrompted() {
+        if (getConfig() == null) return false;
         return getConfig().getBool("app", "android_power_saver_dialog", false);
     }
 
     public void powerSaverDialogPrompted(boolean b) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "android_power_saver_dialog", b);
     }
 
@@ -1153,63 +1218,78 @@ public class LinphonePreferences {
     }
 
     public void enableDarkMode(boolean enable) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "dark_mode", enable);
     }
 
     public String getDeviceName(Context context) {
         String defaultValue = Compatibility.getDeviceName(context);
+        if (getConfig() == null) return defaultValue;
         return getConfig().getString("app", "device_name", defaultValue);
     }
 
     public void setDeviceName(String name) {
+        if (getConfig() == null) return;
         getConfig().setString("app", "device_name", name);
     }
 
     public boolean isEchoCancellationCalibrationDone() {
+        if (getConfig() == null) return false;
         return getConfig().getBool("app", "echo_cancellation_calibration_done", false);
     }
 
     public void setEchoCancellationCalibrationDone(boolean done) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "echo_cancellation_calibration_done", done);
     }
 
     public boolean isOpenH264CodecDownloadEnabled() {
+        if (getConfig() == null) return true;
         return getConfig().getBool("app", "open_h264_download_enabled", true);
     }
 
     public void setOpenH264CodecDownloadEnabled(boolean enable) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "open_h264_download_enabled", enable);
     }
 
     public boolean isVideoPreviewEnabled() {
+        if (getConfig() == null) return false;
         return isVideoEnabled() && getConfig().getBool("app", "video_preview", false);
     }
 
     public void setVideoPreviewEnabled(boolean enabled) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "video_preview", enabled);
     }
 
     public boolean shortcutsCreationEnabled() {
+        if (getConfig() == null) return false;
         return getConfig().getBool("app", "shortcuts", false);
     }
 
     public void enableChatRoomsShortcuts(boolean enable) {
+        if (getConfig() == null) return;
         getConfig().setBool("app", "shortcuts", enable);
     }
 
     public boolean hideEmptyChatRooms() {
+        if (getConfig() == null) return true;
         return getConfig().getBool("misc", "hide_empty_chat_rooms", true);
     }
 
     public void setHideEmptyChatRooms(boolean hide) {
+        if (getConfig() == null) return;
         getConfig().setBool("misc", "hide_empty_chat_rooms", hide);
     }
 
     public boolean hideRemovedProxiesChatRooms() {
+        if (getConfig() == null) return true;
         return getConfig().getBool("misc", "hide_chat_rooms_from_removed_proxies", true);
     }
 
     public void setHideRemovedProxiesChatRooms(boolean hide) {
+        if (getConfig() == null) return;
         getConfig().setBool("misc", "hide_chat_rooms_from_removed_proxies", hide);
     }
 }
diff --git a/app/src/main/java/org/linphone/utils/DeviceUtils.java b/app/src/main/java/org/linphone/utils/DeviceUtils.java
index bbd2c0243..c5d271dd1 100644
--- a/app/src/main/java/org/linphone/utils/DeviceUtils.java
+++ b/app/src/main/java/org/linphone/utils/DeviceUtils.java
@@ -151,9 +151,10 @@ public class DeviceUtils {
         for (final Intent intent : POWERMANAGER_INTENTS) {
             if (DeviceUtils.isIntentCallable(context, intent)) {
                 Log.w(
-                        "[Hacks] "
-                                + android.os.Build.MANUFACTURER
-                                + " device with power saver detected !");
+                        "[Hacks] ",
+                        android.os.Build.MANUFACTURER,
+                        " device with power saver detected: ",
+                        intent.getComponent().getClassName());
                 if (!LinphonePreferences.instance().hasPowerSaverDialogBeenPrompted()) {
                     Log.w("[Hacks] Asking power saver for whitelist !");
 
@@ -201,7 +202,15 @@ public class DeviceUtils {
                                     // assume it will make the change so don't prompt again
                                     LinphonePreferences.instance().powerSaverDialogPrompted(true);
 
-                                    context.startActivity(intent);
+                                    try {
+                                        context.startActivity(intent);
+                                    } catch (SecurityException se) {
+                                        Log.e(
+                                                "[Hacks] Couldn't start intent [",
+                                                intent.getComponent().getClassName(),
+                                                "], security exception was thrown: ",
+                                                se);
+                                    }
                                     dialog.dismiss();
                                 }
                             });