Commit graph

86 commits

Author SHA1 Message Date
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
Ghislain MARY
6b290a01ea Fix compilation. 2014-07-11 11:04:08 +02:00
Guillaume BIENKOWSKI
38ea4ee8a3 Made the code more readable 2014-07-10 17:44:58 +02:00
Guillaume BIENKOWSKI
575c9a20d2 Fix crash when launching file download from message after linphone reboot.
We now launch the download from the external_body_url and create a file_transfer_information when the response headers are received.
2014-07-10 17:44:58 +02:00
Simon Morlat
71d498fd95 fix potential crash during provisioning
update po file and fr translation
2014-07-01 21:57:31 +02:00
Ghislain MARY
484d05b02b Fix wrong character in comment. 2014-07-01 15:45:10 +02:00
Jehan Monnier
b68e2990ff Merge remote-tracking branch 'origin/master' into dev_lime 2014-07-01 11:53:25 +02:00
Jehan Monnier
39b9fcd8e7 protect chat message from being released in delivery error cb 2014-07-01 11:52:52 +02:00
Johan Pascal
65984cd5e2 Fix bug in selection message content type in encrypted mode 2014-07-01 10:18:47 +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
Johan Pascal
a18092880b File transfer uses multipart body handler for uploading 2014-06-30 01:27:17 +02:00
Johan Pascal
58530de9bb File transfer : add test for I/O error 2014-06-26 00:45:53 +02:00
Ghislain MARY
02914901f5 Fix compilation on Linux. 2014-06-23 18:18:13 +02:00
Ghislain MARY
136d8379fe Fix compilation for Windows Phone 8. 2014-06-23 15:31:16 +02:00
Ghislain MARY
de947f4403 Include libxml/parser.h. 2014-06-16 14:05:59 +02:00
Johan Pascal
6bdc649624 Add encrypted file transfer message
+ test for the encrypted text message
+ fix bug introduced in last merge
2014-06-12 00:49:36 +02:00
Johan Pascal
b302a87c72 Merge with public master to include the file transfer
- update message test to pass the one with lime disabled
2014-06-10 11:36:26 +02:00
Jehan Monnier
0b46ef520c fix compilation issue 2014-06-10 10:26:32 +02:00
Jehan Monnier
306a2647cf fix mingw compilation issue 2014-06-10 08:41:07 +02:00
Guillaume BIENKOWSKI
1c1165ff65 Fix user agent in chat 2014-06-09 15:29:43 +02:00
Johan Pascal
3c918dfd8b Merge branch 'master' of git.linphone.org:linphone into dev_filetransfer 2014-06-09 13:40:06 +02:00
Simon Morlat
c913816dee java synchronize LinphoneEvent and LinphoneChatRoom APIs with LinphoneCore 2014-06-09 11:05:22 +02:00
Gautier Pelloux-Prayer
4094aec87a removed minor warnings generated by doxygen due to outdated functions prototype 2014-06-05 17:38:15 +02:00
Guillaume BIENKOWSKI
a29a93cd76 Add an API to set and retrieve chat messages "app data". This allows clients to store resilient data for each messages 2014-06-02 14:06:03 +02:00
Johan Pascal
509b105bb6 File transfer: fix memory leak 2014-06-02 06:58:19 +02:00
Johan Pascal
c10b5f652b File transfer implemented following RCS5.1 recommendation
- memory leaks to be fixed
2014-05-29 00:10:49 +02:00
Guillaume BIENKOWSKI
f27a2387d4 Add list of transient messages for messages that are still transitioning to either "delivered" or "error" state.
This allows the get_history() call to return pointers that are valid when the chat_state_changed callback is called.
2014-05-15 17:14:50 +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
26ada60683 Complete LIME integration into liblinphone
- add a boolean into linphoneCore to check if encryption is requested
- move encryption/decryption from chat.c to sal_op_message.c
- check encrypted message validity
- return error to application when enable to encrypt/decrypt
2014-04-25 21:24:50 +02:00
Gautier Pelloux-Prayer
4386f18b21 replace tabs with spaces and remove trailing spaces 2014-04-22 17:22:51 +02:00
Johan Pascal
2522605b79 Merge branch 'master' into dev_bzrtp 2014-04-14 22:04:30 +02:00
Simon Morlat
5e3ff318d9 add ref count to LinphoneChatMessage 2014-04-11 11:51:38 +02:00
Johan Pascal
8a8eb4afe1 Add Lime (Linphone Instant Message Encryption)
- not fully functional yet.
2014-04-11 00:02:36 +02:00
Simon Morlat
c25273e9ca add C function to disable chat 2014-03-25 12:48:50 +01:00
Simon Morlat
269f8d1c4e add new API to obtain full details about failures (calls, registration, events).
Fix bug when receiving a 487 after cancelling call, resulting in a call waiting tone to be played.
2014-03-21 18:15:28 +01:00
Simon Morlat
a45d28a328 implement receiving of in-dialog chat message 2014-03-10 17:25:44 +01:00
Simon Morlat
90b5d17172 split linphone_gtk_iterate and fix bad enum casting in chat message handling 2014-03-05 14:41:08 +01:00
Guillaume Beraudo
93f5e85967 Expose chat message reason based on LinphoneReason.
The response code is not exposed to allow mrtp in the future.
There is no possibility to retrieve the code or the sip reason phrase.
2014-02-13 17:20:04 +01:00
Simon Morlat
931c8ade5f Revert "Expose chat message response code and reason."
This reverts commit f021e9aa51.
2014-02-12 17:47:16 +01:00
Guillaume Beraudo
f021e9aa51 Expose chat message response code and reason. 2014-02-12 16:04:48 +01:00
Ghislain MARY
3e09aff605 Add unit test for RFC3994: is-composing notification. 2014-01-10 11:26:39 +01:00
Sylvain Berfini
abb7c2d50c Improved composing_received to prevent loosing the information if the chatroom doesn't exists 2014-01-07 11:45:34 +01:00
Ghislain MARY
a3f0967236 Add missing is_composing_received callback when a text message is received. 2014-01-06 15:42:34 +01:00
Ghislain MARY
d468050c8b Implement RFC3994: Indication of Message Composition for Instant Messaging. 2014-01-03 15:01:18 +01:00
Guillaume BIENKOWSKI
1c94770d55 Fix likely leak 2013-11-22 15:14:48 +01:00
Simon Morlat
08d5cbbe2c fix big crash in linphone_core_get_or_create_chat_room() 2013-10-18 10:25:23 +02:00
Simon Morlat
d48286fc97 add new test for early media and forking 2013-10-14 15:30:28 +02:00
Simon Morlat
77d6169624 improve documentation, rationalize some callbacks name.
lp-gen-wrapper functional.
2013-10-01 22:00:39 +02:00
Sylvain Berfini
8f186adebb Fix compilation for WP 2013-09-09 11:58:39 +02:00
Sylvain Berfini
34f405894c Added JNI binding to get message storage id + added possibility to limit the number of messages to fetch 2013-08-20 12:12:39 +02:00