Commit graph

3613 commits

Author SHA1 Message Date
Sylvain Berfini
28c8807ba5 Merge branch 'master' into dev_vcard 2016-01-08 11:14:58 +01:00
Sylvain Berfini
bcf55b64b5 Fix extern C issue 2016-01-08 11:14:41 +01:00
Sylvain Berfini
44e18649ac Merge branch 'master' into dev_vcard
Conflicts:
	build/android/Android.mk
	coreapi/CMakeLists.txt
	coreapi/Makefile.am
	coreapi/friend.c
	coreapi/linphonecore.c
	coreapi/linphonecore.h
2016-01-08 10:37:54 +01:00
François Grisez
dab5cc724d Fixes JNI crashes around LinphoneConference.getParticipants() 2016-01-08 10:12:02 +01:00
Simon Morlat
804fd8a0fc repair automake build 2016-01-07 20:35:29 +01:00
Sylvain Berfini
4561b0ce8c Fixed a leak 2016-01-07 17:04:29 +01:00
Sylvain Berfini
5ff8d1232f Fixed carddav tests 2016-01-07 16:36:52 +01:00
Brieuc Viel
c20dea4b94 Fix JNI crash about LinphoneCall.getCoference() 2016-01-07 16:26:33 +01:00
Sylvain Berfini
873493b628 More work on CardDAV sync: store etag and url for each vcard in db, call the correct callbacks and improved tester using stats 2016-01-07 15:44:59 +01:00
Sylvain Berfini
6fc86237ac Improve xml parsing of carddav responses 2016-01-07 14:24:40 +01:00
Sylvain Berfini
b5300c180c Parse results for PROPFIND and REPORT requests 2016-01-07 13:04:43 +01:00
François Grisez
c253cb7b77 Fix double definition of LinphoneConference type 2016-01-07 12:09:48 +01:00
Jehan Monnier
1fc31123b8 add lp-auto-answer to make build’s scripts 2016-01-07 11:16:25 +01:00
François Grisez
41545fadbd Fixes conflicts between François and Ghislain's "internal" parameter of vtables 2016-01-07 10:57:32 +01:00
François Grisez
38dfb9ab6f Merge branch 'dev_conference_rfc4579' 2016-01-07 10:13:04 +01:00
Simon Morlat
60708a53ab repair message storage 2016-01-06 17:40:36 +01:00
François Grisez
fe6d7528f4 Makes Linphone ignore REFER requests with BYE method set 2016-01-06 16:36:04 +01:00
Simon Morlat
c82307a747 fix rtpsession leak (for RTT streams) 2016-01-06 16:33:19 +01:00
Gautier Pelloux-Prayer
218db02a1a submodules: update ms2 to fix music pause on iOS 2016-01-06 15:12:09 +01:00
François Grisez
dc62411463 Fix JNI of getConference() methods of LinphoneCore and LinphoneCall 2016-01-06 15:03:53 +01:00
Simon Morlat
49ad4b81c6 fix crash 2016-01-06 14:43:39 +01:00
François Grisez
95c893dcc1 Wrap LinphoneConference class into Java 2016-01-06 14:30:13 +01:00
Ghislain MARY
83ad9553d8 Do not try to open NULL filepath (causes crash on Windows). 2016-01-06 11:59:47 +01:00
Simon Morlat
321c1d7fd9 fix make dist and null pointer when rtt is disabled 2016-01-06 10:51:32 +01:00
François Grisez
d7e761b09e Send REFER with BYE in dialog 2016-01-06 10:07:40 +01:00
François Grisez
a49cd7566c Add a setter/getter for the method param to LinphoneAddress 2016-01-06 10:03:14 +01:00
Simon Morlat
590f80a463 fix build and bad declaration. 2016-01-05 21:25:14 +01:00
Simon Morlat
e4d97e2a51 add release methods for friends and friend list, so that the core can properly shutdown without leaving references. 2016-01-05 21:15:02 +01:00
Sylvain Berfini
a8e6cc908f More work on CardDAV sync: doing propfind and addressbook-query requests 2016-01-05 16:31:20 +01:00
Ghislain MARY
7251c06e57 Fix build on Windows. 2016-01-05 11:33:24 +01:00
Gautier Pelloux-Prayer
f903eeb0df ringtoneplayer.c: use include, not import 2016-01-05 11:21:55 +01:00
Sylvain Berfini
f85edbaa9e Started carddav code 2016-01-05 11:19:25 +01:00
Gautier Pelloux-Prayer
b711888ac0 ringplayer: add ring player object to play ringtones (CAF on iOS, WAV otherwise) 2016-01-05 10:31:23 +01:00
Ghislain MARY
ce01af18f7 Notify presence list notify events only to the internal vtables. 2016-01-04 17:06:50 +01:00
François Grisez
ca05715af6 Fix crash in JNI concerning the removeListener() function 2016-01-04 16:45:18 +01:00
Sylvain Berfini
c20bcb0d08 Removed unused LinphoneContent in xmlrpc API 2016-01-04 16:18:33 +01:00
Jehan Monnier
05af238d9a make sure list subscribe is only sent when proxy config is transitioned to RegistrationOk 2016-01-04 15:32:53 +01:00
Christophe Deschamps
4738dd78a4 Do not call linphone_content_get_buffer on multipart body messages (JNI Wrapper) 2015-12-30 22:48:22 +01:00
Sylvain Berfini
8cc1a6d6f0 Fix windows compilation when belcard isn't found/enabled 2015-12-30 17:31:04 +01:00
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
Ghislain MARY
bdc8dad0f0 Fix build with Visual Studio 2015. 2015-12-30 15:01:06 +01:00
Ghislain MARY
01ee6e21f2 Fix build with Visual Studio 2015. 2015-12-30 11:58:09 +01:00
Christophe Deschamps
12e71eccbe Merge remote-tracking branch 'remotes/origin/dev_presence_list'
- Fix memory leak in jni wrapper
- Implemented findFriendByUri (LinphoneFriendList)
2015-12-29 23:44:02 +01:00
Christophe Deschamps
293376d648 Fixes crash upon file transfer - jni wrapper 2015-12-29 22:35:58 +01:00
Sylvain Berfini
f0428f5c86 Added LinphoneFriend setName/getName APIs to JNI layer 2015-12-29 11:27:30 +01:00
Ghislain MARY
b9bfbb3df9 Fix includes when using LinphoneFriendList from outside of liblinphone. 2015-12-28 16:08:11 +01:00
Christophe Deschamps
a589056381 Fix memory leak 2015-12-28 09:26:32 +01:00
Simon Morlat
f922907fd8 repair jni compilation 2015-12-27 12:35:50 +01:00
Simon Morlat
debed1a326 Revert "retired LinphoneContentPrivate in JNI & fixed Android compilation (friendlist)"
This reverts commit f151d70d4d.

The changes done in this commit break all features using LinphoneContent objects.
2015-12-27 11:28:20 +01:00
Sylvain Berfini
4d454fdfd5 Fix importFriends JNI method 2015-12-24 16:11:28 +01:00