adding getUUID method which returns current uuid for pubnub object

yishai-glide · Aug 26, 2013 · 4bd1e01 · 4bd1e01
1 parent ffca7a3
commit 4bd1e01
Show file tree

Hide file tree

Showing 35 changed files with 72 additions and 39 deletions.
diff --git a/android/Pubnub-Android-3.5.4.jar b/android/Pubnub-Android-3.5.4.jar
diff --git a/android/Pubnub-Android-Debug-3.5.4.jar b/android/Pubnub-Android-Debug-3.5.4.jar
diff --git a/android/examples/PubnubExample/libs/Pubnub-Android-3.5.4.jar b/android/examples/PubnubExample/libs/Pubnub-Android-3.5.4.jar
diff --git a/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.4.jar b/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.4.jar
diff --git a/blackberry/Pubnub-BlackBerry-3.5.4.jar b/blackberry/Pubnub-BlackBerry-3.5.4.jar
diff --git a/blackberry/Pubnub-BlackBerry-Debug-3.5.4.jar b/blackberry/Pubnub-BlackBerry-Debug-3.5.4.jar
diff --git a/codenameone/Pubnub-CodeNameOne-3.5.4.cn1lib b/codenameone/Pubnub-CodeNameOne-3.5.4.cn1lib
diff --git a/codenameone/Pubnub-CodeNameOne-Debug-3.5.4.cn1lib b/codenameone/Pubnub-CodeNameOne-Debug-3.5.4.cn1lib
diff --git a/j2me/Pubnub-MicroEdition-3.5.4.jar b/j2me/Pubnub-MicroEdition-3.5.4.jar
diff --git a/j2me/Pubnub-MicroEdition-Debug-3.5.4.jar b/j2me/Pubnub-MicroEdition-Debug-3.5.4.jar
diff --git a/java/Pubnub-StandardEdition-3.5.4.jar b/java/Pubnub-StandardEdition-3.5.4.jar
diff --git a/java/Pubnub-StandardEdition-Debug-3.5.4.jar b/java/Pubnub-StandardEdition-Debug-3.5.4.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 Aug 23 23:20:06 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:49 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <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 Aug 23 23:20:06 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:49 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <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 Aug 23 23:20:05 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:48 IST 2013 -->
 <TITLE>
 Callback
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <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 Fri Aug 23 23:20:05 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:48 IST 2013 -->
 <TITLE>
 HttpUtil
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <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 Aug 23 23:20:05 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:48 IST 2013 -->
 <TITLE>
 Pubnub
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
@@ -399,6 +399,14 @@ <H2>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../com/pubnub/api/Pubnub.html#getUUID()">getUUID</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets current UUID</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../com/pubnub/api/Pubnub.html#hereNow(java.lang.String, com.pubnub.api.Callback)">hereNow</A></B>(java.lang.String&nbsp;channel,
         <A HREF="../../../com/pubnub/api/Callback.html" title="class in com.pubnub.api">Callback</A>&nbsp;callback)</CODE>
@@ -1803,6 +1811,21 @@ <H2>
 </DL>
 <HR>
 
+<A NAME="getUUID()"><!-- --></A><H3>
+getUUID</H3>
+<PRE>
+public java.lang.String <B>getUUID</B>()</PRE>
+<DL>
+<DD>Gets current UUID
+<P>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>uuid
+            current UUID value for Pubnub client</DL>
+</DD>
+</DL>
+<HR>
+
 <A NAME="publish(java.lang.String, org.json.JSONObject, com.pubnub.api.Callback)"><!-- --></A><H3>
 publish</H3>
 <PRE>

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 Aug 23 23:20:06 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:49 IST 2013 -->
 <TITLE>
 PubnubError
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <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 Aug 23 23:20:06 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:49 IST 2013 -->
 <TITLE>
 PubnubException
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <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 Aug 23 23:20:06 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:49 IST 2013 -->
 <TITLE>
 PubnubUtil
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <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 Aug 23 23:20:06 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:49 IST 2013 -->
 <TITLE>
 com.pubnub.api
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <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 Aug 23 23:20:06 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:49 IST 2013 -->
 <TITLE>
 com.pubnub.api
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <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 Aug 23 23:20:06 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:49 IST 2013 -->
 <TITLE>
 com.pubnub.api Class Hierarchy
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <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 Aug 23 23:20:06 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:49 IST 2013 -->
 <TITLE>
 Constant Field Values
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <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 Aug 23 23:20:06 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:49 IST 2013 -->
 <TITLE>
 Deprecated List
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <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 Aug 23 23:20:06 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:49 IST 2013 -->
 <TITLE>
 API Help
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <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 Aug 23 23:20:06 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:49 IST 2013 -->
 <TITLE>
 Index
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <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 Aug 23 23:20:06 IST 2013-->
+<!-- Generated by javadoc on Mon Aug 26 12:12:49 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 Aug 23 23:20:06 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:49 IST 2013 -->
 <TITLE>
 Class Hierarchy
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <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 Aug 23 23:20:06 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Aug 26 12:12:49 IST 2013 -->
 <TITLE>
 Serialized Form
 </TITLE>
 
-<META NAME="date" CONTENT="2013-08-23">
+<META NAME="date" CONTENT="2013-08-26">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/jars/Pubnub-UnitTests-3.5.4.jar b/java/jars/Pubnub-UnitTests-3.5.4.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/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
@@ -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;
     }
 }