Merge pull request #582 from OneSignal/onesignal-ios

[User Model] Bind to iOS SDK

Author: shepherd-l

OneSignalExample/Assets/OneSignal/Example/OneSignalExampleBehaviour.cs

@@ -79,6 +79,16 @@ public class OneSignalExampleBehaviour : MonoBehaviour {
     /// </summary>
     public string language;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public string aliasKey;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string aliasValue;
+
     /// <summary>
     /// 
     /// </summary>
@@ -182,8 +192,8 @@ private void _notificationPermissionChanged(bool permission) {
         _log($"Notification Permission changed to: {permission}");
     }
 
-    private void _pushSubscriptionChanged(IPushSubscription subscription) {
-        _log($"Push subscription changed to: {subscription.Id}");
+    private void _pushSubscriptionChanged(PushSubscriptionState current) {
+        _log($"Push subscription changed: {JsonUtility.ToJson(current)}");
     }
 
     /*
@@ -224,60 +234,59 @@ public void SetAlertLevel() {
      * User identification
      */
 
-    public async void LoginOneSignalUser() {
-        _log($"Logging in user (<b>{externalId}</b>) and awaiting result...");
-
-        await OneSignal.Default.LoginAsync(externalId);
-
-        _log("User login complete");
+    public void LoginOneSignalUser() {
+        _log($"Logging in user (<b>{externalId}</b>)");
+        OneSignal.Default.Login(externalId);
     }
 
-    public async void LogoutOneSignalUser() {
-        _log($"Logging out user and awaiting result...");
-
-        await OneSignal.Default.LogoutAsync();
+    public void LogoutOneSignalUser() {
+        _log($"Logging out user");
+        OneSignal.Default.Logout();
+    }
 
-        _log("User logout complete");
+    public void PushSubscriptionOptIn() {
+        _log($"Opting in push subscription");
+        OneSignal.Default.User.PushSubscription.OptIn();
+    }
 
+    public void PushSubscriptionOptOut() {
+        _log($"Opting out push subscription");
+        OneSignal.Default.User.PushSubscription.OptOut();
     }
 
     public void AddEmail() {
         _log($"Adding email (<b>{email}</b>)");
-        OneSignal.Default.User.AddEmailSubscription(email);
+        OneSignal.Default.User.AddEmail(email);
     }
 
     public void RemoveEmail() {
         _log($"Removing email (<b>{email}</b>)");
-        OneSignal.Default.User.RemoveEmailSubscription(email);
+        OneSignal.Default.User.RemoveEmail(email);
     }
 
     public void AddSms() {
         _log($"Adding sms (<b>{phoneNumber}</b>)");
-        OneSignal.Default.User.AddSmsSubscription(phoneNumber);
+        OneSignal.Default.User.AddSms(phoneNumber);
     }
 
     public void RemoveSms() {
         _log($"Removing sms (<b>{phoneNumber}</b>)");
-        OneSignal.Default.User.RemoveSmsSubscription(phoneNumber);
-    }
-
-    public void GetLanguage() {
-        _log($"Language set for the user is (<b>{OneSignal.Default.User.Language}</b>)");
+        OneSignal.Default.User.RemoveSms(phoneNumber);
     }
 
     public void SetLanguage() {
         _log($"Setting language for the user to (<b>{language}</b>)");
         OneSignal.Default.User.Language = language;
     }
 
-    public void PushSubscriptionOptIn() {
-        _log($"Opting in push subscription");
-        OneSignal.Default.User.PushSubscription.OptIn();
+    public void AddAlias() {
+        _log($"Adding alias with label <b>{aliasKey}</b> and id <b>{aliasValue}</b>");
+        OneSignal.Default.User.AddAlias(aliasKey, aliasValue);
     }
 
-    public void PushSubscriptionOptOut() {
-        _log($"Opting out push subscription");
-        OneSignal.Default.User.PushSubscription.OptOut();
+    public void RemoveAlias() {
+        _log($"Removing alias with label <b>{aliasKey}</b>");
+        OneSignal.Default.User.RemoveAlias(aliasKey);
     }
 
     /*
@@ -290,17 +299,17 @@ public async void PromptForPush() {
         var result = await OneSignal.Default.Notifications.RequestPermissionAsync(true);
 
         if (result)
-            _log("Notification permission accpeted");
+            _log("Notification permission accepeted");
         else
             _log("Notification permission denied");
 
         _log($"Notification permission is: {OneSignal.Default.Notifications.Permission}");
     }
 
-    public async void ClearPush() {
-        _log("Clearing existing OneSignal push notifications and awaiting result ...");
+    public void ClearPush() {
+        _log("Clearing existing OneSignal push notifications");
 
-        await OneSignal.Default.Notifications.ClearAllNotificationsAsync();
+        OneSignal.Default.Notifications.ClearAllNotifications();
 
         _log("Notifications cleared");
     }
@@ -366,15 +375,10 @@ public void AddOutcomeWithValue() {
      * Location
      */
 
-    public async void PromptLocation() {
-        _log("Opening permission prompt for location and awaiting result...");
-
-        var result = await OneSignal.Default.Location.RequestPermissionAsync(true);
+    public void PromptLocation() {
+        _log("Opening permission prompt for location");
 
-        if (result)
-            _log("User opted in");
-        else
-            _log("User opted out");
+        OneSignal.Default.Location.RequestPermission();
     }
 
     public void ToggleShareLocation() {
@@ -408,6 +412,9 @@ public void ToggleLaunchURLsInApp() {
     public void SetPhoneNumberString(string newVal) => phoneNumber = newVal;
     public void SetLanguageString(string newVal) => language = newVal;
 
+    public void SetAliasKey(string newVal) => aliasKey = newVal;
+    public void SetAliasValue(string newVal) => aliasValue = newVal;
+
     public void SetTriggerKey(string newVal) => triggerKey = newVal;
     public void SetTriggerValue(string newVal) => triggerValue = newVal;