Add support for custom HTTP headers

erizet · Jan 14, 2014 · 52a75bc · 52a75bc
1 parent 2d9f62a
commit 52a75bc
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 2 deletions.
diff --git a/...alA.LongPolling/src/main/java/com/zsoft/SignalA/transport/longpolling/ConnectedState.java b/...alA.LongPolling/src/main/java/com/zsoft/SignalA/transport/longpolling/ConnectedState.java
@@ -2,6 +2,7 @@
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.Map;
 
 import org.json.JSONObject;
 
@@ -92,6 +93,10 @@ public void onError(Exception ex) {
 		};
 
 		ParallelHttpClient httpClient = new ParallelHttpClient();
+        for (Map.Entry<String, String> entry : mConnection.getHeaders().entrySet())
+        {
+            httpClient.addHeader(entry.getKey(), entry.getValue());
+        }
 		ParameterMap params = httpClient.newParams()
 		        						.add("data", text.toString());
         httpClient.setMaxRetries(1);
@@ -181,6 +186,10 @@ public void onError(Exception ex) {
 		httpClient.setMaxRetries(1);
 		httpClient.setConnectionTimeout(5000);
 		httpClient.setReadTimeout(115000);
+        for (Map.Entry<String, String> entry : mConnection.getHeaders().entrySet())
+        {
+            httpClient.addHeader(entry.getKey(), entry.getValue());
+        }
 		ParameterMap params = httpClient.newParams();
 		httpClient.post(url, params, cb);
 	}

diff --git a/...lA.LongPolling/src/main/java/com/zsoft/SignalA/transport/longpolling/ConnectingState.java b/...lA.LongPolling/src/main/java/com/zsoft/SignalA/transport/longpolling/ConnectingState.java
@@ -12,6 +12,8 @@
 import com.zsoft.SignalA.Transport.TransportHelper;
 import com.zsoft.parallelhttpclient.ParallelHttpClient;
 
+import java.util.Map;
+
 public class ConnectingState extends StopableStateWithCallback {
 	public ConnectingState(ConnectionBase connection) {
 		super(connection);
@@ -100,6 +102,10 @@ public void onError(Exception ex) {
 
 		ParallelHttpClient httpClient = new ParallelHttpClient();
         httpClient.setMaxRetries(1);
+        for (Map.Entry<String, String> entry : mConnection.getHeaders().entrySet())
+        {
+            httpClient.addHeader(entry.getKey(), entry.getValue());
+        }
         httpClient.get(url, null, cb);
 	}
 

diff --git a/...LongPolling/src/main/java/com/zsoft/SignalA/transport/longpolling/DisconnectingState.java b/...LongPolling/src/main/java/com/zsoft/SignalA/transport/longpolling/DisconnectingState.java
@@ -2,6 +2,7 @@
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.Map;
 
 import android.util.Log;
 
@@ -74,6 +75,10 @@ public void onError(Exception ex) {
 
 		ParallelHttpClient httpClient = new ParallelHttpClient();
 		httpClient.setMaxRetries(1);
+        for (Map.Entry<String, String> entry : mConnection.getHeaders().entrySet())
+        {
+            httpClient.addHeader(entry.getKey(), entry.getValue());
+        }
 		ParameterMap params = httpClient.newParams();
 		httpClient.post(url, params, cb);
 	}

diff --git a/....LongPolling/src/main/java/com/zsoft/SignalA/transport/longpolling/ReconnectingState.java b/....LongPolling/src/main/java/com/zsoft/SignalA/transport/longpolling/ReconnectingState.java
@@ -14,6 +14,8 @@
 import com.zsoft.SignalA.Transport.TransportHelper;
 import com.zsoft.parallelhttpclient.ParallelHttpClient;
 
+import java.util.Map;
+
 public class ReconnectingState extends StopableStateWithCallback {
 
 	public ReconnectingState(ConnectionBase connection) {
@@ -36,7 +38,7 @@ public void Send(CharSequence text, SendCallback callback) {
 
 	@Override
 	protected void OnRun() {
-		if(DoStop()) return; 
+		if(DoStop()) return;
 
 	    if (mConnection.getMessageId() == null)
 		{
@@ -121,6 +123,10 @@ public void onError(Exception ex) {
 
 		ParallelHttpClient httpClient = new ParallelHttpClient();
         httpClient.setMaxRetries(1);
+        for (Map.Entry<String, String> entry : mConnection.getHeaders().entrySet())
+        {
+            httpClient.addHeader(entry.getKey(), entry.getValue());
+        }
         httpClient.post(url, null, cb);
 	}
 

diff --git a/SignalA/src/main/java/com/zsoft/signala/ConnectionBase.java b/SignalA/src/main/java/com/zsoft/signala/ConnectionBase.java
@@ -7,6 +7,9 @@
 
 import android.content.Context;
 
+import java.util.Map;
+import java.util.TreeMap;
+
 public abstract class ConnectionBase {
 	private Object mStateLock = new Object();
     private StateBase mCurrentState = null;
@@ -18,6 +21,7 @@ public abstract class ConnectionBase {
 	private ITransport mTransport;
 	private String mGroupsToken = null;
 	private String mQueryString = null;
+	private Map<String, String> mHeaders = new TreeMap<String, String>();
 
     public ConnectionBase(String url, Context context, ITransport transport, String queryString)
     {
@@ -127,6 +131,13 @@ public void setError(Exception exception)
 	{
 		OnError(exception);
 	}
+
+    public void addHeader(String header, String value)
+    {
+        mHeaders.put(header, value);
+    }
+
+    public Map<String, String> getHeaders() { return mHeaders; }
 
 	// Methods for the user to implement
 
@@ -152,5 +163,5 @@ public void Send(CharSequence text, SendCallback callback) {
 
 
 
-    
+
 }