Allow AsynchttpRequest to specify the initial headers. Should I be dumping the header defaults into them?

koush · koush · commit 26af1cfd63c9 · 2013-06-08T09:22:15.000-07:00
diff --git a/AndroidAsync/.classpath b/AndroidAsync/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/AndroidAsync/AndroidAsync.iml b/AndroidAsync/AndroidAsync.iml
@@ -3,11 +3,6 @@
   <component name="FacetManager">
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="bundleDebug" />
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
         <option name="LIBRARY_PROJECT" value="true" />
         <notImportedProperties>
           <property>MANIFEST_FILE_PATH</property>
@@ -54,6 +49,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/build/apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/assets" />
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
@@ -89,8 +89,15 @@ public AsyncHttpRequest setMethod(String method) {
     }
 
     public AsyncHttpRequest(URI uri, String method) {
+        this(uri, method, null);
+    }
+
+    public AsyncHttpRequest(URI uri, String method, RawHeaders headers) {
         assert uri != null;
         mMethod = method;
+        if (headers == null)
+            headers = new RawHeaders();
+        mRawHeaders = headers;
         mHeaders = new RequestHeaders(uri, mRawHeaders);
         mRawHeaders.setStatusLine(getRequestLine().toString());
         mHeaders.setHost(uri.getHost());
@@ -148,7 +155,8 @@ public AsyncHttpRequestBody getBody() {
     public void onHandshakeException(AsyncSSLException e) {
     }
 
-    int mTimeout = 30000;
+    public static final int DEFAULT_TIMEOUT = 30000;
+    int mTimeout = DEFAULT_TIMEOUT;
     public int getTimeout() {
         return mTimeout;
     }
