Commit graph

12 commits

Author SHA1 Message Date
Sylvain Berfini
db7c875468 Merge remote-tracking branch 'origin/master' into dev_vcard
Conflicts:
	build/android/liblinphone_tester.mk
	coreapi/friend.c
	coreapi/friendlist.c
	coreapi/linphonecore_jni.cc
2015-12-30 15:17:01 +01:00
Sylvain Berfini
5f58df86e0 Updated Android Makefile for belr and belcard + renamed friend variables to lf because friend is a keyword 2015-12-24 11:44:00 +01:00
Simon Morlat
7b5da68fd8 fix presence tests 2015-12-22 14:55:56 +01:00
Sylvain Berfini
a0076b7d66 Merge remote-tracking branch 'origin/master' into dev_vcard
Conflicts:
	coreapi/friend.c
	coreapi/private.h
2015-12-18 16:48:09 +01:00
Ghislain MARY
da682bf63a If a presence list subscription already exist refresh it instead of creating a new one. 2015-12-18 14:58:29 +01:00
Ghislain MARY
e63f2ba108 Fix some memory leaks. 2015-11-30 17:45:09 +01:00
Ghislain MARY
7885a5c80a Prevent sending multiple identical subscribes for presence list + send new subscribe when adding a friend. 2015-11-30 14:15:33 +01:00
Ghislain MARY
fccaa5e36e Handle versioning of presence list notifications + store information that we have received presence information for a friend. 2015-11-30 11:39:21 +01:00
Ghislain MARY
97f28a65ca Basic parsing of presence list notify. 2015-11-27 11:44:16 +01:00
Ghislain MARY
96d249c674 Generate resource-lists SUBSCRIBE for presence. 2015-11-23 17:41:09 +01:00
Ghislain MARY
89aa523d71 Use LinphoneFriendList object for the list of friends of a LinphoneCore. 2015-11-23 17:41:09 +01:00
Ghislain MARY
3b6eceaad4 Add the LinphoneFriendList object. 2015-11-23 17:41:09 +01:00