Merge branch 'hotfix'

Author: knowledgecode

CHANGELOG.md

@@ -1,4 +1,9 @@
 ## Change Log
+#### 0.11.1
+* fixed the bug that was not be done unescape when sending a message (thanks to @shilder)  
+* fixed the bug that became unable to send a message when was created an instance many times  
+* temporarily disabled `AndroidLogger`  
+
 #### 0.11.0
 * permessage-deflate support  
 * deleted unused code (further shrank about 20%)  

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-websocket",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Cordova WebSocket Plugin for Android",
   "cordova": {
     "id": "cordova-plugin-websocket",

plugin.xml

@@ -3,7 +3,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="cordova-plugin-websocket"
-  version="0.11.0">
+  version="0.11.1">
   <name>WebSocket for Android</name>
   <description>Cordova WebSocket Plugin for Android</description>
   <license>Apache 2.0</license>

src/android/com/knowledgecode/cordova/websocket/ConnectionTask.java

@@ -95,7 +95,7 @@ public void execute(String rawArgs, CallbackContext ctx) {
             WebSocketClient client = _factory.newWebSocketClient();
 
             JSONArray args = new JSONArray(rawArgs);
-            int id = Integer.parseInt(args.getString(0), 16);
+            int id = args.getInt(0);
             URI uri = new URI(args.getString(1));
             String protocol = args.getString(2);
             JSONObject options = args.getJSONObject(5);

src/android/com/knowledgecode/cordova/websocket/SendingTask.java

@@ -22,6 +22,7 @@
 import org.apache.cordova.PluginResult;
 import org.apache.cordova.PluginResult.Status;
 import org.eclipse.jetty.websocket.WebSocket.Connection;
+import org.json.JSONArray;
 
 import com.knowledgecode.cordova.websocket.TaskRunner.Task;
 
@@ -47,16 +48,17 @@ public SendingTask(SparseArray<Connection> map) {
     @Override
     public void execute(String rawArgs, CallbackContext ctx) {
         try {
-            Connection conn = _map.get(Integer.parseInt(rawArgs.substring(2, 10), 16));
+            String args = new JSONArray(rawArgs).getString(0);
+            Connection conn = _map.get(Integer.parseInt(args.substring(0, 8), 16));
 
             if (conn != null) {
-                if (rawArgs.charAt(10) == '1') {
-                    byte[] binary = Base64.decode(rawArgs.substring(rawArgs.indexOf(',') + 1, rawArgs.length() - 2),
-                            Base64.NO_WRAP);
+                if (args.charAt(8) == '1') {
+                    byte[] binary = Base64.decode(args.substring(args.indexOf(',') + 1), Base64.NO_WRAP);
                     conn.sendMessage(binary, 0, binary.length);
                 } else {
-                    conn.sendMessage(rawArgs.substring(11, rawArgs.length() - 2));
+                    conn.sendMessage(args.substring(9));
                 }
+            } else {
             }
         } catch (Exception e) {
             if (!ctx.isFinished()) {

src/android/com/knowledgecode/cordova/websocket/WebSocket.java

@@ -36,7 +36,7 @@
  * This plugin is using Jetty under the terms of the Apache License v2.0.
  *
  * @author KNOWLEDGECODE <knowledgecode@gmail.com>
- * @version 0.11.0
+ * @version 0.11.1
  */
 public class WebSocket extends CordovaPlugin {
 

src/android/org/eclipse/jetty/util/log/Log.java

@@ -104,29 +104,6 @@ public void ignore(Throwable ignored)
         }
     };
 
-    static
-    {
-        ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        try
-        {
-            @SuppressWarnings("unchecked")
-            Class<Logger> clazz = (Class<Logger>) loader.loadClass("org.eclipse.jetty.util.log.AndroidLogger");
-            LOG = clazz.newInstance();
-        }
-        catch (ClassNotFoundException e)
-        {
-        }
-        catch (IllegalAccessException e)
-        {
-        }
-        catch (IllegalArgumentException e)
-        {
-        }
-        catch (InstantiationException e)
-        {
-        }
-    }
-
     /**
      * Obtain a named Logger based on the fully qualified class name.
      *

www/websocket.js

@@ -19,7 +19,7 @@
 /**
  * Cordova WebSocket Plugin for Android
  * @author KNOWLEDGECODE <knowledgecode@gmail.com>
- * @version 0.11.0
+ * @version 0.11.1
  */
 (function (window) {
     'use strict';