Fix event ack

Change-Id: I4ea3f10d261b3422ec98400359be3a2a7b3a4ab5

Author: koush

AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java

@@ -293,10 +293,12 @@ public void onSelect(SocketIOClient client) {
         });
     }
 
-    private Acknowledge acknowledge(final String messageId) {
-        if (TextUtils.isEmpty(messageId))
+    private Acknowledge acknowledge(final String _messageId) {
+        if (TextUtils.isEmpty(_messageId))
             return null;
 
+        final String messageId = _messageId.replaceAll("\\+$", "");
+
         return new Acknowledge() {
             @Override
             public void acknowledge(JSONArray arguments) {

AndroidAsyncTest/src/com/koushikdutta/async/test/SocketIOTests.java

@@ -169,4 +169,32 @@ public void run() {
         assertTrue(disconnectTrigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
         assertTrue(reconnectTrigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
     }
+
+    public void testEventAck() throws Exception {
+        final TriggerFuture trigger = new TriggerFuture();
+        SocketIOClient client = SocketIOClient.connect(AsyncHttpClient.getDefaultInstance(), "http://192.168.1.2:3000/", null).get();
+
+        final JSONArray args = new JSONArray();
+        args.put("echo");
+
+        client.on("scoop", new EventCallback() {
+            @Override
+            public void onEvent(JSONArray argument, Acknowledge acknowledge) {
+                acknowledge.acknowledge(args);
+
+            }
+        });
+
+        client.on("ack", new EventCallback() {
+            @Override
+            public void onEvent(JSONArray argument, Acknowledge acknowledge) {
+
+                trigger.trigger(args.optString(0, null).equals("echo"));
+            }
+        });
+
+        client.emit("poop", args);
+
+        assertTrue(trigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
+    }
 }