Fix method names

Author: shepherd-l

OneSignalExample/Assets/OneSignal/Example/OneSignalExampleBehaviour.cs

@@ -228,7 +228,7 @@ public async void LoginOneSignalUser() {
 
     public void LogoutOneSignalUser() {
         _log($"Logging out user ");
-        OneSignal.Default.Logout();
+        OneSignal.Default.LogoutAsync();
     }
 
     public void AddEmail() {
@@ -258,12 +258,12 @@ public void RemoveSms() {
     public async void PromptForPush() {
         _log("Opening permission prompt for push notifications and awaiting result...");
 
-        var result = await OneSignal.Default.Notifications.RequestPermisionAsync(true);
+        var result = await OneSignal.Default.Notifications.RequestPermissionAsync(true);
 
         if (result)
             _log("User opted in");
         else
-            _error("User opted out");
+            _log("User opted out");
     }
 
     public void ClearPush() {
@@ -335,17 +335,17 @@ public void AddOutcomeWithValue() {
     public async void PromptLocation() {
         _log("Opening permission prompt for location and awaiting result...");
 
-        var result = await OneSignal.Default.Location.RequestPermisionAsync(true);
+        var result = await OneSignal.Default.Location.RequestPermissionAsync(true);
 
         if (result)
             _log("User opted in");
         else
-            _error("User opted out");
+            _log("User opted out");
     }
 
     public void ToggleShareLocation() {
-        _log($"Toggling ShareLocation to <b>{!OneSignal.Default.Location.IsLocationShared}</b>");
-        OneSignal.Default.Location.IsLocationShared = !OneSignal.Default.Location.IsLocationShared;
+        _log($"Toggling ShareLocation to <b>{!OneSignal.Default.Location.IsShared}</b>");
+        OneSignal.Default.Location.IsShared = !OneSignal.Default.Location.IsShared;
     }
 
     /*

com.onesignal.unity.core/Editor/Platform/LocationManager.cs

@@ -29,9 +29,9 @@
 
 namespace OneSignalSDKNew.Location {
     internal sealed class LocationManager : ILocationManager {
-        public bool IsLocationShared { get; set; }
+        public bool IsShared { get; set; }
 
-        public Task<bool> RequestPermisionAsync(bool fallbackToSettings) {
+        public Task<bool> RequestPermissionAsync(bool fallbackToSettings) {
             return Task.FromResult(false);
         }
     }

com.onesignal.unity.core/Editor/Platform/NotificationsManager.cs

@@ -36,9 +36,7 @@ internal sealed class NotificationsManager : INotificationsManager {
 
         public bool Permission { get; }
 
-        public bool PushEnabled { get; set; }
-
-        public Task<bool> RequestPermisionAsync(bool fallbackToSettings){
+        public Task<bool> RequestPermissionAsync(bool fallbackToSettings){
             return Task.FromResult(false);
         }
 

com.onesignal.unity.core/Editor/Platform/OneSignalNative.cs

@@ -92,7 +92,7 @@ public override Task LoginAsync(string externalId, string jwtBearerToken = null)
             return Task.FromResult(false);
         }
 
-        public override void Logout() {
+        public override void LogoutAsync() {
 
         }
     }

com.onesignal.unity.core/Editor/Platform/PushSubscription.cs

@@ -34,6 +34,14 @@ internal sealed class PushSubscription : IPushSubscription {
 
         public string Token { get; }
 
-        public bool Enabled  { get; set; }
+        public bool OptedIn  { get; set; }
+
+        public void OptIn() {
+
+        }
+
+        public void OptOut() {
+
+        }
     }
 }

com.onesignal.unity.core/Runtime/Behaviors/OneSignalBehaviour.cs

@@ -60,13 +60,13 @@ public class OneSignalBehaviour : MonoBehaviour {
         /// Disable or enable location collection by OneSignal (defaults to enabled if your app has location permission).
         /// </summary>
         /// <remarks>This method must be called before <see cref="OneSignal.Initialize"/> on iOS.</remarks>
-        public bool IsLocationShared = false;
+        public bool IsShared = false;
 
         private void Start() {
             OneSignal.Default.Debug.LogLevel               = LogLevel;
             OneSignal.Default.Debug.AlertLevel             = AlertLevel;
             OneSignal.Default.RequiresPrivacyConsent       = RequiresPrivacyConsent;
-            OneSignal.Default.Location.IsLocationShared    = IsLocationShared;
+            OneSignal.Default.Location.IsShared            = IsShared;
 
             OneSignal.Default.Initialize(AppId);
         }

com.onesignal.unity.core/Runtime/Location/ILocationManager.cs

@@ -36,7 +36,7 @@ public interface ILocationManager {
         /// Disable or enable location collection by OneSignal (defaults to enabled if your app has location permission).
         /// </summary>
         /// <remarks>This method must be called before <see cref="OneSignal.Initialize"/> on iOS.</remarks>
-        bool IsLocationShared { get; set; }
+        bool IsShared { get; set; }
 
         /// <summary>
         /// Helper method to show the native prompt to ask the user for consent to share their location
@@ -49,6 +49,6 @@ public interface ILocationManager {
         /// Awaitable boolean of true if the user opted in to location permission or
         /// false if the user is opted out of location permission
         /// </returns>
-        Task<bool> RequestPermisionAsync(bool fallbackToSettings);
+        Task<bool> RequestPermissionAsync(bool fallbackToSettings);
     }
 }

com.onesignal.unity.core/Runtime/Notifications/INotificationsManager.cs

@@ -70,12 +70,6 @@ public interface INotificationsManager {
         /// </summary>
         event PermissionChangedDelegate PermissionChanged;
 
-        /// <summary>
-        /// Whether push notifications are currently enabled for an active push subscription.
-        /// </summary>
-        /// <remarks>Can be used to turn off push notifications for a user without removing their user data</remarks>
-        bool PushEnabled { get; set; }
-
         /// <summary>
         /// Current status of permissions granted by this device for push notifications
         /// </summary>
@@ -92,7 +86,7 @@ public interface INotificationsManager {
         /// Awaitable boolean of true if the user opted in to push notifications or
         /// false if the user opted out of push notifications.
         /// </returns>
-        Task<bool> RequestPermisionAsync(bool fallbackToSettings);
+        Task<bool> RequestPermissionAsync(bool fallbackToSettings);
 
         /// <summary>
         /// Removes all OneSignal app notifications from the Notification Shade

com.onesignal.unity.core/Runtime/OneSignal.cs

@@ -147,6 +147,6 @@ internal set {
         /// be retrieved, except through this device as long as the app remains installed and the app
         /// data is not cleared.
         /// </summary>
-        public abstract void Logout();
+        public abstract void LogoutAsync();
     }
 }

com.onesignal.unity.core/Runtime/User/Models/IPushSubscription.cs

@@ -57,8 +57,26 @@ public interface IPushSubscription { // TODO: class or interface ? AndroidPushSu
         string Token { get; }
 
         /// <summary>
-        /// Whether this subscription is currently active
+        /// Whether the user of this subscription is opted-in to received notifications. When true,
+        /// the user is able to receive notifications through this subscription. Otherwise, the
+        /// user will not receive notifications through this subscription (even when the user has
+        /// granted app permission).
         /// </summary>
-        bool Enabled  { get; set; }
+        bool OptedIn { get; set; }
+
+        /// <summary>
+        /// Opt the user into this push subscription.  If the application does not have permission,
+        /// the user will be prompted by Android to permit push permissions.  If the user has
+        /// granted app permission, the user will be able to receive push notification.  If the user
+        /// rejects app permission, the user will only be able to receive push notifications once
+        /// the app permission has been granted.
+        /// </summary>
+        void OptIn();
+
+        /// <summary>
+        /// Opt the user out of this push subscription.  The user will no longer received push
+        /// notifications, although the app permission state will not be changed.
+        /// </summary>
+        void OptOut();
     }
 }