Commit graph

117 commits

Author SHA1 Message Date
Erwan Croze
2482371bc4 Add account creator request engine + some changes 2017-03-28 17:08:01 +02:00
Sylvain Berfini
1ed3fccf3a Merge branch 'master' into dev_vcard
Conflicts:
	coreapi/friendlist.c
	java/common/org/linphone/core/LinphoneCore.java
2016-02-18 14:25:06 +01:00
Simon Morlat
7fd9db22ac port linphone-android to bctoolbox 2016-02-17 17:30:00 +01:00
Sylvain Berfini
235dca249d Merge branch 'master' into dev_vcard
Conflicts:
	build/android/Android.mk
	coreapi/private.h
	java/common/org/linphone/core/LinphoneCore.java
	java/impl/org/linphone/core/LinphoneCoreImpl.java
2016-02-09 10:21:18 +01:00
Simon Morlat
1980323a8e link against webrtc's ilbc codec 2016-02-04 23:02:06 +01:00
Sylvain Berfini
39b2596744 Added carddav.c to CMakeLists.txt and Android.mk 2016-01-15 11:40:00 +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
38dfb9ab6f Merge branch 'dev_conference_rfc4579' 2016-01-07 10:13:04 +01:00
Simon Morlat
a0a801b8ad fix android build 2016-01-05 16:36:06 +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
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
François Grisez
2fcf9d4f2c Fix build on Android and autotools 2015-12-17 16:08:49 +01:00
Christophe Deschamps
f151d70d4d retired LinphoneContentPrivate in JNI & fixed Android compilation (friendlist) 2015-12-14 00:01:15 +01:00
Simon Morlat
f1a872cedd fix compilation problems 2015-11-20 22:43:32 +01:00
Margaux Clerc
47662ce97e Add calllogs in database for android 2015-11-19 14:43:08 +01:00
Sylvain Berfini
2e56ba2aa1 This should fix the Android 6 issue when loading shared libs (bsed hack) 2015-11-09 16:58:54 +01:00
Simon Morlat
46547098cc fix android build 2015-09-25 11:52:55 +02:00
Johan Pascal
06575db0ae Add codec2 capabilities (when mscodec2 plugin is present)
- update oRTP and ms2
2015-08-20 23:50:41 +02:00
Margaux Clerc
075f13f233 Remove textReceived callback
Made  echo calibration at start
2015-08-12 17:53:32 +02:00
Ghislain MARY
8669032383 Fix Android build. 2015-06-11 09:41:07 +02:00
Ghislain MARY
c5e3bd5809 Build account creator and xmlrpc on Android and WP8 + install header files. 2015-06-09 08:30:59 +02:00
Jehan Monnier
5035992c64 Merge remote-tracking branch 'private/dev_lime'
Conflicts:
	coreapi/linphonecall.c
2015-03-12 15:08:35 +01:00
Simon Morlat
5955681cc3 update ms2, fix android build 2015-03-10 16:37:28 +01:00
Johan Pascal
d133ebd5eb Merge remote-tracking branch 'linphone-public/master' into dev_lime 2015-02-26 22:46:24 +01:00
Margaux Clerc
a29ccb43e2 Link android project with zlib 2015-02-17 15:57:17 +01:00
Gautier Pelloux-Prayer
ff330203af ILBC build is now optionnal on Android 2015-01-07 10:30:38 +01:00
Ghislain MARY
89565386ac Working file transfer in Python.
- Add the LinphoneBuffer object so that file transfer callbacks do not pass out parameters
- Use the LinphoneBuffer object in the file transfer callbacks
- Implement the file_transfer_send callback in the Python file transfer test
2014-12-10 16:35:19 +01:00
Guillaume BIENKOWSKI
e6209d9051 Merge commit '2e515642f07eb33974583587ddb2ee4669d4ff29' into dev_lime
Conflicts:
	coreapi/chat.c
2014-11-27 18:01:33 +01:00
Ghislain MARY
35189535a7 Convert LinphoneContent from a simple struct to a belle-sip object to ease generation of wrappers. 2014-11-18 16:42:16 +01:00
Sylvain Berfini
52312c0361 Fix compilation with ndk 10c 2014-11-07 15:15:57 +01:00
Guillaume BIENKOWSKI
dec0ccb9df Merge remote-tracking branch 'public/master' into dev_lime
Conflicts:
	build/android/Android.mk
	coreapi/private.h
2014-10-31 10:47:13 +01:00
Ghislain MARY
a2954ef1aa Fix compilation warnings/errors when compiling for Android. 2014-10-30 14:59:08 +01:00
François Grisez
2630a9b0f0 Fix compilation on Android 2014-10-15 12:44:52 +02:00
François Grisez
db528b1a74 Add the LinphonePlayer Java interface 2014-10-06 15:07:47 +02:00
Margaux Clerc
4a8ce7f061 Merge commit '728ed3077cf4e47e6e972732a3f8a1b39a96f2ed' into dev_lime
Conflicts:
	build/android/Android.mk
	coreapi/chat.c
	coreapi/help/filetransfer.c
	tester/message_tester.c
2014-09-25 17:52:30 +02:00
Jehan Monnier
def9a95377 fix LIBLINPHONE_VERSION on Android 2014-09-01 18:33:43 +02:00
Ghislain MARY
eaa1d6bb1d Add reference count handling to the LinphoneCallParams object. 2014-09-01 14:58:32 +02:00
Ghislain MARY
095beeb583 Build player.c on all platforms. 2014-09-01 10:43:01 +02:00
Ghislain MARY
b4963d9f70 Put call log related code in its own files. 2014-08-29 14:39:34 +02:00
Margaux Clerc
e6eb8008fa Merge remote-tracking branch 'linphone-public/master' into dev_lime
Conflicts:
	tester/message_tester.c
2014-07-11 14:45:10 +02:00
Sylvain Berfini
556b859e5e Updated ms2 and Android.mk for openh264 update 2014-07-03 10:39:48 +02:00
Jehan Monnier
819ca3bb78 Merge remote-tracking branch 'origin/master' into dev_lime
Conflicts:
	coreapi/chat.c
	coreapi/help/filetransfer.c
	tester/message_tester.c
2014-06-30 20:26:21 +02:00
Ghislain MARY
7caaca64ff Use the iSAC codec and WebRTC echo canceller from the mswebrtc plugin on Android. 2014-06-13 14:57:24 +02:00
Jehan Monnier
ed4d9c0d20 Merge remote-tracking branch 'origin' into dev_lime
Conflicts:
	build/android/Android.mk
	coreapi/Makefile.am
2014-05-14 15:15:50 +02:00
Johan Pascal
9242d38292 add lime to the android makefile 2014-04-25 21:26:34 +02:00
Gautier Pelloux-Prayer
8417c0b18d Quality reporting: on call end, send a PUBLISH message with call quality data (work in progress) 2014-04-17 16:38:38 +02:00
Ghislain MARY
90b5101764 Changes to add support of OpenH264 on Android. 2014-04-07 12:48:00 +02:00
Jehan Monnier
75529783cf bzrtp integration for android 2014-04-02 17:24:49 +02:00
Johan Pascal
e42a8d15c0 Update Makefile and oRTP to switch to bzrtp 2014-03-31 12:02:19 +02:00