Merge branch 'master' of ssh://github.com/koush/AndroidAsync

Author: Koushik Dutta

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: koush
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

AndroidAsync/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="308"
-    android:versionName="3.0.9">
+    android:versionCode="310"
+    android:versionName="3.1.0">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

AndroidAsync/build.gradle

@@ -50,6 +50,4 @@ android {
     }
 }
 
-if (false && System.getenv().I_AM_KOUSH == 'true') {
-  apply from: 'https://raw.githubusercontent.com/koush/mvn-repo/master/maven.gradle'
-}
+apply from: 'maven.gradle'

AndroidAsync/maven.gradle

@@ -0,0 +1,119 @@
+// Setup
+
+// 0) Setup your sonatype credentials by editing/creating ~/.gradle/gradle.properties and enter:
+// signing.keyId=<HEXADECIMCAL KEY ID RETRIVABLE VIA gpg --list-keys>
+// signing.password=<KEY PASSWORD>
+// signing.secretKeyRingFile=<PATH TO KEY RING, USUALLY ~/.gnupg/secring.gpg>
+// sonatypeUsername=<SONATYPE USERNAME OR WHATEVER YOU USE>
+// sonatypePassword=<CORRESPONDING PASSWORD>
+
+// 1) Setup your build.gradle for your android project and add this one line of code which imports this gist:
+// apply from: 'https://raw.github.com/koush/mvn-repo/master/maven.gradle'
+
+// 2) gradle clean && gradle build && gradle uploadArchives
+
+// 3) That's it!
+
+
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+
+afterEvaluate { project ->
+  String user = null
+  String repo = null
+  'git remote -v'.execute(null, project.projectDir).getText().find('.*[email protected]/(.*?)/(.*?) .*?') {
+      match ->
+          user = match[1]
+          repo = match[2]
+  }
+
+  String githubUrl = 'https://api.github.com/repos/' + user + '/' + repo;
+  if (System.getenv().GITHUB_TOKEN)
+    githubUrl += '?access_token=' + System.getenv().GITHUB_TOKEN
+  def repoInfo = new groovy.json.JsonSlurper().parseText(new URL(githubUrl).getText())
+
+  def android_manifest
+  try {
+      android_manifest = new XmlParser(false, false).parseText(new File(project.projectDir, 'AndroidManifest.xml').getText())
+  }
+  catch (e) {
+      android_manifest = new XmlParser(false, false).parseText(new File(project.projectDir, 'src/main/AndroidManifest.xml').getText())
+  }  
+  def versionName = android_manifest.'@android:versionName'
+  def package_name = android_manifest.'@package'
+  def artifact_id = project.projectDir.getName().toLowerCase()
+  project.version = versionName
+  project.group = package_name
+
+  uploadArchives {
+      repositories {
+          mavenDeployer {
+
+              beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+              pom.groupId = package_name
+              pom.artifactId = artifact_id
+              pom.version = versionName
+
+              repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+                authentication(userName: sonatypeUsername, password: sonatypePassword)
+              }
+
+              pom.project {
+                 name repo
+                 packaging 'jar'
+                 description repoInfo.description
+                 url repoInfo.html_url
+
+                 scm {
+                     url repoInfo.git_url
+                     connection repoInfo.git_url
+                     developerConnection repoInfo.ssh_url
+                 }
+
+                 licenses {
+                     license {
+                         name 'The Apache Software License, Version 2.0'
+                         url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                         distribution 'repo'
+                     }
+                 }
+
+                 developers {
+                     developer {
+                         id user
+                         name user
+                     }
+                 }
+             }
+          }
+      }
+  }
+
+  signing {
+      sign configurations.archives
+  }
+
+  task androidJavadocs(type: Javadoc) {
+     source = android.sourceSets.main.java.srcDirs
+  }
+
+  task androidJavadocsJar(type: Jar) {
+    classifier = 'javadoc'
+    baseName = artifact_id
+    from androidJavadocs.destinationDir
+  }
+
+  task androidSourcesJar(type: Jar) {
+    classifier = 'sources'
+    baseName = artifact_id
+    from android.sourceSets.main.java.srcDirs 
+  } 
+
+  artifacts {
+    // archives packageReleaseJar
+    archives androidSourcesJar
+    archives androidJavadocsJar
+  }
+}
+

AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java

@@ -49,7 +49,6 @@ ChannelWrapper getChannel() {
     }
 
     public void onDataWritable() {
-//        assert mWriteableHandler != null;
         if (!mChannel.isChunked()) {
             // turn write off
             mKey.interestOps(~SelectionKey.OP_WRITE & mKey.interestOps());
@@ -79,7 +78,6 @@ public void run() {
             return;
         }
         if (!mChannel.isConnected()) {
-            assert !mChannel.isChunked();
             return;
         }
 
@@ -103,7 +101,6 @@ private void handleRemaining(int remaining) throws IOException {
             throw new IOException(new CancelledKeyException());
         if (remaining > 0) {
             // chunked channels should not fail
-            assert !mChannel.isChunked();
             // register for a write notification if a write fails
             // turn write on
             mKey.interestOps(SelectionKey.OP_WRITE | mKey.interestOps());

AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java

@@ -471,7 +471,6 @@ public void write(ByteBufferList bb) {
                 bb.addAll(arr);
                 writeBuf.flip();
                 writeList.add(writeBuf);
-                assert !writeList.hasRemaining();
                 if (writeList.remaining() > 0)
                     mSink.write(writeList);
                 int previousCapacity = writeBuf.capacity();

AndroidAsync/src/com/koushikdutta/async/AsyncServer.java

@@ -396,7 +396,6 @@ public Cancellable connectResolvedInetSocketAddress(final InetSocketAddress addr
 
     public ConnectFuture connectResolvedInetSocketAddress(final InetSocketAddress address, final ConnectCallback callback, final SocketCreateCallback createCallback) {
         final ConnectFuture cancel = new ConnectFuture();
-        assert !address.isUnresolved();
 
         post(new Runnable() {
             @Override

AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java

@@ -104,7 +104,6 @@ public int getMaxBuffer() {
     }
 
     public void setMaxBuffer(int maxBuffer) {
-        assert maxBuffer >= 0;
         mMaxBuffer = maxBuffer;
     }
 

AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java

@@ -166,7 +166,6 @@ public void get(byte[] bytes, int offset, int length) {
             offset += read;
             if (b.remaining() == 0) {
                 ByteBuffer removed = mBuffers.remove();
-                assert b == removed;
                 reclaim(b);
             }
         }
@@ -196,8 +195,6 @@ public void get(ByteBufferList into, int length) {
                 b.get(subset.array(), 0, need);
                 into.add(subset);
                 mBuffers.addFirst(b);
-                assert subset.capacity() >= need;
-                assert subset.position() == 0;
                 break;
             }
             else {
@@ -338,7 +335,6 @@ public void recycle() {
         while (mBuffers.size() > 0) {
             reclaim(mBuffers.remove());
         }
-        assert mBuffers.size() == 0;
         remaining = 0;
     }
 
@@ -465,14 +461,11 @@ public static void reclaim(ByteBuffer b) {
                 return;
             }
 
-            assert !reclaimedContains(b);
-
             b.position(0);
             b.limit(b.capacity());
             currentSize += b.capacity();
 
             r.add(b);
-            assert r.size() != 0 ^ currentSize == 0;
 
             maxItem = Math.max(maxItem, b.capacity());
         }
@@ -490,7 +483,6 @@ public static ByteBuffer obtain(int size) {
                         if (r.size() == 0)
                             maxItem = 0;
                         currentSize -= ret.capacity();
-                        assert r.size() != 0 ^ currentSize == 0;
                         if (ret.capacity() >= size) {
 //                            System.out.println("using " + ret.capacity());
                             return ret;
@@ -516,7 +508,6 @@ public static void obtainArray(ByteBuffer[] arr, int size) {
                 while (r.size() > 0 && total < size && index < arr.length - 1) {
                     ByteBuffer b = r.remove();
                     currentSize -= b.capacity();
-                    assert r.size() != 0 ^ currentSize == 0;
                     int needed = Math.min(size - total, b.capacity());
                     total += needed;
                     arr[index++] = b;

AndroidAsync/src/com/koushikdutta/async/DataEmitterReader.java

@@ -8,10 +8,8 @@ public class DataEmitterReader implements com.koushikdutta.async.callback.DataCa
     ByteBufferList mPendingData = new ByteBufferList();
 
     public void read(int count, DataCallback callback) {
-        assert mPendingRead == null;
         mPendingReadLength = count;
         mPendingRead = callback;
-        assert !mPendingData.hasRemaining();
         mPendingData.recycle();
     }
 
@@ -22,7 +20,6 @@ private boolean handlePendingData(DataEmitter emitter) {
         DataCallback pendingRead = mPendingRead;
         mPendingRead = null;
         pendingRead.onDataAvailable(emitter, mPendingData);
-        assert !mPendingData.hasRemaining();
 
         return true;
     }
@@ -32,7 +29,6 @@ public DataEmitterReader() {
     @Override
     public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
         // if we're registered for data, we must be waiting for a read
-        assert mPendingRead != null;
         do {
             int need = Math.min(bb.remaining(), mPendingReadLength - mPendingData.remaining());
             bb.get(mPendingData, need);

AndroidAsync/src/com/koushikdutta/async/LineEmitter.java

@@ -37,7 +37,6 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
         while (bb.remaining() > 0) {
             byte b = bb.get();
             if (b == '\n') {
-                assert mLineCallback != null;
                 buffer.flip();
                 data.add(buffer);
                 mLineCallback.onStringAvailable(data.readString(charset));

AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java

@@ -37,20 +37,17 @@ public int getLocalPort() {
     @Override
     public int read(ByteBuffer buffer) throws IOException {
         final String msg = "Can't read ServerSocketChannel";
-        assert false;
         throw new IOException(msg);
     }
 
     @Override
     public boolean isConnected() {
-        assert false;
         return false;
     }
 
     @Override
     public int write(ByteBuffer src) throws IOException {
         final String msg = "Can't write ServerSocketChannel";
-        assert false;
         throw new IOException(msg);
     }
 
@@ -62,21 +59,18 @@ public SelectionKey register(Selector sel) throws ClosedChannelException {
     @Override
     public int write(ByteBuffer[] src) throws IOException {
         final String msg = "Can't write ServerSocketChannel";
-        assert false;
         throw new IOException(msg);
     }
 
     @Override
     public long read(ByteBuffer[] byteBuffers) throws IOException {
         final String msg = "Can't read ServerSocketChannel";
-        assert false;
         throw new IOException(msg);
     }
 
     @Override
     public long read(ByteBuffer[] byteBuffers, int i, int i2) throws IOException {
         final String msg = "Can't read ServerSocketChannel";
-        assert false;
         throw new IOException(msg);
     }
 

AndroidAsync/src/com/koushikdutta/async/Util.java

@@ -36,7 +36,6 @@ public static void emitAllData(DataEmitter emitter, ByteBufferList list) {
                 list.recycle();
                 if (SUPRESS_DEBUG_EXCEPTIONS)
                     return;
-                assert false;
                 throw new RuntimeException("mDataHandler failed to consume data, yet remains the mDataHandler.");
             }
         }
@@ -50,7 +49,6 @@ public static void emitAllData(DataEmitter emitter, ByteBufferList list) {
             list.recycle();
             if (SUPRESS_DEBUG_EXCEPTIONS)
                 return;
-//            assert false;
 //            throw new AssertionError("Not all data was consumed by Util.emitAllData");
         }
     }

AndroidAsync/src/com/koushikdutta/async/future/Continuation.java

@@ -56,7 +56,6 @@ public void onCompleted(Exception ex) {
                 if (mThisCompleted)
                     return;
                 mThisCompleted = true;
-                assert waiting;
                 waiting = false;
                 if (ex == null) {
                     next();

AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java

@@ -153,7 +153,6 @@ public boolean cancel() {
     }
 
     private void reportConnectedCompleted(FutureAsyncHttpResponse cancel, Exception ex, AsyncHttpResponseImpl response, AsyncHttpRequest request, final HttpConnectCallback callback) {
-        assert callback != null;
         cancel.scheduled.cancel();
         boolean complete;
         if (ex != null) {
@@ -166,7 +165,6 @@ private void reportConnectedCompleted(FutureAsyncHttpResponse cancel, Exception
         }
         if (complete) {
             callback.onConnectCompleted(ex, response);
-            assert ex != null || response.socket() == null || response.getDataCallback() != null || response.isPaused();
             return;
         }
 
@@ -204,7 +202,6 @@ private static void copyHeader(AsyncHttpRequest from, AsyncHttpRequest to, Strin
     }
 
     private void executeAffinity(final AsyncHttpRequest request, final int redirectCount, final FutureAsyncHttpResponse cancel, final HttpConnectCallback callback) {
-        assert mServer.isAffinityThread();
         if (redirectCount > 15) {
             reportConnectedCompleted(cancel, new RedirectLimitExceededException("too many redirects"), null, request, callback);
             return;
@@ -704,13 +701,11 @@ public Future<WebSocket> websocket(final AsyncHttpRequest req, String[] protocol
     }
 
     public Future<WebSocket> websocket(String uri, String protocol, final WebSocketConnectCallback callback) {
-//        assert callback != null;
         final AsyncHttpGet get = new AsyncHttpGet(uri.replace("ws://", "http://").replace("wss://", "https://"));
         return websocket(get, protocol, callback);
     }
 
     public Future<WebSocket> websocket(String uri, String[] protocols, final WebSocketConnectCallback callback) {
-//        assert callback != null;
         final AsyncHttpGet get = new AsyncHttpGet(uri.replace("ws://", "http://").replace("wss://", "https://"));
         return websocket(get, protocols, callback);
     }