1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-05 16:15:58 +01:00
Commit graph

42 commits

Author SHA1 Message Date
Florian Schmaus
b907d606d9 SMACK-352 removed duplicated headers, fixed svn keywords
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13459 b35dd754-fafc-0310-a699-88a17e54d16e
2013-02-07 19:10:22 +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
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
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
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
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
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
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
Michael Will
1edc69780b more work on generic
add ' quoting
fix IntegerInstantiation is more memory friendly

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11024 b35dd754-fafc-0310-a699-88a17e54d16e
2009-06-04 11:58:25 +00:00
Jeff Williams
708284ca46 CS-4346 - Added method to send a stream instead of a file. Also added a way of getting the sid for a transfer. To be reviewed by Gato. Migrated from 3.0.4
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10556 b35dd754-fafc-0310-a699-88a17e54d16e
2008-06-19 18:06:32 +00:00
Alex Wenckus
8fdd2702db Flush IBB output stream before closing it. SMACK-231
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8539 b35dd754-fafc-0310-a699-88a17e54d16e
2007-06-11 21:42:50 +00:00
Francisco Vives
41b4308936 SMACK-128 File Transfer Fail-over Failing. The problem was when users have set a big value for a packet timeout.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8377 b35dd754-fafc-0310-a699-88a17e54d16e
2007-05-22 17:47:42 +00:00
Francisco Vives
b3d4f6643b git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8345 b35dd754-fafc-0310-a699-88a17e54d16e 2007-05-18 01:21:05 +00:00
Francisco Vives
51272c823d git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8335 b35dd754-fafc-0310-a699-88a17e54d16e 2007-05-17 22:07:20 +00:00
Alex Wenckus
02b6924b99 Cleanup listening socket
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7617 b35dd754-fafc-0310-a699-88a17e54d16e
2007-03-21 04:21:30 +00:00
Alex Wenckus
c95c8b7e3a File transfer upgrade, 1.5 and beautification.
Fixed fault tolerant negotiator. SMACK-128

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7616 b35dd754-fafc-0310-a699-88a17e54d16e
2007-03-21 04:09:52 +00:00
Alex Wenckus
2ceed95f6b added reply timeout wait for used host response.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7230 b35dd754-fafc-0310-a699-88a17e54d16e
2007-02-21 00:08:34 +00:00
Alex Wenckus
0e85f25129 Outputstream may not have been properly closed in case of error. SMACK-198
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7144 b35dd754-fafc-0310-a699-88a17e54d16e
2007-02-15 17:33:44 +00:00
Alex Wenckus
694c7863bd file transfer callback is now actually a callback.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6378 b35dd754-fafc-0310-a699-88a17e54d16e
2006-12-12 19:47:59 +00:00
Derek DeMoro
4e0397e80a 1) Added conflict check in ReconnectionManager.
2) Fixed compilation errors due to change in interface name.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6122 b35dd754-fafc-0310-a699-88a17e54d16e
2006-11-15 22:29:25 +00:00
Gaston Dombiak
3af86fd462 Added reconnection support. SMACK-172
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@5367 b35dd754-fafc-0310-a699-88a17e54d16e
2006-09-14 19:16:40 +00:00
Alex Wenckus
39662d3b0f 1) FileTransfer#isDone() will now return true on refused. SMACK-158
2) Learned to spell.
3) Changed to enums.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@5163 b35dd754-fafc-0310-a699-88a17e54d16e
2006-09-01 17:38:53 +00:00
Alex Wenckus
201d36e4d1 Some small refactoring to handle the rare case when a disco request may return an unknown response and could cause an NPE.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4624 b35dd754-fafc-0310-a699-88a17e54d16e
2006-07-20 17:17:19 +00:00
Matt Tucker
47abf627b7 Added privacy list support and improved error handling from Francisco (SMACK-121, SMACK-31).
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4603 b35dd754-fafc-0310-a699-88a17e54d16e
2006-07-19 19:24:00 +00:00
Gaston Dombiak
f57ff10ad9 1. Clean up code
2. Refactoring work
3. Optimization work. SMACK-153
4. Fixed roster test cases. SMACK-154
4. Fixed vCard issue. SMACK-152

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4538 b35dd754-fafc-0310-a699-88a17e54d16e
2006-07-18 05:14:33 +00:00
Alex Wenckus
386b0abcdd After 2 failed connection attempts file transfer will black list a stream host for 2 hours. SMACK-138
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4261 b35dd754-fafc-0310-a699-88a17e54d16e
2006-07-05 18:34:11 +00:00
Alex Wenckus
58254d82aa 1) SOCKS5 listening thread and socket should now be closed properly. SMACK-148
2) PacketCollectors are now properly timed-out.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4260 b35dd754-fafc-0310-a699-88a17e54d16e
2006-07-05 17:45:59 +00:00
Gaston Dombiak
2b8b0183c9 Deleting class per Alex request. :)
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3830 b35dd754-fafc-0310-a699-88a17e54d16e
2006-05-03 21:41:26 +00:00
Alex Wenckus
c22f731c6d Changed base64 implementation. SMACK-135
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3828 b35dd754-fafc-0310-a699-88a17e54d16e
2006-05-03 21:13:25 +00:00
Alex Wenckus
912e8ad25e Setter for response timeout was not static.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3775 b35dd754-fafc-0310-a699-88a17e54d16e
2006-04-14 22:36:42 +00:00
Alex Wenckus
e8c0266740 Illegal XML characters in presence status would crash connection. SMACK-132
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3766 b35dd754-fafc-0310-a699-88a17e54d16e
2006-04-13 20:18:26 +00:00
Alex Wenckus
a5b061d187 Increased file transfer buffer size.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3701 b35dd754-fafc-0310-a699-88a17e54d16e
2006-04-04 20:44:39 +00:00
Alex Wenckus
aa4b965001 Initial transfer status was not being set.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3634 b35dd754-fafc-0310-a699-88a17e54d16e
2006-03-27 22:49:24 +00:00
Alex Wenckus
422317e238 File transfer progress was not being rounded correctly. SMACK-127
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3598 b35dd754-fafc-0310-a699-88a17e54d16e
2006-03-20 17:59:01 +00:00
Alex Wenckus
d1ed521726 Throttle for IBB
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3416 b35dd754-fafc-0310-a699-88a17e54d16e
2006-02-09 01:39:04 +00:00
Alex Wenckus
55d921645d Syncronization issues
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3409 b35dd754-fafc-0310-a699-88a17e54d16e
2006-02-08 18:03:09 +00:00
Alex Wenckus
9d2eafdc49 Cleanup resources on shutdown
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3408 b35dd754-fafc-0310-a699-88a17e54d16e
2006-02-08 18:01:39 +00:00
Derek DeMoro
b3364fcce7 Added getAmountWritten.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3407 b35dd754-fafc-0310-a699-88a17e54d16e
2006-02-08 04:39:27 +00:00
Alex Wenckus
586e3a1604 File transfer fault tolerance
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3406 b35dd754-fafc-0310-a699-88a17e54d16e
2006-02-08 00:31:17 +00:00
Alex Wenckus
131cd4ac15 Added license information for file transfer code
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3397 b35dd754-fafc-0310-a699-88a17e54d16e
2006-02-03 19:13:23 +00:00
Alex Wenckus
8d0db1a339 File Transfer. (SMACK-72) (SMACK-122)
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3395 b35dd754-fafc-0310-a699-88a17e54d16e
2006-02-03 18:44:22 +00:00