adding iv constructor to Pubnub class

yishai-glide · Jul 10, 2013 · 89b32c1 · 89b32c1
1 parent e672d5b
commit 89b32c1
Show file tree

Hide file tree

Showing 34 changed files with 122 additions and 39 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/android/src/com/pubnub/api/Pubnub.java b/android/src/com/pubnub/api/Pubnub.java
@@ -79,6 +79,29 @@ public Pubnub(String publish_key, String subscribe_key, String secret_key) {
         super(publish_key, subscribe_key, secret_key, "", false);
     }
 
+    /**
+    *
+    * Constructor for Pubnub Class
+    *
+    * @param publish_key
+    *            Publish Key
+    * @param subscribe_key
+    *            Subscribe Key
+    * @param secret_key
+    *            Secret Key
+    * @param cipher_key
+    *            Cipher Key
+    * @param ssl_on
+    *            SSL enabled ?
+    * @param initialization_vector
+    *            Initialization vector
+    */
+
+    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);
+    }
+
     /**
      * Sets value for UUID
      *

diff --git a/blackberry/Pubnub-BlackBerry-3.5.2.jar b/blackberry/Pubnub-BlackBerry-3.5.2.jar
diff --git a/blackberry/src/com/pubnub/api/Pubnub.java b/blackberry/src/com/pubnub/api/Pubnub.java
@@ -28,6 +28,11 @@ public Pubnub(String publish_key, String subscribe_key, String secret_key) {
         super(publish_key, subscribe_key, secret_key, "", false);
     }
 
+    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);
+    }
+
     /**
      * UUID
      *

diff --git a/codenameone/pubnub-codenameone-3.5.2.cn1lib b/codenameone/pubnub-codenameone-3.5.2.cn1lib
diff --git a/j2me/Pubnub-MicroEdition-3.5.2.jar b/j2me/Pubnub-MicroEdition-3.5.2.jar
diff --git a/j2me/examples/PubnubExample/src/com/pubnub/examples/me/PubnubMenu.java b/j2me/examples/PubnubExample/src/com/pubnub/examples/me/PubnubMenu.java
@@ -87,7 +87,7 @@ public Form getMenu() {
             menu.addCommand(exitCommand);
             authKeyConfigCommand = new Command("Set Auth Key", Command.ITEM, 0);
             menu.addCommand(authKeyConfigCommand);
-            
+
             menu.setCommandListener(new CommandListener() {
 
                 public void commandAction(Command command, Displayable displayable) {

diff --git a/j2me/src1/com/pubnub/api/SubscribeWorker.java b/j2me/src1/com/pubnub/api/SubscribeWorker.java
@@ -19,13 +19,13 @@ void process(HttpRequest hreq) {
         log.verbose("disconnectAndResubscribe is " + hreq.isDar());
         boolean sleep = false;
         while (!_die && currentRetryAttempt <= maxRetries) {
-        	if (sleep) {
+            if (sleep) {
                 try {
                     Thread.sleep(retryInterval);
                 } catch (InterruptedException e) {
                 }
                 sleep = true;
-        	}
+            }
             try {
                 log.debug(hreq.getUrl());
                 hresp = httpclient.fetch(hreq.getUrl(), hreq.getHeaders());

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 Tue Jul 09 22:43:09 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:07:00 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <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 Jul 09 22:43:09 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:07:00 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <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 Jul 09 22:43:08 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:58 IST 2013 -->
 <TITLE>
 Callback
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <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 Jul 09 22:43:08 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:58 IST 2013 -->
 <TITLE>
 HttpUtil
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <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 Jul 09 22:43:08 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:58 IST 2013 -->
 <TITLE>
 Pubnub
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
@@ -162,6 +162,17 @@ <H2>
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Pubnub Constructor</TD>
 </TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../com/pubnub/api/Pubnub.html#Pubnub(java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean, java.lang.String)">Pubnub</A></B>(java.lang.String&nbsp;publish_key,
+       java.lang.String&nbsp;subscribe_key,
+       java.lang.String&nbsp;secret_key,
+       java.lang.String&nbsp;cipher_key,
+       boolean&nbsp;ssl_on,
+       java.lang.String&nbsp;initialization_vector)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor for Pubnub Class</TD>
+</TR>
 </TABLE>
 &nbsp;
 <!-- ========== METHOD SUMMARY =========== -->
@@ -949,6 +960,23 @@ <H2>
 <DL>
 <DT><B>Parameters:</B><DD><CODE>publish_key</CODE> - <DD><CODE>subscribe_key</CODE> - <DD><CODE>secret_key</CODE> - </DL>
 </DL>
+<HR>
+
+<A NAME="Pubnub(java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean, java.lang.String)"><!-- --></A><H3>
+Pubnub</H3>
+<PRE>
+public <B>Pubnub</B>(java.lang.String&nbsp;publish_key,
+              java.lang.String&nbsp;subscribe_key,
+              java.lang.String&nbsp;secret_key,
+              java.lang.String&nbsp;cipher_key,
+              boolean&nbsp;ssl_on,
+              java.lang.String&nbsp;initialization_vector)</PRE>
+<DL>
+<DD>Constructor for Pubnub Class
+<P>
+<DL>
+<DT><B>Parameters:</B><DD><CODE>publish_key</CODE> - Publish Key<DD><CODE>subscribe_key</CODE> - Subscribe Key<DD><CODE>secret_key</CODE> - Secret Key<DD><CODE>cipher_key</CODE> - Cipher Key<DD><CODE>ssl_on</CODE> - SSL enabled ?<DD><CODE>initialization_vector</CODE> - Initialization vector</DL>
+</DL>
 
 <!-- ============ METHOD DETAIL ========== -->
 

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 Jul 09 22:43:09 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:59 IST 2013 -->
 <TITLE>
 PubnubError
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <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 Jul 09 22:43:09 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:59 IST 2013 -->
 <TITLE>
 PubnubException
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <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 Jul 09 22:43:09 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:59 IST 2013 -->
 <TITLE>
 PubnubUtil
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <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 Jul 09 22:43:09 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:59 IST 2013 -->
 <TITLE>
 com.pubnub.api
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <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 Jul 09 22:43:09 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:59 IST 2013 -->
 <TITLE>
 com.pubnub.api
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <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 Jul 09 22:43:09 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:59 IST 2013 -->
 <TITLE>
 com.pubnub.api Class Hierarchy
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <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 Jul 09 22:43:09 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:59 IST 2013 -->
 <TITLE>
 Constant Field Values
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <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 Jul 09 22:43:09 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:07:00 IST 2013 -->
 <TITLE>
 Deprecated List
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <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 Jul 09 22:43:09 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:07:00 IST 2013 -->
 <TITLE>
 API Help
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <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 Jul 09 22:43:09 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:07:00 IST 2013 -->
 <TITLE>
 Index
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="./stylesheet.css" TITLE="Style">
 
@@ -343,6 +343,9 @@
 <DT><A HREF="./com/pubnub/api/Pubnub.html#Pubnub(java.lang.String, java.lang.String, java.lang.String)"><B>Pubnub(String, String, String)</B></A> - 
 Constructor for class com.pubnub.api.<A HREF="./com/pubnub/api/Pubnub.html" title="class in com.pubnub.api">Pubnub</A>
 <DD>&nbsp;
+<DT><A HREF="./com/pubnub/api/Pubnub.html#Pubnub(java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean, java.lang.String)"><B>Pubnub(String, String, String, String, boolean, String)</B></A> - 
+Constructor for class com.pubnub.api.<A HREF="./com/pubnub/api/Pubnub.html" title="class in com.pubnub.api">Pubnub</A>
+<DD>Constructor for Pubnub Class
 <DT><A HREF="./com/pubnub/api/PubnubError.html" title="class in com.pubnub.api"><B>PubnubError</B></A> - Class in <A HREF="./com/pubnub/api/package-summary.html">com.pubnub.api</A><DD>PubnubError object is passed to errorCallback.<DT><A HREF="./com/pubnub/api/PubnubError.html#PubnubError(com.pubnub.api.PubnubError, java.lang.String)"><B>PubnubError(PubnubError, String)</B></A> - 
 Constructor for class com.pubnub.api.<A HREF="./com/pubnub/api/PubnubError.html" title="class in com.pubnub.api">PubnubError</A>
 <DD>&nbsp;

diff --git a/java/doc/index.html b/java/doc/index.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc on Tue Jul 09 22:43:09 IST 2013-->
+<!-- Generated by javadoc on Wed Jul 10 09:07:00 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 Jul 09 22:43:09 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:07:00 IST 2013 -->
 <TITLE>
 Class Hierarchy
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <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 Jul 09 22:43:09 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Wed Jul 10 09:06:59 IST 2013 -->
 <TITLE>
 Serialized Form
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-09">
+<META NAME="date" CONTENT="2013-07-10">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/jars/Pubnub-UnitTests-3.5.2.jar b/java/jars/Pubnub-UnitTests-3.5.2.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