504 commits

Author	SHA1	Message	Date
Florian Schmaus	81002c4fbd	Merge branch '4.2'	2017-11-22 08:37:47 +01:00
Florian Schmaus	9e11b68144	Add comment style checkstyle rule requiring a space	2017-11-20 08:53:19 +01:00
Florian Schmaus	52bd680bb5	Fix OfflineMessageManager.getMessages(List<STring>) ... by implementing a new logic how the messages are retrieved. Previously in case the node list has exactly one item, the method would perform an unnecessary call to nextResult() causing a delay. Fixes SMACK-785.	2017-11-18 15:58:08 +01:00
Florian Schmaus	0da3ebf385	Make MUC invitation rejected filter also filter by room address ... Fixes SMACK-783.	2017-11-12 12:20:08 +01:00
Florian Schmaus	a66c42834f	Add findServicesDiscoveryInfo() variant ... which does not log some exceptions, but instead comes with an optional output paramater which returns the encountered exceptions.	2017-11-09 18:16:08 +01:00
Florian Schmaus	5ef6853db6	Improve MultiUserChat's leave() and destroy() login ... Remove the "if (!joined) return" guard in leave() this allows to resync the instances state with the real world state in case they ever get out of sync. Also call userHasLeft() in even if leave() throws and in certain situations if destroy() throws. Thanks to Дамян Минков and Ingo Bauersachs for pointing this out.	2017-11-07 20:38:19 +01:00
Florian Schmaus	0a4cd79d4e	Call MultiUserChat.userHasLeft() before invoking listeners ... in case a listener throws, userHasLeft() will eventually have set the MutliUserChat instance to the right state.	2017-11-07 20:34:43 +01:00
Florian Schmaus	d93d214f0e	Remove duplicate code in MultiUserChat	2017-11-07 20:34:43 +01:00
damencho	44e4607259	Fix memory leak in MutliUserChat.removeConnectionCallback(). ... Fix memory leak by removing subject listener in MutliUserChat.removeConnectionCallback(). Fixes SMACK-782.	2017-11-07 20:34:43 +01:00
Florian Schmaus	65b4f506dc	Add SubscribeAnswer.ApproveAndAlsoRequestIfRequired	2017-11-06 22:41:28 +01:00
Florian Schmaus	384c285fbc	Merge branch '4.2'	2017-10-14 14:56:36 +02:00
Florian Schmaus	0729392ab8	Fix isSupported discovery of "Push Notifications" ... Fixes SMACK-780.	2017-10-14 14:12:28 +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
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
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
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
Ingo Bauersachs	c9b9558cd4	Make add/remove for presence interceptors consistent	2017-08-01 16:17:35 +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
Ingo Bauersachs	0b8788a9fc	Fix parameter ordering in BoBHash construction	2017-07-20 22:50:34 +02:00
Florian Schmaus	104146c5ed	Add Jingle.getSoleContentOrThrow()	2017-07-17 21:05:56 +02:00
Florian Schmaus	8f808b38e1	Merge pull request #153 from vanitasvitae/fixReason ... Allow parsing of JingleReason.AlternativeSession	2017-07-08 08:24:17 +02:00
vanitasvitae	58c32639b5	Allow parsing of JingleReason.AlternativeSession ... The JingleReasonProvider was faulty and ignored the <alternative-session> element.	2017-07-06 16:55:12 +02:00
vanitasvitae	8bd3856fa1	Fix typos in filetransfer package	2017-07-06 14:01:28 +02:00
vanitasvitae	99c1c93c2a	Fix shouldPreserveAddressOrderOnInsertions test ... The test failed because the ArrayList - in contrast to the underlying Set - did not check for duplicates on insert. Under certain circumstances this lead to an index out of bounds exception because the list in the test contained duplicated entries which were not present in the set of the Socks5Proxy. I fixed the issue by only inserting the address when it was not in the list before.	2017-07-04 21:50:08 +02:00
vanitasvitae	7e76bc1ae5	More changes to the Jingle package: ... - Change visibility of some Socks5Bytestreams code. - Add central ThreadPool - Move FullJidAndSessionId in own class - More complete JingleSession class - More complete JingleUtil class - Improved tests	2017-07-03 10:35:46 +02:00
vanitasvitae	5bd01b7385	Add Jingle File Transfer elements and JingleUtil class	2017-06-30 15:03:13 +02:00
Florian Schmaus	541c9ecfdd	Fix compile errors in jingle code ... Which where introduced by merging 20eabca1b3 after b14aca744f	2017-06-29 18:09:25 +02:00
Florian Schmaus	1d53889874	Merge pull request #145 from vanitasvitae/singleJingleTransport ... Switch to single transport instead of list	2017-06-28 21:02:52 +02:00
vanitasvitae	20eabca1b3	Also replace list with single transport-info info	2017-06-26 15:04:22 +02:00
vanitasvitae	e2b8ffdf22	Switch to single transport instead of list	2017-06-21 13:42:02 +02:00
vanitasvitae	b14aca744f	Add Jingle SOCKS5Bytestream transport method	2017-06-19 10:11:08 +02:00
Florian Schmaus	08a4ee4eb2	Reworked some Jingle unit tests to use Junit's "expected=" ... Also don't use randomString() because then the unit tests also depend on the correct behavior of it.	2017-06-17 16:08:32 +02:00
Florian Schmaus	2b11074950	Merge branch '4.2'	2017-06-17 15:55:38 +02:00
Florian Schmaus	05148ab0ad	Merge pull request #142 from vanitasvitae/jingleIBB ... Add Jingle InBandBytestream transports	2017-06-16 23:32:59 +02:00
Florian Schmaus	aaad697b02	Merge pull request #140 from vanitasvitae/TransportInfo ... Add JingleContentTransportInfo class	2017-06-16 23:25:23 +02:00
Florian Schmaus	6712cc91c8	Merge pull request #139 from vanitasvitae/JingleErrors ... Remove unused errors and add missing ones	2017-06-16 23:19:50 +02:00
vanitasvitae	5699373cd9	Add method to set Reason	2017-06-16 22:54:32 +02:00
Florian Schmaus	759a7d7a70	Fix InitationListenerTest's timeouts ... Don't use Thread.sleep(), isntead we use Mockito's timeout() method.	2017-06-16 22:51:14 +02:00
vanitasvitae	287976e0e0	Add Jingle InBandBytestream transports	2017-06-16 22:43:50 +02:00
Florian Schmaus	08e897113d	Add CustomImportOrder checkstyle rule ... And matching ImportOrder settings for Eclipse in resources/eclipse/smack.importorder	2017-06-14 17:12:43 +02:00
vanitasvitae	e33bb5a741	Reorder imports	2017-06-14 00:01:05 +02:00
vanitasvitae	a604266336	Create alternative-session JingleReason	2017-06-14 00:00:27 +02:00
vanitasvitae	62167a7857	Reorder imports	2017-06-13 23:58:41 +02:00
vanitasvitae	4ae8434852	Remove unused errors and add missing ones	2017-06-13 23:57:59 +02:00
vanitasvitae	d49dc71bae	Add JingleContentTransportInfo class	2017-06-08 15:04:25 +02:00