Skip to content

Commit c87a477

Browse files
author
Joseph Kalash
committed
Adjusted tabs to spaces
1 parent c67d9f6 commit c87a477

File tree

6 files changed

+38
-36
lines changed

6 files changed

+38
-36
lines changed

Unity4.7OneSignalExample/Assets/OneSignal/Example/GameControllerExample.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,11 @@ private static void HandleNotificationReceived(OSNotification notification) {
6363
print("displayType: " + notification.displayType);
6464
extraMessage = "Notification received with text: " + message;
6565

66-
Dictionary<string, object> additionalData = payload.additionalData;
67-
if (additionalData == null)
68-
Debug.Log ("[HandleNotificationReceived] Additional Data == null");
69-
else
70-
Debug.Log("[HandleNotificationReceived] message "+ message +", additionalData: "+ Json.Serialize(additionalData) as string);
71-
66+
Dictionary<string, object> additionalData = payload.additionalData;
67+
if (additionalData == null)
68+
Debug.Log ("[HandleNotificationReceived] Additional Data == null");
69+
else
70+
Debug.Log("[HandleNotificationReceived] message "+ message +", additionalData: "+ Json.Serialize(additionalData) as string);
7271
}
7372

7473
// Called when a notification is opened.

Unity4.7OneSignalExample/Assets/OneSignal/src/OneSignal.cs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public class OSNotificationPayload {
4949
public string body;
5050
public string subtitle;
5151
public string launchURL;
52-
public Dictionary<string, object> additionalData;
53-
public Dictionary<string, object> actionButtons;
52+
public Dictionary<string, object> additionalData;
53+
public Dictionary<string, object> actionButtons;
5454
public bool contentAvailable;
5555
public int badge;
5656
public string smallIcon;
@@ -377,16 +377,18 @@ private OSNotification DictionaryToNotification(Dictionary<string, object> jsonO
377377
if (payloadObj.ContainsKey("body")) payload.body = payloadObj["body"] as string;
378378
if (payloadObj.ContainsKey("subtitle")) payload.subtitle = payloadObj["subtitle"] as string;
379379
if (payloadObj.ContainsKey("launchURL")) payload.launchURL = payloadObj["launchURL"] as string;
380-
if (payloadObj.ContainsKey("additionalData")) {
381-
if(payloadObj["additionalData"] is string)
382-
payload.additionalData = Json.Deserialize(payloadObj["additionalData"] as string) as Dictionary<string, object>;
383-
else payload.additionalData = payloadObj["additionalData"] as Dictionary<string, object>;
384-
}
385-
if (payloadObj.ContainsKey("actionButtons")) {
386-
if(payloadObj["actionButtons"] is string)
387-
payload.actionButtons = Json.Deserialize(payloadObj["actionButtons"] as string) as Dictionary<string, object>;
388-
else payload.actionButtons = payloadObj["actionButtons"] as Dictionary<string, object>;
389-
}
380+
if (payloadObj.ContainsKey("additionalData")) {
381+
if(payaoadObj["additionalData"] is string)
382+
payload.additionalData = Json.Deserialize(payloadObj["additionalData"] as string) as Dictionary<string, object>;
383+
else
384+
payload.additionalData = payloadObj["additionalData"] as Dictionary<string, object>;
385+
}
386+
if (payloadObj.ContainsKey("actionButtons")) {
387+
if(payloadObj["actionButtons"] is string)
388+
payload.actionButtons = Json.Deserialize(payloadObj["actionButtons"] as string) as Dictionary<string, object>;
389+
else
390+
payload.actionButtons = payloadObj["actionButtons"] as Dictionary<string, object>;
391+
}
390392
if (payloadObj.ContainsKey("contentAvailable")) payload.contentAvailable = (bool)payloadObj["contentAvailable"];
391393
if (payloadObj.ContainsKey("badge")) payload.badge = (int)payloadObj["badge"];
392394
if (payloadObj.ContainsKey("smallIcon")) payload.smallIcon = payloadObj["smallIcon"] as string;

Unity4.7OneSignalSDK.unitypackage

-43 Bytes
Binary file not shown.

Unity5OneSignalExample/Assets/OneSignal/Example/GameControllerExample.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,11 @@ private static void HandleNotificationReceived(OSNotification notification) {
6363
print("displayType: " + notification.displayType);
6464
extraMessage = "Notification received with text: " + message;
6565

66-
Dictionary<string, object> additionalData = payload.additionalData;
67-
if (additionalData == null)
68-
Debug.Log ("[HandleNotificationReceived] Additional Data == null");
69-
else
70-
Debug.Log("[HandleNotificationReceived] message "+ message +", additionalData: "+ Json.Serialize(additionalData) as string);
71-
66+
Dictionary<string, object> additionalData = payload.additionalData;
67+
if (additionalData == null)
68+
Debug.Log ("[HandleNotificationReceived] Additional Data == null");
69+
else
70+
Debug.Log("[HandleNotificationReceived] message "+ message +", additionalData: "+ Json.Serialize(additionalData) as string);
7271
}
7372

7473
// Called when a notification is opened.

Unity5OneSignalExample/Assets/OneSignal/src/OneSignal.cs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public class OSNotificationPayload {
4949
public string body;
5050
public string subtitle;
5151
public string launchURL;
52-
public Dictionary<string, object> additionalData;
53-
public Dictionary<string, object> actionButtons;
52+
public Dictionary<string, object> additionalData;
53+
public Dictionary<string, object> actionButtons;
5454
public bool contentAvailable;
5555
public int badge;
5656
public string smallIcon;
@@ -377,16 +377,18 @@ private OSNotification DictionaryToNotification(Dictionary<string, object> jsonO
377377
if (payloadObj.ContainsKey("body")) payload.body = payloadObj["body"] as string;
378378
if (payloadObj.ContainsKey("subtitle")) payload.subtitle = payloadObj["subtitle"] as string;
379379
if (payloadObj.ContainsKey("launchURL")) payload.launchURL = payloadObj["launchURL"] as string;
380-
if (payloadObj.ContainsKey("additionalData")) {
381-
if(payloadObj["additionalData"] is string)
382-
payload.additionalData = Json.Deserialize(payloadObj["additionalData"] as string) as Dictionary<string, object>;
383-
else payload.additionalData = payloadObj["additionalData"] as Dictionary<string, object>;
384-
}
385-
if (payloadObj.ContainsKey("actionButtons")) {
386-
if(payloadObj["actionButtons"] is string)
387-
payload.actionButtons = Json.Deserialize(payloadObj["actionButtons"] as string) as Dictionary<string, object>;
388-
else payload.actionButtons = payloadObj["actionButtons"] as Dictionary<string, object>;
389-
}
380+
if (payloadObj.ContainsKey("additionalData")) {
381+
if(payaoadObj["additionalData"] is string)
382+
payload.additionalData = Json.Deserialize(payloadObj["additionalData"] as string) as Dictionary<string, object>;
383+
else
384+
payload.additionalData = payloadObj["additionalData"] as Dictionary<string, object>;
385+
}
386+
if (payloadObj.ContainsKey("actionButtons")) {
387+
if(payloadObj["actionButtons"] is string)
388+
payload.actionButtons = Json.Deserialize(payloadObj["actionButtons"] as string) as Dictionary<string, object>;
389+
else
390+
payload.actionButtons = payloadObj["actionButtons"] as Dictionary<string, object>;
391+
}
390392
if (payloadObj.ContainsKey("contentAvailable")) payload.contentAvailable = (bool)payloadObj["contentAvailable"];
391393
if (payloadObj.ContainsKey("badge")) payload.badge = (int)payloadObj["badge"];
392394
if (payloadObj.ContainsKey("smallIcon")) payload.smallIcon = payloadObj["smallIcon"] as string;

Unity5OneSignalSDK.unitypackage

-44 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)