Commit graph

4258 commits

Author SHA1 Message Date
Sandrine Avakian
623dc72e1f Merge branch '3.10.x'
# Conflicts:
#	CMakeLists.txt
#	coreapi/account_creator.c
#	coreapi/friendlist.c
#	coreapi/linphonecore_jni.cc
#	coreapi/misc.c
#	coreapi/vcard.cc
#	coreapi/vcard.h
#	coreapi/vcard_stubs.c
#	gtk/videowindow.c
#	java/common/org/linphone/core/LinphoneNatPolicy.java
#	java/impl/org/linphone/core/LinphoneNatPolicyImpl.java
#	mediastreamer2
#	tester/vcard_tester.c
2016-08-25 17:52:12 +02:00
Gautier Pelloux-Prayer
c24a71a17a cmake: compile help executables 2016-08-25 14:44:02 +02:00
Gautier Pelloux-Prayer
db4ddb32bc account_creator: pass xmlrpc response to callback so that application can deal with it 2016-08-25 11:39:11 +02:00
Sylvain Berfini
d46ef9590e Fix crash if Android log handler is null 2016-08-25 09:59:11 +02:00
Gautier Pelloux-Prayer
411ae723ad friend.c: fix some stuff 2016-08-24 11:43:28 +02:00
Gautier Pelloux-Prayer
63fe9fad52 account_creator.c: switch parameters 2016-08-24 10:33:51 +02:00
Gautier Pelloux-Prayer
49e93dd016 update presence 2016-08-23 09:16:41 +02:00
Erwan Croze
1d1c196ead Update mediastreamer 2016-08-19 11:21:06 +02:00
Simon Morlat
3a1dacbdf4 big rework of Tunnel management
- better integration with network reachability callback
- fix crashes (mTunnelClient can no longer be NULL)
- avoid useless operations during transcient states
- clarify source code
- allow the application to set root_ca before the tunnel connection actually starts.
2016-08-18 18:51:11 +02:00
Ghislain MARY
b05492078d Save nat policy changes immediately instead of waiting for the core destruction. 2016-08-18 15:03:55 +02:00
Sylvain Berfini
2f928c41b8 Card context has to work even without vCard support for fetching friend from db...
Cherry pick from master ae708bdd8c
2016-08-10 12:24:28 +02:00
Sylvain Berfini
6256cf1636 Moved and renamed some vcard methods for python wrapper
Cherry pick c8ae29742a from master
2016-08-10 12:07:42 +02:00
Ghislain MARY
bc0c127752 Fix bug 0003250: Reset logs button not working.
The file needs to be closed to be removed on Windows.
2016-08-10 11:42:10 +02:00
Sylvain Berfini
8d21acd7f0 Edit friends database schema to allow empty SIP URI column in new installs 2016-08-09 18:05:54 +02:00
Erwan Croze
958366ce19 Add echo tester api + jni 2016-08-08 12:07:41 +02:00
Sylvain Berfini
6f1e96c8f6 JNI wrapper for newly added account creator method 2016-08-08 09:59:14 +02:00
Gautier Pelloux-Prayer
7b2e4bd4e2 account_creator: add recover_phone_account 2016-08-05 17:11:30 +02:00
Gautier Pelloux-Prayer
c6b204fc64 one more crash… 2016-08-05 17:11:30 +02:00
Gautier Pelloux-Prayer
97c8f0d0d8 account_creator.c: fix creation 2016-08-05 15:46:08 +02:00
Ghislain MARY
7c03fefec5 Fix build for Windows 10. 2016-08-04 17:37:28 +02:00
Sandrine Avakian
4904fec941 Revert "Handle IPv6 for ICE and TURN 2016-08-04 13:50:11 +02:00
Sandrine Avakian
36d95999b5 Revert "Enable IPv6 by default on all platforms (it was only enabled on iOS)."
This reverts commit ead444f3f0.
2016-08-04 11:17:01 +02:00
Ghislain MARY
3e924ef6f5 Move get_local_ip_for() to bctoolbox. 2016-08-03 14:27:13 +02:00
Sylvain Berfini
90f670e320 Fix JNI for LogHandler 2016-08-03 11:38:14 +02:00
Ghislain MARY
9a5253de52 Really fix the automatic wrapper generation (the 'Cbs' in callback name is important, do not remove it!). 2016-08-03 11:23:33 +02:00
Ghislain MARY
b6fa538ce7 Oooopsss... Fix last commit. 2016-08-03 11:10:21 +02:00
Ghislain MARY
019e51cd21 Document new account creator API + fix automatic wrapper generation. 2016-08-03 11:04:28 +02:00
Gautier Pelloux-Prayer
d687000a81 xmlrpc.c: indent 2016-08-02 16:17:50 +02:00
Sylvain Berfini
be38b3474c Fix compilation + fix crash when vCards are disabled and URI is NULL + remove warning 2016-08-02 14:22:52 +02:00
Sylvain Berfini
0a697d0d6f Added a JNI method to know if a LinphoneFriend has been added to a LinphoneFriendList 2016-08-02 14:10:47 +02:00
Sylvain Berfini
16fd894d55 Fix getAccountCreator JNI method 2016-08-02 13:39:48 +02:00
Sylvain Berfini
c2daece48f Fixed JNI callbacks signature for account creator 2016-08-02 13:31:03 +02:00
Sylvain Berfini
61a3b8a98e Use user_version to know if friends db needs to be updated or not 2016-08-02 12:09:54 +02:00
Sylvain Berfini
d843d27890 Only alter sip_uri column in update + close/reopen connection needed after schema update + do it in transaction just in case... 2016-08-02 11:09:10 +02:00
Ghislain MARY
5b19181748 Include linphonecore.h in vcard.cc so that the linphone_core_vcard_supported symbol is exported on Windows. 2016-08-02 09:45:40 +02:00
Ghislain MARY
1cb1d7c5eb Allow friends to be added to a friend list even if they do not have a SIP address. 2016-08-01 17:30:51 +02:00
Ghislain MARY
3be8c6bd00 Fix crash in friends handling when building with vCard disabled. 2016-08-01 16:26:53 +02:00
Ghislain MARY
90e248875a Fix crash in linphone_call_update_ice_from_remote_media_description() when building with GCC >= 4.9 and -O2. 2016-08-01 15:51:48 +02:00
Ghislain MARY
afbf257749 Fix crash in linphone_call_update_ice_from_remote_media_description() when building with GCC >= 4.9 and -O2. 2016-08-01 15:46:28 +02:00
Sylvain Berfini
4a7099b983 Fix merge issue 2016-07-29 16:24:08 +02:00
Sylvain Berfini
510d426b7d Merge branch 'dev_phonenumber' 2016-07-29 16:18:23 +02:00
Sylvain Berfini
9e15903546 JNI wrapper for account creator + fixes 2016-07-29 16:07:57 +02:00
Ghislain MARY
dd36939023 Fix some memory leaks. 2016-07-29 15:36:19 +02:00
Gautier Pelloux-Prayer
fbb24ec879 account_creator: add phone number support 2016-07-29 11:59:24 +02:00
Ghislain MARY
fb04d71445 Test association of SIP URI and phone number in presence server tester. 2016-07-29 11:09:45 +02:00
Ghislain MARY
0af986526d Add more address API. 2016-07-29 11:09:45 +02:00
Ghislain MARY
80bdec5205 Associate a presence model to each SIP URI and phone number of a friend. 2016-07-29 11:09:45 +02:00
Ghislain MARY
9243291c6b Correctly put phone numbers in resource list xml. 2016-07-29 11:09:45 +02:00
Ghislain MARY
dd6f88691d Extend address API to handle parameters. 2016-07-29 11:09:45 +02:00
Ghislain MARY
8a0823f5cb Apply configured RLS URI to the friend lists if no RLS URI are configured from them. 2016-07-29 11:09:45 +02:00