adding constructor which takes initialization vector

yishai-glide · Jul 6, 2013 · b6d49f2 · b6d49f2
1 parent 0f6db83
commit b6d49f2
Show file tree

Hide file tree

Showing 34 changed files with 186 additions and 110 deletions.
diff --git a/android/Pubnub-Android-3.5.2.jar b/android/Pubnub-Android-3.5.2.jar
diff --git a/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar b/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar
diff --git a/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar b/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar
diff --git a/blackberry/Pubnub-BlackBerry-3.5.2.jar b/blackberry/Pubnub-BlackBerry-3.5.2.jar
diff --git a/j2me/Pubnub-MicroEdition-3.5.2.jar b/j2me/Pubnub-MicroEdition-3.5.2.jar
diff --git a/j2me/src/com/pubnub/api/Pubnub.java b/j2me/src/com/pubnub/api/Pubnub.java
@@ -1,7 +1,7 @@
 package com.pubnub.api;
 
 import org.bouncycastle.util.SecureRandom;
-
+import org.json.me.*;
 
 public class Pubnub extends PubnubCore {
 
@@ -10,12 +10,16 @@ public Pubnub(String publish_key, String subscribe_key, String secret_key,
         super(publish_key, subscribe_key, secret_key, cipher_key, ssl_on);
     }
 
+    public Pubnub(String publish_key, String subscribe_key, String secret_key,
+                  String cipher_key, boolean ssl_on, String initialization_vector) {
+        super(publish_key, subscribe_key, secret_key, cipher_key, ssl_on, initialization_vector);
+    }
+
     public Pubnub(String publish_key, String subscribe_key, String secret_key,
                   boolean ssl_on) {
         super(publish_key, subscribe_key, secret_key, "", ssl_on);
     }
 
-
     public Pubnub(String publish_key, String subscribe_key) {
         super(publish_key, subscribe_key, "", "", false);
     }

diff --git a/j2me/src1/com/pubnub/api/PubnubCrypto.java b/j2me/src1/com/pubnub/api/PubnubCrypto.java
@@ -11,6 +11,10 @@ public PubnubCrypto(String CIPHER_KEY) {
         super(CIPHER_KEY);
     }
 
+    public PubnubCrypto(String CIPHER_KEY, String IV) {
+        super(CIPHER_KEY, IV);
+    }
+
     /**
      * Sign Message
      *

diff --git a/j2me/src1/com/pubnub/api/PubnubUtil.java b/j2me/src1/com/pubnub/api/PubnubUtil.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
+import org.json.me.*;
 
 public class PubnubUtil extends PubnubUtilCore {
 
@@ -122,5 +123,25 @@ public static boolean dontNeedEncoding(int ch) {
 
         return en;
     }
+
+    /**
+     * Convert input String to JSONObject, JSONArray, or String
+     *
+     * @param str
+     *            JSON data in string format
+     *
+     * @return JSONArray or JSONObject or String
+     */
+    static Object stringToJSON(String str) {
+        try {
+            return new JSONArray(str);
+        } catch (JSONException e) {
+        }
+        try {
+            return new JSONObject(str);
+        } catch (JSONException ex) {
+        }
+        return str;
+    }
     private static String _dontNeedEncoding = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ -_.*";
 }
diff --git a/java/Pubnub-StandardEdition-3.5.2.jar b/java/Pubnub-StandardEdition-3.5.2.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 Fri Jul 05 09:15:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <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 Fri Jul 05 09:15:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <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 Fri Jul 05 09:15:33 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:17 IST 2013 -->
 <TITLE>
 Callback
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <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 Fri Jul 05 09:15:33 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:17 IST 2013 -->
 <TITLE>
 Pubnub
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <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 Fri Jul 05 09:15:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:18 IST 2013 -->
 <TITLE>
 PubnubError
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <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 Fri Jul 05 09:15:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:19 IST 2013 -->
 <TITLE>
 PubnubException
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <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 Fri Jul 05 09:15:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:19 IST 2013 -->
 <TITLE>
 PubnubUtil
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <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 Fri Jul 05 09:15:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:19 IST 2013 -->
 <TITLE>
 com.pubnub.api
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <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 Fri Jul 05 09:15:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:19 IST 2013 -->
 <TITLE>
 com.pubnub.api
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <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 Fri Jul 05 09:15:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
 <TITLE>
 com.pubnub.api Class Hierarchy
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <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 Fri Jul 05 09:15:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
 <TITLE>
 Constant Field Values
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <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 Fri Jul 05 09:15:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
 <TITLE>
 Deprecated List
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <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 Fri Jul 05 09:15:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
 <TITLE>
 API Help
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <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 Fri Jul 05 09:15:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
 <TITLE>
 Index
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <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 Fri Jul 05 09:15:34 IST 2013-->
+<!-- Generated by javadoc on Sun Jul 07 00:29:20 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 Fri Jul 05 09:15:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
 <TITLE>
 Class Hierarchy
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <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 Fri Jul 05 09:15:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
 <TITLE>
 Serialized Form
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">