631 commits

Author	SHA1	Message	Date
vanitasvitae	aeab6504a7	Merge upstream	2017-08-16 15:46:32 +02:00
vanitasvitae	e1655aa344	Cleanup code	2017-08-16 15:36:49 +02:00
Florian Schmaus	9bb0ed150b	Merge pull request #165 from pocman/patch-1 ... Keep 4.1.9 chat.sendMessage(String) behavior	2017-08-16 15:18:52 +02:00
Florian Schmaus	ba323b51f9	Remove API parts scheduled to be removed in Smack 4.3	2017-08-16 14:31:46 +02:00
Florian Schmaus	80eaaf2d71	Fix warnings	2017-08-16 14:10:00 +02:00
vanitasvitae	d7df408661	Add JingleContent tests	2017-08-15 00:11:00 +02:00
vanitasvitae	9ff0333032	Merge master 4.2.1	2017-08-14 22:15:23 +02:00
Florian Schmaus	43abd52d76	Smack 4.2.1 ... -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEEl3UFnzoh3OFr5PuuIjmn6PWFIFIFAlmR75tfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk3 NzUwNTlGM0EyMURDRTE2QkU0RkJBRTIyMzlBN0U4RjU4NTIwNTIACgkQIjmn6PWF IFLeXggAjdgj7YVUe22NtamnROBj1c3PaWwgSY0gEjcyDPsOz5qeqNUdQLHbmt2j XQQpYZWKg1/1uoQHlsixaFKbGVctKRk72aNEodRfd1osta11WTOwZKEb8nI411Tt 7M0Fhf430WZY6nioZiZIorsmid57fftJ2EMPlmjEDp2FD0AVGAXkEhCneGaPtt9Q hbWbepIy9tApeIH+QgmFLBmPLnFCaSg+X6NUden3Z21bUz5vH8pmcbeUVfsNB7kW nkkDuNwKHPFLgjuhcq7D+KAKRwNU7n8WEuHseRzM7bMCEB+S/rZok5KPXe/tV4v+ YZKN2e+2yh4j5l4FT/fCzELfWcvrgA== =MV3G -----END PGP SIGNATURE----- Merge tag '4.2.1' Smack 4.2.1	2017-08-14 21:01:36 +02:00
Florian Schmaus	772e45da92	Introduce NotAPubSubNodeException ... Fixes SMACK-759.	2017-08-14 20:23:35 +02:00
vanitasvitae	28674a4620	Refactoring	2017-08-13 19:44:02 +02:00
vanitasvitae	5895ca8b07	Merge remote-tracking branch 'upstream/master' into jingle3	2017-08-13 17:22:41 +02:00
vanitasvitae	7744b244e8	Fix S5B test	2017-08-13 17:22:26 +02:00
vanitasvitae	a9e80dc788	Fix errornous <activate> in s5b, calculate missing dst.addr	2017-08-13 14:38:38 +02:00
Florian Schmaus	f4391c07d7	Rework SmackFuture and add async API based on it	2017-08-12 17:35:45 +02:00
Florian Schmaus	0602ae064a	Remove deprecated methods from XMPPConnection	2017-08-12 13:36:47 +02:00
Thomas	b70e80b1ad	Keep 4.1.9 chat.sendMessage(String) behavior ... chat2.Chat.send(String) should have the same behavior as chat.Chat.sendMessage(String)	2017-08-11 10:30:05 +02:00
vanitasvitae	9fe247b1dc	JingleIBBAdapter test + getSid -> getStreamId (S5B)	2017-08-09 19:54:09 +02:00
vanitasvitae	8263a759b3	Add JingleTransportComparisonTest	2017-08-09 19:50:42 +02:00
vanitasvitae	4b8ac5a1ab	More Jingle IBB tests	2017-08-09 19:44:31 +02:00
vanitasvitae	efaa3c27a9	More Jingle IBB tests	2017-08-09 19:26:33 +02:00
vanitasvitae	901d7b39c5	Test isReceiving, isSending	2017-08-09 18:36:54 +02:00
vanitasvitae	f930c1bdc5	Rename getSid -> getSession/StreamId ... add junit tests for JingleSession	2017-08-09 16:45:35 +02:00
vanitasvitae	a23eb6aeea	Add UnknownSecurityElement ... Fix parsing of JingleSecurityElements Switch to 12 byte IV for AES keys	2017-08-09 10:45:34 +02:00
vanitasvitae	792a9a348b	FIX F%?§@N SOCKS5	2017-08-07 23:55:32 +02:00
vanitasvitae	034b7f3844	More feature-not-implemented and remove crap	2017-08-07 19:53:08 +02:00
vanitasvitae	cac35d74b4	Check for disco support before file transfers	2017-08-07 14:35:00 +02:00
vanitasvitae	6fad0b9fab	Add Gajim fixes, ... Return feature-not-implemented when suitable, try next transport on transport-reject.	2017-08-07 11:36:40 +02:00
vanitasvitae	0d8b383b1c	Simplify content state handling, add Fallback test	2017-08-05 20:28:36 +02:00
vanitasvitae	9712dc1df7	Merge flowdalic/master	2017-08-05 18:22:07 +02:00
vanitasvitae	62587daa35	Merge master	2017-08-05 17:22:13 +02:00
vanitasvitae	066d366dd5	fix checkstyle issues	2017-08-05 14:44:59 +02:00
vanitasvitae	c4588eadc6	New JUnit tests and equals methods	2017-08-05 14:30:00 +02:00
Florian Schmaus	7f851d806c	Use StandardExtensionElement in JingleProvider ... and some further minor jingle fixes: - deprecate getJingleTransport() in favor of getTransport() - Jingle.Builder now checks if the session ID is not empty	2017-08-05 11:13:58 +02:00
vanitasvitae	9c71cb8aeb	Add tests	2017-08-05 00:43:54 +02:00
vanitasvitae	1aef1aaadc	Refactoring	2017-08-04 23:05:59 +02:00
vanitasvitae	f0029a65ca	Rename methods for clarity	2017-08-04 22:48:33 +02:00
vanitasvitae	cdcf0d590a	Add cleanup for transports, improve content states	2017-08-04 15:08:49 +02:00
vanitasvitae	a07a1cdc61	Implement transport fallback	2017-08-04 14:06:12 +02:00
vanitasvitae	23eb34932f	SOCKS5 works (no external proxy)	2017-08-03 23:01:55 +02:00
vanitasvitae	ff2f66fa67	Do not store peers proposal as transport	2017-08-03 15:11:34 +02:00
vanitasvitae	aa8e8592af	JS5B test works	2017-08-02 20:52:52 +02:00
vanitasvitae	1c72fdfa14	More improvements to JS5B test (still fails)	2017-08-01 17:12:27 +02:00
Ingo Bauersachs	c9b9558cd4	Make add/remove for presence interceptors consistent	2017-08-01 16:17:35 +02:00
vanitasvitae	d2f979ed15	JET is close to working	2017-07-31 12:08:18 +02:00
vanitasvitae	b0b46ad167	More progress on JET	2017-07-30 22:31:29 +02:00
Florian Schmaus	ed9eae4793	Improve JingleS5BTransportInfo by introducing abstract class ... Introduce a abstract class for shared functionality. And remove static lazy getters.	2017-07-30 19:29:11 +02:00
vanitasvitae	c82b25ea09	Work on Jingle Encrypted Transfers	2017-07-30 15:40:04 +02:00
vanitasvitae	1dbdafe28c	Basic Sending/Receiving Files works again	2017-07-29 22:21:36 +02:00
vanitasvitae	af069ffc49	Pass events down to contents	2017-07-29 19:31:16 +02:00
vanitasvitae	185d569b89	Progress	2017-07-28 14:02:32 +02:00