Merge pull request #22 from pubnub/CE-3355-Message-Count-Changes

crimsonred · web-flow · commit 3ef84536e296 · 2019-03-13T09:16:26.000+05:30
Message Count Changes
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,5 +1,12 @@
 --- 
-changelog: 
+changelog:
+  - 
+    changes: 
+      - 
+        text: "Message Counts simplification (Breaking changes from the previous version)."
+        type: improvement
+    date: Mar 13, 19  
+    version: v4.2.0
   - 
     changes: 
       - 
@@ -365,4 +372,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.1.1
+version: v4.2.0
diff --git a/PubNubUnity/Assets/PubNub/Builders/History/MessageCountsRequestBuilder.cs b/PubNubUnity/Assets/PubNub/Builders/History/MessageCountsRequestBuilder.cs
@@ -14,14 +14,14 @@ public MessageCountsRequestBuilder(PubNubUnity pn):base(pn, PNOperationType.PNMe
 
         private string TimetokenToUse {get; set;}
 
-        private List<string> ChannelTimetokensToUse {get; set;}
+        private List<long> ChannelTimetokensToUse {get; set;}
 
         public MessageCountsRequestBuilder Channels(List<string> channelNames){
             ChannelsToUse = channelNames;
             return this;
         }
 
-        public MessageCountsRequestBuilder ChannelsTimetoken(List<string> channelTimetoken){
+        public MessageCountsRequestBuilder ChannelsTimetoken(List<long> channelTimetoken){
             ChannelTimetokensToUse = channelTimetoken;
             return this;
         }
@@ -37,12 +37,26 @@ public void Async(Action<PNMessageCountsResult, PNStatus> callback)
         {
             this.Callback = callback;
             if((this.ChannelsToUse == null) || ((this.ChannelsToUse != null) && (this.ChannelsToUse.Count <= 0))){
-                PNStatus pnStatus = base.CreateErrorResponseFromMessage("HistoryChannel is null or empty", null, PNStatusCategory.PNBadRequestCategory);
+                PNStatus pnStatus = base.CreateErrorResponseFromMessage("Channel is null or empty", null, PNStatusCategory.PNBadRequestCategory);
                 Callback(null, pnStatus);
 
                 return;
             }
 
+            if(((this.ChannelTimetokensToUse == null) || ((this.ChannelTimetokensToUse != null) && (this.ChannelTimetokensToUse.Count <= 0))) && (string.IsNullOrEmpty(TimetokenToUse))){
+                PNStatus pnStatus = base.CreateErrorResponseFromMessage("Channel Timetoken is null or empty", null, PNStatusCategory.PNBadRequestCategory);
+                Callback(null, pnStatus);
+
+                return;
+            }
+
+            if ((ChannelTimetokensToUse.Count > 1) && (ChannelTimetokensToUse.Count() != ChannelsToUse.Count())) {
+                PNStatus pnStatus = base.CreateErrorResponseFromMessage("Length of Channels Timetoken and Channels do not match", null, PNStatusCategory.PNBadRequestCategory);
+                Callback(null, pnStatus);
+
+                return;
+            }
+		
             base.Async(this);
         }
         #endregion
@@ -51,14 +65,28 @@ protected override void RunWebRequest(QueueManager qm){
             RequestState requestState = new RequestState ();
             requestState.OperationType = base.OperationType;
 
+            string TimetokenToUseString = "";
+            string ChannelsTimetokenToUseString = "";
+            if ((ChannelTimetokensToUse != null) && (ChannelTimetokensToUse.Count == 1)) {
+                TimetokenToUseString = ChannelTimetokensToUse[0].ToString();
+                ChannelsTimetokenToUseString = "";
+            } else if (ChannelTimetokensToUse != null){
+                TimetokenToUseString = "";
+                ChannelsTimetokenToUseString = String.Join(",", ChannelTimetokensToUse.Select(p=>p.ToString()).ToArray());
+            } else {
+                // TODO: Remove in next major version bump
+                TimetokenToUseString = TimetokenToUse;
+                ChannelsTimetokenToUseString = "";
+            }
+
             #if (ENABLE_PUBNUB_LOGGING)
-            this.PubNubInstance.PNLog.WriteToLog(string.Format ("MessageCountsRequestBuilder: \nChannel {0} \nChannelTimetokens: {1} \nTimetokenToUse:{2}", string.Join(",", this.ChannelsToUse.ToArray()), (ChannelTimetokensToUse!=null)?string.Join(",", this.ChannelTimetokensToUse.ToArray()):"", this.TimetokenToUse), PNLoggingMethod.LevelInfo);
+            this.PubNubInstance.PNLog.WriteToLog(string.Format ("MessageCountsRequestBuilder: \nChannel {0} \nChannelTimetokens: {1} \nTimetokenToUse:{2}", string.Join(",", this.ChannelsToUse.ToArray()), ChannelsTimetokenToUseString, ChannelsTimetokenToUseString), PNLoggingMethod.LevelInfo);
             #endif
-            
+
             Uri request = BuildRequests.BuildMessageCountsRequest(
                 ChannelsToUse.ToArray(),
-                (ChannelTimetokensToUse!=null)?ChannelTimetokensToUse.ToArray():null,
-                TimetokenToUse,
+                ChannelsTimetokenToUseString, 
+                TimetokenToUseString,
                 this.PubNubInstance,
                 this.QueryParams
             );
diff --git a/PubNubUnity/Assets/PubNub/Editor/MessageCountsBuildRequestsTests.cs b/PubNubUnity/Assets/PubNub/Editor/MessageCountsBuildRequestsTests.cs
@@ -3,6 +3,7 @@
 using NUnit.Framework;
 using System.Text;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace PubNubAPI.Tests
 {
@@ -14,7 +15,7 @@ public class MessageCountsBuildRequestsTests
         public void TestBuildMessageCountsRequestMultiChannelAuthSSL ()
         {
             string[] channels = { "test", "test2" };
-            string[] channelsTimetoken = { "15499825804610610", "15499925804610615" };
+            long[] channelsTimetoken = { 15499825804610610, 15499925804610615 };
             string timetoken = "15499825804610609";
             TestMessageCountsBuildRequestCommon (channels, channelsTimetoken, timetoken, true, "authKey", false);
         }
@@ -23,7 +24,7 @@ public void TestBuildMessageCountsRequestMultiChannelAuthSSL ()
         public void TestBuildMessageCountsRequestMultiChannelTTAuthSSL ()
         {
             string[] channels = { "test", "test2" };
-            string[] channelsTimetoken = { };
+            long[] channelsTimetoken = { };
             string timetoken = "15499825804610609";
             TestMessageCountsBuildRequestCommon (channels, channelsTimetoken, timetoken, true, "authKey", false);
         }
@@ -32,7 +33,7 @@ public void TestBuildMessageCountsRequestMultiChannelTTAuthSSL ()
         public void TestBuildMessageCountsRequestMultiChannelCTAuthSSL ()
         {
             string[] channels = { "test", "test2" };
-            string[] channelsTimetoken = { "15499825804610610", "15499925804610615" };
+            long[] channelsTimetoken = { 15499825804610610, 15499925804610615 };
             string timetoken = "";
             TestMessageCountsBuildRequestCommon (channels, channelsTimetoken, timetoken, true, "authKey", false);
         }
@@ -41,7 +42,7 @@ public void TestBuildMessageCountsRequestMultiChannelCTAuthSSL ()
         public void TestBuildMessageCountsRequestMultiChannelAuthSSLQP ()
         {
             string[] channels = { "test", "test2" };
-            string[] channelsTimetoken = { "15499825804610610", "15499925804610615" };
+            long[] channelsTimetoken = { 15499825804610610, 15499925804610615 };
             string timetoken = "15499825804610609";
             TestMessageCountsBuildRequestCommon (channels, channelsTimetoken, timetoken, true, "authKey", true);
         }
@@ -50,7 +51,7 @@ public void TestBuildMessageCountsRequestMultiChannelAuthSSLQP ()
         public void TestBuildMessageCountsRequestMultiChannelTTAuthSSLQP ()
         {
             string[] channels = { "test", "test2" };
-            string[] channelsTimetoken = { };
+            long[] channelsTimetoken = { };
             string timetoken = "15499825804610609";
             TestMessageCountsBuildRequestCommon (channels, channelsTimetoken, timetoken, true, "authKey", true);
         }
@@ -59,12 +60,12 @@ public void TestBuildMessageCountsRequestMultiChannelTTAuthSSLQP ()
         public void TestBuildMessageCountsRequestMultiChannelCTAuthSSLQP ()
         {
             string[] channels = { "test", "test2" };
-            string[] channelsTimetoken = { "15499825804610610", "15499925804610615" };
+            long[] channelsTimetoken = { 15499825804610610, 15499925804610615 };
             string timetoken = "";
             TestMessageCountsBuildRequestCommon (channels, channelsTimetoken, timetoken, true, "authKey", true);
         }
 
-        public void TestMessageCountsBuildRequestCommon(string[] channels, string[] channelsTimetoken, string timetoken, bool ssl, string authKey, bool sendQueryParams)
+        public void TestMessageCountsBuildRequestCommon(string[] channels, long[] channelsTimetoken, string timetoken, bool ssl, string authKey, bool sendQueryParams)
         {
             Dictionary<string,string> queryParams = new Dictionary<string, string>();
             string queryParamString = "";
@@ -100,10 +101,10 @@ public void TestMessageCountsBuildRequestCommon(string[] channels, string[] chan
             }
 
             if(channelsTimetoken != null){
-                channelsTimetokenStr = string.Join(",", channelsTimetoken);
+                channelsTimetokenStr = String.Join(",", channelsTimetoken.Select(p=>p.ToString()).ToArray());
             }
 
-            Uri uri = BuildRequests.BuildMessageCountsRequest (channels, channelsTimetoken, timetoken, pnUnity, queryParams);
+            Uri uri = BuildRequests.BuildMessageCountsRequest (channels, channelsTimetokenStr, timetoken, pnUnity, queryParams);
 
             //https://ps.pndsn.com/v3/history/sub-key/demo/message-counts/test,test2?timetoken=15499825804610609&channelsTimetoken=15499825804610610,15499925804610615&auth=authKey&uuid=customuuid&pnsdk=PubNub-CSharp-UnityOSX%2F4.1.1 
             string expected = string.Format ("http{0}://{1}/v3/history/sub-key/{2}/message-counts/{3}?timetoken={4}&channelsTimetoken={5}{6}&uuid={7}&pnsdk={8}{9}",
diff --git a/PubNubUnity/Assets/PubNub/EndPoints/HIstory/MessageCountsBuilder.cs b/PubNubUnity/Assets/PubNub/EndPoints/HIstory/MessageCountsBuilder.cs
@@ -14,11 +14,12 @@ public MessageCountsBuilder Channels(List<string> channelNames){
             return this;
         }
 
-        public MessageCountsBuilder ChannelsTimetoken(List<string> channelsTimetoken){
+        public MessageCountsBuilder ChannelsTimetoken(List<long> channelsTimetoken){
             pubBuilder.ChannelsTimetoken(channelsTimetoken);
             return this;
         }
 
+        [Obsolete("Use ChannelsTimetoken instead, pass one value in ChannelsTimetoken to achieve the same results.")]    
         public MessageCountsBuilder Timetoken(string timetoken){
             pubBuilder.Timetoken(timetoken);
             return this;
diff --git a/PubNubUnity/Assets/PubNub/Examples/Example.cs b/PubNubUnity/Assets/PubNub/Examples/Example.cs
@@ -417,7 +417,7 @@ void Init(){
 
         void MessageCounts(List<string> listChannels, PubNub pubnub){
             //pubnub.MessageCounts().ChannelTimetokens(new List<string>{"15499825804610610","15499925804610615"}).Channels(listChannels).Timetoken("1549982652").Async((result, status) =>{
-            pubnub.MessageCounts().Channels(listChannels).Timetoken("1549982652").Async((result, status) =>{    
+            pubnub.MessageCounts().Channels(listChannels).ChannelsTimetoken(new List<long>{1549982652}).Async((result, status) =>{    
                     if(status.Error){
                         Debug.Log (string.Format("In Example, MessageCounts Error: {0} {1} {2}", status.StatusCode, status.ErrorData, status.Category));
                     } else {
@@ -427,7 +427,7 @@ void MessageCounts(List<string> listChannels, PubNub pubnub){
                         }                        
                     }
                 });
-            pubnub.MessageCounts().Channels(listChannels).ChannelsTimetoken(new List<string>{"1551795013294","155179501329433"}).Async((result, status) =>{    
+            pubnub.MessageCounts().Channels(listChannels).ChannelsTimetoken(new List<long>{1551795013294,155179501329433}).Async((result, status) =>{    
                     if(status.Error){
                         Debug.Log (string.Format("In Example, MessageCounts Error: {0} {1} {2}", status.StatusCode, status.ErrorData, status.Category));
                     } else {
diff --git a/PubNubUnity/Assets/PubNub/Models/Server/BuildRequests.cs b/PubNubUnity/Assets/PubNub/Models/Server/BuildRequests.cs
@@ -181,12 +181,12 @@ public static Uri BuildDeleteMessagesRequest (string channel, long start, long e
             return BuildRestApiRequest<Uri> (url, PNOperationType.PNDeleteMessagesOperation, parameterBuilder.ToString(), pnInstance, queryParams);
         }
 
-        public static Uri BuildMessageCountsRequest (string[] channels, string[] channelsTimetoken, string timetoken, PubNubUnity pnInstance, Dictionary<string, string> queryParams)
+        public static Uri BuildMessageCountsRequest (string[] channels, string channelsTimetoken, string timetoken, PubNubUnity pnInstance, Dictionary<string, string> queryParams)
         {
             StringBuilder parameterBuilder = new StringBuilder ();
 
             parameterBuilder.AppendFormat ("?timetoken={0}", timetoken);
-            parameterBuilder.AppendFormat ("&channelsTimetoken={0}", (channelsTimetoken!=null)?string.Join(",", channelsTimetoken):"");
+            parameterBuilder.AppendFormat ("&channelsTimetoken={0}", channelsTimetoken);
 
             List<string> url = new List<string> ();
 
diff --git a/PubNubUnity/Assets/PubNub/PlayModeTests/PlayModeTests.cs b/PubNubUnity/Assets/PubNub/PlayModeTests/PlayModeTests.cs
@@ -3365,7 +3365,14 @@ public IEnumerator TestMessageCounts() {
 			channelList2.Add(channel);
 			channelList2.Add(channel2);
 			bool tresult = false;
+			pubnub.MessageCounts().Channels(channelList2).ChannelsTimetoken(new List<long>{10, 11, 12}).Async((result, status) => {
+				tresult = true;
+				Assert.True(status.Error.Equals(true));
 
+			});
+			yield return new WaitForSeconds (1);
+			
+			tresult = false;
 			long timetoken1 = 0;
 			pubnub.Time().Async((result, status) => {
 				timetoken1 = result.TimeToken;
@@ -3434,7 +3441,7 @@ public IEnumerator TestMessageCounts() {
 			Assert.True(!timetoken3.Equals(0));
 
 			tresult = false;
-			pubnub.MessageCounts().Channels(channelList2).ChannelsTimetoken(new List<string>{timetoken2.ToString(), timetoken3.ToString()}).Async((result, status) => {
+			pubnub.MessageCounts().Channels(channelList2).ChannelsTimetoken(new List<long>{timetoken2, timetoken3}).Async((result, status) => {
 				Assert.True(status.Error.Equals(false));
 				Debug.Log("status.Error.Equals(false)"+status.Error.Equals(false));
 				if(!status.Error){
@@ -3463,7 +3470,7 @@ public IEnumerator TestMessageCounts() {
 			Assert.True(tresult, "MessageCounts test didnt return 2");
 
 			tresult = false;
-			pubnub.MessageCounts().Channels(channelList2).Timetoken(timetoken2.ToString()).Async((result, status) => {
+			pubnub.MessageCounts().Channels(channelList2).ChannelsTimetoken(new List<long>{timetoken2}).Async((result, status) => {
 				Assert.True(status.Error.Equals(false));
 				Debug.Log("status.Error.Equals(false)"+status.Error.Equals(false));
 				if(!status.Error){
diff --git a/PubNubUnity/Assets/PubNub/PubNubUnity/PubNubUnityBase.cs b/PubNubUnity/Assets/PubNub/PubNubUnity/PubNubUnityBase.cs
@@ -7,7 +7,7 @@ namespace PubNubAPI
     public class PubNubUnityBase
     {
         protected Counter publishMessageCounter;
-        private const string build = "4.1.1";
+        private const string build = "4.2.0";
         private string pnsdkVersion = string.Format ("PubNub-CSharp-Unity/{0}", build);
 
         public string Version {
diff --git a/README.md b/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.1.1 Web Data Push Cloud-Hosted API for Unity 5+
+## PubNub 4.2.0 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
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.1.1
+4.2.0

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using NUnit.Framework;`
`4`	`4`	`using System.Text;`
`5`	`5`	`using System.Collections.Generic;`
	`6`	`+using System.Linq;`
`6`	`7`
`7`	`8`	`namespace PubNubAPI.Tests`
`8`	`9`	`{`
`@@ -14,7 +15,7 @@ public class MessageCountsBuildRequestsTests`
`14`	`15`	`public void TestBuildMessageCountsRequestMultiChannelAuthSSL ()`
`15`	`16`	`{`
`16`	`17`	`string[] channels = { "test", "test2" };`
`17`		`- string[] channelsTimetoken = { "15499825804610610", "15499925804610615" };`
	`18`	`+ long[] channelsTimetoken = { 15499825804610610, 15499925804610615 };`
`18`	`19`	`string timetoken = "15499825804610609";`
`19`	`20`	`TestMessageCountsBuildRequestCommon (channels, channelsTimetoken, timetoken, true, "authKey", false);`
`20`	`21`	`}`
`@@ -23,7 +24,7 @@ public void TestBuildMessageCountsRequestMultiChannelAuthSSL ()`
`23`	`24`	`public void TestBuildMessageCountsRequestMultiChannelTTAuthSSL ()`
`24`	`25`	`{`
`25`	`26`	`string[] channels = { "test", "test2" };`
`26`		`- string[] channelsTimetoken = { };`
	`27`	`+ long[] channelsTimetoken = { };`
`27`	`28`	`string timetoken = "15499825804610609";`
`28`	`29`	`TestMessageCountsBuildRequestCommon (channels, channelsTimetoken, timetoken, true, "authKey", false);`
`29`	`30`	`}`
`@@ -32,7 +33,7 @@ public void TestBuildMessageCountsRequestMultiChannelTTAuthSSL ()`
`32`	`33`	`public void TestBuildMessageCountsRequestMultiChannelCTAuthSSL ()`
`33`	`34`	`{`
`34`	`35`	`string[] channels = { "test", "test2" };`
`35`		`- string[] channelsTimetoken = { "15499825804610610", "15499925804610615" };`
	`36`	`+ long[] channelsTimetoken = { 15499825804610610, 15499925804610615 };`
`36`	`37`	`string timetoken = "";`
`37`	`38`	`TestMessageCountsBuildRequestCommon (channels, channelsTimetoken, timetoken, true, "authKey", false);`
`38`	`39`	`}`
`@@ -41,7 +42,7 @@ public void TestBuildMessageCountsRequestMultiChannelCTAuthSSL ()`
`41`	`42`	`public void TestBuildMessageCountsRequestMultiChannelAuthSSLQP ()`
`42`	`43`	`{`
`43`	`44`	`string[] channels = { "test", "test2" };`
`44`		`- string[] channelsTimetoken = { "15499825804610610", "15499925804610615" };`
	`45`	`+ long[] channelsTimetoken = { 15499825804610610, 15499925804610615 };`
`45`	`46`	`string timetoken = "15499825804610609";`
`46`	`47`	`TestMessageCountsBuildRequestCommon (channels, channelsTimetoken, timetoken, true, "authKey", true);`
`47`	`48`	`}`
`@@ -50,7 +51,7 @@ public void TestBuildMessageCountsRequestMultiChannelAuthSSLQP ()`
`50`	`51`	`public void TestBuildMessageCountsRequestMultiChannelTTAuthSSLQP ()`
`51`	`52`	`{`
`52`	`53`	`string[] channels = { "test", "test2" };`
`53`		`- string[] channelsTimetoken = { };`
	`54`	`+ long[] channelsTimetoken = { };`
`54`	`55`	`string timetoken = "15499825804610609";`
`55`	`56`	`TestMessageCountsBuildRequestCommon (channels, channelsTimetoken, timetoken, true, "authKey", true);`
`56`	`57`	`}`
`@@ -59,12 +60,12 @@ public void TestBuildMessageCountsRequestMultiChannelTTAuthSSLQP ()`
`59`	`60`	`public void TestBuildMessageCountsRequestMultiChannelCTAuthSSLQP ()`
`60`	`61`	`{`
`61`	`62`	`string[] channels = { "test", "test2" };`
`62`		`- string[] channelsTimetoken = { "15499825804610610", "15499925804610615" };`
	`63`	`+ long[] channelsTimetoken = { 15499825804610610, 15499925804610615 };`
`63`	`64`	`string timetoken = "";`
`64`	`65`	`TestMessageCountsBuildRequestCommon (channels, channelsTimetoken, timetoken, true, "authKey", true);`
`65`	`66`	`}`
`66`	`67`
`67`		`- public void TestMessageCountsBuildRequestCommon(string[] channels, string[] channelsTimetoken, string timetoken, bool ssl, string authKey, bool sendQueryParams)`
	`68`	`+ public void TestMessageCountsBuildRequestCommon(string[] channels, long[] channelsTimetoken, string timetoken, bool ssl, string authKey, bool sendQueryParams)`
`68`	`69`	`{`
`69`	`70`	`Dictionary<string,string> queryParams = new Dictionary<string, string>();`
`70`	`71`	`string queryParamString = "";`
`@@ -100,10 +101,10 @@ public void TestMessageCountsBuildRequestCommon(string[] channels, string[] chan`
`100`	`101`	`}`
`101`	`102`
`102`	`103`	`if(channelsTimetoken != null){`
`103`		`- channelsTimetokenStr = string.Join(",", channelsTimetoken);`
	`104`	`+ channelsTimetokenStr = String.Join(",", channelsTimetoken.Select(p=>p.ToString()).ToArray());`
`104`	`105`	`}`
`105`	`106`
`106`		`- Uri uri = BuildRequests.BuildMessageCountsRequest (channels, channelsTimetoken, timetoken, pnUnity, queryParams);`
	`107`	`+ Uri uri = BuildRequests.BuildMessageCountsRequest (channels, channelsTimetokenStr, timetoken, pnUnity, queryParams);`
`107`	`108`
`108`	`109`	`//https://ps.pndsn.com/v3/history/sub-key/demo/message-counts/test,test2?timetoken=15499825804610609&channelsTimetoken=15499825804610610,15499925804610615&auth=authKey&uuid=customuuid&pnsdk=PubNub-CSharp-UnityOSX%2F4.1.1`
`109`	`110`	`string expected = string.Format ("http{0}://{1}/v3/history/sub-key/{2}/message-counts/{3}?timetoken={4}&channelsTimetoken={5}{6}&uuid={7}&pnsdk={8}{9}",`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,12 @@ public MessageCountsBuilder Channels(List<string> channelNames){`
`14`	`14`	`return this;`
`15`	`15`	`}`
`16`	`16`
`17`		`- public MessageCountsBuilder ChannelsTimetoken(List<string> channelsTimetoken){`
	`17`	`+ public MessageCountsBuilder ChannelsTimetoken(List<long> channelsTimetoken){`
`18`	`18`	`pubBuilder.ChannelsTimetoken(channelsTimetoken);`
`19`	`19`	`return this;`
`20`	`20`	`}`
`21`	`21`
	`22`	`+ [Obsolete("Use ChannelsTimetoken instead, pass one value in ChannelsTimetoken to achieve the same results.")]`
`22`	`23`	`public MessageCountsBuilder Timetoken(string timetoken){`
`23`	`24`	`pubBuilder.Timetoken(timetoken);`
`24`	`25`	`return this;`
Original file line number	Diff line number	Diff line change
`@@ -181,12 +181,12 @@ public static Uri BuildDeleteMessagesRequest (string channel, long start, long e`
`181`	`181`	`return BuildRestApiRequest<Uri> (url, PNOperationType.PNDeleteMessagesOperation, parameterBuilder.ToString(), pnInstance, queryParams);`
`182`	`182`	`}`
`183`	`183`
`184`		`- public static Uri BuildMessageCountsRequest (string[] channels, string[] channelsTimetoken, string timetoken, PubNubUnity pnInstance, Dictionary<string, string> queryParams)`
	`184`	`+ public static Uri BuildMessageCountsRequest (string[] channels, string channelsTimetoken, string timetoken, PubNubUnity pnInstance, Dictionary<string, string> queryParams)`
`185`	`185`	`{`
`186`	`186`	`StringBuilder parameterBuilder = new StringBuilder ();`
`187`	`187`
`188`	`188`	`parameterBuilder.AppendFormat ("?timetoken={0}", timetoken);`
`189`		`- parameterBuilder.AppendFormat ("&channelsTimetoken={0}", (channelsTimetoken!=null)?string.Join(",", channelsTimetoken):"");`
	`189`	`+ parameterBuilder.AppendFormat ("&channelsTimetoken={0}", channelsTimetoken);`
`190`	`190`
`191`	`191`	`List<string> url = new List<string> ();`
`192`	`192`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace PubNubAPI`
`7`	`7`	`public class PubNubUnityBase`
`8`	`8`	`{`
`9`	`9`	`protected Counter publishMessageCounter;`
`10`		`- private const string build = "4.1.1";`
	`10`	`+ private const string build = "4.2.0";`
`11`	`11`	`private string pnsdkVersion = string.Format ("PubNub-CSharp-Unity/{0}", build);`
`12`	`12`
`13`	`13`	`public string Version {`