Smack 4.1.1

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQF8BAABCgBmBQJVTgmuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzU3QjAxODY1QjI1MDNDMTg0NTNEMjA4
 Q0FDMkE5Njc4NTQ4RTM1AAoJEIysKpZ4VI41MXUH/3A5Jc6rzALhnXMT4yj+jXow
 rLLX5/ypOvkAXEMRlTf9xd2apz4hT8dMsBcL3JvZscuVmkw0/woh9eV/PFSDoc7t
 HA7bMZRqWqUuVOezFD0ggHsJ7zfpcIuxsgoNARQlCRMPHzCLzKhMNctz5UApAdfy
 +wPpTMpc3K5SM1bNlM60qp+dbPCqQcLwYP02KrOQASgenVDm6iKFpzx0ieVpPY1M
 hOBMyaZg3n2j+267gpqBG6c7PVmEq3deAlB6BOBAsL/Bp1w5B5Smq959LWJLstrU
 /LeYJFi1TeIASiFy1vZyTV0Tw+Pe++3gB6ppLqkQhfWV8vXzm0coCXx29qWxAzM=
 =pGJt
 -----END PGP SIGNATURE-----

Merge tag '4.1.1'

Smack 4.1.1

Conflicts:
	smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java
	smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
	smack-java7/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java
	version.gradle

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

@@ -684,6 +684,17 @@ public abstract class ConnectionConfiguration {
             return getThis();
         }
 
+        /**
+         * Set the information about the Proxy used for the connection.
+         *
+         * @param proxyInfo the Proxy information.
+         * @return a reference to this builder.
+         */
+        public B setProxyInfo(ProxyInfo proxyInfo) {
+            this.proxy = proxyInfo;
+            return getThis();
+        }
+
         /**
          * Allow <code>null</code> or the empty String as username.
          *

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

@@ -186,10 +186,12 @@ public final class ReconnectionManager {
                     if (attempts > 13) {
                         delay = randomBase * 6 * 5; // between 2.5 and 7.5 minutes (~5 minutes)
                     }
-                    if (attempts > 7) {
+                    else if (attempts > 7) {
                         delay = randomBase * 6; // between 30 and 90 seconds (~1 minutes)
                     }
-                    delay = randomBase; // 10 seconds
+                    else {
+                        delay = randomBase; // 10 seconds
+                    }
                     break;
                 default:
                     throw new AssertionError("Unknown reconnection policy " + reconnectionPolicy);

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

@@ -572,7 +572,9 @@ public class PacketParserUtils {
                     try {
                         PacketParserUtils.addExtensionElement(presence, parser, elementName, namespace);
                     } catch (Exception e) {
-                        LOGGER.log(Level.WARNING, "Failed to parse extension packet in Presence packet.", e);
+                        LOGGER.log(Level.WARNING,
+                                        "Failed to parse extension packet in Presence packet. Attributes: from="
+                                                        + presence.getFrom() + " id=" + presence.getStanzaId(), e);
                     }
                     break;
                 }

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

@@ -0,0 +1,28 @@
+/**
+ *
+ * Copyright 2015 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.util;
+
+public class SystemUtil {
+
+    public static final String PROPERTY_JAVA_VENDOR = "java.vendor";
+
+    public static boolean onAndroid() {
+        String vendor = System.getProperty(PROPERTY_JAVA_VENDOR);
+        return vendor.contains("Android");
+    }
+
+}