expose socket object.

fix readString on ByteBufferList.

Change-Id: I07993c7354432d32b25de1e7b9c097c16ac99a4a

8 files changed, 35 insertions, 9 deletions

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncDatagramSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncDatagramSocket.java
index 0dd83be..8e6fd54 100644
--- 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
index 1b1c143..83998ac 100644
--- 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 class AsyncNetworkSocket implements AsyncSocket {
     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
index aa4ffd7..f09430f 100644
--- 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
index ad9e9b8..950e74f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -329,6 +329,7 @@ public class ByteBufferList {
             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
index 0cc4455..0fd5501 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ChannelWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ChannelWrapper.java
@@ -47,4 +47,5 @@ abstract class ChannelWrapper implements ReadableByteChannel, ScatteringByteChan
     }
     
     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
index 2478857..9d3c84c 100644
--- 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 @@ class DatagramChannelWrapper extends ChannelWrapper {
     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
index 3e9d975..d13bd71 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java
@@ -73,4 +73,9 @@ class ServerSocketChannelWrapper extends ChannelWrapper {
         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
index 3d599c7..73b1195 100644
--- a/AndroidAsync/src/com/koushikdutta/async/SocketChannelWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/SocketChannelWrapper.java
@@ -67,4 +67,9 @@ class SocketChannelWrapper extends ChannelWrapper {
     public long read(ByteBuffer[] byteBuffers, int i, int i2) throws IOException {
         return mChannel.read(byteBuffers, i, i2);
     }
+
+    @Override
+    public Object getSocket() {
+        return mChannel.socket();
+    }
 }