From 161ac91de19cfe6bde86713f921a4a0821f0f9df Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Wed, 8 Mar 2017 13:13:21 +0100 Subject: [PATCH] Fix crash in ContactsManager with getString --- src/org/linphone/ContactsManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/org/linphone/ContactsManager.java b/src/org/linphone/ContactsManager.java index bbc7a2951..8ecd1f905 100644 --- a/src/org/linphone/ContactsManager.java +++ b/src/org/linphone/ContactsManager.java @@ -424,7 +424,9 @@ public class ContactsManager extends ContentObserver { setSipContacts(sipContacts); if (LinphonePreferences.instance() != null && LinphonePreferences.instance().isFriendlistsubscriptionEnabled()) { - LinphoneManager.getLc().getFriendLists()[0].setRLSUri(getString(R.string.rls_uri)); + if (getString(R.string.rls_uri) != null) { + LinphoneManager.getLc().getFriendLists()[0].setRLSUri(getString(R.string.rls_uri)); + } LinphoneManager.getLc().getFriendLists()[0].updateSubscriptions(); } for (ContactsUpdatedListener listener : contactsUpdatedListeners) { @@ -484,6 +486,7 @@ public class ContactsManager extends ContentObserver { } public String getString(int resourceID) { + if (context == null) return null; return context.getString(resourceID); }