mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-26 00:08:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

-fix wrong res server

Browse source 
-remove ha1 from initial remote provisioning uri
This commit is contained in:
Jehan Monnier 2018-10-10 17:03:09 +02:00
parent be86c31472
commit c504653079
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java
View file

@ -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();

12
src/android/org/linphone/contacts/ContactsManager.java
View file

@ -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();
}