Merge opt2 to master w features

Fixed conflict on index.md

documentation/extensions/index.md

@@ -85,6 +85,7 @@ Experimental Smack Extensions and currently supported XEPs of smack-experimental
 | [Internet of Things - Provisioning](iot.md) | [XEP-0324](http://xmpp.org/extensions/xep-0324.html) | Provisioning, access rights and user priviliges for the Internet of Things. |
 | [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. |
 | 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-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java

@@ -0,0 +1,89 @@
+/**
+ *
+ * Copyright © 2016 Fernando Ramirez
+ *
+ * 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.chat_markers;
+
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import org.jivesoftware.smack.ConnectionCreationListener;
+import org.jivesoftware.smack.Manager;
+import org.jivesoftware.smack.SmackException.NoResponseException;
+import org.jivesoftware.smack.SmackException.NotConnectedException;
+import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.XMPPConnectionRegistry;
+import org.jivesoftware.smack.XMPPException.XMPPErrorException;
+import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements;
+import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
+
+/**
+ * Chat Markers Manager class (XEP-0333).
+ * 
+ * @see <a href="http://xmpp.org/extensions/xep-0333.html">XEP-0333: Chat
+ *      Markers</a>
+ * @author Fernando Ramirez
+ * 
+ */
+public final class ChatMarkersManager extends Manager {
+
+    static {
+        XMPPConnectionRegistry.addConnectionCreationListener(new ConnectionCreationListener() {
+            @Override
+            public void connectionCreated(XMPPConnection connection) {
+                getInstanceFor(connection);
+            }
+        });
+    }
+
+    private static final Map<XMPPConnection, ChatMarkersManager> INSTANCES = new WeakHashMap<>();
+
+    /**
+     * Get the singleton instance of ChatMarkersManager.
+     * 
+     * @param connection
+     * @return the instance of ChatMarkersManager
+     */
+    public static synchronized ChatMarkersManager getInstanceFor(XMPPConnection connection) {
+        ChatMarkersManager chatMarkersManager = INSTANCES.get(connection);
+
+        if (chatMarkersManager == null) {
+            chatMarkersManager = new ChatMarkersManager(connection);
+            INSTANCES.put(connection, chatMarkersManager);
+        }
+
+        return chatMarkersManager;
+    }
+
+    private ChatMarkersManager(XMPPConnection connection) {
+        super(connection);
+    }
+
+    /**
+     * Returns true if Chat Markers is supported by the server.
+     * 
+     * @return true if Chat Markers is supported by the server.
+     * @throws NotConnectedException
+     * @throws XMPPErrorException
+     * @throws NoResponseException
+     * @throws InterruptedException
+     */
+    public boolean isSupportedByServer()
+            throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
+        return ServiceDiscoveryManager.getInstanceFor(connection())
+                .serverSupportsFeature(ChatMarkersElements.NAMESPACE);
+    }
+
+}

smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/element/ChatMarkersElements.java

@@ -0,0 +1,234 @@
+/**
+ *
+ * Copyright © 2016 Fernando Ramirez
+ *
+ * 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.chat_markers.element;
+
+import org.jivesoftware.smack.packet.ExtensionElement;
+import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.util.XmlStringBuilder;
+
+/**
+ * Chat Markers elements (XEP-0333).
+ * 
+ * @see <a href="http://xmpp.org/extensions/xep-0333.html">XEP-0333: Chat
+ *      Markers</a>
+ * @author Fernando Ramirez
+ * 
+ */
+public class ChatMarkersElements {
+
+    public static final String NAMESPACE = "urn:xmpp:chat-markers:0";
+
+    /**
+     * Markable extension class.
+     * 
+     * @see <a href="http://xmpp.org/extensions/xep-0333.html">XEP-0333: Chat
+     *      Markers</a>
+     * @author Fernando Ramirez
+     *
+     */
+    public static class MarkableExtension implements ExtensionElement {
+
+        /**
+         * markable element.
+         */
+        public static final String ELEMENT = "markable";
+
+        public MarkableExtension() {
+        }
+
+        @Override
+        public String getElementName() {
+            return ELEMENT;
+        }
+
+        @Override
+        public String getNamespace() {
+            return NAMESPACE;
+        }
+
+        @Override
+        public CharSequence toXML() {
+            XmlStringBuilder xml = new XmlStringBuilder(this);
+            xml.closeEmptyElement();
+            return xml;
+        }
+
+        public static MarkableExtension from(Message message) {
+            return (MarkableExtension) message.getExtension(ELEMENT, NAMESPACE);
+        }
+    }
+
+    /**
+     * Received extension class.
+     * 
+     * @see <a href="http://xmpp.org/extensions/xep-0333.html">XEP-0333: Chat
+     *      Markers</a>
+     * @author Fernando Ramirez
+     *
+     */
+    public static class ReceivedExtension implements ExtensionElement {
+
+        /**
+         * received element.
+         */
+        public static final String ELEMENT = "received";
+
+        private String id;
+
+        public ReceivedExtension(String id) {
+            this.id = id;
+        }
+
+        /**
+         * Get the id.
+         * 
+         * @return the id
+         */
+        public String getId() {
+            return id;
+        }
+
+        @Override
+        public String getElementName() {
+            return ELEMENT;
+        }
+
+        @Override
+        public String getNamespace() {
+            return NAMESPACE;
+        }
+
+        @Override
+        public CharSequence toXML() {
+            XmlStringBuilder xml = new XmlStringBuilder(this);
+            xml.attribute("id", id);
+            xml.closeEmptyElement();
+            return xml;
+        }
+
+        public static ReceivedExtension from(Message message) {
+            return (ReceivedExtension) message.getExtension(ELEMENT, NAMESPACE);
+        }
+    }
+
+    /**
+     * Displayed extension class.
+     * 
+     * @see <a href="http://xmpp.org/extensions/xep-0333.html">XEP-0333: Chat
+     *      Markers</a>
+     * @author Fernando Ramirez
+     *
+     */
+    public static class DisplayedExtension implements ExtensionElement {
+
+        /**
+         * displayed element.
+         */
+        public static final String ELEMENT = "displayed";
+
+        private String id;
+
+        public DisplayedExtension(String id) {
+            this.id = id;
+        }
+
+        /**
+         * Get the id.
+         * 
+         * @return the id
+         */
+        public String getId() {
+            return id;
+        }
+
+        @Override
+        public String getElementName() {
+            return ELEMENT;
+        }
+
+        @Override
+        public String getNamespace() {
+            return NAMESPACE;
+        }
+
+        @Override
+        public CharSequence toXML() {
+            XmlStringBuilder xml = new XmlStringBuilder(this);
+            xml.attribute("id", id);
+            xml.closeEmptyElement();
+            return xml;
+        }
+
+        public static DisplayedExtension from(Message message) {
+            return (DisplayedExtension) message.getExtension(ELEMENT, NAMESPACE);
+        }
+    }
+
+    /**
+     * Acknowledged extension class.
+     * 
+     * @see <a href="http://xmpp.org/extensions/xep-0333.html">XEP-0333: Chat
+     *      Markers</a>
+     * @author Fernando Ramirez
+     *
+     */
+    public static class AcknowledgedExtension implements ExtensionElement {
+
+        /**
+         * acknowledged element.
+         */
+        public static final String ELEMENT = "acknowledged";
+
+        private String id;
+
+        public AcknowledgedExtension(String id) {
+            this.id = id;
+        }
+
+        /**
+         * Get the id.
+         * 
+         * @return the id
+         */
+        public String getId() {
+            return id;
+        }
+
+        @Override
+        public String getElementName() {
+            return ELEMENT;
+        }
+
+        @Override
+        public String getNamespace() {
+            return NAMESPACE;
+        }
+
+        @Override
+        public CharSequence toXML() {
+            XmlStringBuilder xml = new XmlStringBuilder(this);
+            xml.attribute("id", id);
+            xml.closeEmptyElement();
+            return xml;
+        }
+
+        public static AcknowledgedExtension from(Message message) {
+            return (AcknowledgedExtension) message.getExtension(ELEMENT, NAMESPACE);
+        }
+    }
+
+}

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

@@ -0,0 +1,24 @@
+/**
+ *
+ * Copyright © 2016 Fernando Ramirez
+ *
+ * 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.
+ */
+/**
+ * Chat Markers elements (XEP-0333).
+ * 
+ * @see <a href="http://xmpp.org/extensions/xep-0333.html">XEP-0333: Chat
+ *      Markers</a>
+ * 
+ */
+package org.jivesoftware.smackx.chat_markers.element;

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

@@ -0,0 +1,24 @@
+/**
+ *
+ * Copyright © 2016 Fernando Ramirez
+ *
+ * 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.
+ */
+/**
+ * XEP-0333: Chat Markers.
+ * 
+ * @see <a href="http://xmpp.org/extensions/xep-0333.html">XEP-0333: Chat
+ *      Markers</a>
+ * 
+ */
+package org.jivesoftware.smackx.chat_markers;