Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-12-25 05:47:58 +01:00
Code Issues Releases Wiki Activity
1450 commits 8 branches 0 tags 34 MiB
Commit graph

360 commits

Author SHA1 Message Date
Florian Schmaus
e75f45082b SMACK-270 MultiUserChat relied on finalize() being called in order to remove packet listeners and the association with RoomListenerMultiplexor. The PacketListeners are referenced by Connection, which meant that MultiUserChat is always strongly reachable until the connection dies. 
This patch introduces an new MultiUserChat.cleanup() method that is called when userHashLeft() is triggered.

Thanks to Stuart Chalmers and scgmile for reporting this.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13418 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-31 22:30:49 +00:00
Florian Schmaus
a75d2d7d0d SMACK-375 Properly escape Strings in DiscoverInfo and DiscoverItems for XML. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13417 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-31 22:30:36 +00:00
Florian Schmaus
2a1f4e8376 SMACK-403 add support for 
XEP-0297 Stanza Forwarding and XEP-0280 Message Carbons
and
XEP-0297: Stanza Forwarding implementation

This patch adds Forwarded.java, a class to wrap messages forwarded
from a different entity. A forwarded stanza contains of a Packet and
an optional timestamp.

WARNING: The current implementation only allows to forward Message
packets, as there is no universal way to parse a Packet from SMACK.

XEP-0280 Message Carbons implementation

This patch adds Carbon.java, a class to wrap the packet extension
defined in XEP-0280 to store copies of messages sent to or received
by a user to his other client(s).

The CarbonManager allows to register XEP-0280 support with the SDM,
to enable and disable the feature and to manipulate messages
accordingly.

Signed-Off-By: Georg Lukas <georg@op-co.de>

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13411 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-28 09:38:02 +00:00
Florian Schmaus
b9fe598129 fix typo in PingManager.getInstanceFor() function name 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13410 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-26 09:47:39 +00:00
Florian Schmaus
704ef1f9dc PingManager: Don't register IQProvider since this is done by smack.providers already. This line was actually a leftover from aSmack development. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13406 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-25 00:13:40 +00:00
Florian Schmaus
4018fa3c7b SMACK-388 Moved PingProvider, Ping and Pong under ../smackx/ping package 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13394 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-15 19:56:25 +00:00
Florian Schmaus
6e141eeb68 PingManager: removed debug message that claims to be a error message 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13393 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-11 10:30:52 +00:00
Florian Schmaus
cd15d7499d Fix erroneous cast from byte to int in IBBInputStream's read() 
method. The casted value needs to be masked with 0xff, because bytes
in java are signed (two's complement)

Fixes SMACK-394

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13387 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-05 12:53:45 +00:00
Florian Schmaus
8c14f0cb55 Added XEP-199 aka. "XMPP Ping" support to smack. Fixes SMACK-388. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13384 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-04 11:43:35 +00:00
rcollier
9cd16fe3dd SMACK-374 Added patch to fix memory leak. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13372 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-11-22 02:51:51 +00:00
rcollier
e08c8afe44 SMACK-363 Applied code cleanup patches for many generics related issues. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13325 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-10-26 10:47:55 +00:00
rcollier
6dc64671e2 Merge of 3.2 stream back into trunk 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12965 b35dd754-fafc-0310-a699-88a17e54d16e
 2012-02-07 04:32:59 +00:00
rcollier
62ce8e85dd SMACK-362 Added check for no values on form. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12926 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-21 14:58:48 +00:00
rcollier
2115a6b545 Moved the EmbeddedExtensionProvider from smackx to smack, since it is not tied to extensions but is a simple utility for aiding in parsing of custom cabinets. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12922 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-19 17:28:57 +00:00
rcollier
be3b4ae9ef Updated url in javadoc. Changed from jabber to xmpp. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12919 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-19 15:45:24 +00:00
rcollier
01d444ac78 SMACK-353 Fix thread leak issue. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12918 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-19 15:43:52 +00:00
Tim Jentz
e16cb2b4cc SMACK-354 Provide milliseconds in timestamp colum debugwindow 
Applied the smack-354-debug_milliseconds.patch

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12914 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-16 13:39:24 +00:00
rcollier
197548b548 SMACK-346 Return correct error code on file transfer refusal 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12860 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-10-09 01:58:56 +00:00
rcollier
55f4eb68be SMACK-349 The correct byte size is now calculated for outgoing ibb streams, taking into account the base64 encoding. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12859 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-10-09 01:38:09 +00:00
rcollier
3b47f94b35 SMACK-263 Applied patch for setting file info for transfer 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12854 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-10-08 03:48:29 +00:00
rcollier
c96be693dc Moved utility class to the core, since it is not extension related and useful for all code. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12598 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-09-21 23:57:34 +00:00
rcollier
3f89df061d Merged the 3.2 branch back into trunk. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12588 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-09-09 01:26:22 +00:00
rcollier
fdd60122d3 SMACK-348 Updated broken links. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12580 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-08-18 03:44:41 +00:00
rcollier
98d03d2d75 Just cleaning up an import used in the javadoc. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12575 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-08-15 01:28:15 +00:00
Wolf Posdorfer
87ccd0b1c2 clear all rows button now clears all rows 
patch by lemon

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12548 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-29 07:58:13 +00:00
rcollier
da5434505b SMACK-129 - Added a property in smack-config file for the default packet collector size and set it much lower than the previous default. Also made the max size for packet collectors configurable from the constructor. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12509 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-18 18:18:03 +00:00
Wolf Posdorfer
0c88e19d3b SMACK-273 
if RoomListenerMultiplexor is null also return a new one for this connection

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12441 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-01 07:41:17 +00:00
Wolf Posdorfer
a71d8960e8 SMACK-329 
changed <br>-Tag to xhtml compliant <br/>-tag

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12440 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-01 07:39:05 +00:00
Wolf Posdorfer
5e8f1c029b adding Generics to Iterators without 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12431 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-05-30 11:31:02 +00:00
Holger Bergunde
a12167ebfc SMACK-338 this should use IBB as fallback protocol if available 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12409 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-05-23 14:11:35 +00:00
rcollier
acd98830b7 Fixed import linked in javadoc 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12306 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-04-29 11:41:12 +00:00
rcollier
1df6aaadf3 SMACK-330 Added missing node attribute in the item element for pubsub. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12303 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-04-29 02:36:16 +00:00
rcollier
750cfa64b0 Fixed bug with setting the form value in ConfigureForm.setChildrenAssociationPolicy. It was trying to set a single string value instead of a list. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12213 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-30 02:34:21 +00:00
rcollier
2c55c2ac65 SMACK-334 FileTransferNegotiator now passes the correct type in the stream-method variable. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12212 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-30 00:43:35 +00:00
rcollier
8a8b8ccd79 SMACK-163 Fixed NPE in accessing form field information. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12200 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-29 00:44:38 +00:00
Wolf Posdorfer
01a1fb7751 added Button to clear "All Packets" Tab 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12152 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-21 15:08:48 +00:00
rcollier
2150d07435 Merged the 3.2 Beta branch into trunk. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12107 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-14 01:53:42 +00:00
rcollier
65d3847670 SMACK-327 Made getFeatures() method public. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12007 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-12-04 16:28:52 +00:00
Henning Staib
7e01c66374 improved Delay Information Parser (fixes SMACK-243) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11823 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 13:20:48 +00:00
Henning Staib
8b54f34153 merged branch improve_bytestreams in trunk 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11821 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-08-15 11:57:11 +00:00
rcollier
ef74695a1b Issue SMACK-308: Fixed multiple bugs in XML generation. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11678 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-04-14 18:24:12 +00:00
guus
bcc1c55894 Adding support for XEP-0224: Attention (SMACK-296) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11655 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-25 08:09:12 +00:00
Günther Niess
127319a821 SMACK-279: The XMPPConnection extends the new abstract Connection class 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11613 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-09 11:55:56 +00:00
rcollier
11a41e79ca SMACK-289 Added functionality for retrieving items when the user has multiple subscriptions 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11579 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-01-30 00:04:39 +00:00
rcollier
e600fb02f5 SMACK-288 - Parser is now advanced correctly to the end tag when parsing multiple items. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11574 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-01-29 13:50:23 +00:00
guus
ce323cb128 Javadoc readability. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11467 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-12-31 22:21:55 +00:00
guus
97d2b5a0f2 Improved documentation a little. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11455 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-12-09 20:28:53 +00:00
guus
a86f45a4e6 Adds packetextension for nicknames (SMACK-285) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11454 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-12-09 19:59:52 +00:00
Michael Will
06805b248d add generics 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11422 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-11-26 14:11:19 +00:00
Michael Will
0b7421eae3 implement a simple macro parser 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11418 b35dd754-fafc-0310-a699-88a17e54d16e
 2009-11-25 16:51:29 +00:00