fix for java decryption when the encryption for javascript

Devendra · Devendra · commit ee5f8bc12a6e · 2014-11-13T06:01:18.000+05:30
diff --git a/android/Pubnub-Android-3.7.0.jar b/android/Pubnub-Android-3.7.0.jar
diff --git a/android/examples/PubnubExample/libs/Pubnub-Android-3.7.0.jar b/android/examples/PubnubExample/libs/Pubnub-Android-3.7.0.jar
diff --git a/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.7.0.jar b/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.7.0.jar
diff --git a/blackberry/Pubnub-BlackBerry-3.7.0.jar b/blackberry/Pubnub-BlackBerry-3.7.0.jar
diff --git a/codenameone/Pubnub-CodeNameOne-3.7.0.cn1lib b/codenameone/Pubnub-CodeNameOne-3.7.0.cn1lib
diff --git a/j2me/Pubnub-MicroEdition-3.7.0.jar b/j2me/Pubnub-MicroEdition-3.7.0.jar
diff --git a/java/Pubnub-StandardEdition-3.7.0.jar b/java/Pubnub-StandardEdition-3.7.0.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 Wed Oct 22 09:02:17 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:30 IST 2014 -->
 <TITLE>
 All Classes
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:17 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:30 IST 2014 -->
 <TITLE>
 All Classes
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:14 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:26 IST 2014 -->
 <TITLE>
 Callback
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
diff --git a/java/doc/com/pubnub/api/ChannelGroup.html b/java/doc/com/pubnub/api/ChannelGroup.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Wed Oct 22 09:02:14 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:27 IST 2014 -->
 <TITLE>
 ChannelGroup
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:14 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:27 IST 2014 -->
 <TITLE>
 HttpUtil
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
diff --git a/java/doc/com/pubnub/api/PnApnsMessage.html b/java/doc/com/pubnub/api/PnApnsMessage.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Wed Oct 22 09:02:14 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:27 IST 2014 -->
 <TITLE>
 PnApnsMessage
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
diff --git a/java/doc/com/pubnub/api/PnGcmMessage.html b/java/doc/com/pubnub/api/PnGcmMessage.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Wed Oct 22 09:02:15 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:27 IST 2014 -->
 <TITLE>
 PnGcmMessage
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
diff --git a/java/doc/com/pubnub/api/PnMessage.html b/java/doc/com/pubnub/api/PnMessage.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Wed Oct 22 09:02:15 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:27 IST 2014 -->
 <TITLE>
 PnMessage
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:15 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:27 IST 2014 -->
 <TITLE>
 Pubnub
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
diff --git a/java/doc/com/pubnub/api/PubnubCrypto.html b/java/doc/com/pubnub/api/PubnubCrypto.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Wed Oct 22 09:02:16 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:29 IST 2014 -->
 <TITLE>
 PubnubCrypto
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:16 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:29 IST 2014 -->
 <TITLE>
 PubnubError
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:16 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:29 IST 2014 -->
 <TITLE>
 PubnubException
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:16 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:29 IST 2014 -->
 <TITLE>
 PubnubUtil
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
diff --git a/java/doc/com/pubnub/api/TimedTaskManager.html b/java/doc/com/pubnub/api/TimedTaskManager.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Wed Oct 22 09:02:16 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:30 IST 2014 -->
 <TITLE>
 TimedTaskManager
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:16 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:30 IST 2014 -->
 <TITLE>
 com.pubnub.api
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:16 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:30 IST 2014 -->
 <TITLE>
 com.pubnub.api
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:16 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:30 IST 2014 -->
 <TITLE>
 com.pubnub.api Class Hierarchy
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:16 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:30 IST 2014 -->
 <TITLE>
 Constant Field Values
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:17 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:30 IST 2014 -->
 <TITLE>
 Deprecated List
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:17 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:30 IST 2014 -->
 <TITLE>
 API Help
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:17 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:30 IST 2014 -->
 <TITLE>
 Index
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:17 IST 2014-->
+<!-- Generated by javadoc on Thu Nov 13 06:00:30 IST 2014-->
 <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 Wed Oct 22 09:02:17 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:30 IST 2014 -->
 <TITLE>
 Class Hierarchy
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <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 Wed Oct 22 09:02:16 IST 2014 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Nov 13 06:00:30 IST 2014 -->
 <TITLE>
 Serialized Form
 </TITLE>
 
-<META NAME="date" CONTENT="2014-10-22">
+<META NAME="date" CONTENT="2014-11-13">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
diff --git a/java/jars/Pubnub-UnitTests-3.7.0.jar b/java/jars/Pubnub-UnitTests-3.7.0.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/jars/PubnubPresenceTest.jar b/java/jars/PubnubPresenceTest.jar
diff --git a/java/jars/PubnubPushTest.jar b/java/jars/PubnubPushTest.jar
diff --git a/java/srcPubnubApi/com/pubnub/api/Base64Encoder.java b/java/srcPubnubApi/com/pubnub/api/Base64Encoder.java
@@ -87,6 +87,18 @@ public static char[] encode(byte[] in, int iLen) {
         return out;
     }
 
+    private static String removeNewLine(String s) {
+    	char[] sa 	= new char[s.length()];
+    	int j 		= 0;
+    	
+    	for (int i = 0; i < s.length(); i++) {
+    		if (s.charAt(i) != '\n' && s.charAt(i) != ' ') {
+    			sa[j++] = s.charAt(i); 
+    		}
+    	}
+    	return new String(sa).trim();
+    }
+    
     /**
      * Decodes a string from Base64 format.
      *
@@ -110,7 +122,7 @@ public static String decodeString(String s) {
      *             if the input is not valid Base64 encoded data.
      */
     public static byte[] decode(String s) {
-        return decode(s.replace(" ",  "").replace("\n", "").toCharArray());
+        return decode(removeNewLine(s).toCharArray());
     }
 
     /**
