java.lang.StringgetUUID()
+
+ voidhereNow(java.lang.String channel,
Callback callback)
@@ -1803,6 +1811,21 @@ +public java.lang.String getUUID()+
+
diff --git a/java/doc/com/pubnub/api/PubnubError.html b/java/doc/com/pubnub/api/PubnubError.html index 9f8af82bb..2b44d939a 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 f37047a1f..d88222bac 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 3fbd44b16..2cd864be0 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 c09ca73ec..3333a85f0 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 73eafc29a..994def430 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 4152a25b4..b95a02842 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 4efc095e2..2c75ccb3b 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 b74c028bd..3a7e0255f 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 3d5b86e8f..0180a66a1 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 95e8de16d..db4cf8e0f 100644 --- a/java/doc/index-all.html +++ b/java/doc/index-all.html @@ -2,12 +2,12 @@ - +Index - + diff --git a/java/doc/index.html b/java/doc/index.html index 1f23fda1d..995219bde 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 21847a4b0..c03bf944b 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 8d8195f6a..731ea1947 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.4.jar b/java/jars/Pubnub-UnitTests-3.5.4.jar index 5afa9f6f4..6a60f9218 100644 Binary files a/java/jars/Pubnub-UnitTests-3.5.4.jar and b/java/jars/Pubnub-UnitTests-3.5.4.jar differ diff --git a/java/jars/PubnubDemoConsole.jar b/java/jars/PubnubDemoConsole.jar index b9c27f3ad..fb1641a6c 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 92251d79e..7e730000b 100644 Binary files a/java/jars/PubnubExample.jar and b/java/jars/PubnubExample.jar differ diff --git a/java/srcPubnubApi/com/pubnub/api/PubnubCore.java b/java/srcPubnubApi/com/pubnub/api/PubnubCore.java index c16ae9a50..1ba9ddd38 100644 --- a/java/srcPubnubApi/com/pubnub/api/PubnubCore.java +++ b/java/srcPubnubApi/com/pubnub/api/PubnubCore.java @@ -190,6 +190,16 @@ public void setUUID(String uuid) { this.UUID = uuid; } + /** + * Gets current UUID + * + * @return uuid + * current UUID value for Pubnub client + */ + public String getUUID() { + return this.UUID; + } + /** * * Constructor for Pubnub Class diff --git a/java/srcPubnubApi/com/pubnub/api/PubnubUtilCore.java b/java/srcPubnubApi/com/pubnub/api/PubnubUtilCore.java index 62fe4eee7..0ba4960f0 100644 --- a/java/srcPubnubApi/com/pubnub/api/PubnubUtilCore.java +++ b/java/srcPubnubApi/com/pubnub/api/PubnubUtilCore.java @@ -198,10 +198,10 @@ static Hashtable hashtableMerge(Hashtable dst, Hashtable src) { * @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); - } + if (obj instanceof String) { + if (((String) obj).endsWith("\"") && ((String) obj).startsWith("\"")) + obj = ((String) obj).substring(1, ((String) obj).length() -1); + } return obj; } } \ No newline at end of file