vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-core/src/main/java/org/jivesoftware/smack
History
Florian Schmaus 701aa7d9c4 Merge branch '4.1' 
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
	smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
	smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.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/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
	smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
	version.gradle
 		2015-03-04 22:42:36 +01:00
..
compress/packet Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
compression Cleanup XMPPTCPConnection, mostly exception handling 2015-01-26 07:54:12 +01:00
debugger Merge branch '4.1' 2015-03-04 22:42:36 +01:00
filter Merge branch '4.1' 2015-03-04 22:42:36 +01:00
initializer Enable OSGi compliance via 'DynamicImport-Package: *' 2015-01-03 13:14:02 +01:00
iqrequest Add AbstractXMPPConnection.setReplyToUnkownIq(boolean) 2015-01-26 07:54:11 +01:00
packet Merge branch '4.1' 2015-03-04 22:42:36 +01:00
parsing Use CharSequence instead of String in parseContent() 2014-07-06 21:10:40 +02:00
provider Merge branch '4.1' 2015-03-04 22:42:36 +01:00
proxy Create smack.util.stringencoder for Base64, Base32,… 2014-09-04 11:07:55 +02:00
sasl Merge branch '4.1' 2015-03-04 22:42:36 +01:00
util Merge branch '4.1' 2015-03-04 22:42:36 +01:00
AbstractConnectionClosedListener.java Add and use AbstractConnectionClosedListener 2015-01-07 20:11:00 +01:00
AbstractConnectionListener.java Add 'resumed' bool ConnectionListener's authenticated() 2015-01-07 21:11:09 +01:00
AbstractXMPPConnection.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
ConnectionConfiguration.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
ConnectionCreationListener.java Make XMPPConnection an interface 2014-05-28 08:18:41 +02:00
ConnectionListener.java Remove protected getConnectionListeners() 2015-01-10 11:26:10 +01:00
ExceptionCallback.java Add an API to send and wait async for a response 2014-08-16 00:08:53 +02:00
Manager.java Add StringUtils.requireNotNullOrEmpty and Objects.requireNonNull 2015-01-26 20:47:09 +01:00
MessageListener.java Improve MUC message and presence listeners 2014-10-12 18:11:02 +02:00
PacketCollector.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
PacketListener.java Rename PacketListener to StanzaListener 2015-03-02 15:49:56 +01:00
PresenceListener.java Improve MUC message and presence listeners 2014-10-12 18:11:02 +02:00
ReconnectionManager.java Improve handling of InterruptedException 2015-01-16 17:31:10 +01:00
SASLAuthentication.java Merge Smack 4.1.0-rc2 2015-02-21 18:07:45 +01:00
SmackConfiguration.java Rename SmackConfiguration.DEBUG_ENABLED to DEBUG 2015-01-19 08:26:42 +01:00
SmackException.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
SmackInitialization.java Create smack-im subproject for XMPP-IM 2015-01-26 07:54:05 +01:00
StanzaListener.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
SynchronizationPoint.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
XMPPConnection.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
XMPPConnectionRegistry.java Make XMPPConnection an interface 2014-05-28 08:18:41 +02:00
XMPPException.java Improve message of StreamErrorException 2015-03-02 15:50:12 +01:00
package.html Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00