2 files changed, 100 insertions, 3 deletions
diff --git a/src/com/isode/stroke/elements/JingleS5BTransportPayload.java b/src/com/isode/stroke/elements/JingleS5BTransportPayload.java
index e9ee67f..546a41a 100644
--- a/src/com/isode/stroke/elements/JingleS5BTransportPayload.java
+++ b/src/com/isode/stroke/elements/JingleS5BTransportPayload.java
@@ -17,6 +17,7 @@ import com.isode.stroke.network.HostAddressPort;
 import com.isode.stroke.jid.JID;
 import com.isode.stroke.base.NotNull;
 import java.util.Vector;
+import java.util.Comparator;
 
 public class JingleS5BTransportPayload extends JingleTransportPayload {
 
@@ -46,9 +47,20 @@ public class JingleS5BTransportPayload extends JingleTransportPayload {
 		}
 	}
 
-	public class CompareCandidate {
-		public boolean compareTo(JingleS5BTransportPayload.Candidate c1, JingleS5BTransportPayload.Candidate c2) {
-			return (c1.priority < c2.priority);
+	public static class CompareCandidate implements Comparator<JingleS5BTransportPayload.Candidate> {
+		public int compare(JingleS5BTransportPayload.Candidate c1, JingleS5BTransportPayload.Candidate c2) {
+			if (c1.priority == c2.priority) { return 0; }
+			else if (c1.priority < c2.priority) { return -1; }
+			else  { return 1; }
+		}
+
+		public boolean equals(Object c) {
+			if(!(c instanceof JingleS5BTransportPayload.Candidate)) {
+				return false;
+			}
+			else {
+				return this.equals(c);
+			}
 		}
 	}
 
diff --git a/src/com/isode/stroke/elements/S5BProxyRequest.java b/src/com/isode/stroke/elements/S5BProxyRequest.java
new file mode 100644
index 0000000..9d0c651
--- /dev/null
+++ b/src/com/isode/stroke/elements/S5BProxyRequest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2011 Tobias Markmann
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+/*
+ * Copyright (c) 2015 Tarun Gupta.
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+package com.isode.stroke.elements;
+
+import com.isode.stroke.elements.Payload;
+import com.isode.stroke.jid.JID;
+import com.isode.stroke.base.NotNull;
+import com.isode.stroke.elements.Bytestreams;
+
+public class S5BProxyRequest extends Payload {
+
+	private StreamHost streamHost;
+	private String sid = "";
+	private JID activate;
+
+	public static class StreamHost {
+		public String host = "";
+		public int port;
+		public JID jid = new JID();
+	};
+
+	/**
+	* Default Constructor.
+	*/
+	public S5BProxyRequest() {
+
+	}
+
+	/**
+	* @return streamHost.
+	*/
+	public StreamHost getStreamHost() {
+		return streamHost;
+	}
+
+	/**
+	* @param streamHost.
+	*/
+	public void setStreamHost(StreamHost streamHost) {
+		this.streamHost = streamHost;
+	}
+
+	/**
+	* @return sid, Not Null.
+	*/
+	public String getSID() {
+		return sid;
+	}
+
+	/**
+	* @param sid, Not Null.
+	*/
+	public void setSID(String sid) {
+		NotNull.exceptIfNull(sid, "sid");
+		this.sid = sid;
+	}
+
+	/**
+	* @return activate.
+	*/
+	public JID getActivate() {
+		return activate;
+	}
+
+	/**
+	* @param activate.
+	*/
+	public void setActivate(JID activate) {
+		this.activate = activate;
+	}
+}
+\ No newline at end of file