Merge pull request #42 from pubnub/develop

HereNow Deserialization Error fix

Author: crimsonred

.pubnub.yml

@@ -1,5 +1,12 @@
 --- 
 changelog:
+  - 
+    changes: 
+      - 
+        text: "HereNow Deserialization Error fix"
+        type: improvement
+    date: Feb 5, 19  
+    version: v4.7.3
   - 
     changes: 
       - 
@@ -485,4 +492,4 @@ supported-platforms:
       - "Ubuntu 12.04+, with Graphics card DX9 (shader model 3.0) or DX11 with feature level 9.3 capabilities; and CPU SSE2 instruction set support."
       - "Mac OS X 10.8+, with Graphics card DX9 (shader model 3.0) or DX11 with feature level 9.3 capabilities; and CPU SSE2 instruction set support."
     version: "PubNub Unity SDK"
-version: v4.7.2
+version: v4.7.3

PubNubUnity/Assets/PubNub/Builders/Presence/HereNowRequestBuilder.cs

@@ -201,6 +201,7 @@ protected bool CreateHereNowResult(object objChannelsDict, out Dictionary<string
                                 }
                             } else {
                                 Dictionary<string, object>[] dictUuidsState = uuids as Dictionary<string, object>[];
+                                if (dictUuidsState != null){
                                 foreach (Dictionary<string, object> objUuidsState in dictUuidsState){
                                     PNHereNowOccupantData occupantData = new PNHereNowOccupantData();
 
@@ -220,10 +221,9 @@ protected bool CreateHereNowResult(object objChannelsDict, out Dictionary<string
                                         occupantData.State = objUuidsState;
                                     }
                                     channelData.Occupants.Add(occupantData);
+                                    }
                                 }
                             }
-                            
-
                         }
                     }
                     channelsResult.Add(channelName, channelData);

PubNubUnity/Assets/PubNub/PlayModeTests/PlayModeTests.cs

@@ -78,6 +78,28 @@ public IEnumerator TestTime() {
 
 		// 	pubnub.CleanUp();
 		// }
+		
+		[UnityTest]
+		public IEnumerator TestHereNowEmptyChannel()
+        {
+			PNConfiguration pnConfiguration = PlayModeCommon.SetPNConfig(false);
+			pnConfiguration.UUID = "UnityTestHereNowUUID";
+			PubNub pubnub = new PubNub(pnConfiguration);
+			string hereNowChannel = "EmptyChannel";
+			List<string> channelList = new List<string>() { hereNowChannel };
+			bool testReturn = false;
+
+			pubnub.HereNow().Channels(channelList).IncludeState(true).IncludeUUIDs(true).Async((result, status) =>
+			{
+				Debug.Log("status.Error:" + status.Error);
+				Assert.True(!status.Error);
+				bool matchResult = MatchHereNowresult(pubnub, result, channelList, pnConfiguration.UUID, true, false, false, 0, false, null);// Check occupancy-> It should be empty
+				testReturn = !status.Error && matchResult;
+			});
+			yield return new WaitForSeconds(PlayModeCommon.WaitTimeBetweenCalls4);
+			Assert.True(testReturn, "test didn't return");
+			pubnub.CleanUp();
+		}
 
 		[UnityTest]
 		public IEnumerator TestHereNowChannels() {

PubNubUnity/Assets/PubNub/PubNubUnity/PubNubUnityBase.cs

@@ -7,7 +7,7 @@ namespace PubNubAPI
     public class PubNubUnityBase
     {
         protected Counter publishMessageCounter;
-        private const string build = "4.7.2";
+        private const string build = "4.7.3";
         private string pnsdkVersion = string.Format ("PubNub-CSharp-Unity/{0}", build);
 
         public string Version {

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://api.travis-ci.org/pubnub/unity.svg?branch=master)](https://travis-ci.org/pubnub/unity) [![Build status](https://ci.appveyor.com/api/projects/status/1p3494pnt6rgqdsm/branch/master?svg=true)](https://ci.appveyor.com/project/PubNub/unity)
 
-## PubNub 4.7.2 Web Data Push Cloud-Hosted API for Unity 5+
+## PubNub 4.7.3 Web Data Push Cloud-Hosted API for Unity 5+
 ### Supports PC, Mac, Linux, iOS, Android, Windows Store Universal 10 and WebGL
 
 ## All new PubNub Unity SDK

VERSION

@@ -1 +1 @@
-4.7.2
+4.7.3