Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-25 15:52:06 +01:00
Code Issues Releases Wiki Activity
1950 commits 8 branches 0 tags 34 MiB
Commit graph

1950 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Schmaus
6caf2cbdb5 Don't use IQReplyFilter for resource binding 
as the local username is only available after binding (and legacy
session establishment). This makes Smack compatible again with XMPP
services that use the user's JID as from attribute in the result IQ
after the bind set IQ, e.g. Facebook:

SENT:
<iq id='sqvTK-1' type='set'>
  <bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'>
    <resource>Smack</resource>
  </bind>
</iq>

RCV:
<iq from='user.name.1@chat.facebook.com' id='sqvTK-1' type='result'>
  <bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'>
    <jid>user.name.1@chat.facebook.com/Smack</jid>
  </bind>
</iq>

Fixes SMACK-590
 2014-08-04 18:01:05 +02:00
Florian Schmaus
076c7d0b81 Configure default Hostname Verifiers 2014-08-03 21:15:41 +02:00
Florian Schmaus
89dc3a0e85 Add smack-android and redesign SASL authentication 
This commit marks an important milestone with the addition of the
smack-android subproject. Smack is now able to run native on Android
without requiring any modifications, which makes the aSmack build
environment obsolete.

It was necessary to redesign the code for SASL authentication to achieve
this. Smack now comes with smack-sasl-provided for SASL implementations
that do not rely on additional APIs like javax for platforms where those
APIs are not available like Android.
 2014-08-01 10:34:47 +02:00
Florian Schmaus
5a2149718a Add gitCommit to version resource 2014-07-28 23:35:56 +02:00
Florian Schmaus
34b195397f Add '--always' to 'git describe' 2014-07-28 16:12:57 +02:00
Florian Schmaus
6bf0678db6 Merge branch '4.0' 
Conflicts:
	build.gradle
	smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
 2014-07-28 00:05:02 +02:00
Florian Schmaus
a0564f2694 Smack 4.0.2 2014-07-27 23:59:48 +02:00
Florian Schmaus
16ea073f4d Fix OSGi component definition for smack-resolver-javax 
The Service Component definition for resolver-javax is in
org.jivesofware.samck and not org.jivesoftware.smack*x*.

SMACK-576
 2014-07-27 23:59:47 +02:00
Florian Schmaus
057d00c9de Add support for HostnameVerifier 
SMACK-586

Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
 2014-07-27 23:28:11 +02:00
Georg Lukas
5f67345275 Make XMPPTCPConnection fail without a HostnameVerifier 2014-07-27 23:19:39 +02:00
Florian Schmaus
7b3331dda0 Add API to find services for a given feature 
It's a common pattern to look for all services hosted under the users
service that provide a given feature. Let's provide an API for that and
use that API in the methods that benefit from it.
 2014-07-26 07:14:42 +02:00
Florian Schmaus
6b7fa4a788 Only call SimpleDataFormat once in build.gradle 
re-use ext.buildDate
 2014-07-25 19:48:54 +02:00
Florian Schmaus
3634587933 Support building with Java8 2014-07-25 10:38:27 +02:00
Florian Schmaus
f05e744011 s/ohloh/openhub/ in README.md 2014-07-23 08:29:47 +02:00
Georg Lukas
2a05c3b707 Roster: merge the two registered ConnectionListeners 2014-07-23 08:29:46 +02:00
Florian Schmaus
d35fd16a21 Add support for HostnameVerifier 2014-07-23 08:29:46 +02:00
Florian Schmaus
fe258fe110 Fix XMPPTCPConnection to set 'host' and 'port' 
Fixes SMACK-585
 2014-07-23 08:29:35 +02:00
Florian Schmaus
b117d3a918 Add smack-java7 2014-07-20 14:29:02 +02:00
Florian Schmaus
d06d5b7c69 Merge branch '4.0' 
Conflicts:
	build.gradle
 2014-07-20 14:19:59 +02:00
Florian Schmaus
2ca92ef601 Smack 4.0.2-SNAPSHOT 2014-07-20 13:33:50 +02:00
Florian Schmaus
d56252f9fb Smack 4.0.1 2014-07-20 12:59:01 +02:00
Florian Schmaus
494f7d5b34 Add getDatestamp() to build.gradle 2014-07-20 12:59:01 +02:00
Florian Schmaus
59527d320d Add SmackAndOsgiInitializer 
OSGi ServiceComponents need the activate method, make sure it exists for
every SmackInitializer by using this class.
 2014-07-20 12:58:50 +02:00
Florian Schmaus
9db5e28fe5 Fix ExperimentalInitializer 2014-07-20 11:08:11 +02:00
Florian Schmaus
97b17e83b4 Move "Message Events (XEP-22)" code to legacy 
Fixes SMACK-569
 2014-07-16 12:01:03 +02:00
Florian Schmaus
49ee058c38 Cleanup carbons, forwarded and a few others API 
Adopt to common design patterns in Smack:

- getFrom(Packet) in Packetextensions
- INSTANCES.put() in getInstanceFor()
- ELEMENT instead of ELEMENT_NAME
- Use XmlStringBuilder
 2014-07-16 11:46:30 +02:00
Florian Schmaus
1ed5c48bcc Merge branch '4.0' 
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
 2014-07-16 10:52:58 +02:00
Florian Schmaus
cea79d1bb8 Use single threaded ExecutorService 
for PacketListeners. Fixes SMACK-583.
 2014-07-16 10:50:35 +02:00
Florian Schmaus
46a54bcd7d Use jxmpp 0.2.0 
this also changes jxmpp's group from org.jivesoftware.jxmpp to org.jxmpp
 2014-07-15 23:32:19 +02:00
Florian Schmaus
06ab0e32d7 Fix XHTMLText.appendBrTag() 
It's an empty element and not a closing one.
 2014-07-15 23:32:10 +02:00
Florian Schmaus
e6aa2416e4 Improve MUC code 
Removes a ton of duplicate code, mostly related to MUCItem being
duplicated in MUCOwner and MUCAdmin, but also some other duplicate code.

Make MUC code use XmlStringBuilder.

Add ELEMENT and NAMESPACE constants to the appropriate places. Also add
"static <MUCPacketExtension> getFrom(Packet)" methods.

Make some MUC classes implement Element.
 2014-07-14 19:22:02 +02:00
Florian Schmaus
7735a5224c Merge branch '4.0' 
Conflicts:
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
 2014-07-14 14:31:09 +02:00
Florian Schmaus
bd0ada480b Improve DeliveryReceipt code, add javadoc 
Also make Packet.getExtension() use Generics
 2014-07-13 11:39:01 +02:00
Florian Schmaus
c063fb1376 Reply correct error code on XEP-65 Stream rejection 
this was previously erroneously changed with
197548b548 from 'forbidden' to
'not-acceptable'. We now change it back to 'forbidden'.

Also delete FileTransferNegotiator.rejectStream(StreamInitation) because
it is dead code and add some comments and javadoc.
 2014-07-12 13:52:54 +02:00
Florian Schmaus
cde6dd65b3 Fix typo: s/no_acceptable/not_acceptable 
in XMPPError.Condition
 2014-07-12 12:39:04 +02:00
Florian Schmaus
fc39ac88bd Add support for retrieving PubSub Node affiliations 
This also marks the starting point for extending the PubSub API to allow
additional packet extensions to be added to the request. This is for
example useful if one wants to limit the result with "Result Set
Management (XEP-59)".

Fixes SMACK-580.
 2014-07-09 13:28:16 +02:00
Florian Schmaus
b0825f73fd Fix TLSUtils.AcceptAllTrustManager 
Should not throw an Exception, but instead return a zero-sized
array. Also add some javadoc.
 2014-07-09 09:42:31 +02:00
Florian Schmaus
bdf9a75c4f Use XmlStringBuilder in RosterPacket and XMPPError 2014-07-07 12:30:36 +02:00
Florian Schmaus
ed7dc1800d Throw IllegalStateException in StringUtils.hash() 
instead of Log.

Also create UTF8 and SHA1 constant.
 2014-07-07 00:11:00 +02:00
Florian Schmaus
e469601468 Do not hardcode the char[] length in StringUtils 2014-07-07 00:03:11 +02:00
Florian Schmaus
8b16c49a31 Remove Packet.ID_NOT_AVAILABLE 2014-07-06 23:57:06 +02:00
Florian Schmaus
f671b9e781 Use CharSequence instead of String in parseContent() 
and parseContentDepth(). This also means that the type of some fields
changed from String to CharSequence.

Also add Matcher for CharSequences.
 2014-07-06 21:10:40 +02:00
Florian Schmaus
54b18e3575 Make XHMTMLExtensionProvider use parseElement() 
which makes the whole provider much simpler.

Also use CharSequence as Base for XHTML-IM bodies.
 2014-07-05 15:04:35 +02:00
Florian Schmaus
94a16ba41e Merge branch '4.0' 
Conflicts:
	build.gradle
	documentation/connections.html
	documentation/gettingstarted.html
	smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
	smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
	smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java
	smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/PacketReader.java
 2014-07-05 14:37:22 +02:00
Florian Schmaus
d8d88d9abd Make XHTMLText use XmlStringBuidler 
also define all element and attribute names as constants.
 2014-07-05 14:19:31 +02:00
Florian Schmaus
4477561d4b Replace references to 'smack.jar' 
Also don't mention the required JDK version in the README as such information
tends to become wrong easily.
 2014-07-05 12:10:43 +02:00
Florian Schmaus
8526f8ab29 Introduce packet.Element 
Re-work filetransfer/bytestream stanza toXML() method to use
XmlStringBuilder. Move the ELEMENT and NAMESPACE definitions in the
right place, ie. the stanza class.
 2014-07-05 11:59:45 +02:00
Florian Schmaus
f05b208120 Remove some duplicate IQ code 
and some dead code in Socks5PacketUtils.
 2014-07-04 23:51:00 +02:00
Florian Schmaus
afd1f6bc36 Remove some duplicate code from smackx.filetransfer 
packet.IQ provides all the utility functions we need. An extension should
never (re-)implemented it's own core functionality.
 2014-07-04 23:17:15 +02:00
Florian Schmaus
09425609af Refactor FileTransfer(Manager|Negotiator) 
to use WeakHashMaps and extend Manager.

SMACK-579
 2014-07-02 09:52:40 +02:00