From c504653079a501b274a2dc782a33a168879a468c Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 10 Oct 2018 17:03:09 +0200 Subject: [PATCH] -fix wrong res server -remove ha1 from initial remote provisioning uri --- .../assistant/RemoteProvisioningLoginActivity.java | 2 ++ .../org/linphone/contacts/ContactsManager.java | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java b/src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java index d463efbe6..62b6ebc91 100644 --- a/src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java +++ b/src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java @@ -399,6 +399,7 @@ public class RemoteProvisioningLoginActivity extends Activity implements OnClick private boolean storeAccount(String url) { + url = url.trim(); int usernameIndex = url.indexOf("username=") + "username=".length(); int domainIndex = url.indexOf("=", usernameIndex+1); int ha1Index = url.indexOf("=", domainIndex+1); @@ -406,6 +407,7 @@ public class RemoteProvisioningLoginActivity extends Activity implements OnClick String username = url.substring(usernameIndex, url.indexOf("&")); String domain = url.substring(domainIndex+1, url.indexOf("&", domainIndex+1)); String ha1 = url.substring(ha1Index+1); + url = url.substring(0,url.indexOf("ha1=")-1); AuthInfo auth = Factory.instance().createAuthInfo(username, null, null, ha1, domain, domain); LinphoneManager.getLc().clearAllAuthInfo(); diff --git a/src/android/org/linphone/contacts/ContactsManager.java b/src/android/org/linphone/contacts/ContactsManager.java index 35f421c55..26f829513 100644 --- a/src/android/org/linphone/contacts/ContactsManager.java +++ b/src/android/org/linphone/contacts/ContactsManager.java @@ -477,12 +477,12 @@ public class ContactsManager extends ContentObserver { setContacts(contacts); setSipContacts(sipContacts); - if (LinphonePreferences.instance() != null && LinphonePreferences.instance().isFriendlistsubscriptionEnabled()) { - if (getString(R.string.rls_uri) != null) { - LinphoneManager.getLc().getFriendsLists()[0].setRlsUri(getString(R.string.rls_uri)); - } - LinphoneManager.getLc().getFriendsLists()[0].updateSubscriptions(); - } +// if (LinphonePreferences.instance() != null && LinphonePreferences.instance().isFriendlistsubscriptionEnabled()) { +// if (getString(R.string.rls_uri) != null) { +// LinphoneManager.getLc().getFriendsLists()[0].setRlsUri(getString(R.string.rls_uri)); +// } +// LinphoneManager.getLc().getFriendsLists()[0].updateSubscriptions(); +// } for (ContactsUpdatedListener listener : contactsUpdatedListeners) { listener.onContactsUpdated(); }