diff --git a/android/Pubnub-Android-3.5.2.jar b/android/Pubnub-Android-3.5.2.jar index 107db55d1..827abb471 100644 Binary files a/android/Pubnub-Android-3.5.2.jar and b/android/Pubnub-Android-3.5.2.jar differ diff --git a/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar b/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar index 107db55d1..827abb471 100644 Binary files a/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar and b/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar differ diff --git a/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar b/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar index 107db55d1..827abb471 100644 Binary files a/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar and b/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar differ diff --git a/android/src/com/pubnub/api/Pubnub.java b/android/src/com/pubnub/api/Pubnub.java index 4b1e0c69f..7a1edb50d 100644 --- 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 index 6a3e295a8..53c4256c6 100644 Binary files a/blackberry/Pubnub-BlackBerry-3.5.2.jar and b/blackberry/Pubnub-BlackBerry-3.5.2.jar differ diff --git a/blackberry/src/com/pubnub/api/Pubnub.java b/blackberry/src/com/pubnub/api/Pubnub.java index bc2728d32..d274bf3bb 100644 --- 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 index 4f02c5d92..af80c61e5 100644 Binary files a/codenameone/pubnub-codenameone-3.5.2.cn1lib and b/codenameone/pubnub-codenameone-3.5.2.cn1lib differ diff --git a/j2me/Pubnub-MicroEdition-3.5.2.jar b/j2me/Pubnub-MicroEdition-3.5.2.jar index fa85e00e6..0eb9c0b86 100644 Binary files a/j2me/Pubnub-MicroEdition-3.5.2.jar and b/j2me/Pubnub-MicroEdition-3.5.2.jar differ diff --git a/j2me/examples/PubnubExample/src/com/pubnub/examples/me/PubnubMenu.java b/j2me/examples/PubnubExample/src/com/pubnub/examples/me/PubnubMenu.java index 67941f087..cde87198e 100644 --- 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 index e8f360689..4139f75e7 100644 --- 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 index 668d86e21..2f5acc729 100644 Binary files a/java/Pubnub-StandardEdition-3.5.2.jar and b/java/Pubnub-StandardEdition-3.5.2.jar differ diff --git a/java/doc/allclasses-frame.html b/java/doc/allclasses-frame.html index 26f1af04b..568b478b1 100644 --- a/java/doc/allclasses-frame.html +++ b/java/doc/allclasses-frame.html @@ -2,12 +2,12 @@ - + All Classes - + diff --git a/java/doc/allclasses-noframe.html b/java/doc/allclasses-noframe.html index 296b6f09b..f1dc3d10c 100644 --- a/java/doc/allclasses-noframe.html +++ b/java/doc/allclasses-noframe.html @@ -2,12 +2,12 @@ - + All Classes - + diff --git a/java/doc/com/pubnub/api/Callback.html b/java/doc/com/pubnub/api/Callback.html index b17a0a7f6..0ebb2d76f 100644 --- a/java/doc/com/pubnub/api/Callback.html +++ b/java/doc/com/pubnub/api/Callback.html @@ -2,12 +2,12 @@ - + Callback - + diff --git a/java/doc/com/pubnub/api/HttpUtil.html b/java/doc/com/pubnub/api/HttpUtil.html index e443602fd..c4515e02a 100644 --- a/java/doc/com/pubnub/api/HttpUtil.html +++ b/java/doc/com/pubnub/api/HttpUtil.html @@ -2,12 +2,12 @@ - + HttpUtil - + diff --git a/java/doc/com/pubnub/api/Pubnub.html b/java/doc/com/pubnub/api/Pubnub.html index 9dcad43b3..6133cd411 100644 --- a/java/doc/com/pubnub/api/Pubnub.html +++ b/java/doc/com/pubnub/api/Pubnub.html @@ -2,12 +2,12 @@ - + Pubnub - + @@ -162,6 +162,17 @@


          Pubnub Constructor + +Pubnub(java.lang.String publish_key, + java.lang.String subscribe_key, + java.lang.String secret_key, + java.lang.String cipher_key, + boolean ssl_on, + java.lang.String initialization_vector) + +
+          Constructor for Pubnub Class +   @@ -949,6 +960,23 @@

Parameters:
publish_key -
subscribe_key -
secret_key -
+
+ +

+Pubnub

+
+public Pubnub(java.lang.String publish_key,
+              java.lang.String subscribe_key,
+              java.lang.String secret_key,
+              java.lang.String cipher_key,
+              boolean ssl_on,
+              java.lang.String initialization_vector)
+
+
Constructor for Pubnub Class +

+

+
Parameters:
publish_key - Publish Key
subscribe_key - Subscribe Key
secret_key - Secret Key
cipher_key - Cipher Key
ssl_on - SSL enabled ?
initialization_vector - Initialization vector
+
diff --git a/java/doc/com/pubnub/api/PubnubError.html b/java/doc/com/pubnub/api/PubnubError.html index 72e8d46f2..59a8783c5 100644 --- a/java/doc/com/pubnub/api/PubnubError.html +++ b/java/doc/com/pubnub/api/PubnubError.html @@ -2,12 +2,12 @@ - + PubnubError - + diff --git a/java/doc/com/pubnub/api/PubnubException.html b/java/doc/com/pubnub/api/PubnubException.html index e75ca7fa3..f843cda60 100644 --- a/java/doc/com/pubnub/api/PubnubException.html +++ b/java/doc/com/pubnub/api/PubnubException.html @@ -2,12 +2,12 @@ - + PubnubException - + diff --git a/java/doc/com/pubnub/api/PubnubUtil.html b/java/doc/com/pubnub/api/PubnubUtil.html index 160753d1e..75586ff7c 100644 --- a/java/doc/com/pubnub/api/PubnubUtil.html +++ b/java/doc/com/pubnub/api/PubnubUtil.html @@ -2,12 +2,12 @@ - + PubnubUtil - + diff --git a/java/doc/com/pubnub/api/package-frame.html b/java/doc/com/pubnub/api/package-frame.html index cba2c6dc8..c7b9e270f 100644 --- a/java/doc/com/pubnub/api/package-frame.html +++ b/java/doc/com/pubnub/api/package-frame.html @@ -2,12 +2,12 @@ - + com.pubnub.api - + diff --git a/java/doc/com/pubnub/api/package-summary.html b/java/doc/com/pubnub/api/package-summary.html index abf312fd4..19f6e5552 100644 --- a/java/doc/com/pubnub/api/package-summary.html +++ b/java/doc/com/pubnub/api/package-summary.html @@ -2,12 +2,12 @@ - + com.pubnub.api - + diff --git a/java/doc/com/pubnub/api/package-tree.html b/java/doc/com/pubnub/api/package-tree.html index 8aa2baa69..c2130debd 100644 --- a/java/doc/com/pubnub/api/package-tree.html +++ b/java/doc/com/pubnub/api/package-tree.html @@ -2,12 +2,12 @@ - + com.pubnub.api Class Hierarchy - + diff --git a/java/doc/constant-values.html b/java/doc/constant-values.html index 8caeb16a9..f2f9af286 100644 --- a/java/doc/constant-values.html +++ b/java/doc/constant-values.html @@ -2,12 +2,12 @@ - + Constant Field Values - + diff --git a/java/doc/deprecated-list.html b/java/doc/deprecated-list.html index ac2f9277e..b8af3ef99 100644 --- a/java/doc/deprecated-list.html +++ b/java/doc/deprecated-list.html @@ -2,12 +2,12 @@ - + Deprecated List - + diff --git a/java/doc/help-doc.html b/java/doc/help-doc.html index 1fc60de3c..6eb3bb941 100644 --- a/java/doc/help-doc.html +++ b/java/doc/help-doc.html @@ -2,12 +2,12 @@ - + API Help - + diff --git a/java/doc/index-all.html b/java/doc/index-all.html index dbbc42dc9..2f93312f4 100644 --- a/java/doc/index-all.html +++ b/java/doc/index-all.html @@ -2,12 +2,12 @@ - + Index - + @@ -343,6 +343,9 @@
Pubnub(String, String, String) - Constructor for class com.pubnub.api.Pubnub
  +
Pubnub(String, String, String, String, boolean, String) - +Constructor for class com.pubnub.api.Pubnub +
Constructor for Pubnub Class
PubnubError - Class in com.pubnub.api
PubnubError object is passed to errorCallback.
PubnubError(PubnubError, String) - Constructor for class com.pubnub.api.PubnubError
  diff --git a/java/doc/index.html b/java/doc/index.html index e52f07b24..8301f9d74 100644 --- a/java/doc/index.html +++ b/java/doc/index.html @@ -2,7 +2,7 @@ - + Generated Documentation (Untitled) diff --git a/java/doc/overview-tree.html b/java/doc/overview-tree.html index 458966531..2fb4ad9da 100644 --- a/java/doc/overview-tree.html +++ b/java/doc/overview-tree.html @@ -2,12 +2,12 @@ - + Class Hierarchy - + diff --git a/java/doc/serialized-form.html b/java/doc/serialized-form.html index 28fde44c0..38d6e866e 100644 --- a/java/doc/serialized-form.html +++ b/java/doc/serialized-form.html @@ -2,12 +2,12 @@ - + Serialized Form - + diff --git a/java/jars/Pubnub-UnitTests-3.5.2.jar b/java/jars/Pubnub-UnitTests-3.5.2.jar index 96079bcd4..057272caa 100644 Binary files a/java/jars/Pubnub-UnitTests-3.5.2.jar and b/java/jars/Pubnub-UnitTests-3.5.2.jar differ diff --git a/java/jars/PubnubDemoConsole.jar b/java/jars/PubnubDemoConsole.jar index 9dd573fb6..cad755059 100644 Binary files a/java/jars/PubnubDemoConsole.jar and b/java/jars/PubnubDemoConsole.jar differ diff --git a/java/jars/PubnubExample.jar b/java/jars/PubnubExample.jar index 19a15c15d..5a415a37a 100644 Binary files a/java/jars/PubnubExample.jar and b/java/jars/PubnubExample.jar differ diff --git a/java/src/com/pubnub/api/Pubnub.java b/java/src/com/pubnub/api/Pubnub.java index 2b01ae4eb..e59fcec5f 100644 --- a/java/src/com/pubnub/api/Pubnub.java +++ b/java/src/com/pubnub/api/Pubnub.java @@ -95,6 +95,30 @@ 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/java/srcPubnubApi/com/pubnub/api/PubnubCore.java b/java/srcPubnubApi/com/pubnub/api/PubnubCore.java index b7fcfd078..f2a33caf0 100644 --- a/java/srcPubnubApi/com/pubnub/api/PubnubCore.java +++ b/java/srcPubnubApi/com/pubnub/api/PubnubCore.java @@ -218,7 +218,7 @@ public void setUUID(String uuid) { * Cipher Key * @param ssl_on * SSL enabled ? - * @param initializatoin_vector + * @param initialization_vector * Initialization vector */