Fix crash in ContactsManager with getString

This commit is contained in:
Erwan Croze 2017-03-08 13:13:21 +01:00
parent aadf3a4f67
commit 161ac91de1

View file

@ -424,7 +424,9 @@ public class ContactsManager extends ContentObserver {
setSipContacts(sipContacts); setSipContacts(sipContacts);
if (LinphonePreferences.instance() != null && LinphonePreferences.instance().isFriendlistsubscriptionEnabled()) { if (LinphonePreferences.instance() != null && LinphonePreferences.instance().isFriendlistsubscriptionEnabled()) {
if (getString(R.string.rls_uri) != null) {
LinphoneManager.getLc().getFriendLists()[0].setRLSUri(getString(R.string.rls_uri)); LinphoneManager.getLc().getFriendLists()[0].setRLSUri(getString(R.string.rls_uri));
}
LinphoneManager.getLc().getFriendLists()[0].updateSubscriptions(); LinphoneManager.getLc().getFriendLists()[0].updateSubscriptions();
} }
for (ContactsUpdatedListener listener : contactsUpdatedListeners) { for (ContactsUpdatedListener listener : contactsUpdatedListeners) {
@ -484,6 +486,7 @@ public class ContactsManager extends ContentObserver {
} }
public String getString(int resourceID) { public String getString(int resourceID) {
if (context == null) return null;
return context.getString(resourceID); return context.getString(resourceID);
} }