Commit Graph

185 Commits

Author SHA1 Message Date
vanitasvitae 639c951fd6
Nearly completed work on Jingle SOCKS5 2017-07-21 23:05:46 +02:00
vanitasvitae f4a910cfa5
Reworking transports WIP 2017-07-19 23:15:17 +02:00
vanitasvitae 6818a52da7
Heavy reworking in progress 2017-07-19 15:17:12 +02:00
vanitasvitae 7658369d63
Temp 2017-07-17 20:18:08 +02:00
vanitasvitae 59e79ef668
Temp 2017-07-14 21:19:03 +02:00
vanitasvitae 520f77112d
Documentation 2017-07-13 21:58:49 +02:00
vanitasvitae d61f9a511d
Rename package, make checkstyle smile 2017-07-13 21:45:04 +02:00
vanitasvitae 3c8542c85a
Add first JET classes 2017-07-13 21:36:37 +02:00
vanitasvitae 2364208bed
Fix faulty ChecksumProvider 2017-07-13 15:34:20 +02:00
vanitasvitae e11a4ea9c5
Add comments and more tests 2017-07-11 22:30:41 +02:00
vanitasvitae ad529be705
Start implementing cancel abilities 2017-07-11 13:30:17 +02:00
vanitasvitae f9086439a8
Use handler to notify on finished file transfer 2017-07-10 12:46:51 +02:00
vanitasvitae 92117ec00b
Temp 2017-07-06 16:53:45 +02:00
vanitasvitae 5479938052
merge origin 2017-07-06 14:11:20 +02:00
vanitasvitae 87949f94b9
Temp 2017-07-06 14:00:36 +02:00
vanitasvitae aae2c7304d
Add SendFileHandler 2017-07-06 00:10:04 +02:00
Florian Schmaus 858ba3f82a Fix HTTP File Upload's SlotRequest
Fixes SMACK-774. Thanks to Nathan Freitas for reporting this.
2017-07-05 18:27:47 +02:00
vanitasvitae 63aa2f017c
Fallback works like a charm 2017-07-03 10:13:00 +02:00
vanitasvitae 4a8251fbe5
Transport Fallback works, but does not save file 2017-07-02 21:25:50 +02:00
vanitasvitae f26f3bb503
Use static threadPool and start working on async file transfer method 2017-07-02 15:42:16 +02:00
vanitasvitae 5bd01b7385
Add Jingle File Transfer elements and JingleUtil class 2017-06-30 15:03:13 +02:00
vanitasvitae 59a600a0b6
progress 2017-06-29 21:53:57 +02:00
vanitasvitae a395b11ee9
S5B Works now in both directions and with external proxy 2017-06-28 14:48:39 +02:00
vanitasvitae d537463a42
SOCKS5 works again :) 2017-06-28 11:40:27 +02:00
vanitasvitae 3058ebe8b9
Some debug output and small fixes 2017-06-27 20:27:38 +02:00
vanitasvitae 9d6a858b23
So close... 2017-06-26 23:18:34 +02:00
vanitasvitae daa6b6b999
Some bugfixes 2017-06-25 22:18:19 +02:00
vanitasvitae 699a19d3c2
Add S5B candidate accept/error 2017-06-24 17:46:03 +02:00
vanitasvitae a101de29fd
JIBB works 2017-06-24 12:14:05 +02:00
vanitasvitae c4ef2c9552
Temp 2017-06-23 23:41:40 +02:00
vanitasvitae 136af25342
Add JingleTransportSession classes 2017-06-23 22:48:28 +02:00
vanitasvitae cb3583e510
IBB sending works using worker thread 2017-06-22 14:47:39 +02:00
vanitasvitae 5dc37ab239
Fixed some sending issues 2017-06-21 18:03:31 +02:00
vanitasvitae 4f03cf9a24
Add send method 2017-06-21 17:34:34 +02:00
vanitasvitae 4649defe4f
Add license 2017-06-21 16:16:52 +02:00
vanitasvitae 4c7feeb11b
Receive in thread 2017-06-21 16:16:27 +02:00
vanitasvitae 6a4695b6c6
Receive file 2017-06-21 16:11:13 +02:00
vanitasvitae 7f04265bb9
Some improvements 2017-06-21 15:54:20 +02:00
vanitasvitae ecd29a1ea8
s5b createTransport 2017-06-21 15:42:00 +02:00
vanitasvitae 4c1ee37ea7
Reuse S5B methods 2017-06-21 15:28:32 +02:00
vanitasvitae 6023350364
Progress 2017-06-21 14:11:42 +02:00
vanitasvitae 16a7f31a46
Add sendingThread 2017-06-21 00:16:47 +02:00
vanitasvitae 96197d4092
Add transport replace actions 2017-06-19 19:22:59 +02:00
vanitasvitae 2bac6297ee
Split JingleFileTransferSession in incoming and outgoing 2017-06-19 17:55:04 +02:00
vanitasvitae 73f9af474e
Send session-accept/decline 2017-06-19 15:26:10 +02:00
vanitasvitae e0a54c19d6
First state representing stuff 2017-06-19 14:44:35 +02:00
vanitasvitae 1912ebb8d0
Join JingleSession and Handler in JingleFT 2017-06-19 10:47:24 +02:00
vanitasvitae b91a9c120f
More ground work 2017-06-18 16:47:49 +02:00
vanitasvitae 21435a72c5
Reorder imports 2017-06-18 12:29:44 +02:00
vanitasvitae 20e6580469 Merge remote-tracking branch 'upstream/master' into jingleFTElements 2017-06-18 12:11:17 +02:00
Florian Schmaus 2b11074950 Merge branch '4.2' 2017-06-17 15:55:38 +02:00
vanitasvitae 2f3de3a64d
Add Jingle File Transfer elements and JingleUtil class 2017-06-17 00:56:32 +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 95d2cd75ec
Reorder imports 2017-06-13 23:54:47 +02:00
vanitasvitae 3ecd01135c
Add convenience methods to HashManager 2017-06-13 23:51:57 +02:00
vanitasvitae 28f3130cf9
Add Use of Cryptographic Hashfunctions (XEP-300)
Also move bouncycastle dep from smack-omemo to
smack-experimental.
2017-06-03 00:33:56 +02:00
Florian Schmaus ce1cddc722 More checkstyle whitespace related checks 2017-05-24 14:42:38 +02:00
Florian Schmaus 162dee0a47 Fix IotIsFriendResponse element name and XML
Fixes SMACK-756
2017-04-25 17:07:19 +02:00
vanitasvitae 6bebeb354b
Fix StoreHint (wrong element name) 2017-04-23 23:37:14 +02:00
Florian Schmaus ba2a287112 Add support for XEP-0380: Explicit Message Encryption
Fixes SMACK-746
2017-04-22 18:58:39 +02:00
Florian Schmaus 142297042c Add support for XEP-0334: Message Processing Hints
Fixes SMACK-758
2017-04-22 17:50:39 +02:00
andri.khrisharyadi c8b4df4f84 Fix EnablePushNotificationsIQ wrong form type
Should be submit instead of form
Fixes SMACK-752
2017-04-03 18:59:14 +07:00
Florian Schmaus 09b6608a3a Fix and improve the HTTP File Upload implementation
Fix a few resource leaks. Improve the API and add an integration
test. Also add compability layer for XEP-0363: HTTP File Upload 0.2.

SMACK-747
2017-03-10 17:54:29 +01:00
Grigory Fedorov 72d4c8b611 Add support for XEP-0363: HTTP File Upload.
Fixes SMACK-747
2017-03-10 17:47:13 +01:00
Florian Schmaus a8c6de6b98 Improve MamManager javadoc 2017-03-10 17:47:13 +01:00
Florian Schmaus 32fd52ea8e Sync MAM API with PubSub API: One MamManager per MAM archive address 2017-02-24 19:33:11 +01:00
Anno van Vliet c13cddd91a Enable querying MAM by address and node.
Enhance the API to query archives for example from a room or a pubsub
node.
2017-02-24 08:11:57 +01:00
Florian Schmaus 4c646436a5 Bump "Error Prone" to 2.0.15
and fix a few things :)
2017-02-11 16:16:41 +01:00
Florian Schmaus 684d33b773 Fix Carbon Listener setup
We can't always setup the carbons listener in the constructor of the
manager, as the our local XMPP address may not be available yet. So
setup the carbons listener on a connection listener *and* in the
constructor.
2017-02-01 10:59:44 +01:00
Florian Schmaus 35ac228125 Add CarbonCopyReceivedListener 2017-01-24 08:46:08 +01:00
Florian Schmaus a4ae941a7c Fix memory leak in MUC-light
Basically the same fix as for MUC in
965cbcc979
2017-01-20 16:48:21 +01:00
Florian Schmaus 9d8caf0563 Fix "XEP-0323: IoT - Sensor Data" namespace 2017-01-12 12:48:07 +01:00
Florian Schmaus d47463a533 Deprecate Chat API, introduce new Chat API
Also add (From|To)TypeFilter and update/fix the documentation in a few places.
2017-01-11 19:48:22 +01:00
Florian Schmaus 90a5e289f8 s/processPacket/processStanza/ s/PacketCollector/StanzaCollector/ 2017-01-03 11:35:04 +01:00
Florian Schmaus 183c605278 Bump JXMPP to 0.5.0 2017-01-02 09:40:46 +01:00
Fernando Ramirez f7fcff139c Add MAM methods to load previous page and to load most recent page 2016-12-29 00:13:02 +01:00
Florian Schmaus 7655ac17f2 Re-activate EntityCaps integration test 2016-12-24 10:27:04 +01:00
Florian Schmaus 26b16665e5 Add setting to enable IoT Managers automatically
or not. Since they interfer a lot with existing code (presence
management etc.)
2016-12-19 18:11:18 +01:00
Florian Schmaus 9165e818d9 Add ParenPad and NoWhitespaceAfter checkstyle rules 2016-11-29 12:01:41 +01:00
Florian Schmaus da58b20b53 IoT: Prevent control/read-out from non friends
and make the behavior configurable.
2016-11-17 10:25:35 +01:00
Fernando Ramirez 6d74d0383c Add support for XEP-0333: Chat Markers
Fixes SMACK-736
2016-11-15 22:49:26 +01:00
Fernando Ramirez 5372c1bcf4 Add support Multi-User Chat Light
Fixes SMACK-740
2016-11-15 22:41:24 +01:00
Florian Schmaus 44d6a9d7c1 Improve logging of IoTProvisioningManager 2016-11-05 18:31:26 +01:00
Florian Schmaus 48a46e43ab Use bare JID when using FriendshipDeniedCache
As it only contains bare JIDs.
2016-11-05 18:26:44 +01:00
Fernando Ramirez e266b1acd8 Push Notifications (XEP-0357) implementation
Fixes SMACK-738
2016-11-01 08:46:59 +01:00
Florian Schmaus 1d3c48e6ce Add support for IoT Friend approvals
This adds supports for an experimental protocol flow where a pending
friend request's decission is later on deliverd to the requestor after
the owner made its decission.
2016-10-31 14:50:37 +01:00
Florian Schmaus 0a96016727 Use generics in IoTControlManager 2016-08-09 17:47:09 +02:00
Florian Schmaus f1e24e2273 Rework Roster's SubscribeListener
allow multiple of them to be installed, instead of at most one. Fixes
deadlock in LowLevelRosterIntegration test because
IoTProvisioningManager's SubscribeListener would not come up with a
decission.
2016-07-31 14:50:59 +02:00
Florian Schmaus 5b137616bb Fix NPE in IoTDiscoveryManager 2016-07-31 14:50:59 +02:00
Florian Schmaus aeb385a022 Apply refinements and fixes to the MAM code
SMACK-625.
2016-07-23 15:45:45 +02:00
Fernando Ramirez 189cac072b Implement Message Archive Management (MAM) XEP-0313
Fixes SMACK-625
2016-07-23 12:45:14 +02:00
Florian Schmaus b91978dcc4 Add (partial) support for IoT XEPs
That is XEP-0323, -0324, -0325, and -0347.

SMACK-727.
2016-07-21 08:51:11 +02:00
Florian Schmaus e6a9027cc6 Improve StringUtils.escapeForXml() 2016-01-18 22:04:20 +01:00
Florian Schmaus 04a0004035 Smack 4.1.4
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQF8BAABCgBmBQJV9nAlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzU3QjAxODY1QjI1MDNDMTg0NTNEMjA4
 Q0FDMkE5Njc4NTQ4RTM1AAoJEIysKpZ4VI41sFEIAJlfRspk6S5ymNc4w7u/FT1w
 MpHT/cxqIQIBU9J5dYqeW6Y8O6VuUeknCmZBEv7dIVHroTmvfosMauAyRZJXWeeL
 FQQTBqDJszYdM88x/d5X6d25lCEBdQkdDh2a5s9AIy9RH0iXE74AypuikbroK+VC
 zI3wRPUFq7WnARtmiP2NalSgSNv5ToeicBO+JSniQ+O52ZAlP2FSDfi4uzPPigdP
 Ip/V3eF4Bp0YZimcxAnWdnMU+ciVLClRYKgD3+qTEoic7dx3dzeTyrk1NoLRgQl9
 mfcNXBgUScHZAoSIkR0QiUx9ktPCJ950qa+XtW3B8NtDOZkXegUL/a8ukQAuz+k=
 =qMsC
 -----END PGP SIGNATURE-----

Merge tag '4.1.4'

Smack 4.1.4
2015-09-14 09:05:24 +02:00
Florian Schmaus b1e4884fbb Remove erroneous next() from AbstractJsonExtensionProvider
Fixes SMACK-695.
2015-08-24 11:09:59 +02:00
Florian Schmaus f9faebe831 Add (disable|enable)CarbonsAsync() to CarbonsManager 2015-07-31 14:04:03 +02:00
Florian Schmaus 8c6e56b122 Reset carbons state on clean disconnect
and if session was not resumed. Fixes SMACK-688.
2015-07-31 13:27:03 +02:00
Florian Schmaus 710948c8f7 Add support for XEP-360: Nonzas
SMACK-682
2015-07-14 22:43:58 +02:00
Florian Schmaus 9ea5c0a2ce "Smackify" HOXT code: Use Smack programming idioms 2015-07-01 13:39:04 +02:00
Tibo-lg 4d57848a0f Update HOXT API to use the buidler pattern. 2015-07-01 12:57:05 +02:00