CyanogenMod · koush · Jul 23, 2013 · Jul 16, 2013 · Jul 17, 2013 · Jul 18, 2013
diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="114"
-    android:versionName="1.1.4" >
+    android:versionCode="115"
+    android:versionName="1.1.5" >
 
     <uses-sdk
         android:minSdkVersion="8"

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncDatagramSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncDatagramSocket.java
@@ -1,10 +1,7 @@
 package com.koushikdutta.async;
 
-import android.util.Log;
-
 import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 
 public class AsyncDatagramSocket extends AsyncNetworkSocket {

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
@@ -1,6 +1,7 @@
 package com.koushikdutta.async;
 
 import android.util.Log;
+
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
@@ -350,4 +351,8 @@ public InetSocketAddress getRemoteAddress() {
     public int getLocalPort() {
         return mChannel.getLocalPort();
     }
+
+    public Object getSocket() {
+        return getChannel().getSocket();
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -1,19 +1,29 @@
 package com.koushikdutta.async;
 
 import android.os.Build;
+
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.wrapper.AsyncSocketWrapper;
+
 import org.apache.http.conn.ssl.StrictHostnameVerifier;
 
-import javax.net.ssl.*;
-import javax.net.ssl.SSLEngineResult.HandshakeStatus;
-import javax.net.ssl.SSLEngineResult.Status;
 import java.nio.ByteBuffer;
 import java.security.KeyStore;
 import java.security.cert.X509Certificate;
 
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLEngineResult;
+import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import javax.net.ssl.SSLEngineResult.Status;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+
 public class AsyncSSLSocketWrapper implements AsyncSocketWrapper, AsyncSSLSocket {
     AsyncSocket mSocket;
     BufferedDataEmitter mEmitter;

diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -329,6 +329,7 @@ public String readString() {
             builder.append(new String(bb.array(), bb.arrayOffset() + bb.position(), bb.remaining()));
             reclaim(bb);
         }
+        remaining = 0;
         return builder.toString();
     }
 

diff --git a/AndroidAsync/src/com/koushikdutta/async/ChannelWrapper.java b/AndroidAsync/src/com/koushikdutta/async/ChannelWrapper.java
@@ -47,4 +47,5 @@ public void close() throws IOException {
     }
 
     public abstract int getLocalPort();
+    public abstract Object getSocket();
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/DatagramChannelWrapper.java b/AndroidAsync/src/com/koushikdutta/async/DatagramChannelWrapper.java
@@ -1,10 +1,7 @@
 package com.koushikdutta.async;
 
-import android.util.Log;
-
 import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.DatagramChannel;
@@ -86,4 +83,9 @@ public long read(ByteBuffer[] byteBuffers) throws IOException {
     public long read(ByteBuffer[] byteBuffers, int i, int i2) throws IOException {
         return mChannel.read(byteBuffers, i, i2);
     }
+
+    @Override
+    public Object getSocket() {
+        return mChannel.socket();
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java b/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java
@@ -73,4 +73,9 @@ public long read(ByteBuffer[] byteBuffers, int i, int i2) throws IOException {
         assert false;
         throw new IOException(msg);
     }
+
+    @Override
+    public Object getSocket() {
+        return mChannel.socket();
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/SocketChannelWrapper.java b/AndroidAsync/src/com/koushikdutta/async/SocketChannelWrapper.java
@@ -67,4 +67,9 @@ public long read(ByteBuffer[] byteBuffers) throws IOException {
     public long read(ByteBuffer[] byteBuffers, int i, int i2) throws IOException {
         return mChannel.read(byteBuffers, i, i2);
     }
+
+    @Override
+    public Object getSocket() {
+        return mChannel.socket();
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/Util.java b/AndroidAsync/src/com/koushikdutta/async/Util.java
@@ -168,8 +168,7 @@ public static void writeAll(final DataSink sink, final ByteBufferList bb, final
         sink.setWriteableCallback(wc = new WritableCallback() {
             @Override
             public void onWriteable() {
-                if (bb.remaining() > 0)
-                    sink.write(bb);
+                sink.write(bb);
                 if (bb.remaining() == 0 && callback != null)
                     callback.onCompleted(null);
             }
@@ -183,13 +182,13 @@ public static void writeAll(DataSink sink, byte[] bytes, CompletedCallback callb
         writeAll(sink, bbl, callback);
     }
 
-    public static AsyncSocket getWrappedSocket(AsyncSocket socket, Class wrappedClass) {
+    public static <T extends AsyncSocket> T getWrappedSocket(AsyncSocket socket, Class<T> wrappedClass) {
         if (wrappedClass.isInstance(socket))
-            return socket;
+            return (T)socket;
         while (socket instanceof AsyncSocketWrapper) {
             socket = ((AsyncSocketWrapper)socket).getSocket();
             if (wrappedClass.isInstance(socket))
-                return socket;
+                return (T)socket;
         }
         return null;
     }

diff --git a/AndroidAsync/src/com/koushikdutta/async/future/Future.java b/AndroidAsync/src/com/koushikdutta/async/future/Future.java
@@ -8,4 +8,5 @@ public interface Future<T> extends Cancellable, java.util.concurrent.Future<T> {
      * @return
      */
     public Future<T> setCallback(FutureCallback<T> callback);
+    public <C extends TransformFuture<?, T>> C then(C callback);
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -151,6 +151,13 @@ public SimpleFuture<T> setCallback(FutureCallback<T> callback) {
         return this;
     }
 
+    @Override
+    public <C extends TransformFuture<?, T>> C then(C callback) {
+        callback.setParent(this);
+        setCallback(callback);
+        return callback;
+    }
+
     @Override
     public SimpleFuture<T> setParent(Cancellable parent) {
         super.setParent(parent);

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java
@@ -635,7 +635,7 @@ public void onConnectCompleted(Exception ex, AsyncHttpResponse response) {
 
     public Future<WebSocket> websocket(String uri, String protocol, final WebSocketConnectCallback callback) {
         assert callback != null;
-        final AsyncHttpGet get = new AsyncHttpGet(uri);
+        final AsyncHttpGet get = new AsyncHttpGet(uri.replace("ws://", "http://").replace("wss://", "https://"));
         return websocket(get, protocol, callback);
     }
 

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
@@ -34,7 +34,7 @@ public String getMethod() {
 
             @Override
             public String toString() {
-                String path = AsyncHttpRequest.this.getUri().getPath();
+                String path = AsyncHttpRequest.this.getUri().getRawPath();
                 if (path.length() == 0)
                     path = "/";
                 String query = AsyncHttpRequest.this.getUri().getRawQuery();

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java
@@ -251,6 +251,7 @@ public AsyncServer getServer() {
     }
 
     public static class CacheData implements Parcelable {
+        DiskLruCache.Snapshot snapshot;
         CacheResponse candidate;
         long contentLength;
         ResponseHeaders cachedResponseHeaders;
@@ -278,7 +279,7 @@ public Cancellable getSocket(final GetSocketData data) {
         }
 
         String key = uriToKey(data.request.getUri());
-        DiskLruCache.Snapshot snapshot;
+        DiskLruCache.Snapshot snapshot = null;
         Entry entry;
         try {
             snapshot = cache.get(key);
@@ -299,7 +300,7 @@ public Cancellable getSocket(final GetSocketData data) {
             snapshot.close();
             return null;
         }
-        
+
         CacheResponse candidate = entry.isHttps() ? new EntrySecureCacheResponse(entry, snapshot) : new EntryCacheResponse(entry, snapshot);
 
         Map<String, List<String>> responseHeadersMap;
@@ -310,6 +311,7 @@ public Cancellable getSocket(final GetSocketData data) {
         }
         catch (Exception e) {
             networkCount++;
+            snapshot.close();
             return null;
         }
         if (responseHeadersMap == null || cachedResponseBody == null) {
@@ -319,6 +321,7 @@ public Cancellable getSocket(final GetSocketData data) {
             catch (Exception e) {
             }
             networkCount++;
+            snapshot.close();
             return null;
         }
 
@@ -351,6 +354,7 @@ public void run() {
         else if (responseSource == ResponseSource.CONDITIONAL_CACHE) {
             data.request.logi("Response may be served from conditional cache");
             CacheData cacheData = new CacheData();
+            cacheData.snapshot = snapshot;
             cacheData.contentLength = contentLength;
             cacheData.cachedResponseHeaders = cachedResponseHeaders;
             cacheData.candidate = candidate;
@@ -367,6 +371,7 @@ else if (responseSource == ResponseSource.CONDITIONAL_CACHE) {
             catch (Exception e) {
             }
             networkCount++;
+            snapshot.close();
             return null;
         }
     }
@@ -567,9 +572,10 @@ public void onBodyDecoder(OnBodyData data) {
                 bodySpewer.spew();
                 return;
             }
-            
+
             // did not validate, so fall through and cache the response
             data.state.remove("cache-data");
+            cacheData.snapshot.close();
         }
 
         if (!caching)
@@ -623,17 +629,24 @@ public void onBodyDecoder(OnBodyData data) {
 
     @Override
     public void onRequestComplete(OnRequestCompleteData data) {
-        BodyCacher cacher = data.state.getParcelable("body-cacher");
-        if (cacher == null)
-            return;
+        CacheData cacheData = data.state.getParcelable("cache-data");
+        if (cacheData != null && cacheData.snapshot != null)
+            cacheData.snapshot.close();
 
-        try {
-            if (data.exception != null)
-                cacher.abort();
-            else
-                cacher.commit();
-        }
-        catch (Exception e) {
+        CachedSocket cachedSocket = Util.getWrappedSocket(data.socket, CachedSocket.class);
+        if (cachedSocket != null)
+            ((SnapshotCacheResponse)cachedSocket.cacheResponse).getSnapshot().close();
+
+        BodyCacher cacher = data.state.getParcelable("body-cacher");
+        if (cacher != null) {
+            try {
+                if (data.exception != null)
+                    cacher.abort();
+                else
+                    cacher.commit();
+            }
+            catch (Exception e) {
+            }
         }
     }
 
@@ -901,11 +914,20 @@ private static InputStream newBodyInputStream(final DiskLruCache.Snapshot snapsh
         };
     }
 
-    static class EntryCacheResponse extends CacheResponse {
+    static interface SnapshotCacheResponse {
+        public DiskLruCache.Snapshot getSnapshot();
+    }
+
+    static class EntryCacheResponse extends CacheResponse implements SnapshotCacheResponse {
         private final Entry entry;
         private final DiskLruCache.Snapshot snapshot;
         private final InputStream in;
 
+        @Override
+        public DiskLruCache.Snapshot getSnapshot() {
+            return snapshot;
+        }
+
         public EntryCacheResponse(Entry entry, DiskLruCache.Snapshot snapshot) {
             this.entry = entry;
             this.snapshot = snapshot;
@@ -921,11 +943,17 @@ public EntryCacheResponse(Entry entry, DiskLruCache.Snapshot snapshot) {
         }
     }
 
-    static class EntrySecureCacheResponse extends SecureCacheResponse {
+    static class EntrySecureCacheResponse extends SecureCacheResponse implements SnapshotCacheResponse {
         private final Entry entry;
         private final DiskLruCache.Snapshot snapshot;
         private final InputStream in;
 
+        @Override
+        public DiskLruCache.Snapshot getSnapshot() {
+            return snapshot;
+        }
+
+
         public EntrySecureCacheResponse(Entry entry, DiskLruCache.Snapshot snapshot) {
             this.entry = entry;
             this.snapshot = snapshot;
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,4 +47,5 @@ public void close() throws IOException { @@
         }
         public abstract int getLocalPort();
+        public abstract Object getSocket();
     }