Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bug with RLS presence

Browse source
This commit is contained in:
Erwan Croze 2017-03-06 16:47:29 +01:00
parent c4f1e2707a
commit 798282c980
6 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
res/raw/linphonerc_factory
View file

@ -12,8 +12,7 @@ register_only_when_network_is_up=1
auto_net_state_mon=0 auto_net_state_mon=0
auto_answer_replacing_calls=1 auto_answer_replacing_calls=1
ping_with_options=0 ping_with_options=0
rls_uri=sip:rls@sip.linphone.org rls_uri=
use_rls_presence=1
[rtp] [rtp]
audio_rtp_port=7076 audio_rtp_port=7076

1
res/values/non_localizable_custom.xml
View file

@ -5,6 +5,7 @@
<string name="default_domain">sip.linphone.org</string><!-- Set the default domain used for account creation/addresses --> <string name="default_domain">sip.linphone.org</string><!-- Set the default domain used for account creation/addresses -->
<string name="sync_account_type">org.linphone</string> <!-- Change package ! --> <string name="sync_account_type">org.linphone</string> <!-- Change package ! -->
<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string> <!-- Change package, leave .profile at the end. Also change res/xml/contacts.xml ! --> <string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string> <!-- Change package, leave .profile at the end. Also change res/xml/contacts.xml ! -->
<string name="rls_uri">sip:rls@sip.linphone.org</string>
<bool name="orientation_portrait_only">false</bool> <bool name="orientation_portrait_only">false</bool>
<bool name="show_statusbar_only_on_dialer">false</bool> <bool name="show_statusbar_only_on_dialer">false</bool>
<bool name="force_use_of_linphone_friends">false</bool> <bool name="force_use_of_linphone_friends">false</bool>

5
src/org/linphone/ContactsManager.java
View file

@ -423,7 +423,10 @@ public class ContactsManager extends ContentObserver {
setContacts(contacts); setContacts(contacts);
setSipContacts(sipContacts); setSipContacts(sipContacts);
LinphoneManager.getLc().getFriendLists()[0].updateSubscriptions(); if (LinphonePreferences.instance() != null && LinphonePreferences.instance().isFriendlistsubscriptionEnabled()) {
LinphoneManager.getLc().getFriendLists()[0].setRLSUri(getString(R.string.rls_uri));
LinphoneManager.getLc().getFriendLists()[0].updateSubscriptions();
}
for (ContactsUpdatedListener listener : contactsUpdatedListeners) { for (ContactsUpdatedListener listener : contactsUpdatedListeners) {
listener.onContactsUpdated(); listener.onContactsUpdated();
} }

5
src/org/linphone/LinphoneActivity.java
View file

@ -1358,11 +1358,6 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
} }
updateMissedChatCount(); updateMissedChatCount();
if(LinphonePreferences.instance().isFriendlistsubscriptionEnabled() && LinphoneManager.getLc().getDefaultProxyConfig() != null){
LinphoneManager.getInstance().subscribeFriendList(true);
} else {
LinphoneManager.getInstance().subscribeFriendList(false);
}
displayMissedCalls(LinphoneManager.getLc().getMissedCallsCount()); displayMissedCalls(LinphoneManager.getLc().getMissedCallsCount());

3
src/org/linphone/LinphoneManager.java
View file

@ -467,6 +467,8 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
LinphoneFriendList mFriendList = (lc.getFriendLists())[0]; LinphoneFriendList mFriendList = (lc.getFriendLists())[0];
Log.i("Presence list subscription is " + (enabled ? "enabled" : "disabled")); Log.i("Presence list subscription is " + (enabled ? "enabled" : "disabled"));
mFriendList.enableSubscriptions(enabled); mFriendList.enableSubscriptions(enabled);
if (ContactsManager.getInstance() != null)
ContactsManager.getInstance().fetchContactsAsync();
} }
} }
@ -789,7 +791,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
mLc.setCallLogsDatabasePath(mCallLogDatabaseFile); mLc.setCallLogsDatabasePath(mCallLogDatabaseFile);
mLc.setFriendsDatabasePath(mFriendsDatabaseFile); mLc.setFriendsDatabasePath(mFriendsDatabaseFile);
mLc.setUserCertificatesPath(mUserCertificatePath); mLc.setUserCertificatesPath(mUserCertificatePath);
subscribeFriendList(false);
//mLc.setCallErrorTone(Reason.NotFound, mErrorToneFile); //mLc.setCallErrorTone(Reason.NotFound, mErrorToneFile);
enableDeviceRingtone(mPrefs.isDeviceRingtoneEnabled()); enableDeviceRingtone(mPrefs.isDeviceRingtoneEnabled());

2
submodules/linphone

@ -1 +1 @@
Subproject commit 9bea70ebe3069a9b7ccfc2b090ce8e8834a8cbee Subproject commit fb21732c38217f81887684e0cd42a9ebf44ba2c5