Added Android In-App messaging methods

* iOS has been stubbed for now

Author: jkasten2

OneSignalExample/Assets/OneSignal/Editor/OneSignalDependencies.xml

@@ -1,9 +1,10 @@
-<dependencies>
+<dependencies>
   <androidPackages>
     <androidPackage spec="com.google.android.gms:play-services-base:[10.2.1, 12.1.0[" />
     <androidPackage spec="com.google.firebase:firebase-messaging:[10.2.1, 12.1.0["/>
     <androidPackage spec="com.google.android.gms:play-services-location:[10.2.1, 12.1.0[" />
     <androidPackage spec="com.android.support:support-v4:[26.0.0, 27.2.0[" />
+    <androidPackage spec="com.android.support:cardview-v7:[26.0.0, 27.2.0[" />  
     <androidPackage spec="com.android.support:customtabs:[26.0.0, 27.2.0[" />
   </androidPackages>
 </dependencies>

OneSignalExample/Assets/OneSignal/Example/GameControllerExample.cs

@@ -54,10 +54,10 @@ void Start () {
       // Call before using any other methods on OneSignal (except setLogLevel or SetRequiredUserPrivacyConsent)
       // Should only be called once when your app is loaded.
       // OneSignal.Init(OneSignal_AppId);
-      OneSignal.StartInit("78e8aff3-7ce2-401f-9da0-2d41f287ebaf")
+      OneSignal.StartInit("99015f5e-87b1-462e-a75b-f99bf7c2822e")
                .HandleNotificationReceived(HandleNotificationReceived)
                .HandleNotificationOpened(HandleNotificationOpened)
-               //.InFocusDisplaying(OneSignal.OSInFocusDisplayOption.Notification)
+               .HandlerInAppMessageClicked(HandlerInAppMessageClicked)
                .EndInit();
 
       OneSignal.inFocusDisplayType = OneSignal.OSInFocusDisplayOption.Notification;
@@ -66,6 +66,30 @@ void Start () {
       OneSignal.emailSubscriptionObserver += OneSignal_emailSubscriptionObserver;
 
       var pushState = OneSignal.GetPermissionSubscriptionState();
+
+      OneSignalInAppMessageTriggerExamples();
+   }
+
+   // Examples of using OneSignal In-App Message triggers
+   private void OneSignalInAppMessageTriggerExamples() {
+      // Add a single trigger
+      OneSignal.AddTrigger("key", "value");
+
+      // Get the current value to a trigger by key
+      var triggerValue = OneSignal.GetTriggerValueForKey("key");
+
+      // Add multiple triggers
+      OneSignal.AddTriggers(new Dictionary<string, object>() { { "key1", "value1" }, { "key2", 2 } });
+
+      // Delete a trigger
+      OneSignal.RemoveTriggerForKey("key");
+
+      // Delete a list of triggers
+      OneSignal.RemoveTriggersForKeys(new List<string>() { "key1", "key2" });
+
+      // Temporarily puase In-App messages; If true is passed in.
+      // Great to ensure you never interrupt your user while they are in the middle of a match in your game.
+      OneSignal.PauseInAppMessages(false);
    }
 
    private void OneSignal_subscriptionObserver(OSSubscriptionStateChanges stateChanges) {
@@ -126,6 +150,12 @@ public static void HandleNotificationOpened(OSNotificationOpenedResult result) {
       }
 	}
 
+   public static void HandlerInAppMessageClicked(OSInAppMessageAction action) {
+      String logInAppClickEvent = "In-App Message opened with action.clickName " + action.clickName;
+      print(logInAppClickEvent);
+      extraMessage = logInAppClickEvent;
+   }
+
    // Test Menu
    // Includes SendTag/SendTags, getting the userID and pushToken, and scheduling an example notification
    void OnGUI () {

OneSignalExample/Assets/OneSignal/Platforms/Android/onesignal-unity.aar

@@ -102,6 +102,13 @@ public class OSNotificationOpenedResult {
    public OSNotification notification;
 }
 
+public class OSInAppMessageAction {
+   public string clickName;
+   public string clickUrl;
+   public bool firstClick;
+   public bool closesMessage;
+}
+
 public enum OSNotificationPermission {
    NotDetermined,
    Denied,
@@ -161,6 +168,8 @@ public class OneSignal : MonoBehaviour {
    // result = The Notification open result describing : 1. The notification opened 2. The action taken by the user
    public delegate void NotificationOpened(OSNotificationOpenedResult result);
 
+   public delegate void InAppMessageClicked(OSInAppMessageAction action);
+
    public delegate void IdsAvailableCallback(string playerID, string pushToken);
    public delegate void TagsReceived(Dictionary<string, object> tags);
    public delegate void PromptForPushNotificationsUserResponse(bool accepted);
@@ -264,11 +273,12 @@ public enum OSInFocusDisplayOption {
    }
 
    public class UnityBuilder {
-      public string appID = null;
-      public string googleProjectNumber = null;
-      public Dictionary<string, bool> iOSSettings = null;
-      public NotificationReceived notificationReceivedDelegate = null;
-      public NotificationOpened notificationOpenedDelegate = null;
+      public string appID;
+      public string googleProjectNumber;
+      public Dictionary<string, bool> iOSSettings;
+      public NotificationReceived notificationReceivedDelegate;
+      public NotificationOpened notificationOpenedDelegate;
+      public InAppMessageClicked inAppMessageClickHandlerDelegate;
 
       // inNotificationReceivedDelegate   = Calls this delegate when a notification is received.
       public UnityBuilder HandleNotificationReceived(NotificationReceived inNotificationReceivedDelegate) {
@@ -278,7 +288,13 @@ public UnityBuilder HandleNotificationReceived(NotificationReceived inNotificati
 
       // inNotificationOpenedDelegate     = Calls this delegate when a push notification is opened.
       public UnityBuilder HandleNotificationOpened(NotificationOpened inNotificationOpenedDelegate) {
-         notificationOpenedDelegate = inNotificationOpenedDelegate; ;
+         notificationOpenedDelegate = inNotificationOpenedDelegate;
+         return this;
+      }
+
+      // inInAppMessageClickHandlerDelegate = Calls this delegate when an In-App Message is opened.
+      public UnityBuilder HandlerInAppMessageClicked(InAppMessageClicked inInAppMessageClickedDelegate) {
+         inAppMessageClickHandlerDelegate = inInAppMessageClickedDelegate;
          return this;
       }
 
@@ -654,6 +670,44 @@ public static void RemoveExternalUserId()
 #endif
    }
 
+   public static void AddTrigger(string key, object value) {
+#if ONESIGNAL_PLATFORM
+      oneSignalPlatform.AddTrigger(key, value);
+#endif
+   }
+
+   public static void AddTriggers(Dictionary<string, object> triggers) {
+#if ONESIGNAL_PLATFORM
+      oneSignalPlatform.AddTriggers(triggers);
+#endif
+   }
+   
+   public static void RemoveTriggerForKey(string key) {
+#if ONESIGNAL_PLATFORM
+      oneSignalPlatform.RemoveTriggerForKey(key);
+#endif
+   }
+
+   public static void RemoveTriggersForKeys(IList<string> keys) {
+#if ONESIGNAL_PLATFORM
+      oneSignalPlatform.RemoveTriggersForKeys(keys);
+#endif
+   }
+   
+   public static object GetTriggerValueForKey(string key) {
+#if ONESIGNAL_PLATFORM
+      return oneSignalPlatform.GetTriggerValueForKey(key);
+#else
+      return null;
+#endif
+   }
+
+   public static void PauseInAppMessages(bool pause) {
+#if ONESIGNAL_PLATFORM
+      oneSignalPlatform.PauseInAppMessages(pause);
+#endif
+   }
+
    /*** protected and private methods ****/
 #if ONESIGNAL_PLATFORM
 
@@ -831,5 +885,25 @@ private void onPromptForPushNotificationsWithUserResponse(string accepted) {
       notificationUserResponseDelegate(Convert.ToBoolean(accepted));
    }
 
+   // Called from native SDK
+   private void onInAppMessageClicked(string jsonString) {
+      if (builder.inAppMessageClickHandlerDelegate == null)
+         return;
+
+      var jsonObject = Json.Deserialize(jsonString) as Dictionary<string, object>;
+
+      var action = new OSInAppMessageAction();
+      if (jsonObject.ContainsKey("click_name"))
+         action.clickName = jsonObject["click_name"] as String;
+      if (jsonObject.ContainsKey("click_url"))
+         action.clickUrl = jsonObject["click_url"] as String;
+      if (jsonObject.ContainsKey("closes_message"))
+         action.closesMessage = (bool)jsonObject["closes_message"];
+      if (jsonObject.ContainsKey("first_click"))
+         action.firstClick = (bool)jsonObject["first_click"];
+
+      builder.inAppMessageClickHandlerDelegate(action);
+   }
+
 #endif
 }

OneSignalExample/Assets/OneSignal/src/OneSignal.cs

@@ -211,6 +211,36 @@ public void SetEmail(string email) {
 
    public void LogoutEmail() {
       mOneSignal.Call("logoutEmail");
-   }
+   }
+
+   public void AddTrigger(string key, object value) {
+      mOneSignal.Call("addTrigger", key, value.ToString());
+   }
+
+   public void AddTriggers(IDictionary<string, object> triggers) {
+      mOneSignal.Call("addTriggers", Json.Serialize(triggers));
+   }
+
+   public void RemoveTriggerForKey(string key) {
+      mOneSignal.Call("removeTriggerForKey", key);
+   }
+
+   public void RemoveTriggersForKeys(IList<string> keys) {
+      mOneSignal.Call("removeTriggersForKeys", Json.Serialize(keys));
+   }
+
+   public object GetTriggerValueForKey(string key) {
+      var valueJsonStr = mOneSignal.Call<string>("getTriggerValueForKey", key);
+      if (valueJsonStr == null)
+         return null;
+      var valueDict = Json.Deserialize(valueJsonStr) as Dictionary<string, object>;
+      if (valueDict.ContainsKey("value"))
+         return valueDict["value"];
+      return null;
+   }
+
+   public void PauseInAppMessages(bool pause) {
+      mOneSignal.Call("pauseInAppMessages", pause);
+   }
 }
 #endif

OneSignalExample/Assets/OneSignal/src/OneSignalAndroid.cs

@@ -311,6 +311,31 @@ public OSEmailSubscriptionState parseOSEmailSubscriptionState(object stateDict)
       state.subscribed = stateDictCasted.ContainsKey("emailUserId") && stateDictCasted["emailUserId"] != null;
 
       return state;
-   }
+   }
+
+   public void AddTrigger(string key, object value) {
+      // Do nothing, In-App not available for iOS yet.
+   }
+
+   public void AddTriggers(IDictionary<string, object> triggers) {
+      // Do nothing, In-App not available for iOS yet.
+   }
+
+   public void RemoveTriggerForKey(string key) {
+      // Do nothing, In-App not available for iOS yet.
+   }
+
+   public void RemoveTriggersForKeys(IList<string> keys) {
+      // Do nothing, In-App not available for iOS yet.
+   }
+
+   public object GetTriggerValueForKey(string key) {
+      // Do nothing, In-App not available for iOS yet.
+      return null;
+   }
+
+   public void PauseInAppMessages(bool pause) {
+      // Do nothing, In-App not available for iOS yet.
+   }
 }
 #endif

OneSignalExample/Assets/OneSignal/src/OneSignalIOS.cs

@@ -64,8 +64,16 @@ public interface OneSignalPlatform {
    void addEmailSubscriptionObserver();
    void removeEmailSubscriptionObserver();
 
-   OSPermissionSubscriptionState getPermissionSubscriptionState();
-
+   OSPermissionSubscriptionState getPermissionSubscriptionState();
+
+    // In-App Messaging
+   void AddTrigger(string key, object value);
+   void AddTriggers(IDictionary<string, object> triggers);
+   void RemoveTriggerForKey(string key);
+   void RemoveTriggersForKeys(IList<string> keys);
+   object GetTriggerValueForKey(string key);
+   void PauseInAppMessages(bool pause);
+
    OSPermissionState parseOSPermissionState(object stateDict);
    OSSubscriptionState parseOSSubscriptionState(object stateDict);
    OSEmailSubscriptionState parseOSEmailSubscriptionState (object stateDict);