derp.

3 files changed, 21 insertions, 3 deletions

diff --git a/AndroidAsync/build.gradle b/AndroidAsync/build.gradle
index 38c3f67..81b428f 100644
--- a/AndroidAsync/build.gradle
+++ b/AndroidAsync/build.gradle
@@ -18,7 +18,7 @@ android {
         main {
             manifest.srcFile 'AndroidManifest.xml'
 
-            jniLibs.srcDirs = ['libs/']
+//            jniLibs.srcDirs = ['libs/']
 
             java.srcDirs=['src/'
 //                          , 'okhttp/'
diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index c036bdf..fe5b50d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -83,7 +83,25 @@ public class ByteBufferList {
     public boolean hasRemaining() {
         return remaining() > 0;
     }
-    
+
+    public short peekShort() {
+        return read(2).duplicate().getShort();
+    }
+
+    public int peekInt() {
+        return read(4).duplicate().getInt();
+    }
+
+    public long peekLong() {
+        return read(8).duplicate().getLong();
+    }
+
+    public byte[] peekBytes(int size) {
+        byte[] ret = new byte[size];
+        read(size).duplicate().get(ret);
+        return ret;
+    }
+
     public int getInt() {
         int ret = read(4).getInt();
         remaining -= 4;
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
index 397b625..89a611c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
@@ -20,7 +20,7 @@ public class StringParser implements AsyncParser<String> {
         .then(new TransformFuture<String, ByteBufferList>() {
             @Override
             protected void transform(ByteBufferList result) throws Exception {
-                setComplete(result.readString(Charset.forName(charset)));
+                setComplete(result.readString(charset != null ? Charset.forName(charset) : null));
             }
         });
     }