diff --git a/res/raw/linphonerc_default b/res/raw/linphonerc_default index 68b6e9a7e..c2acb3c86 100644 --- a/res/raw/linphonerc_default +++ b/res/raw/linphonerc_default @@ -26,6 +26,3 @@ port=443 [misc] log_collection_upload_server_url=https://www.linphone.org:444/lft.php file_transfer_server_url=https://www.linphone.org:444/lft.php - -[proxy_default_values] -rls_uri=sips:rls@sip.linphone.org diff --git a/src/android/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java index 62fcda1ef..9fa218d5e 100644 --- a/src/android/org/linphone/assistant/AssistantActivity.java +++ b/src/android/org/linphone/assistant/AssistantActivity.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.linphone.ContactsManager; import org.linphone.LinphoneActivity; import org.linphone.LinphoneLauncherActivity; import org.linphone.LinphoneManager; @@ -392,6 +393,9 @@ private static AssistantActivity instance; lc.setDefaultProxyConfig(proxyConfig); + if (ContactsManager.getInstance() != null) + ContactsManager.getInstance().fetchContactsAsync(); + if (LinphonePreferences.instance() != null) mPrefs.enabledFriendlistSubscription(getResources().getBoolean(R.bool.use_friendlist_subscription));