Merge branch 'dev' of github.com:androidquery/androidquery into dev

Author: androidquery

dist/build-full.jardesc

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="WINDOWS-1252" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="AndroidQuery/dist/android-query-full.0.24.2-beta.jar"/>
+    <jar path="AndroidQuery/dist/android-query-full.0.25.1-beta.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/AndroidQuery/dist/build-full.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>

dist/build.jardesc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="AndroidQuery/dist/android-query.0.23.16.jar"/>
+    <jar path="AndroidQuery/dist/android-query.0.24.3.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/AndroidQuery/dist/build.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>

src/com/androidquery/callback/AbstractAjaxCallback.java

@@ -28,6 +28,7 @@
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
@@ -1445,6 +1446,28 @@ private static DefaultHttpClient getClient(){
 		return client;
 	}
 
+	//helper method to support underscore subdomain
+	private HttpResponse execute(HttpUriRequest hr, DefaultHttpClient client, HttpContext context) throws ClientProtocolException, IOException{
+		
+		HttpResponse response = null;
+
+		if(hr.getURI().getAuthority().contains("_")) {
+            URL urlObj = hr.getURI().toURL();
+            HttpHost host;
+            if(urlObj.getPort() == -1) {
+                host = new HttpHost(urlObj.getHost(), 80, urlObj.getProtocol());
+            } else {
+                host = new HttpHost(urlObj.getHost(), urlObj.getPort(), urlObj.getProtocol());
+            }
+            response = client.execute(host, hr, context);
+        } else {
+            response = client.execute(hr, context);
+        }
+		
+		
+		return response;
+	}
+	
 
 	private void httpDo(HttpUriRequest hr, String url, Map<String, String> headers, AjaxStatus status) throws ClientProtocolException, IOException{
 
@@ -1494,14 +1517,16 @@ private void httpDo(HttpUriRequest hr, String url, Map<String, String> headers,
 		HttpResponse response = null;
 
 		try{
-			response = client.execute(hr, context);
+			//response = client.execute(hr, context);
+			response = execute(hr, client, context);
 		}catch(HttpHostConnectException e){
 
 			//if proxy is used, automatically retry without proxy
 			if(proxy != null){
 				AQUtility.debug("proxy failed, retrying without proxy");
 				hp.setParameter(ConnRoutePNames.DEFAULT_PROXY, null);
-				response = client.execute(hr, context);
+				//response = client.execute(hr, context);
+				response = execute(hr, client, context);
 			}else{
 				throw e;
 			}
@@ -1566,11 +1591,12 @@ private void httpDo(HttpUriRequest hr, String url, Map<String, String> headers,
 		        	os = new BufferedOutputStream(new FileOutputStream(file));
 		        }
 
-		        //AQUtility.time("copy");
-		        
-		        copy(entity.getContent(), os, getEncoding(entity), (int) entity.getContentLength());
+		        is = entity.getContent();
+				if("gzip".equalsIgnoreCase(getEncoding(entity))){
+					is = new GZIPInputStream(is);
+				}
 
-		        //AQUtility.timeEnd("copy", 0);
+		        copy(is, os, (int) entity.getContentLength());
 
 
 		        os.flush();
@@ -1612,6 +1638,29 @@ private String getEncoding(HttpEntity entity){
 
 	}
 
+	private void copy(InputStream is, OutputStream os, int max) throws IOException{
+		
+
+		
+		Object o = null;
+		
+		if(progress != null){
+			o = progress.get();
+		}
+		
+		Progress p = null;
+		
+		if(o != null){
+			p = new Progress(o); 
+		}
+		
+		AQUtility.copy(is, os, max, p);
+		
+		
+	}
+	
+	
+	/*
 	private void copy(InputStream is, OutputStream os, String encoding, int max) throws IOException{
 		
 		if("gzip".equalsIgnoreCase(encoding)){
@@ -1634,7 +1683,7 @@ private void copy(InputStream is, OutputStream os, String encoding, int max) thr
 		
 		
 	}
-	
+	*/
 
 	/**
 	 * Set the authentication type of this request. This method requires API 5+.
@@ -1888,6 +1937,14 @@ private static void writeData(DataOutputStream dos, String name, String filename
 		dos.writeBytes(twoHyphens + boundary + lineEnd);
 		dos.writeBytes("Content-Disposition: form-data; name=\""+name+"\";"
 				+ " filename=\"" + filename + "\"" + lineEnd);
+		
+		
+		//added to specify type
+		dos.writeBytes("Content-Type: application/octet-stream");
+		dos.writeBytes(lineEnd);
+		dos.writeBytes("Content-Transfer-Encoding: binary");
+		dos.writeBytes(lineEnd);
+		
 		dos.writeBytes(lineEnd);
 
 		AQUtility.copy(is, dos);

src/com/androidquery/util/Constants.java

@@ -19,7 +19,7 @@
 public interface Constants {
 
 
-	public static final String VERSION = "0.24.3";
+	public static final String VERSION = "0.25.1";
 
 	public static final int LAYER_TYPE_SOFTWARE = 1;
 	public static final int LAYER_TYPE_HARDWARE = 2;

tests/src/com/androidquery/test/AQueryXmlTest.java

@@ -31,6 +31,24 @@ public class AQueryXmlTest extends AbstractTest<AQueryTestActivity> {
 
 	private XmlDom xml;
 
+	private String url;
+	private Object result;
+	private AjaxStatus status;
+	
+	public void done(String url, Object result, AjaxStatus status){
+		
+		this.url = url;
+		this.result = result;
+		this.status = status;
+
+		log("done", result);
+		
+		assertTrue(AQUtility.isUIThread());
+		
+		done();
+		
+	}
+	
 	public AQueryXmlTest() throws SAXException {		
 		super(AQueryTestActivity.class);
 
@@ -170,4 +188,29 @@ public void testText3() throws Exception{
 
 	}
 
+	public void testMalformXml(){
+		
+		String url = "http://www.bbc.co.uk/nepali/index.xml";
+		
+		AjaxCallback<XmlDom> cb = new AjaxCallback<XmlDom>(){
+			@Override
+			public void callback(String url, XmlDom object, AjaxStatus status) {
+				done(url, object, status);
+			}
+		};
+		cb.url(url).type(XmlDom.class);
+			
+        aq.ajax(cb);
+        
+        waitAsync();
+        
+        XmlDom xml = (XmlDom) result;
+       
+        assertNotNull(xml);
+        
+        AQUtility.debug(xml);
+        
+		
+	}
+	
 }