Merge pull request #47 from pubnub/develop

crimsonred · web-flow · commit cbfca7026c35 · 2020-03-10T08:06:24.000+05:30
Add Listener fix for Signal
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,18 +1,25 @@
 --- 
 changelog:
+  - 
+    changes: 
+      - 
+        text: "Correct null check for signal callback"
+        type: bug
+    date: Mar 10, 20  
+    version: v4.8.1
   - 
     changes: 
       - 
         text: "Token Management System - Client end"
         type: improvement
-    date: Feb 18, 19  
+    date: Feb 18, 20  
     version: v4.8.0
   - 
     changes: 
       - 
         text: "HereNow Deserialization Error fix"
         type: improvement
-    date: Feb 5, 19  
+    date: Feb 5, 20  
     version: v4.7.3
   - 
     changes: 
@@ -22,14 +29,14 @@ changelog:
       - 
         text: "Presence Heartbeat defaults to 300"
         type: improvement
-    date: Jan 16, 19  
+    date: Jan 16, 20  
     version: v4.7.2
   - 
     changes: 
       - 
         text: "Objects Filtering"
         type: improvement
-    date: Jan 6, 19  
+    date: Jan 6, 20  
     version: v4.7.1   
   - 
     changes: 
diff --git a/PubNubUnity/Assets/PubNub/Editor/SignalTest.cs b/PubNubUnity/Assets/PubNub/Editor/SignalTest.cs
@@ -22,6 +22,23 @@ public void TestSignalRequestQueryParam ()
             TestSignalCommon (true, true);
         }
 
+        [Test]
+        public void TestAddListenerSignalCallback ()
+        {
+            PNConfiguration pnConfiguration = new PNConfiguration ();
+            PubNubUnity pnUnity = new PubNubUnity(pnConfiguration, null, null);
+            bool receivedCallback = false;
+            Action<PNSignalEventResult> callback = (pnser) => receivedCallback = true;
+            pnUnity.AddListener(null, null, null, callback, null, null, null, null);
+
+            pnUnity.RaiseEvent(new SubscribeEventEventArgs()
+            {
+                SignalEventResult = new PNSignalEventResult(null, null, null, 0, 0, null, null)
+            });
+
+            Assert.IsTrue(receivedCallback);
+        }
+
         public void TestSignalCommon(bool ssl, bool sendQueryParams){
             string channel = EditorCommon.GetRandomChannelName();
             string message = "Test signal";
diff --git a/PubNubUnity/Assets/PubNub/PubNubUnity/PubNubUnity.cs b/PubNubUnity/Assets/PubNub/PubNubUnity/PubNubUnity.cs
@@ -70,28 +70,28 @@ public void AddListener(Action<PNStatus> statusCallback, Action<PNMessageResult>
                 #endif
                 
                 if(mea!=null){
-                    if(mea.Status != null){
+                    if(mea.Status != null && statusCallback != null){
                         statusCallback(mea.Status);
                     }
-                    if(mea.MessageResult != null){
+                    if(mea.MessageResult != null && messageCallback != null){
                         messageCallback(mea.MessageResult);
                     }
-                    if(mea.PresenceEventResult != null){
+                    if(mea.PresenceEventResult != null && presenceCallback != null){
                         presenceCallback(mea.PresenceEventResult);
                     }
-                    if(mea.MessageResult != null){
+                    if(mea.SignalEventResult != null && signalCallback != null){
                         signalCallback(mea.SignalEventResult);
                     }
-                    if(mea.UserEventResult != null){
+                    if(mea.UserEventResult != null && userCallback != null){
                         userCallback(mea.UserEventResult);
                     }
-                    if(mea.SpaceEventResult != null){
+                    if(mea.SpaceEventResult != null && spaceCallback != null){
                         spaceCallback(mea.SpaceEventResult);
                     }
-                    if(mea.MembershipEventResult != null){
+                    if(mea.MembershipEventResult != null && membershipCallback != null){
                         membershipCallback(mea.MembershipEventResult);
                     }
-                    if(mea.MessageActionsEventResult != null){
+                    if(mea.MessageActionsEventResult != null && messageActionsCallback != null){
                         messageActionsCallback(mea.MessageActionsEventResult);
                     }
 
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.8.0";
+        private const string build = "4.8.1";
         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.8.0 Web Data Push Cloud-Hosted API for Unity 5+
+## PubNub 4.8.1 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.8.0
+4.8.1

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,25 @@`
`1`	`1`	`---`
`2`	`2`	`changelog:`
	`3`	`+ -`
	`4`	`+ changes:`
	`5`	`+ -`
	`6`	`+ text: "Correct null check for signal callback"`
	`7`	`+ type: bug`
	`8`	`+ date: Mar 10, 20`
	`9`	`+ version: v4.8.1`
`3`	`10`	`-`
`4`	`11`	`changes:`
`5`	`12`	`-`
`6`	`13`	`text: "Token Management System - Client end"`
`7`	`14`	`type: improvement`
`8`		`- date: Feb 18, 19`
	`15`	`+ date: Feb 18, 20`
`9`	`16`	`version: v4.8.0`
`10`	`17`	`-`
`11`	`18`	`changes:`
`12`	`19`	`-`
`13`	`20`	`text: "HereNow Deserialization Error fix"`
`14`	`21`	`type: improvement`
`15`		`- date: Feb 5, 19`
	`22`	`+ date: Feb 5, 20`
`16`	`23`	`version: v4.7.3`
`17`	`24`	`-`
`18`	`25`	`changes:`
`@@ -22,14 +29,14 @@ changelog:`
`22`	`29`	`-`
`23`	`30`	`text: "Presence Heartbeat defaults to 300"`
`24`	`31`	`type: improvement`
`25`		`- date: Jan 16, 19`
	`32`	`+ date: Jan 16, 20`
`26`	`33`	`version: v4.7.2`
`27`	`34`	`-`
`28`	`35`	`changes:`
`29`	`36`	`-`
`30`	`37`	`text: "Objects Filtering"`
`31`	`38`	`type: improvement`
`32`		`- date: Jan 6, 19`
	`39`	`+ date: Jan 6, 20`
`33`	`40`	`version: v4.7.1`
`34`	`41`	`-`
`35`	`42`	`changes:`
Original file line number	Diff line number	Diff line change
`@@ -70,28 +70,28 @@ public void AddListener(Action<PNStatus> statusCallback, Action<PNMessageResult>`
`70`	`70`	`#endif`
`71`	`71`
`72`	`72`	`if(mea!=null){`
`73`		`- if(mea.Status != null){`
	`73`	`+ if(mea.Status != null && statusCallback != null){`
`74`	`74`	`statusCallback(mea.Status);`
`75`	`75`	`}`
`76`		`- if(mea.MessageResult != null){`
	`76`	`+ if(mea.MessageResult != null && messageCallback != null){`
`77`	`77`	`messageCallback(mea.MessageResult);`
`78`	`78`	`}`
`79`		`- if(mea.PresenceEventResult != null){`
	`79`	`+ if(mea.PresenceEventResult != null && presenceCallback != null){`
`80`	`80`	`presenceCallback(mea.PresenceEventResult);`
`81`	`81`	`}`
`82`		`- if(mea.MessageResult != null){`
	`82`	`+ if(mea.SignalEventResult != null && signalCallback != null){`
`83`	`83`	`signalCallback(mea.SignalEventResult);`
`84`	`84`	`}`
`85`		`- if(mea.UserEventResult != null){`
	`85`	`+ if(mea.UserEventResult != null && userCallback != null){`
`86`	`86`	`userCallback(mea.UserEventResult);`
`87`	`87`	`}`
`88`		`- if(mea.SpaceEventResult != null){`
	`88`	`+ if(mea.SpaceEventResult != null && spaceCallback != null){`
`89`	`89`	`spaceCallback(mea.SpaceEventResult);`
`90`	`90`	`}`
`91`		`- if(mea.MembershipEventResult != null){`
	`91`	`+ if(mea.MembershipEventResult != null && membershipCallback != null){`
`92`	`92`	`membershipCallback(mea.MembershipEventResult);`
`93`	`93`	`}`
`94`		`- if(mea.MessageActionsEventResult != null){`
	`94`	`+ if(mea.MessageActionsEventResult != null && messageActionsCallback != null){`
`95`	`95`	`messageActionsCallback(mea.MessageActionsEventResult);`
`96`	`96`	`}`
`97`	`97`
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.8.0";`
	`10`	`+ private const string build = "4.8.1";`
`11`	`11`	`private string pnsdkVersion = string.Format ("PubNub-CSharp-Unity/{0}", build);`
`12`	`12`
`13`	`13`	`public string Version {`