fixing double quotes issue when sending/receiving string to/from js d…

…ev console
yishai-glide · Aug 23, 2013 · 79f571a · 79f571a
1 parent ef1b00c
commit 79f571a
Show file tree

Hide file tree

Showing 30 changed files with 57 additions and 39 deletions.
diff --git a/android/Pubnub-Android-3.5.4.jar b/android/Pubnub-Android-3.5.4.jar
diff --git a/android/examples/PubnubExample/libs/Pubnub-Android-3.5.4.jar b/android/examples/PubnubExample/libs/Pubnub-Android-3.5.4.jar
diff --git a/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.4.jar b/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.4.jar
diff --git a/blackberry/Pubnub-BlackBerry-3.5.4.jar b/blackberry/Pubnub-BlackBerry-3.5.4.jar
diff --git a/codenameone/pubnub-codenameone-3.5.4.cn1lib b/codenameone/pubnub-codenameone-3.5.4.cn1lib
diff --git a/j2me/Pubnub-MicroEdition-3.5.4.jar b/j2me/Pubnub-MicroEdition-3.5.4.jar
diff --git a/java/Pubnub-StandardEdition-3.5.4.jar b/java/Pubnub-StandardEdition-3.5.4.jar
diff --git a/java/doc/allclasses-frame.html b/java/doc/allclasses-frame.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:16 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:24 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/allclasses-noframe.html b/java/doc/allclasses-noframe.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:16 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:24 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/Callback.html b/java/doc/com/pubnub/api/Callback.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:14 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:23 IST 2013 -->
 <TITLE>
 Callback
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/HttpUtil.html b/java/doc/com/pubnub/api/HttpUtil.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:14 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:23 IST 2013 -->
 <TITLE>
 HttpUtil
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/Pubnub.html b/java/doc/com/pubnub/api/Pubnub.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:14 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:23 IST 2013 -->
 <TITLE>
 Pubnub
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/PubnubError.html b/java/doc/com/pubnub/api/PubnubError.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:15 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:24 IST 2013 -->
 <TITLE>
 PubnubError
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/PubnubException.html b/java/doc/com/pubnub/api/PubnubException.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:15 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:24 IST 2013 -->
 <TITLE>
 PubnubException
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/PubnubUtil.html b/java/doc/com/pubnub/api/PubnubUtil.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:15 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:24 IST 2013 -->
 <TITLE>
 PubnubUtil
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/package-frame.html b/java/doc/com/pubnub/api/package-frame.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:15 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:24 IST 2013 -->
 <TITLE>
 com.pubnub.api
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/package-summary.html b/java/doc/com/pubnub/api/package-summary.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:15 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:24 IST 2013 -->
 <TITLE>
 com.pubnub.api
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/package-tree.html b/java/doc/com/pubnub/api/package-tree.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:15 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:24 IST 2013 -->
 <TITLE>
 com.pubnub.api Class Hierarchy
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/constant-values.html b/java/doc/constant-values.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:15 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:24 IST 2013 -->
 <TITLE>
 Constant Field Values
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/deprecated-list.html b/java/doc/deprecated-list.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:16 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:24 IST 2013 -->
 <TITLE>
 Deprecated List
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/help-doc.html b/java/doc/help-doc.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:16 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:24 IST 2013 -->
 <TITLE>
 API Help
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/index-all.html b/java/doc/index-all.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:15 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:24 IST 2013 -->
 <TITLE>
 Index
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="./stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/index.html b/java/doc/index.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc on Tue Aug 20 15:34:16 IST 2013-->
+<!-- Generated by javadoc on Fri Aug 23 22:55:24 IST 2013-->
 <TITLE>
 Generated Documentation (Untitled)
 </TITLE>

diff --git a/java/doc/overview-tree.html b/java/doc/overview-tree.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:15 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:24 IST 2013 -->
 <TITLE>
 Class Hierarchy
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/serialized-form.html b/java/doc/serialized-form.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Tue Aug 20 15:34:15 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 22:55:24 IST 2013 -->
 <TITLE>
 Serialized Form
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-20">
+<META NAME="date" CONTENT="2013-08-23">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/jars/Pubnub-UnitTests-3.5.4.jar b/java/jars/Pubnub-UnitTests-3.5.4.jar
diff --git a/java/jars/PubnubDemoConsole.jar b/java/jars/PubnubDemoConsole.jar
diff --git a/java/jars/PubnubExample.jar b/java/jars/PubnubExample.jar
diff --git a/java/srcPubnubApi/com/pubnub/api/PubnubCore.java b/java/srcPubnubApi/com/pubnub/api/PubnubCore.java
@@ -512,6 +512,9 @@ public void publish(Hashtable args) {
             // Encrypt Message
             PubnubCrypto pc = new PubnubCrypto(this.CIPHER_KEY, this.IV);
             try {
+                if (message instanceof String) {
+                    msgStr = "\"" + msgStr + "\"";
+                }
                 msgStr = "\"" + pc.encrypt(msgStr) + "\"";
             } catch (DataLengthException e) {
                 callback.errorCallback(channel,
@@ -1342,7 +1345,7 @@ public void handleResponse(HttpRequest hreq, String response) {
                                         if (!isWorkerDead(hreq))  _channel.callback
                                             .successCallback(
                                                 _channel.name,
-                                                PubnubUtil.stringToJSON(message));
+                                                PubnubUtil.parseJSON(PubnubUtil.stringToJSON(message)));
                                     } catch (DataLengthException e) {
                                         if (!isWorkerDead(hreq)) _channel.callback
                                             .errorCallback(
@@ -1384,7 +1387,7 @@ public void handleResponse(HttpRequest hreq, String response) {
                                 } else {
                                     if (!isWorkerDead(hreq)) _channel.callback.successCallback(
                                             _channel.name,
-                                            messages.get(i));
+                                            PubnubUtil.parseJSON(messages.get(i)));
                                 }
                             }
                         }
@@ -1412,7 +1415,7 @@ public void handleResponse(HttpRequest hreq, String response) {
                                         if (!isWorkerDead(hreq)) _channel.callback
                                             .successCallback(
                                                 _channel.name,
-                                                PubnubUtil.stringToJSON(message));
+                                                PubnubUtil.parseJSON(PubnubUtil.stringToJSON(message)));
                                     } catch (DataLengthException e) {
                                         if (!isWorkerDead(hreq)) _channel.callback
                                             .errorCallback(
@@ -1452,7 +1455,7 @@ public void handleResponse(HttpRequest hreq, String response) {
                                 } else {
                                     if (!isWorkerDead(hreq)) _channel.callback.successCallback(
                                             _channel.name,
-                                            messages.get(i));
+                                            PubnubUtil.parseJSON(messages.get(i)));
                                 }
 
                             }

diff --git a/java/srcPubnubApi/com/pubnub/api/PubnubUtilCore.java b/java/srcPubnubApi/com/pubnub/api/PubnubUtilCore.java
@@ -189,4 +189,19 @@ static Hashtable hashtableMerge(Hashtable dst, Hashtable src) {
         }
         return dst;
     }
+    /**
+     * Parse Json, change json string to string
+     *
+     * @param obj
+     *            JSON data in string format
+     *
+     * @return JSONArray or JSONObject or String
+     */
+    static Object parseJSON(Object obj) {
+    	if (obj instanceof String) {
+    		if (((String) obj).endsWith("\"") && ((String) obj).startsWith("\""))
+    			obj = ((String) obj).substring(1, ((String) obj).length() -1);
+    	}
+        return obj;
+    }
 }