Merge branch '4.2'

.gitignore

@@ -1,6 +1,8 @@
 # IntelliJ
 .idea
 *.iml
+*.ipr
+*.iws
 
 # Mac OS X
 .DS_Store

.travis.yml

@@ -10,7 +10,7 @@ cache:
   - $HOME/.m2
 
 before_install:
-  - export GRADLE_VERSION=2.12
+  - export GRADLE_VERSION=3.5
   - wget https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip
   - unzip -q gradle-${GRADLE_VERSION}-all.zip
   - export PATH="$(pwd)/gradle-${GRADLE_VERSION}/bin:$PATH"
@@ -19,6 +19,6 @@ install: gradle assemble --stacktrace
 script: gradle check --stacktrace
 
 after_success:
-- JAVAC_VERSION=$((javac -version) 2>&1)
+  - JAVAC_VERSION=$((javac -version) 2>&1)
-# Only run jacocoRootReport in the Java7 build
+  # Only run jacocoRootReport in the Java 8 build
-- if [[ "$JAVAC_VERSION" = javac\ 1.7.* ]]; then gradle jacocoRootReport coveralls; fi
+  - if [[ "$JAVAC_VERSION" = javac\ 1.8.* ]]; then gradle jacocoRootReport coveralls; fi

build.gradle

@@ -8,9 +8,9 @@ buildscript {
     }
     dependencies {
         classpath 'org.kordamp:markdown-gradle-plugin:1.0.0'
-		classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.2.0'
+		classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.2.2'
 		classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1"
-		classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.9'
+		classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.10'
     }
 }
 apply plugin: 'org.kordamp.gradle.markdown'
@@ -20,6 +20,7 @@ apply from: 'version.gradle'
 allprojects {
 	apply plugin: 'java'
 	apply plugin: 'eclipse'
+	apply plugin: 'idea'
 	apply plugin: 'jacoco'
 	apply plugin: 'net.ltgt.errorprone'
 
@@ -266,6 +267,7 @@ subprojects {
 
 	checkstyle {
 		configFile = new File(rootConfigDir, 'checkstyle.xml')
+		toolVersion = '7.7'
 	}
 	task sourcesJar(type: Jar, dependsOn: classes) {
 		classifier = 'sources'

config/checkstyle.xml

@@ -117,5 +117,75 @@
 										 , INDEX_OP
 										 "/>
 		</module>
+		<module name="WhitespaceAfter">
+		  <property name="tokens" value="TYPECAST
+										 , LITERAL_IF
+										 , LITERAL_ELSE
+										 , LITERAL_WHILE
+										 , LITERAL_DO
+										 , LITERAL_FOR
+										 , DO_WHILE
+										 "/>
+		</module>
+		<module name="WhitespaceAround">
+		  <property
+			  name="ignoreEnhancedForColon"
+			  value="false"
+			  />
+		  <!-- Currently disabled tokens: LCURLY, RCURLY, WILDCARD_TYPE, GENERIC_START, GENERIC_END -->
+		  <property
+			  name="tokens"
+			  value="ASSIGN
+					 , ARRAY_INIT
+					 , BAND
+					 , BAND_ASSIGN
+					 , BOR
+					 , BOR_ASSIGN
+					 , BSR
+					 , BSR_ASSIGN
+					 , BXOR
+					 , BXOR_ASSIGN
+					 , COLON
+					 , DIV
+					 , DIV_ASSIGN
+					 , DO_WHILE
+					 , EQUAL
+					 , GE
+					 , GT
+					 , LAMBDA
+					 , LAND
+					 , LE
+					 , LITERAL_CATCH
+					 , LITERAL_DO
+					 , LITERAL_ELSE
+					 , LITERAL_FINALLY
+					 , LITERAL_FOR
+					 , LITERAL_IF
+					 , LITERAL_RETURN
+					 , LITERAL_SWITCH
+					 , LITERAL_SYNCHRONIZED
+					 , LITERAL_TRY
+					 , LITERAL_WHILE
+					 , LOR
+					 , LT
+					 , MINUS
+					 , MINUS_ASSIGN
+					 , MOD
+					 , MOD_ASSIGN
+					 , NOT_EQUAL
+					 , PLUS
+					 , PLUS_ASSIGN
+					 , QUESTION
+					 , SL
+					 , SLIST
+					 , SL_ASSIGN
+					 , SR
+					 , SR_ASSIGN
+					 , STAR
+					 , STAR_ASSIGN
+					 , LITERAL_ASSERT
+					 , TYPE_EXTENSION_AND
+					 "/>
+		</module>
 	</module>
 </module>

documentation/extensions/index.md

@@ -87,6 +87,7 @@ Experimental Smack Extensions and currently supported XEPs of smack-experimental
 | [Internet of Things - Control](iot.md)      | [XEP-0325](http://xmpp.org/extensions/xep-0325.html) | Describes how to control devices or actuators in an XMPP-based sensor netowrk. |
 | [HTTP over XMPP transport](hoxt.md)         | [XEP-0332](http://xmpp.org/extensions/xep-0332.html) | Allows to transport HTTP communication over XMPP peer-to-peer networks. |
 | Chat Markers         			  			  | [XEP-0333](http://xmpp.org/extensions/xep-0333.html) | A solution of marking the last received, displayed and acknowledged message in a chat. |
+| Message Processing Hints                    | [XEP-0334](http://xmpp.org/extensions/xep-0334.html) | Hints to entities routing or receiving a message. |
 | JSON Containers                             | [XEP-0335](http://xmpp.org/extensions/xep-0335.html) | Encapsulation of JSON data within XMPP Stanzas. |
 | [Internet of Things - Discovery](iot.md)    | [XEP-0347](http://xmpp.org/extensions/xep-0347.html) | Describes how Things can be installed and discovered by their owners. |
 | Client State Indication                     | [XEP-0352](http://xmpp.org/extensions/xep-0352.html) | A way for the client to indicate its active/inactive state. |

smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java

@@ -325,7 +325,7 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
         writer = new Writer() {
             @Override
             public void write(char[] cbuf, int off, int len) {
-                /* ignore */}
+                /* ignore */ }
 
             @Override
             public void close() {

smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java

@@ -41,6 +41,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.jivesoftware.smack.ConnectionConfiguration.SecurityMode;
+import org.jivesoftware.smack.SmackConfiguration.UnknownIqRequestReplyMode;
 import org.jivesoftware.smack.SmackException.AlreadyConnectedException;
 import org.jivesoftware.smack.SmackException.AlreadyLoggedInException;
 import org.jivesoftware.smack.SmackException.NoResponseException;
@@ -626,7 +627,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
             hostAddresses = DNSUtil.resolveXMPPServiceDomain(config.getXMPPServiceDomain().toString(), failedAddresses, config.getDnssecMode());
         }
         // Either the populated host addresses are not empty *or* there must be at least one failed address.
-        assert(!hostAddresses.isEmpty() || !failedAddresses.isEmpty());
+        assert (!hostAddresses.isEmpty() || !failedAddresses.isEmpty());
         return failedAddresses;
     }
 
@@ -665,7 +666,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
     @Override
     public void sendStanza(Stanza stanza) throws NotConnectedException, InterruptedException {
         Objects.requireNonNull(stanza, "Stanza must not be null");
-        assert(stanza instanceof Message || stanza instanceof Presence || stanza instanceof IQ);
+        assert (stanza instanceof Message || stanza instanceof Presence || stanza instanceof IQ);
 
         throwNotConnectedExceptionIfAppropriate();
         switch (fromMode) {
@@ -894,7 +895,8 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
                         continue;
                     }
                 }
-            }});
+            }
+        });
     }
 
     @Override
@@ -991,20 +993,31 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
         replyTimeout = timeout;
     }
 
-    private static boolean replyToUnknownIqDefault = true;
-
     /**
      * Set the default value used to determine if new connection will reply to unknown IQ requests. The pre-configured
      * default is 'true'.
      *
      * @param replyToUnkownIqDefault
      * @see #setReplyToUnknownIq(boolean)
+     * @deprecated Use {@link SmackConfiguration#setUnknownIqRequestReplyMode(org.jivesoftware.smack.SmackConfiguration.UnknownIqRequestReplyMode)} instead.
      */
+    @Deprecated
+    // TODO Remove in Smack 4.3
     public static void setReplyToUnknownIqDefault(boolean replyToUnkownIqDefault) {
-        AbstractXMPPConnection.replyToUnknownIqDefault = replyToUnkownIqDefault;
+        SmackConfiguration.UnknownIqRequestReplyMode mode;
+        if (replyToUnkownIqDefault) {
+            mode = SmackConfiguration.UnknownIqRequestReplyMode.replyServiceUnavailable;
+        } else {
+            mode = SmackConfiguration.UnknownIqRequestReplyMode.doNotReply;
+        }
+        SmackConfiguration.setUnknownIqRequestReplyMode(mode);
     }
 
-    private boolean replyToUnkownIq = replyToUnknownIqDefault;
+    private SmackConfiguration.UnknownIqRequestReplyMode unknownIqRequestReplyMode = SmackConfiguration.getUnknownIqRequestReplyMode();
+
+    public void setUnknownIqRequestReplyMode(UnknownIqRequestReplyMode unknownIqRequestReplyMode) {
+        this.unknownIqRequestReplyMode = Objects.requireNonNull(unknownIqRequestReplyMode, "Mode must not be null");
+    }
 
     /**
      * Set if Smack will automatically send
@@ -1012,9 +1025,18 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
      * registered {@link IQRequestHandler} is received.
      *
      * @param replyToUnknownIq
+     * @deprecated use {@link #setUnknownIqRequestReplyMode(UnknownIqRequestReplyMode)} instead.
      */
+    @Deprecated
+    // TODO Remove in Smack 4.3
     public void setReplyToUnknownIq(boolean replyToUnknownIq) {
-        this.replyToUnkownIq = replyToUnknownIq;
+        SmackConfiguration.UnknownIqRequestReplyMode mode;
+        if (replyToUnknownIq) {
+            mode = SmackConfiguration.UnknownIqRequestReplyMode.replyServiceUnavailable;
+        } else {
+            mode = SmackConfiguration.UnknownIqRequestReplyMode.doNotReply;
+        }
+        unknownIqRequestReplyMode = mode;
     }
 
     protected void parseAndProcessStanza(XmlPullParser parser) throws Exception {
@@ -1048,7 +1070,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
      * @throws InterruptedException
      */
     protected void processStanza(final Stanza stanza) throws InterruptedException {
-        assert(stanza != null);
+        assert (stanza != null);
         lastStanzaReceived = System.currentTimeMillis();
         // Deliver the incoming packet to listeners.
         executorService.executeBlocking(new Runnable() {
@@ -1089,13 +1111,24 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
                     throw new IllegalStateException("Should only encounter IQ type 'get' or 'set'");
                 }
                 if (iqRequestHandler == null) {
-                    if (!replyToUnkownIq) {
+                    XMPPError.Condition replyCondition;
+                    switch (unknownIqRequestReplyMode) {
+                    case doNotReply:
                         return;
+                    case replyFeatureNotImplemented:
+                        replyCondition = XMPPError.Condition.feature_not_implemented;
+                        break;
+                    case replyServiceUnavailable:
+                        replyCondition = XMPPError.Condition.service_unavailable;
+                        break;
+                    default:
+                        throw new AssertionError();
                     }
+
                     // If the IQ stanza is of type "get" or "set" with no registered IQ request handler, then answer an
                     // IQ of type 'error' with condition 'service-unavailable'.
                     ErrorIQ errorIQ = IQ.createErrorResponse(iq, XMPPError.getBuilder((
-                                    XMPPError.Condition.service_unavailable)));
+                                    replyCondition)));
                     try {
                         sendStanza(errorIQ);
                     }
@@ -1170,7 +1203,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
         }
 
         // Loop through all collectors and notify the appropriate ones.
-        for (StanzaCollector collector: collectors) {
+        for (StanzaCollector collector : collectors) {
             collector.processStanza(packet);
         }
 
@@ -1192,7 +1225,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
                 for (StanzaListener listener : listenersToNotify) {
                     try {
                         listener.processStanza(packet);
-                    } catch(NotConnectedException e) {
+                    } catch (NotConnectedException e) {
                         LOGGER.log(Level.WARNING, "Got not connected exception, aborting", e);
                         break;
                     } catch (Exception e) {

smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java

@@ -162,7 +162,7 @@ public abstract class ConnectionConfiguration {
         enabledSaslMechanisms = builder.enabledSaslMechanisms;
 
         // If the enabledSaslmechanisms are set, then they must not be empty
-        assert(enabledSaslMechanisms != null ? !enabledSaslMechanisms.isEmpty() : true);
+        assert (enabledSaslMechanisms != null ? !enabledSaslMechanisms.isEmpty() : true);
 
         if (dnssecMode != DnssecMode.disabled && customSSLContext != null) {
             throw new IllegalStateException("You can not use a custom SSL context with DNSSEC enabled");

smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java

@@ -132,13 +132,13 @@ public final class SASLAuthentication {
     }
 
     public static boolean blacklistSASLMechanism(String mechansim) {
-        synchronized(BLACKLISTED_MECHANISMS) {
+        synchronized (BLACKLISTED_MECHANISMS) {
             return BLACKLISTED_MECHANISMS.add(mechansim);
         }
     }
 
     public static boolean unBlacklistSASLMechanism(String mechanism) {
-        synchronized(BLACKLISTED_MECHANISMS) {
+        synchronized (BLACKLISTED_MECHANISMS) {
             return BLACKLISTED_MECHANISMS.remove(mechanism);
         }
     }
@@ -209,7 +209,7 @@ public final class SASLAuthentication {
             }
         }
 
-        if (saslException != null){
+        if (saslException != null) {
             if (saslException instanceof SmackException) {
                 throw (SmackException) saslException;
             } else if (saslException instanceof SASLErrorException) {

smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java

@@ -34,6 +34,7 @@ import org.jivesoftware.smack.debugger.SmackDebugger;
 import org.jivesoftware.smack.debugger.SmackDebuggerFactory;
 import org.jivesoftware.smack.parsing.ExceptionThrowingCallback;
 import org.jivesoftware.smack.parsing.ParsingExceptionCallback;
+import org.jivesoftware.smack.util.Objects;
 
 /**
  * Represents the configuration of Smack. The configuration is used for:
@@ -173,7 +174,7 @@ public final class SmackConfiguration {
      * @param mech the SASL mechanism to be added
      */
     public static void addSaslMech(String mech) {
-        if(!defaultMechs.contains(mech)) {
+        if (!defaultMechs.contains(mech)) {
             defaultMechs.add(mech);
         }
     }
@@ -184,7 +185,7 @@ public final class SmackConfiguration {
      * @param mechs the Collection of SASL mechanisms to be added
      */
     public static void addSaslMechs(Collection<String> mechs) {
-        for(String mech : mechs) {
+        for (String mech : mechs) {
             addSaslMech(mech);
         }
     }
@@ -370,4 +371,20 @@ public final class SmackConfiguration {
         return defaultHostnameVerififer;
     }
 
+    enum UnknownIqRequestReplyMode {
+        doNotReply,
+        replyFeatureNotImplemented,
+        replyServiceUnavailable,
+    }
+
+    // TODO Change to replyFeatureNotImplemented in Smack 4.3
+    private static UnknownIqRequestReplyMode unknownIqRequestReplyMode = UnknownIqRequestReplyMode.replyServiceUnavailable;
+
+    public static UnknownIqRequestReplyMode getUnknownIqRequestReplyMode() {
+        return unknownIqRequestReplyMode;
+    }
+
+    public static void setUnknownIqRequestReplyMode(UnknownIqRequestReplyMode unknownIqRequestReplyMode) {
+        SmackConfiguration.unknownIqRequestReplyMode = Objects.requireNonNull(unknownIqRequestReplyMode, "Must set mode");
+    }
 }

smack-core/src/main/java/org/jivesoftware/smack/SmackFuture.java

@@ -0,0 +1,170 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import org.jivesoftware.smack.SmackException.NotConnectedException;
+import org.jivesoftware.smack.packet.Stanza;
+
+public abstract class SmackFuture<V> implements Future<V> {
+
+    private boolean cancelled;
+
+    private V result;
+
+    protected Exception exception;
+
+    private SuccessCallback<V> successCallback;
+
+    private ExceptionCallback exceptionCallback;
+
+    @Override
+    public synchronized final boolean cancel(boolean mayInterruptIfRunning) {
+        if (isDone()) {
+            return false;
+        }
+
+        cancelled = true;
+        return true;
+    }
+
+    @Override
+    public synchronized final boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public synchronized final boolean isDone() {
+        return result != null;
+    }
+
+    public void onSuccessOrError(SuccessCallback<V> successCallback, ExceptionCallback exceptionCallback) {
+        this.successCallback = successCallback;
+        this.exceptionCallback = exceptionCallback;
+
+        maybeInvokeCallbacks();
+    }
+
+    public void onSuccess(SuccessCallback<V> successCallback) {
+        onSuccessOrError(successCallback, null);
+    }
+
+    public void onError(ExceptionCallback exceptionCallback) {
+        onSuccessOrError(null, exceptionCallback);
+    }
+
+    private final V getResultOrThrow() throws ExecutionException {
+        assert (result != null || exception != null);
+        if (result != null) {
+            return result;
+        }
+
+        throw new ExecutionException(exception);
+    }
+
+    @Override
+    public synchronized final V get() throws InterruptedException, ExecutionException {
+        while (result == null && exception == null) {
+            wait();
+        }
+
+        return getResultOrThrow();
+    }
+
+    @Override
+    public synchronized final V get(long timeout, TimeUnit unit)
+                    throws InterruptedException, ExecutionException, TimeoutException {
+        final long deadline = System.currentTimeMillis() + unit.toMillis(timeout);
+        while (result != null && exception != null) {
+            final long waitTimeRemaining = deadline - System.currentTimeMillis();
+            if (waitTimeRemaining > 0) {
+                wait(waitTimeRemaining);
+            }
+        }
+
+        if (result == null || exception == null) {
+            throw new TimeoutException();
+        }
+
+        return getResultOrThrow();
+    }
+
+    protected final synchronized void maybeInvokeCallbacks() {
+        if (result != null && successCallback != null) {
+            successCallback.onSuccess(result);
+        } else if (exception != null && exceptionCallback != null) {
+            exceptionCallback.processException(exception);
+        }
+    }
+
+    /**
+     * This method checks if the given exception is <b>not</b> fatal. If this method returns <code>false</code>, then
+     * the future will automatically set the given exception as failure reason and notify potential waiting threads.
+     *
+     * @param exception the exception to check.
+     * @return <code>true</code> if the exception is not fatal, <code>false</code> otherwise.
+     */
+    protected abstract boolean isNonFatalException(Exception exception);
+
+    protected abstract void handleStanza(Stanza stanza) throws NotConnectedException, InterruptedException;
+
+    protected final void setResult(V result) {
+        assert (Thread.holdsLock(this));
+
+        this.result = result;
+        this.notifyAll();
+
+        maybeInvokeCallbacks();
+    }
+
+    public static abstract class InternalSmackFuture<V> extends SmackFuture<V> implements StanzaListener, ExceptionCallback {
+
+        @Override
+        public synchronized final void processException(Exception exception) {
+            if (!isNonFatalException(exception)) {
+                this.exception = exception;
+                this.notifyAll();
+
+                maybeInvokeCallbacks();
+            }
+        }
+
+        /**
+         * Wrapper method for {@link #handleStanza(Stanza)}. Note that this method is <code>synchronized</code>.
+         */
+        @Override
+        public synchronized final void processStanza(Stanza stanza) throws NotConnectedException, InterruptedException {
+            handleStanza(stanza);
+        }
+    }
+
+    /**
+     * A simple version of InternalSmackFuture which implements {@link #isNonFatalException(Exception)} as always returning <code>false</code> method.
+     *
+     * @param <V>
+     */
+    public static abstract class SimpleInternalSmackFuture<V> extends InternalSmackFuture<V> {
+        @Override
+        protected boolean isNonFatalException(Exception exception) {
+            return false;
+        }
+    }
+}

smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java

@@ -68,7 +68,7 @@ public final class SmackInitialization {
             } catch (IOException e) {
                 LOGGER.log(Level.WARNING, "IOException closing stream", e);
             }
-        } catch(Exception e) {
+        } catch (Exception e) {
             LOGGER.log(Level.SEVERE, "Could not determine Smack version", e);
             smackVersion = "unkown";
         }

smack-core/src/main/java/org/jivesoftware/smack/SuccessCallback.java

@@ -0,0 +1,23 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack;
+
+public interface SuccessCallback<T> {
+
+    public void onSuccess(T result);
+
+}

smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java

@@ -79,7 +79,7 @@ public class SynchronizationPoint<E extends Exception> {
                 if (request instanceof Stanza) {
                     connection.sendStanza((Stanza) request);
                 }
-                else if (request instanceof Nonza){
+                else if (request instanceof Nonza) {
                     connection.sendNonza((Nonza) request);
                 } else {
                     throw new IllegalStateException("Unsupported element type");

smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java

@@ -413,6 +413,7 @@ public interface XMPPConnection {
      * @deprecated use {@link #getReplyTimeout()} instead.
      */
     @Deprecated
+    // TODO Remove in Smack 4.3
     public long getPacketReplyTimeout();
 
     /**
@@ -423,6 +424,7 @@ public interface XMPPConnection {
      * @deprecated use {@link #setReplyTimeout(long)} instead.
      */
     @Deprecated
+    // TODO Remove in Smack 4.3
     public void setPacketReplyTimeout(long timeout);
 
     /**

smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractJidTypeFilter.java

@@ -39,7 +39,7 @@ public abstract class AbstractJidTypeFilter implements StanzaFilter {
 
     @Override
     public final boolean accept(Stanza stanza) {
-        final Jid jid = stanza.getFrom();
+        final Jid jid = getJidToInspect(stanza);
 
         if (jid == null) {
             return false;

smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractListFilter.java

@@ -45,7 +45,7 @@ public abstract class AbstractListFilter implements StanzaFilter {
      */
     protected AbstractListFilter(StanzaFilter... filters) {
         Objects.requireNonNull(filters, "Parameter must not be null.");
-        for(StanzaFilter filter : filters) {
+        for (StanzaFilter filter : filters) {
             Objects.requireNonNull(filter, "Parameter must not be null.");
         }
         this.filters = new ArrayList<StanzaFilter>(Arrays.asList(filters));

smack-core/src/main/java/org/jivesoftware/smack/filter/MessageWithThreadFilter.java

@@ -0,0 +1,43 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jivesoftware.smack.filter;
+
+import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.util.StringUtils;
+
+/**
+ * Filters message stanzas which have at least one body.
+ */
+public final class MessageWithThreadFilter extends FlexibleStanzaTypeFilter<Message> {
+
+    public static final StanzaFilter INSTANCE = new MessageWithThreadFilter();
+
+    private MessageWithThreadFilter() {
+        super(Message.class);
+    }
+
+    @Override
+    protected boolean acceptSpecific(Message message) {
+        return StringUtils.isNotEmpty(message.getThread());
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName();
+    }
+}

smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java

@@ -67,7 +67,10 @@ public class AbstractError {
         String defaultLocale = Locale.getDefault().getLanguage();
         String descriptiveText = getDescriptiveText(defaultLocale);
         if (descriptiveText == null) {
-            descriptiveText = getDescriptiveText("");
+            descriptiveText = getDescriptiveText("en");
+            if (descriptiveText == null) {
+                descriptiveText = getDescriptiveText("");
+            }
         }
         return descriptiveText;
     }

smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java

@@ -488,7 +488,7 @@ public final class Message extends Stanza implements TypedCloneable<Message> {
         // Add the subject in other languages
         for (Subject subject : getSubjects()) {
             // Skip the default language
-            if(subject.equals(defaultSubject))
+            if (subject.equals(defaultSubject))
                 continue;
             buf.append(subject.toXML());
         }
@@ -500,7 +500,7 @@ public final class Message extends Stanza implements TypedCloneable<Message> {
         // Add the bodies in other languages
         for (Body body : getBodies()) {
             // Skip the default language
-            if(body.equals(defaultBody))
+            if (body.equals(defaultBody))
                 continue;
             buf.append(body.toXML());
         }

smack-core/src/main/java/org/jivesoftware/smack/packet/StandardExtensionElement.java

@@ -120,7 +120,7 @@ public final class StandardExtensionElement implements ExtensionElement {
     }
 
     public List<StandardExtensionElement> getElements() {
-        if (elements == null){
+        if (elements == null) {
             return Collections.emptyList();
         }
         return elements.values();

smack-core/src/main/java/org/jivesoftware/smack/provider/Provider.java

@@ -23,7 +23,7 @@ import org.xmlpull.v1.XmlPullParser;
 
 public abstract class Provider<E extends Element> {
 
-    public final E parse(XmlPullParser parser) throws Exception{
+    public final E parse(XmlPullParser parser) throws Exception {
         // XPP3 calling convention assert: Parser should be at start tag
         ParserUtils.assertAtStartTag(parser);
 

smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java

@@ -135,7 +135,7 @@ public class ProviderFileLoader implements ProviderLoader {
             }
             while (eventType != XmlPullParser.END_DOCUMENT);
         }
-        catch (Exception e){
+        catch (Exception e) {
             LOGGER.log(Level.SEVERE, "Unknown error occurred while parsing provider file", e);
             exceptions.add(e);
         }

smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyException.java

@@ -31,7 +31,7 @@ public class ProxyException extends IOException {
 
     public ProxyException(ProxyInfo.ProxyType type, String ex)
     {
-        super("Proxy Exception " + type.toString() + " : "+ex);
+        super("Proxy Exception " + type.toString() + " : " + ex);
     }
 
     public ProxyException(ProxyInfo.ProxyType type)

smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java

@@ -50,12 +50,12 @@ public class Socks4ProxySocketConnection implements ProxySocketConnection {
         try
         {
             socket.connect(new InetSocketAddress(proxy_host, proxy_port), timeout);
-            in=socket.getInputStream();
+            in = socket.getInputStream();
-            out=socket.getOutputStream();
+            out = socket.getOutputStream();
             socket.setTcpNoDelay(true);
 
-            byte[] buf=new byte[1024];
+            byte[] buf = new byte[1024];
-            int index=0;
+            int index = 0;
 
     /*
     1) CONNECT
@@ -75,27 +75,27 @@ public class Socks4ProxySocketConnection implements ProxySocketConnection {
     of all zero bits.
     */
 
-            index=0;
+            index = 0;
-            buf[index++]=4;
+            buf[index++] = 4;
-            buf[index++]=1;
+            buf[index++] = 1;
 
-            buf[index++]=(byte)(port>>>8);
+            buf[index++] = (byte) (port >>> 8);
-            buf[index++]=(byte)(port&0xff);
+            buf[index++] = (byte) (port & 0xff);
 
             InetAddress inetAddress = InetAddress.getByName(proxy_host);
             byte[] byteAddress = inetAddress.getAddress();
             for (int i = 0; i < byteAddress.length; i++)
             {
-                buf[index++]=byteAddress[i];
+                buf[index++] = byteAddress[i];
             }
 
-            if(user!=null)
+            if (user != null)
             {
                 byte[] userBytes = user.getBytes(StringUtils.UTF8);
                 System.arraycopy(userBytes, 0, buf, index, user.length());
-                index+=user.length();
+                index += user.length();
             }
-            buf[index++]=0;
+            buf[index++] = 0;
             out.write(buf, 0, index);
 
     /*
@@ -125,49 +125,49 @@ public class Socks4ProxySocketConnection implements ProxySocketConnection {
     The remaining fields are ignored.
     */
 
-            int len=6;
+            int len = 6;
-            int s=0;
+            int s = 0;
-            while(s<len)
+            while (s < len)
             {
-                int i=in.read(buf, s, len-s);
+                int i = in.read(buf, s, len - s);
-                if(i<=0)
+                if (i <= 0)
                 {
                     throw new ProxyException(ProxyInfo.ProxyType.SOCKS4, 
                         "stream is closed");
                 }
-                s+=i;
+                s += i;
             }
-            if(buf[0]!=0)
+            if (buf[0] != 0)
             {
                 throw new ProxyException(ProxyInfo.ProxyType.SOCKS4, 
-                    "server returns VN "+buf[0]);
+                    "server returns VN " + buf[0]);
             }
-            if(buf[1]!=90)
+            if (buf[1] != 90)
             {
                 try
                 {
                     socket.close();
                 }
-                catch(Exception eee)
+                catch (Exception eee)
                 {
                 }
-                String message="ProxySOCKS4: server returns CD "+buf[1];
+                String message = "ProxySOCKS4: server returns CD " + buf[1];
-                throw new ProxyException(ProxyInfo.ProxyType.SOCKS4,message);
+                throw new ProxyException(ProxyInfo.ProxyType.SOCKS4, message);
             }
             byte[] temp = new byte[2];
             in.read(temp, 0, 2);
         }
-        catch(RuntimeException e)
+        catch (RuntimeException e)
         {
             throw e;
         }
-        catch(Exception e)
+        catch (Exception e)
         {
             try
             {
                socket.close();
             }
-            catch(Exception eee)
+            catch (Exception eee)
             {
             }
             throw new ProxyException(ProxyInfo.ProxyType.SOCKS4, e.toString());

smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java

@@ -50,13 +50,13 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
         try
         {
             socket.connect(new InetSocketAddress(proxy_host, proxy_port), timeout);
-            in=socket.getInputStream();
+            in = socket.getInputStream();
-            out=socket.getOutputStream();
+            out = socket.getOutputStream();
 
             socket.setTcpNoDelay(true);
 
-            byte[] buf=new byte[1024];
+            byte[] buf = new byte[1024];
-            int index=0;
+            int index = 0;
 
 /*
                    +----+----------+----------+
@@ -79,11 +79,11 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
           o  X'FF' NO ACCEPTABLE METHODS
 */
 
-            buf[index++]=5;
+            buf[index++] = 5;
 
-            buf[index++]=2;
+            buf[index++] = 2;
-            buf[index++]=0;           // NO AUTHENTICATION REQUIRED
+            buf[index++] = 0;           // NO AUTHENTICATION REQUIRED
-            buf[index++]=2;           // USERNAME/PASSWORD
+            buf[index++] = 2;           // USERNAME/PASSWORD
 
             out.write(buf, 0, index);
 
@@ -100,14 +100,14 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
       //in.read(buf, 0, 2);
             fill(in, buf, 2);
 
-            boolean check=false;
+            boolean check = false;
-            switch((buf[1])&0xff)
+            switch ((buf[1]) & 0xff)
             {
                 case 0:                // NO AUTHENTICATION REQUIRED
-                    check=true;
+                    check = true;
                     break;
                 case 2:                // USERNAME/PASSWORD
-                    if(user==null || passwd==null)
+                    if (user == null || passwd == null)
                     {
                         break;
                     }
@@ -131,18 +131,18 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
    PASSWD field that follows. The PASSWD field contains the password
    association with the given UNAME.
 */
-                    index=0;
+                    index = 0;
-                    buf[index++]=1;
+                    buf[index++] = 1;
-                    buf[index++]=(byte)(user.length());
+                    buf[index++] = (byte) (user.length());
                     byte[] userBytes = user.getBytes(StringUtils.UTF8);
                     System.arraycopy(userBytes, 0, buf, index, 
                         user.length());
-                    index+=user.length();
+                    index += user.length();
                     byte[] passwordBytes = user.getBytes(StringUtils.UTF8);
-                    buf[index++]=(byte)(passwordBytes.length);
+                    buf[index++] = (byte) (passwordBytes.length);
                     System.arraycopy(passwordBytes, 0, buf, index, 
                         passwd.length());
-                    index+=passwd.length();
+                    index += passwd.length();
 
                     out.write(buf, 0, index);
 
@@ -162,21 +162,21 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
 */
                     //in.read(buf, 0, 2);
                     fill(in, buf, 2);
-                    if(buf[1]==0)
+                    if (buf[1] == 0)
                     {
-                        check=true;
+                        check = true;
                     }
                     break;
                 default:
             }
 
-            if(!check)
+            if (!check)
             {
                 try
                 {
                     socket.close();
                 }
-                catch(Exception eee)
+                catch (Exception eee)
                 {
                 }
                 throw new ProxyException(ProxyInfo.ProxyType.SOCKS5,
@@ -209,19 +209,19 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
          order
 */
 
-            index=0;
+            index = 0;
-            buf[index++]=5;
+            buf[index++] = 5;
-            buf[index++]=1;       // CONNECT
+            buf[index++] = 1;       // CONNECT
-            buf[index++]=0;
+            buf[index++] = 0;
 
-            byte[] hostb= host.getBytes(StringUtils.UTF8);
+            byte[] hostb = host.getBytes(StringUtils.UTF8);
-            int len=hostb.length;
+            int len = hostb.length;
-            buf[index++]=3;      // DOMAINNAME
+            buf[index++] = 3;      // DOMAINNAME
-            buf[index++]=(byte)(len);
+            buf[index++] = (byte) (len);
             System.arraycopy(hostb, 0, buf, index, len);
-            index+=len;
+            index += len;
-            buf[index++]=(byte)(port>>>8);
+            buf[index++] = (byte) (port >>> 8);
-            buf[index++]=(byte)(port&0xff);
+            buf[index++] = (byte) (port & 0xff);
 
             out.write(buf, 0, index);
 
@@ -263,20 +263,20 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
       //in.read(buf, 0, 4);
             fill(in, buf, 4);
 
-            if(buf[1]!=0)
+            if (buf[1] != 0)
             {
                 try
                 {
                     socket.close();
                 }
-                catch(Exception eee)
+                catch (Exception eee)
                 {
                 }
                 throw new ProxyException(ProxyInfo.ProxyType.SOCKS5, 
-                    "server returns "+buf[1]);
+                    "server returns " + buf[1]);
             }
 
-            switch(buf[3]&0xff)
+            switch (buf[3] & 0xff)
             {
                 case 1:
                     //in.read(buf, 0, 6);
@@ -286,7 +286,7 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
                     //in.read(buf, 0, 1);
                     fill(in, buf, 1);
                     //in.read(buf, 0, buf[0]+2);
-                    fill(in, buf, (buf[0]&0xff)+2);
+                    fill(in, buf, (buf[0] & 0xff) + 2);
                     break;
                 case 4:
                     //in.read(buf, 0, 18);
@@ -295,17 +295,17 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
                 default:
             }
         }
-        catch(RuntimeException e)
+        catch (RuntimeException e)
         {
             throw e;
         }
-        catch(Exception e)
+        catch (Exception e)
         {
             try
             {
                 socket.close();
             }
-            catch(Exception eee)
+            catch (Exception eee)
             {
             }
             // TODO convert to IOException(e) when minimum Android API level is 9 or higher
@@ -316,16 +316,16 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
     private static void fill(InputStream in, byte[] buf, int len) 
       throws IOException
     {
-        int s=0;
+        int s = 0;
-        while(s<len)
+        while (s < len)
         {
-            int i=in.read(buf, s, len-s);
+            int i = in.read(buf, s, len - s);
-            if(i<=0)
+            if (i <= 0)
             {
                 throw new ProxyException(ProxyInfo.ProxyType.SOCKS5, "stream " +
                     "is closed");
             }
-            s+=i;
+            s += i;
         }
     }
 

smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java

@@ -164,7 +164,7 @@ public abstract class SASLMechanism implements Comparable<SASLMechanism> {
         this.password = password;
         this.authorizationId = authzid;
         this.sslSession = sslSession;
-        assert(authorizationId == null || authzidSupported());
+        assert (authorizationId == null || authzidSupported());
         authenticateInternal();
         authenticate();
     }
@@ -194,7 +194,7 @@ public abstract class SASLMechanism implements Comparable<SASLMechanism> {
         this.serviceName = serviceName;
         this.authorizationId = authzid;
         this.sslSession = sslSession;
-        assert(authorizationId == null || authzidSupported());
+        assert (authorizationId == null || authzidSupported());
         authenticateInternal(cbh);
         authenticate();
     }

smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java

@@ -232,7 +232,7 @@ public abstract class ScramMechanism extends SASLMechanism {
         }
 
         String cbName = getChannelBindingName();
-        assert(StringUtils.isNotEmpty(cbName));
+        assert (StringUtils.isNotEmpty(cbName));
 
         return cbName + ',' + authzidPortion + ",";
     }

smack-core/src/main/java/org/jivesoftware/smack/util/EventManger.java

@@ -81,7 +81,7 @@ public class EventManger<K, R, E extends Exception> {
             return false;
         }
         reference.eventResult = eventResult;
-        synchronized(reference) {
+        synchronized (reference) {
             reference.notifyAll();
         }
         return true;

smack-core/src/main/java/org/jivesoftware/smack/util/LazyStringBuilder.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2014 Florian Schmaus
+ * Copyright 2014-2017 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,13 @@ package org.jivesoftware.smack.util;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class LazyStringBuilder implements Appendable, CharSequence {
 
+    private static final Logger LOGGER = Logger.getLogger(LazyStringBuilder.class.getName());
+
     private final List<CharSequence> list;
 
     private String cache;
@@ -69,8 +73,15 @@ public class LazyStringBuilder implements Appendable, CharSequence {
             return cache.length();
         }
         int length = 0;
-        for (CharSequence csq : list) {
+        try {
-            length += csq.length();
+            for (CharSequence csq : list) {
+                length += csq.length();
+            }
+        }
+        catch (NullPointerException npe) {
+            StringBuilder sb = safeToStringBuilder();
+            LOGGER.log(Level.SEVERE, "The following LazyStringBuilder threw a NullPointerException:  " + sb, npe);
+            throw npe;
         }
         return length;
     }
@@ -107,6 +118,14 @@ public class LazyStringBuilder implements Appendable, CharSequence {
         return cache;
     }
 
+    public StringBuilder safeToStringBuilder() {
+        StringBuilder sb = new StringBuilder();
+        for (CharSequence csq : list) {
+            sb.append(csq);
+        }
+        return sb;
+    }
+
     /**
      * Get the List of CharSequences representation of this instance. The list is unmodifiable. If
      * the resulting String was already cached, a list with a single String entry will be returned.

smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java

@@ -143,7 +143,7 @@ public class MultiMap<K,V> {
         if (res == null) {
             return null;
         }
-        assert(!res.isEmpty());
+        assert (!res.isEmpty());
         return res.iterator().next();
     }
 

smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java

@@ -214,7 +214,7 @@ public class PacketParserUtils {
     public static Message parseMessage(XmlPullParser parser)
                     throws Exception {
         ParserUtils.assertAtStartTag(parser);
-        assert(parser.getName().equals(Message.ELEMENT));
+        assert (parser.getName().equals(Message.ELEMENT));
 
         final int initialDepth = parser.getDepth();
         Message message = new Message();
@@ -247,7 +247,7 @@ public class PacketParserUtils {
             case XmlPullParser.START_TAG:
                 String elementName = parser.getName();
                 String namespace = parser.getNamespace();
-                switch(elementName) {
+                switch (elementName) {
                 case "subject":
                     String xmlLangSubject = getLanguageAttribute(parser);
                     if (xmlLangSubject == null) {
@@ -385,7 +385,7 @@ public class PacketParserUtils {
      */
     public static CharSequence parseContent(XmlPullParser parser)
                     throws XmlPullParserException, IOException {
-        assert(parser.getEventType() == XmlPullParser.START_TAG);
+        assert (parser.getEventType() == XmlPullParser.START_TAG);
         if (parser.isEmptyElementTag()) {
             return "";
         }
@@ -546,7 +546,7 @@ public class PacketParserUtils {
             case XmlPullParser.START_TAG:
                 String elementName = parser.getName();
                 String namespace = parser.getNamespace();
-                switch(elementName) {
+                switch (elementName) {
                 case "status":
                     presence.setStatus(parser.nextText());
                     break;
@@ -620,7 +620,7 @@ public class PacketParserUtils {
             case XmlPullParser.START_TAG:
                 String elementName = parser.getName();
                 String namespace = parser.getNamespace();
-                switch(elementName) {
+                switch (elementName) {
                 case "error":
                     error = PacketParserUtils.parseError(parser);
                     break;
@@ -775,7 +775,7 @@ public class PacketParserUtils {
                     descriptiveTexts = parseDescriptiveTexts(parser, descriptiveTexts);
                 }
                 else {
-                    assert(condition == null);
+                    assert (condition == null);
                     condition = parser.getName();
                 }
                 break;
@@ -945,7 +945,7 @@ public class PacketParserUtils {
                 }
             }
         }
-        assert(parser.getEventType() == XmlPullParser.END_TAG);
+        assert (parser.getEventType() == XmlPullParser.END_TAG);
         return new StartTls(required);
     }
 
@@ -954,7 +954,7 @@ public class PacketParserUtils {
         final int initialDepth = parser.getDepth();
         boolean optional = false;
         if (!parser.isEmptyElementTag()) {
-        outerloop: while(true) {
+        outerloop: while (true) {
             int event = parser.next();
             switch (event) {
             case XmlPullParser.START_TAG:
@@ -1022,7 +1022,7 @@ public class PacketParserUtils {
     }
 
     public static void addExtensionElement(Stanza packet, XmlPullParser parser, String elementName,
-                    String namespace) throws Exception{
+                    String namespace) throws Exception {
         ExtensionElement packetExtension = parseExtensionElement(elementName, namespace, parser);
         packet.addExtension(packetExtension);
     }

smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java

@@ -43,7 +43,7 @@ public class ParserUtils {
     public static final String JID = "jid";
 
     public static void assertAtStartTag(XmlPullParser parser) throws XmlPullParserException {
-        assert(parser.getEventType() == XmlPullParser.START_TAG);
+        assert (parser.getEventType() == XmlPullParser.START_TAG);
     }
 
     public static void assertAtStartTag(XmlPullParser parser, String name) throws XmlPullParserException {
@@ -52,7 +52,7 @@ public class ParserUtils {
     }
 
     public static void assertAtEndTag(XmlPullParser parser) throws XmlPullParserException {
-        assert(parser.getEventType() == XmlPullParser.END_TAG);
+        assert (parser.getEventType() == XmlPullParser.END_TAG);
     }
 
     public static void forwardToEndTagOfDepth(XmlPullParser parser, int depth)

smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java

@@ -121,7 +121,7 @@ public class StringUtils {
             return null;
         }
         final int len = input.length();
-        final StringBuilder out = new StringBuilder((int)(len*1.3));
+        final StringBuilder out = new StringBuilder((int) (len * 1.3));
         CharSequence toAppend;
         char ch;
         int last = 0;
@@ -153,7 +153,7 @@ public class StringUtils {
                 break;
             case forAttribute:
                 // No need to escape '>' for attributes.
-                switch(ch) {
+                switch (ch) {
                 case '<':
                     toAppend = LT_ENCODE;
                     break;
@@ -172,7 +172,7 @@ public class StringUtils {
                 break;
             case forAttributeApos:
                 // No need to escape '>' and '"' for attributes using '\'' as quote.
-                switch(ch) {
+                switch (ch) {
                 case '<':
                     toAppend = LT_ENCODE;
                     break;
@@ -188,7 +188,7 @@ public class StringUtils {
                 break;
             case forText:
                 // No need to escape '"', '\'', and '>' for text.
-                switch(ch) {
+                switch (ch) {
                 case '<':
                     toAppend = LT_ENCODE;
                     break;
@@ -307,8 +307,8 @@ public class StringUtils {
 
         final Random random = randGen.get();
         // Create a char buffer to put random letters and numbers in.
-        char [] randBuffer = new char[length];
+        char[] randBuffer = new char[length];
-        for (int i=0; i<randBuffer.length; i++) {
+        for (int i = 0; i < randBuffer.length; i++) {
             randBuffer[i] = numbersAndLetters[random.nextInt(numbersAndLetters.length)];
         }
         return new String(randBuffer);
@@ -336,7 +336,7 @@ public class StringUtils {
     }
 
     private static char getPrintableChar(byte indexByte) {
-        assert(numbersAndLetters.length < Byte.MAX_VALUE * 2);
+        assert (numbersAndLetters.length < Byte.MAX_VALUE * 2);
 
         // Convert indexByte as it where an unsigned byte by promoting it to int
         // and masking it with 0xff. Yields results from 0 - 254.

smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java

@@ -172,7 +172,7 @@ public class XmlStringBuilder implements Appendable, CharSequence {
     }
 
     public XmlStringBuilder halfOpenElement(String name) {
-        assert(StringUtils.isNotEmpty(name));
+        assert (StringUtils.isNotEmpty(name));
         sb.append('<').append(name);
         return this;
     }

smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java

@@ -89,7 +89,7 @@ public class HostAddress {
 
     public void setException(InetAddress inetAddress, Exception exception) {
         Exception old = exceptions.put(inetAddress, exception);
-        assert(old == null);
+        assert (old == null);
     }
 
     /**

smack-core/src/test/java/org/jivesoftware/smack/SmackFutureTest.java

@@ -0,0 +1,57 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import org.jivesoftware.smack.SmackException.NotConnectedException;
+import org.jivesoftware.smack.SmackFuture.InternalSmackFuture;
+import org.jivesoftware.smack.SmackFuture.SimpleInternalSmackFuture;
+import org.jivesoftware.smack.packet.Stanza;
+import org.junit.Test;
+
+public class SmackFutureTest {
+
+    @Test
+    public void simpleSmackFutureSuccessTest() throws NotConnectedException, InterruptedException, ExecutionException {
+        InternalSmackFuture<Boolean> future = new SimpleInternalSmackFuture<Boolean>() {
+            @Override
+            protected void handleStanza(Stanza stanza) throws NotConnectedException, InterruptedException {
+                setResult(true);
+            }
+        };
+
+        future.processStanza(null);
+
+        assertTrue(future.get());
+    }
+
+    @Test(expected = TimeoutException.class)
+    public void simpleSmackFutureTimeoutTest() throws InterruptedException, ExecutionException, TimeoutException {
+        InternalSmackFuture<Boolean> future = new SimpleInternalSmackFuture<Boolean>() {
+            @Override
+            protected void handleStanza(Stanza stanza) throws NotConnectedException, InterruptedException {
+            }
+        };
+
+        future.get(5, TimeUnit.SECONDS);
+    }
+}

smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java

@@ -31,7 +31,7 @@ public class StanzaCollectorTest
     {
         TestStanzaCollector collector = new TestStanzaCollector(null, new OKEverything(), 5);
 
-        for (int i=0; i<6; i++)
+        for (int i = 0; i < 6; i++)
         {
             Stanza testPacket = new TestPacket(i);
             collector.processStanza(testPacket);
@@ -45,7 +45,7 @@ public class StanzaCollectorTest
         assertEquals("5", collector.pollResult().getStanzaId());
         assertNull(collector.pollResult());
 
-        for (int i=10; i<15; i++)
+        for (int i = 10; i < 15; i++)
         {
             Stanza testPacket = new TestPacket(i);
             collector.processStanza(testPacket);
@@ -156,7 +156,7 @@ public class StanzaCollectorTest
         consumer2.start();
         consumer3.start();
 
-        for(int i=0; i<insertCount; i++)
+        for (int i = 0; i < insertCount; i++)
         {
             collector.processStanza(new TestPacket(i));
         }

smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java

@@ -57,9 +57,10 @@ public class ThreadedDummyConnection extends DummyConnection {
                 replyQ.add(replyPacket);
             }
             replyPacket.setStanzaId(packet.getStanzaId());
-            replyPacket.setFrom(packet.getTo());
             replyPacket.setTo(packet.getFrom());
-            replyPacket.setType(Type.result);
+            if (replyPacket.getType() == null) {
+                replyPacket.setType(Type.result);
+            }
 
             new ProcessQueue(replyQ).start();
         }

smack-core/src/test/java/org/jivesoftware/smack/filter/FilterToStringTest.java

@@ -29,7 +29,7 @@ public class FilterToStringTest {
         andFilter.addFilter(new ThreadFilter("42"));
         andFilter.addFilter(MessageWithBodiesFilter.INSTANCE);
 
-        final String res =andFilter.toString();
+        final String res = andFilter.toString();
         assertEquals("AndFilter: (StanzaIdFilter: id=foo, ThreadFilter: thread=42, MessageWithBodiesFilter)", res);
     }
 }

smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java

@@ -64,7 +64,7 @@ public class MessageTest {
         assertXMLEqual(control, messageTypeSet.toXML().toString());
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void setNullMessageBodyTest() {
         Message message = getNewMessage();
         message.addBody(null, null);

smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java

@@ -60,7 +60,7 @@ public class PresenceTest {
         assertXMLEqual(control, presenceTypeSet.toXML().toString());
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void setNullPresenceTypeTest() {
         getNewPresence().setType(null);
     }
@@ -113,7 +113,7 @@ public class PresenceTest {
         assertXMLEqual(control, presence.toXML().toString());
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void setIllegalPriorityTest() {
         getNewPresence().setPriority(Integer.MIN_VALUE);
     }

smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderConfigTest.java

@@ -54,7 +54,7 @@ public class ProviderConfigTest {
     }
 
     @Test
-    public void addClasspathFileLoaderProvider() throws Exception{
+    public void addClasspathFileLoaderProvider() throws Exception {
         ProviderManager.addLoader(new ProviderFileLoader(FileUtils.getStreamForUrl("classpath:test.providers", null)));
         Assert.assertNotNull(ProviderManager.getIQProvider("provider", "test:file_provider"));
     }

smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderManagerTest.java

@@ -29,7 +29,7 @@ public class ProviderManagerTest {
      * This test should be run in a clean (e.g. forked) VM
      */
     @Test
-    public void shouldInitializeSmackTest() throws Exception{
+    public void shouldInitializeSmackTest() throws Exception {
         ProviderManager.addIQProvider("foo", "bar", new TestIQProvider());
         assertTrue(SmackConfiguration.isSmackInitialized());
     }

smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright © 2014 Florian Schmaus
+ * Copyright © 2014-2017 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ import org.jxmpp.jid.EntityBareJid;
 
 public class DigestMd5SaslTest extends AbstractSaslTest {
 
-    protected static final String challenge = "realm=\"xmpp.org\",nonce=\"aTUr3GXqUtyy2B7HVDW6C+gQs+j+0EhWWjoBKkkg\",qop=\"auth\",charset=utf-8,algorithm=md5-sess";
+    protected static final String challenge = "realm=\"xmpp.org\",nonce=\"jgGgnz+cQcmyVaAs2n88kQ==\",qop=\"auth\",charset=utf-8,algorithm=md5-sess";
     protected static final byte[] challengeBytes = StringUtils.toBytes(challenge);
 
     public DigestMd5SaslTest(SASLMechanism saslMechanism) {
@@ -50,8 +50,7 @@ public class DigestMd5SaslTest extends AbstractSaslTest {
         String[] responseParts = responseString.split(",");
         Map<String, String> responsePairs = new HashMap<String, String>();
         for (String part : responseParts) {
-            String[] keyValue = part.split("=");
+            String[] keyValue = part.split("=", 2);
-            assertTrue(keyValue.length == 2);
             String key = keyValue[0];
             String value = keyValue[1].replace("\"", "");
             responsePairs.put(key, value);
@@ -59,7 +58,7 @@ public class DigestMd5SaslTest extends AbstractSaslTest {
         if (useAuthzid) {
           assertMapValue("authzid", "shazbat@xmpp.org", responsePairs);
         } else {
-          assert(!responsePairs.containsKey("authzid"));
+          assertTrue (!responsePairs.containsKey("authzid"));
         }
         assertMapValue("username", "florian", responsePairs);
         assertMapValue("realm", "xmpp.org", responsePairs);

smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java

@@ -664,7 +664,7 @@ public class PacketParserUtilsTest {
      * 
      * @throws Exception
      */
-    @Test(expected=XmlPullParserException.class)
+    @Test(expected = XmlPullParserException.class)
     public void invalidMessageBodyContainingTagTest() throws Exception {
         String control = XMLBuilder.create("message")
             .a("from", "romeo@montague.lit/orchard")
@@ -701,7 +701,7 @@ public class PacketParserUtilsTest {
         try {
             PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(invalidControl));
             fail("Exception should be thrown");
-        } catch(XmlPullParserException e) {
+        } catch (XmlPullParserException e) {
             assertTrue(e.getMessage().contains("end tag name </span>"));
         }
 
@@ -710,7 +710,7 @@ public class PacketParserUtilsTest {
         try {
             PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(invalidControl));
             fail("Exception should be thrown");
-        } catch(XmlPullParserException e) {
+        } catch (XmlPullParserException e) {
             assertTrue(e.getMessage().contains("end tag name </body>"));
         }
 
@@ -719,7 +719,7 @@ public class PacketParserUtilsTest {
         try {
             PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(invalidControl));
             fail("Exception should be thrown");
-        } catch(XmlPullParserException e) {
+        } catch (XmlPullParserException e) {
             assertTrue(e.getMessage().contains("end tag name </message>"));
         }
 

smack-core/src/test/java/org/jivesoftware/smack/util/SHA1Test.java

@@ -70,7 +70,7 @@ public class SHA1Test  {
      */
     private boolean isValidHash(String result) {
         boolean valid = true;
-        for (int i=0; i<result.length(); i++) {
+        for (int i = 0; i < result.length(); i++) {
             char c = result.charAt(i);
             if (HASH_CHARS.indexOf(c) < 0) {
                 valid = false;

smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java

@@ -263,7 +263,7 @@ public class EnhancedDebugger implements SmackDebugger {
 
             }
             @Override
-            public void reconnectingIn(final int seconds){
+            public void reconnectingIn(final int seconds) {
                 SwingUtilities.invokeLater(new Runnable() {
                     @Override
                     public void run() {
@@ -301,7 +301,7 @@ public class EnhancedDebugger implements SmackDebugger {
 
         messagesTable =
                 new DefaultTableModel(
-                        new Object[]{"Hide", "Timestamp", "", "", "Message", "Id", "Type", "To", "From"},
+                        new Object[] {"Hide", "Timestamp", "", "", "Message", "Id", "Type", "To", "From"},
                         0) {
                     // CHECKSTYLE:OFF
         			private static final long serialVersionUID = 8136121224474217264L;
@@ -735,9 +735,9 @@ public class EnhancedDebugger implements SmackDebugger {
         packetsPanel.setBorder(BorderFactory.createTitledBorder("Transmitted Packets"));
 
         statisticsTable =
-                new DefaultTableModel(new Object[][]{{"IQ", 0, 0}, {"Message", 0, 0},
+                new DefaultTableModel(new Object[][] { {"IQ", 0, 0}, {"Message", 0, 0},
                         {"Presence", 0, 0}, {"Other", 0, 0}, {"Total", 0, 0}},
-                        new Object[]{"Type", "Received", "Sent"}) {
+                        new Object[] {"Type", "Received", "Sent"}) {
                     // CHECKSTYLE:OFF
         			private static final long serialVersionUID = -6793886085109589269L;
 					@Override
@@ -878,7 +878,7 @@ public class EnhancedDebugger implements SmackDebugger {
                 }
 
                 messagesTable.addRow(
-                        new Object[]{
+                        new Object[] {
                                 formatXML(packet.toXML().toString()),
                                 dateFormatter.format(new Date()),
                                 packetReceivedIcon,
@@ -940,7 +940,7 @@ public class EnhancedDebugger implements SmackDebugger {
                 }
 
                 messagesTable.addRow(
-                        new Object[]{
+                        new Object[] {
                                 formatXML(packet.toXML().toString()),
                                 dateFormatter.format(new Date()),
                                 packetSentIcon,

smack-debug/src/main/java/org/jivesoftware/smackx/debugger/LiteDebugger.java

@@ -289,8 +289,8 @@ public class LiteDebugger implements SmackDebugger {
      */
     public void rootWindowClosing(WindowEvent evt) {
         connection.removeAsyncStanzaListener(listener);
-        ((ObservableReader)reader).removeReaderListener(readerListener);
+        ((ObservableReader) reader).removeReaderListener(readerListener);
-        ((ObservableWriter)writer).removeWriterListener(writerListener);
+        ((ObservableWriter) writer).removeWriterListener(writerListener);
     }
 
     /**
@@ -322,7 +322,7 @@ public class LiteDebugger implements SmackDebugger {
 
     @Override
     public Reader newConnectionReader(Reader newReader) {
-        ((ObservableReader)reader).removeReaderListener(readerListener);
+        ((ObservableReader) reader).removeReaderListener(readerListener);
         ObservableReader debugReader = new ObservableReader(newReader);
         debugReader.addReaderListener(readerListener);
         reader = debugReader;
@@ -331,7 +331,7 @@ public class LiteDebugger implements SmackDebugger {
 
     @Override
     public Writer newConnectionWriter(Writer newWriter) {
-        ((ObservableWriter)writer).removeWriterListener(writerListener);
+        ((ObservableWriter) writer).removeWriterListener(writerListener);
         ObservableWriter debugWriter = new ObservableWriter(newWriter);
         debugWriter.addWriterListener(writerListener);
         writer = debugWriter;

smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java

@@ -123,7 +123,7 @@ public final class CarbonManager extends Manager {
                 // also reset here.
                 enabled_state = false;
                 boolean removed = connection().removeSyncStanzaListener(carbonsListener);
-                assert(removed);
+                assert (removed);
             }
             @Override
             public void authenticated(XMPPConnection connection, boolean resumed) {

smack-experimental/src/main/java/org/jivesoftware/smackx/eme/ExplicitMessageEncryptionManager.java

@@ -0,0 +1,57 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.eme;
+
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import org.jivesoftware.smack.ConnectionCreationListener;
+import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.XMPPConnectionRegistry;
+import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
+import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement;
+
+public final class ExplicitMessageEncryptionManager {
+
+    private static final Map<XMPPConnection, ExplicitMessageEncryptionManager> INSTANCES = new WeakHashMap<>();
+
+    static {
+        XMPPConnectionRegistry.addConnectionCreationListener(new ConnectionCreationListener() {
+            @Override
+            public void connectionCreated(XMPPConnection connection) {
+                getInstanceFor(connection);
+            }
+        });
+    }
+
+    public static final String NAMESPACE_V0 = ExplicitMessageEncryptionElement.NAMESPACE;
+
+    public static synchronized ExplicitMessageEncryptionManager getInstanceFor(XMPPConnection connection) {
+        ExplicitMessageEncryptionManager manager = INSTANCES.get(connection);
+        if (manager == null) {
+            manager = new ExplicitMessageEncryptionManager(connection);
+            INSTANCES.put(connection, manager);
+        }
+        return manager;
+    }
+
+    private ExplicitMessageEncryptionManager(XMPPConnection connection) {
+        ServiceDiscoveryManager sdm = ServiceDiscoveryManager.getInstanceFor(connection);
+        sdm.addFeature(NAMESPACE_V0);
+    }
+
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java

@@ -0,0 +1,146 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.eme.element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jivesoftware.smack.packet.ExtensionElement;
+import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.util.StringUtils;
+import org.jivesoftware.smack.util.XmlStringBuilder;
+
+public class ExplicitMessageEncryptionElement implements ExtensionElement {
+
+    private static final Map<String, ExplicitMessageEncryptionProtocol> PROTOCOL_LUT = new HashMap<>();
+
+    public static final String ELEMENT = "encryption";
+
+    public static final String NAMESPACE = "urn:xmpp:eme:0";
+
+    public enum ExplicitMessageEncryptionProtocol {
+
+        /**
+         * The encryption method specified in <a href="https://xmpp.org/extensions/xep-0373.html">XEP-0373: OpenPGP for
+         * XMPP</a>.
+         */
+        openpgpV0("urn:xmpp:openpgp:0", "OpenPGP for XMPP (XEP-0373)"),
+
+        otrV0("urn:xmpp:otr:0", "Off-the-Record Messaging (XEP-0364)"),
+
+        legacyOpenPGP("jabber:x:encrypted", "Legacy OpenPGP for XMPP [DANGEROUS, DO NOT USE!]"),
+        ;
+
+        private final String namespace;
+        private final String name;
+
+        private ExplicitMessageEncryptionProtocol(String namespace, String name) {
+            this.namespace = namespace;
+            this.name = name;
+            PROTOCOL_LUT.put(namespace, this);
+        }
+
+        public String getNamespace() {
+            return namespace;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public static ExplicitMessageEncryptionProtocol from(String namespace) {
+            return PROTOCOL_LUT.get(namespace);
+        }
+    }
+
+    private final String encryptionNamespace;
+
+    private final String name;
+
+    private boolean isUnknownProtocol;
+
+    private ExplicitMessageEncryptionProtocol protocolCache;
+
+    public ExplicitMessageEncryptionElement(ExplicitMessageEncryptionProtocol protocol) {
+        this(protocol.getNamespace(), protocol.getName());
+    }
+
+    public ExplicitMessageEncryptionElement(String encryptionNamespace) {
+        this(encryptionNamespace, null);
+    }
+
+    public ExplicitMessageEncryptionElement(String encryptionNamespace, String name) {
+        this.encryptionNamespace = StringUtils.requireNotNullOrEmpty(encryptionNamespace,
+                        "encryptionNamespace must not be null");
+        this.name = name;
+    }
+
+    public ExplicitMessageEncryptionProtocol getProtocol() {
+        if (protocolCache != null) {
+            return protocolCache;
+        }
+
+        if (isUnknownProtocol) {
+            return null;
+        }
+
+        ExplicitMessageEncryptionProtocol protocol = PROTOCOL_LUT.get(encryptionNamespace);
+        if (protocol == null) {
+            isUnknownProtocol = true;
+            return null;
+        }
+
+        protocolCache = protocol;
+        return protocol;
+    }
+
+    public String getEncryptionNamespace() {
+        return encryptionNamespace;
+    }
+
+    /**
+     * Get the optional name of the encryption method.
+     *
+     * @return the name of the encryption method or <code>null</code>.
+     */
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getElementName() {
+        return ELEMENT;
+    }
+
+    @Override
+    public String getNamespace() {
+        return NAMESPACE;
+    }
+
+    @Override
+    public XmlStringBuilder toXML() {
+        XmlStringBuilder xml = new XmlStringBuilder(this);
+        xml.attribute("namespace", getEncryptionNamespace());
+        xml.optAttribute("name", getName());
+        xml.closeEmptyElement();
+        return xml;
+    }
+
+    public static ExplicitMessageEncryptionElement from(Message message) {
+        return message.getExtension(ELEMENT, NAMESPACE);
+    }
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/eme/element/package-info.java

@@ -0,0 +1,20 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * XMPP extension elements for XEP-0380: Explicit Message Encryption.
+ */
+package org.jivesoftware.smackx.eme.element;

smack-experimental/src/main/java/org/jivesoftware/smackx/eme/package-info.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2015 Florian Schmaus
+ * Copyright 2017 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
- * TODO describe me
+ * Smack's API for XEP-0380: Explicit Message Encryption.
  */
-package org.jivesoftware.smackx.iqprivate;
+package org.jivesoftware.smackx.eme;

smack-experimental/src/main/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProvider.java

@@ -0,0 +1,32 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.eme.provider;
+
+import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement;
+import org.xmlpull.v1.XmlPullParser;
+
+public class ExplicitMessageEncryptionProvider extends ExtensionElementProvider<ExplicitMessageEncryptionElement> {
+
+    @Override
+    public ExplicitMessageEncryptionElement parse(XmlPullParser parser, int initialDepth) throws Exception {
+        String namespace = parser.getAttributeValue(null, "namespace");
+        String name = parser.getAttributeValue(null, "name");
+        return new ExplicitMessageEncryptionElement(namespace, name);
+    }
+
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/eme/provider/package-info.java

@@ -0,0 +1,20 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Smack Provider for XEP-0380: Explicit Message Encryption.
+ */
+package org.jivesoftware.smackx.eme.provider;

smack-experimental/src/main/java/org/jivesoftware/smackx/hints/MessageProcessingHintsManager.java

@@ -0,0 +1,71 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.hints;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smackx.hints.element.MessageProcessingHintType;
+import org.jivesoftware.smackx.hints.element.NoCopyHint;
+import org.jivesoftware.smackx.hints.element.NoPermanentStoreHint;
+import org.jivesoftware.smackx.hints.element.NoStoreHint;
+import org.jivesoftware.smackx.hints.element.StoreHint;
+
+public class MessageProcessingHintsManager {
+
+    public static Set<MessageProcessingHintType> getHintsFrom(Message message) {
+        Set<MessageProcessingHintType> hints = null;
+
+        boolean noCopyHint = NoCopyHint.hasHint(message);
+        if (noCopyHint) {
+            hints = new HashSet<>(MessageProcessingHintType.values().length);
+            hints.add(MessageProcessingHintType.no_copy);
+        }
+
+        boolean noPermanentStoreHint = NoPermanentStoreHint.hasHint(message);
+        if (noPermanentStoreHint) {
+            if (hints == null) {
+                hints = new HashSet<>(MessageProcessingHintType.values().length);
+            }
+            hints.add(MessageProcessingHintType.no_permanent_store);
+        }
+
+        boolean noStoreHint = NoStoreHint.hasHint(message);
+        if (noStoreHint) {
+            if (hints == null) {
+                hints = new HashSet<>(MessageProcessingHintType.values().length);
+            }
+            hints.add(MessageProcessingHintType.no_store);
+        }
+
+        boolean storeHint = StoreHint.hasHint(message);
+        if (storeHint) {
+            if (hints == null) {
+                hints = new HashSet<>(MessageProcessingHintType.values().length);
+            }
+            hints.add(MessageProcessingHintType.store);
+        }
+
+        if (hints == null) {
+            return Collections.emptySet();
+        }
+
+        return hints;
+    }
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/MessageProcessingHint.java

@@ -0,0 +1,32 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.hints.element;
+
+import org.jivesoftware.smack.packet.ExtensionElement;
+
+public abstract class MessageProcessingHint implements ExtensionElement {
+
+    public static final String NAMESPACE = "urn:xmpp:hints";
+
+    @Override
+    public final String getNamespace() {
+        return NAMESPACE;
+    }
+
+    public abstract MessageProcessingHintType getHintType();
+
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/MessageProcessingHintType.java

@@ -0,0 +1,27 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.hints.element;
+
+public enum MessageProcessingHintType {
+
+    no_permanent_store,
+    no_store,
+    no_copy,
+    store,
+    ;
+
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/NoCopyHint.java

@@ -0,0 +1,61 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.hints.element;
+
+import org.jivesoftware.smack.packet.Message;
+
+/**
+ * A "no copy" hint. Messages with this hint should not be copied to addresses other than the one to which it is addressed. 
+ *
+ * @see <a href="https://xmpp.org/extensions/xep-0334.html#no-copy">XEP-0344 § 4.3 No copies</a>
+ */
+public final class NoCopyHint extends MessageProcessingHint {
+
+    public static final NoCopyHint INSTANCE = new NoCopyHint();
+
+    public static final String ELEMENT = "no-copy";
+
+    private NoCopyHint() {
+    }
+
+    @Override
+    public String getElementName() {
+        return ELEMENT;
+    }
+
+    @Override
+    public String toXML() {
+        return '<' + ELEMENT + " xmlns='" + NAMESPACE + "'/>";
+    }
+
+    @Override
+    public MessageProcessingHintType getHintType() {
+        return MessageProcessingHintType.no_copy;
+    }
+
+    public static NoCopyHint from(Message message) {
+        return message.getExtension(ELEMENT, NAMESPACE);
+    }
+
+    public static boolean hasHint(Message message) {
+        return from(message) != null;
+    }
+
+    public static void set(Message message) {
+        message.addExtension(INSTANCE);
+    }
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/NoPermanentStoreHint.java

@@ -0,0 +1,69 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.hints.element;
+
+import org.jivesoftware.smack.packet.Message;
+
+/**
+ * A "no permanent store" hint. Messages with this hint should not be stored in permanent stores or archives.
+ *
+ * @see <a href="https://xmpp.org/extensions/xep-0334.html#no-permanent-store">XEP-0334 § 4.1 No permanent store</a>
+ */
+public final class NoPermanentStoreHint extends MessageProcessingHint {
+
+    public static final NoPermanentStoreHint INSTANCE = new NoPermanentStoreHint();
+
+    public static final String ELEMENT = "no-permanent-store";
+
+    private NoPermanentStoreHint() {
+    }
+
+    @Override
+    public String getElementName() {
+        return ELEMENT;
+    }
+
+    @Override
+    public String toXML() {
+        return '<' + ELEMENT + " xmlns='" + NAMESPACE + "'/>";
+    }
+
+    @Override
+    public MessageProcessingHintType getHintType() {
+        return MessageProcessingHintType.no_permanent_store;
+    }
+
+    public static NoPermanentStoreHint from(Message message) {
+        return message.getExtension(ELEMENT, NAMESPACE);
+    }
+
+    public static boolean hasHint(Message message) {
+        return from(message) != null;
+    }
+
+    public static void set(Message message) {
+        if (StoreHint.hasHint(message)) {
+            // No need to set the no-permanent-store hint when a no-store hint is already set.
+            return;
+        }
+        setExplicitly(message);
+    }
+
+    public static void setExplicitly(Message message) {
+        message.addExtension(INSTANCE);
+    }
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/NoStoreHint.java

@@ -0,0 +1,61 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.hints.element;
+
+import org.jivesoftware.smack.packet.Message;
+
+/**
+ * A "no store" hint. Messages with this hint should not be stored in stores or archives.
+ *
+ * <a href="https://xmpp.org/extensions/xep-0334.html#no-store">XEP-0334 § 4.2 No store</a>
+ */
+public final class NoStoreHint extends MessageProcessingHint {
+
+    public static final NoStoreHint INSTANCE = new NoStoreHint();
+
+    public static final String ELEMENT = "no-store";
+
+    private NoStoreHint() {
+    }
+
+    @Override
+    public String getElementName() {
+        return ELEMENT;
+    }
+
+    @Override
+    public String toXML() {
+        return '<' + ELEMENT + " xmlns='" + NAMESPACE + "'/>";
+    }
+
+    @Override
+    public MessageProcessingHintType getHintType() {
+        return MessageProcessingHintType.no_store;
+    }
+
+    public static NoStoreHint from(Message message) {
+        return message.getExtension(ELEMENT, NAMESPACE);
+    }
+
+    public static boolean hasHint(Message message) {
+        return from(message) != null;
+    }
+
+    public static void set(Message message) {
+        message.addExtension(INSTANCE);
+    }
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/StoreHint.java

@@ -0,0 +1,61 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.hints.element;
+
+import org.jivesoftware.smack.packet.Message;
+
+/**
+ * A "store" hint. Messages with this hint should be stored in permanent stores or archives.
+ *
+ * @see <a href="https://xmpp.org/extensions/xep-0334.html#sect-idm140684698220992">XEP-0334 § 4.4 Store</a>
+ */
+public final class StoreHint extends MessageProcessingHint {
+
+    public static final StoreHint INSTANCE = new StoreHint();
+
+    public static final String ELEMENT = "store";
+
+    private StoreHint() {
+    }
+
+    @Override
+    public String getElementName() {
+        return ELEMENT;
+    }
+
+    @Override
+    public String toXML() {
+        return '<' + ELEMENT + " xmlns='" + NAMESPACE + "'/>";
+    }
+
+    @Override
+    public MessageProcessingHintType getHintType() {
+        return MessageProcessingHintType.store;
+    }
+
+    public static StoreHint from(Message message) {
+        return message.getExtension(ELEMENT, NAMESPACE);
+    }
+
+    public static boolean hasHint(Message message) {
+        return from(message) != null;
+    }
+
+    public static void set(Message message) {
+        message.addExtension(INSTANCE);
+    }
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/package-info.java

@@ -0,0 +1,20 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * XMPP extension elements for XEP-0334: Message Processing Hints.
+ */
+package org.jivesoftware.smackx.hints.element;

smack-experimental/src/main/java/org/jivesoftware/smackx/hints/package-info.java

@@ -0,0 +1,20 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Smack's API for XEP-0334: Message Processing Hints.
+  */
+package org.jivesoftware.smackx.hints;

smack-experimental/src/main/java/org/jivesoftware/smackx/hints/provider/MessageProcessingHintProvider.java

@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.hints.provider;
+
+import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smackx.hints.element.MessageProcessingHint;
+import org.xmlpull.v1.XmlPullParser;
+
+public abstract class MessageProcessingHintProvider<H extends MessageProcessingHint> extends ExtensionElementProvider<H> {
+
+    @Override
+    public H parse(XmlPullParser parser, int initialDepth) throws Exception {
+        return getHint();
+    }
+
+    protected abstract H getHint();
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/hints/provider/NoCopyHintProvider.java

@@ -0,0 +1,28 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.hints.provider;
+
+import org.jivesoftware.smackx.hints.element.NoCopyHint;
+
+public class NoCopyHintProvider extends MessageProcessingHintProvider<NoCopyHint> {
+
+    @Override
+    protected NoCopyHint getHint() {
+        return NoCopyHint.INSTANCE;
+    }
+
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/hints/provider/NoPermanentStoreHintProvider.java

@@ -0,0 +1,28 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.hints.provider;
+
+import org.jivesoftware.smackx.hints.element.NoPermanentStoreHint;
+
+public class NoPermanentStoreHintProvider extends MessageProcessingHintProvider<NoPermanentStoreHint> {
+
+    @Override
+    protected NoPermanentStoreHint getHint() {
+        return NoPermanentStoreHint.INSTANCE;
+    }
+
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/hints/provider/NoStoreHintProvider.java

@@ -0,0 +1,28 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.hints.provider;
+
+import org.jivesoftware.smackx.hints.element.NoStoreHint;
+
+public class NoStoreHintProvider extends MessageProcessingHintProvider<NoStoreHint> {
+
+    @Override
+    protected NoStoreHint getHint() {
+        return NoStoreHint.INSTANCE;
+    }
+
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/hints/provider/StoreHintProvider.java

@@ -0,0 +1,28 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.hints.provider;
+
+import org.jivesoftware.smackx.hints.element.StoreHint;
+
+public class StoreHintProvider extends MessageProcessingHintProvider<StoreHint> {
+
+    @Override
+    protected StoreHint getHint() {
+        return StoreHint.INSTANCE;
+    }
+
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/hints/provider/package-info.java

@@ -0,0 +1,20 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Smack Provider for XEP-0334: Message Processing Hints.
+ */
+package org.jivesoftware.smackx.hints.provider;

smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadManager.java

@@ -121,7 +121,7 @@ public final class HttpFileUploadManager extends Manager {
     }
 
     private static UploadService uploadServiceFrom(DiscoverInfo discoverInfo) {
-        assert(containsHttpFileUploadNamespace(discoverInfo));
+        assert (containsHttpFileUploadNamespace(discoverInfo));
 
         UploadService.Version version;
         if (discoverInfo.containsFeature(NAMESPACE)) {

smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProvider.java

@@ -34,13 +34,13 @@ public class FileTooLargeErrorProvider extends ExtensionElementProvider<FileTooL
         final String namespace = parser.getNamespace();
         Long maxFileSize = null;
 
-        outerloop: while(true) {
+        outerloop: while (true) {
             int event = parser.next();
 
             switch (event) {
                 case XmlPullParser.START_TAG:
                     String name = parser.getName();
-                    switch(name) {
+                    switch (name) {
                         case "max-file-size":
                             maxFileSize = Long.valueOf(parser.nextText());
                             break;

smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProvider.java

@@ -50,7 +50,7 @@ public class SlotProvider extends IQProvider<Slot> {
             switch (event) {
                 case XmlPullParser.START_TAG:
                     String name = parser.getName();
-                    switch(name) {
+                    switch (name) {
                         case "put":
                             putUrl = new URL(parser.nextText());
                             break;

smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/IoTIsFriendResponse.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright © 2016 Florian Schmaus
+ * Copyright © 2016-2017 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import org.jxmpp.jid.BareJid;
 
 public class IoTIsFriendResponse extends IQ {
 
-    public static final String ELEMENT = "isFriend";
+    public static final String ELEMENT = "isFriendResponse";
     public static final String NAMESPACE = Constants.IOT_PROVISIONING_NAMESPACE;
 
     private final BareJid jid;
@@ -46,6 +46,7 @@ public class IoTIsFriendResponse extends IQ {
     protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder xml) {
         xml.attribute("jid", jid);
         xml.attribute("result", result);
+        xml.setEmptyElement();
         return xml;
     }
 

smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/EnablePushNotificationsIQ.java

@@ -96,7 +96,7 @@ public class EnablePushNotificationsIQ extends IQ {
         xml.rightAngleBracket();
 
         if (publishOptions != null) {
-            DataForm dataForm = new DataForm(DataForm.Type.form);
+            DataForm dataForm = new DataForm(DataForm.Type.submit);
 
             FormField formTypeField = new FormField("FORM_TYPE");
             formTypeField.addValue(PubSub.NAMESPACE + "#publish-options");

smack-experimental/src/main/resources/org.jivesoftware.smack.experimental/experimental.providers

@@ -233,6 +233,28 @@
       <className>org.jivesoftware.smackx.chat_markers.provider.AcknowledgedProvider</className>
     </extensionProvider>
 
+    <!-- XEP-0334: Message Processing Hints -->
+    <extensionProvider>
+      <elementName>no-copy</elementName>
+      <namespace>urn:xmpp:hints</namespace>
+      <className>org.jivesoftware.smackx.hints.provider.NoCopyHintProvider</className>
+    </extensionProvider>
+    <extensionProvider>
+      <elementName>no-permanent-store</elementName>
+      <namespace>urn:xmpp:hints</namespace>
+      <className>org.jivesoftware.smackx.hints.provider.NoPermanentStoreHintProvider</className>
+    </extensionProvider>
+    <extensionProvider>
+      <elementName>no-store</elementName>
+      <namespace>urn:xmpp:hints</namespace>
+      <className>org.jivesoftware.smackx.hints.provider.NoStoreHintProvider</className>
+    </extensionProvider>
+    <extensionProvider>
+      <elementName>store</elementName>
+      <namespace>urn:xmpp:hints</namespace>
+      <className>org.jivesoftware.smackx.hints.provider.StoreHintProvider</className>
+    </extensionProvider>
+g
     <!-- XEP-0363: HTTP File Upload -->
     <iqProvider>
       <elementName>slot</elementName>
@@ -255,4 +277,11 @@
       <className>org.jivesoftware.smackx.httpfileupload.provider.FileTooLargeErrorProvider</className>
     </extensionProvider>
 
+    <!-- XEP-0380: Explicit Message Encryption -->
+    <extensionProvider>
+      <elementName>encryption</elementName>
+      <namespace>urn:xmpp:eme:0</namespace>
+      <className>org.jivesoftware.smackx.eme.provider.ExplicitMessageEncryptionProvider</className>
+    </extensionProvider>
+
 </smackProviders>

smack-experimental/src/main/resources/org.jivesoftware.smack.experimental/experimental.xml

@@ -5,5 +5,6 @@
         <className>org.jivesoftware.smackx.iot.discovery.IoTDiscoveryManager</className>
         <className>org.jivesoftware.smackx.iot.provisioning.IoTProvisioningManager</className>
         <className>org.jivesoftware.smackx.httpfileupload.HttpFileUploadManager</className>
+		<className>org.jivesoftware.smackx.eme.ExplicitMessageEncryptionManager</className>
     </startupClasses>
 </smack>

smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java

@@ -94,7 +94,7 @@ public class CarbonTest extends ExperimentalInitializerTest {
         assertEquals("received", parser.getName());
     }
 
-    @Test(expected=Exception.class)
+    @Test(expected = Exception.class)
     public void carbonEmptyTest() throws Exception {
         XmlPullParser parser;
         String control;

smack-experimental/src/test/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProviderTest.java

@@ -0,0 +1,47 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.eme.provider;
+
+import static org.junit.Assert.assertEquals;
+
+import org.jivesoftware.smack.test.util.TestUtils;
+import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement;
+import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement.ExplicitMessageEncryptionProtocol;
+import org.junit.Test;
+
+public class ExplicitMessageEncryptionProviderTest {
+
+    private static final String OX_EME_ELEMENT = "<encryption xmlns='urn:xmpp:eme:0' namespace='urn:xmpp:openpgp:0'/>";
+
+    private static final String UNKNOWN_NAMESPACE = "urn:xmpp:foobar:0";
+    private static final String UNKNOWN_NAME = "Foo Bar";
+    private static final String UNKNOWN_EME_ELEMENT = "<encryption xmlns='urn:xmpp:eme:0' namespace='" + UNKNOWN_NAMESPACE
+                    + "' name='" + UNKNOWN_NAME + "'/>";
+
+    @Test
+    public void testParseOxEmeElement() throws Exception {
+        ExplicitMessageEncryptionElement eme = TestUtils.parseExtensionElement(OX_EME_ELEMENT);
+        assertEquals(ExplicitMessageEncryptionProtocol.openpgpV0, eme.getProtocol());
+    }
+
+    @Test
+    public void testParseUnknownEmeElement() throws Exception {
+        ExplicitMessageEncryptionElement eme = TestUtils.parseExtensionElement(UNKNOWN_EME_ELEMENT);
+        assertEquals(UNKNOWN_NAMESPACE, eme.getEncryptionNamespace());
+        assertEquals(UNKNOWN_NAME, eme.getName());
+    }
+}

smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java

@@ -27,7 +27,7 @@ public class MUCLightDestroyTest {
             + "<query xmlns='urn:xmpp:muclight:0#destroy'/>" + "</iq>";
 
     @Test
-    public void checkDestroyMUCLightStanza() throws Exception{
+    public void checkDestroyMUCLightStanza() throws Exception {
         MUCLightDestroyIQ mucLightDestroyIQ = new MUCLightDestroyIQ(JidCreate.from("coven@muclight.shakespeare.lit"));
         mucLightDestroyIQ.setStanzaId("destroy1");
         Assert.assertEquals(mucLightDestroyIQ.toXML().toString(), stanza);

smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java

@@ -31,7 +31,7 @@ public class EnablePushNotificationsIQTest {
 
     String exampleEnableIQWithPublishOptions = "<iq id='x42' type='set'>"
             + "<enable xmlns='urn:xmpp:push:0' jid='push-5.client.example' node='yxs32uqsflafdk3iuqo'>"
-            + "<x xmlns='jabber:x:data' type='form'>"
+            + "<x xmlns='jabber:x:data' type='submit'>"
             + "<field var='FORM_TYPE'><value>http://jabber.org/protocol/pubsub#publish-options</value></field>"
             + "<field var='secret'><value>eruio234vzxc2kla-91</value></field>" + "</x>" + "</enable>" + "</iq>";
 

smack-extensions/src/main/java/org/jivesoftware/smackx/admin/ServiceAdministrationManager.java

@@ -84,7 +84,7 @@ public class ServiceAdministrationManager extends Manager {
         passwordVerifyField.addValue(password);
 
         command.next(answerForm);
-        assert(command.isCompleted());
+        assert (command.isCompleted());
     }
 
     public RemoteCommand deleteUser() {
@@ -112,6 +112,6 @@ public class ServiceAdministrationManager extends Manager {
         accountJids.addValues(JidUtil.toStringList(jidsToDelete));
 
         command.next(answerForm);
-        assert(command.isCompleted());
+        assert (command.isCompleted());
     }
 }

smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java

@@ -228,7 +228,7 @@ public class AMPExtension implements ExtensionElement {
         String getName();
         String getValue();
 
-        static final String ATTRIBUTE_NAME="condition";
+        static final String ATTRIBUTE_NAME = "condition";
     }
 
     /**
@@ -265,7 +265,7 @@ public class AMPExtension implements ExtensionElement {
          */
         notify;
 
-        public static final String ATTRIBUTE_NAME="action";
+        public static final String ATTRIBUTE_NAME = "action";
     }
 
     /**

smack-extensions/src/main/java/org/jivesoftware/smackx/bob/BoBData.java

@@ -82,7 +82,7 @@ public class BoBData {
 
     private void setContentBinaryIfRequired() {
         if (contentBinary == null) {
-            assert(StringUtils.isNotEmpty(contentString));
+            assert (StringUtils.isNotEmpty(contentString));
             contentBinary = Base64.decode(contentString);
         }
     }

smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java

@@ -118,9 +118,9 @@ public final class BookmarkManager {
         BookmarkedConference bookmark
                 = new BookmarkedConference(name, jid, isAutoJoin, nickname, password);
         List<BookmarkedConference> conferences = bookmarks.getBookmarkedConferences();
-        if(conferences.contains(bookmark)) {
+        if (conferences.contains(bookmark)) {
             BookmarkedConference oldConference = conferences.get(conferences.indexOf(bookmark));
-            if(oldConference.isShared()) {
+            if (oldConference.isShared()) {
                 throw new IllegalArgumentException("Cannot modify shared bookmark");
             }
             oldConference.setAutoJoin(isAutoJoin);
@@ -149,10 +149,10 @@ public final class BookmarkManager {
     public void removeBookmarkedConference(EntityBareJid jid) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
         retrieveBookmarks();
         Iterator<BookmarkedConference> it = bookmarks.getBookmarkedConferences().iterator();
-        while(it.hasNext()) {
+        while (it.hasNext()) {
             BookmarkedConference conference = it.next();
-            if(conference.getJid().equals(jid)) {
+            if (conference.getJid().equals(jid)) {
-                if(conference.isShared()) {
+                if (conference.isShared()) {
                     throw new IllegalArgumentException("Conference is shared and can't be removed");
                 }
                 it.remove();
@@ -192,9 +192,9 @@ public final class BookmarkManager {
         retrieveBookmarks();
         BookmarkedURL bookmark = new BookmarkedURL(URL, name, isRSS);
         List<BookmarkedURL> urls = bookmarks.getBookmarkedURLS();
-        if(urls.contains(bookmark)) {
+        if (urls.contains(bookmark)) {
             BookmarkedURL oldURL = urls.get(urls.indexOf(bookmark));
-            if(oldURL.isShared()) {
+            if (oldURL.isShared()) {
                 throw new IllegalArgumentException("Cannot modify shared bookmarks");
             }
             oldURL.setName(name);
@@ -219,10 +219,10 @@ public final class BookmarkManager {
     public void removeBookmarkedURL(String bookmarkURL) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
         retrieveBookmarks();
         Iterator<BookmarkedURL> it = bookmarks.getBookmarkedURLS().iterator();
-        while(it.hasNext()) {
+        while (it.hasNext()) {
             BookmarkedURL bookmark = it.next();
-            if(bookmark.getURL().equalsIgnoreCase(bookmarkURL)) {
+            if (bookmark.getURL().equalsIgnoreCase(bookmarkURL)) {
-                if(bookmark.isShared()) {
+                if (bookmark.isShared()) {
                     throw new IllegalArgumentException("Cannot delete a shared bookmark.");
                 }
                 it.remove();
@@ -249,8 +249,8 @@ public final class BookmarkManager {
     }
 
     private Bookmarks retrieveBookmarks() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
-        synchronized(bookmarkLock) {
+        synchronized (bookmarkLock) {
-            if(bookmarks == null) {
+            if (bookmarks == null) {
                 bookmarks = (Bookmarks) privateDataManager.getPrivateData("storage",
                         "storage:bookmarks");
             }

smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedConference.java

@@ -115,10 +115,10 @@ public class BookmarkedConference implements SharedBookmark {
 
     @Override
     public boolean equals(Object obj) {
-        if(obj == null || !(obj instanceof BookmarkedConference)) {
+        if (obj == null || !(obj instanceof BookmarkedConference)) {
             return false;
         }
-        BookmarkedConference conference = (BookmarkedConference)obj;
+        BookmarkedConference conference = (BookmarkedConference) obj;
         return conference.getJid().equals(jid);
     }
 

smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedURL.java

@@ -86,10 +86,10 @@ public class BookmarkedURL implements SharedBookmark {
 
     @Override
     public boolean equals(Object obj) {
-        if(!(obj instanceof BookmarkedURL)) {
+        if (!(obj instanceof BookmarkedURL)) {
             return false;
         }
-        BookmarkedURL url = (BookmarkedURL)obj;
+        BookmarkedURL url = (BookmarkedURL) obj;
         return url.getURL().equalsIgnoreCase(URL);
     }
 

smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java

@@ -177,7 +177,7 @@ public class Bookmarks implements PrivateData {
         buf.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).rightAngleBracket();
 
         for (BookmarkedURL urlStorage : getBookmarkedURLS()) {
-            if(urlStorage.isShared()) {
+            if (urlStorage.isShared()) {
                 continue;
             }
             buf.halfOpenElement("url").attribute("name", urlStorage.getName()).attribute("url", urlStorage.getURL());
@@ -187,7 +187,7 @@ public class Bookmarks implements PrivateData {
 
         // Add Conference additions
         for (BookmarkedConference conference : getBookmarkedConferences()) {
-            if(conference.isShared()) {
+            if (conference.isShared()) {
                 continue;
             }
             buf.halfOpenElement("conference");
@@ -260,7 +260,7 @@ public class Bookmarks implements PrivateData {
         boolean done = false;
         while (!done) {
             int eventType = parser.next();
-            if(eventType == XmlPullParser.START_TAG
+            if (eventType == XmlPullParser.START_TAG
                         && "shared_bookmark".equals(parser.getName())) {
                     urlStore.setShared(true);
             }
@@ -291,7 +291,7 @@ public class Bookmarks implements PrivateData {
             else if (eventType == XmlPullParser.START_TAG && "password".equals(parser.getName())) {
                 conf.setPassword(parser.nextText());
             }
-            else if(eventType == XmlPullParser.START_TAG
+            else if (eventType == XmlPullParser.START_TAG
                         && "shared_bookmark".equals(parser.getName())) {
                     conf.setShared(true);
             }

smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java

@@ -64,7 +64,7 @@ class DataListener extends AbstractIqRequestHandler {
                 ibbSession.processIQPacket(data);
             }
         }
-        catch (NotConnectedException|InterruptedException e) {
+        catch (NotConnectedException | InterruptedException e) {
             return null;
         }
         return null;

smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java

@@ -415,7 +415,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
      */
     @Override
     public Socks5BytestreamSession establishSession(Jid targetJID, String sessionID)
-                    throws IOException, InterruptedException, NoResponseException, SmackException, XMPPException{
+                    throws IOException, InterruptedException, NoResponseException, SmackException, XMPPException {
         XMPPConnection connection = connection();
         XMPPErrorException discoveryException = null;
         // check if target supports SOCKS5 Bytestream
@@ -556,7 +556,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
             try {
                 proxyInfo = serviceDiscoveryManager.discoverInfo(item.getEntityID());
             }
-            catch (NoResponseException|XMPPErrorException e) {
+            catch (NoResponseException | XMPPErrorException e) {
                 // blacklist errornous server
                 proxyBlacklist.add(item.getEntityID());
                 continue;

smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java

@@ -280,7 +280,7 @@ public final class Socks5Proxy {
      * @return true if the address was removed.
      */
     public boolean removeLocalAddress(String address) {
-        synchronized(localAddresses) {
+        synchronized (localAddresses) {
             return localAddresses.remove(address);
         }
     }
@@ -311,7 +311,7 @@ public final class Socks5Proxy {
         if (addresses == null) {
             throw new IllegalArgumentException("list must not be null");
         }
-        synchronized(localAddresses) {
+        synchronized (localAddresses) {
             localAddresses.clear();
             localAddresses.addAll(addresses);
         }

smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java

@@ -224,7 +224,7 @@ public class Bytestream extends IQ {
 
     @Override
     protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder xml) {
-        switch(getType()) {
+        switch (getType()) {
         case set:
             xml.optAttribute("sid", getSessionID());
             xml.optAttribute("mode", getMode());

smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java

@@ -717,7 +717,7 @@ public final class EntityCapsManager extends Manager {
             throw new AssertionError(e);
         }
         byte[] digest;
-        synchronized(md) {
+        synchronized (md) {
             digest = md.digest(bytes);
         }
         String version = Base64.encodeToString(digest);

smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java

@@ -105,10 +105,10 @@ public final class ChatStateManager extends Manager {
      * @throws InterruptedException 
      */
     public void setCurrentState(ChatState newState, org.jivesoftware.smack.chat.Chat chat) throws NotConnectedException, InterruptedException {
-        if(chat == null || newState == null) {
+        if (chat == null || newState == null) {
             throw new IllegalArgumentException("Arguments cannot be null.");
         }
-        if(!updateChatState(chat, newState)) {
+        if (!updateChatState(chat, newState)) {
             return;
         }
         Message message = new Message();

smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java

@@ -140,7 +140,7 @@ public final class ServiceDiscoveryManager extends Manager {
                     response.addItems(nodeInformationProvider.getNodeItems());
                     // Add packet extensions
                     response.addExtensions(nodeInformationProvider.getNodePacketExtensions());
-                } else if(discoverItems.getNode() != null) {
+                } else if (discoverItems.getNode() != null) {
                     // Return <item-not-found/> error since client doesn't contain
                     // the specified node
                     response.setType(IQ.Type.error);
@@ -761,7 +761,7 @@ public final class ServiceDiscoveryManager extends Manager {
         try {
             // Get the disco items and send the disco packet to each server item
             items = discoverItems(serviceName);
-        } catch(XMPPErrorException e) {
+        } catch (XMPPErrorException e) {
             LOGGER.log(Level.WARNING, "Could not discover items about service", e);
             return serviceDiscoInfo;
         }

smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java

@@ -74,7 +74,7 @@ public class DiscoverInfoProvider extends IQProvider<DiscoverInfo> {
                 if (parser.getName().equals("feature")) {
                     // Create a new feature and add it to the discovered info.
                     boolean notADuplicateFeature = discoverInfo.addFeature(variable);
-                    assert(notADuplicateFeature);
+                    assert (notADuplicateFeature);
                 }
                 if (parser.getName().equals("query")) {
                     done = true;

smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java

@@ -73,7 +73,7 @@ public class FaultTolerantNegotiator extends StreamNegotiator {
     private StreamNegotiator determineNegotiator(Stanza streamInitiation) {
         if (streamInitiation instanceof Bytestream) {
             return primaryNegotiator;
-        } else if (streamInitiation instanceof Open){
+        } else if (streamInitiation instanceof Open) {
             return secondaryNegotiator;
         } else {
             throw new IllegalStateException("Unknown stream initation type");

smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java

@@ -308,7 +308,7 @@ public abstract class FileTransfer {
      * Return the length of bytes written out to the stream.
      * @return the amount in bytes written out.
      */
-    public long getAmountWritten(){
+    public long getAmountWritten() {
         return amountWritten;
     }
 

smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java

@@ -162,7 +162,7 @@ public class OutgoingFileTransfer extends FileTransfer {
             final long fileSize, final String description,
             final NegotiationProgress progress)
     {
-        if(progress == null) {
+        if (progress == null) {
             throw new IllegalArgumentException("Callback progress cannot be null.");
         }
         checkTransferThread();
@@ -295,7 +295,7 @@ public class OutgoingFileTransfer extends FileTransfer {
      * @param fileSize the size of the file that is transferred
      * @param description a description for the file to transfer.
      */
-    public synchronized void sendStream(final InputStream in, final String fileName, final long fileSize, final String description){
+    public synchronized void sendStream(final InputStream in, final String fileName, final long fileSize, final String description) {
         checkTransferThread();
 
         setFileInfo(fileName, fileSize);
@@ -409,7 +409,7 @@ public class OutgoingFileTransfer extends FileTransfer {
     @Override
     protected boolean updateStatus(Status oldStatus, Status newStatus) {
         boolean isUpdated = super.updateStatus(oldStatus, newStatus);
-        if(callback != null && isUpdated) {
+        if (callback != null && isUpdated) {
             callback.statusUpdated(oldStatus, newStatus);
         }
         return isUpdated;
@@ -419,7 +419,7 @@ public class OutgoingFileTransfer extends FileTransfer {
     protected void setStatus(Status status) {
         Status oldStatus = getStatus();
         super.setStatus(status);
-        if(callback != null) {
+        if (callback != null) {
             callback.statusUpdated(oldStatus, status);
         }
     }
@@ -427,7 +427,7 @@ public class OutgoingFileTransfer extends FileTransfer {
     @Override
     protected void setException(Exception exception) {
         super.setException(exception);
-        if(callback != null) {
+        if (callback != null) {
             callback.errorEstablishingStream(exception);
         }
     }