Merge pull request #583 from OneSignal/update-sdk-namespace

[User Model] Update SDK namespace

OneSignalExample/Assets/OneSignal/Attribution/OneSignal.UnityPackage.Attribution.asmdef

@@ -16,7 +16,7 @@
     "versionDefines": [
         {
             "name": "com.onesignal.unity.core",
-            "expression": "3.0.0-beta.1",
+            "expression": "3.0.0",
             "define": "ONE_SIGNAL_INSTALLED"
         }
     ],

OneSignalExample/Assets/OneSignal/CHANGELOG.md

@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Overhauled public API of the SDK to a user-centered model. While this release is in beta please see our included [example MonoBehaviour](Example/OneSignalExampleBehaviour.cs) for usage.
+- Updated included Android SDK to [5.0.0-beta1](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/5.0.0-beta1) 
+- Updated included iOS SDK to [5.0.0-beta-01](https://github.com/OneSignal/OneSignal-iOS-SDK/releases/tag/5.0.0-beta-01)
+
+If you run into any problems, please don’t hesitate to [open an issue](https://github.com/OneSignal/OneSignal-Unity-SDK/issues/new)!
+
 ## [3.0.9]
 ### Fixed
 - Android - Lock OneSignal version so it doesn't get bumped to the next major version.

OneSignalExample/Assets/OneSignal/Editor/Setup/OneSignalSetupWindow.cs

@@ -75,7 +75,7 @@ private void OnEnable() {
                 if (Activator.CreateInstance(stepType) is OneSignalSetupStep step)
                     steps.Add(step);
                 else
-                    Debug.LogWarning($"could not create setup step from type {stepType.Name}");
+                    UnityEngine.Debug.LogWarning($"could not create setup step from type {stepType.Name}");
             }
 
             _setupSteps = steps;

OneSignalExample/Assets/OneSignal/Example/OneSignalExampleBehaviour.cs

@@ -27,14 +27,14 @@
 
 #if ONE_SIGNAL_INSTALLED
 using System;
-using OneSignalSDKNew; // TODO: Change namespace and delete MiniJson copy, OneSignalExampleBehaviourOld, OneSignalExampleSceneOld
+using OneSignalSDK;
 using UnityEngine;
 using UnityEngine.UI;
-using OneSignalSDKNew.Debug.Utilities;
-using OneSignalSDKNew.Debug.Models;
-using OneSignalSDKNew.Notifications.Models;
-using OneSignalSDKNew.InAppMessages.Models;
-using OneSignalSDKNew.User.Models;
+using OneSignalSDK.Debug.Utilities;
+using OneSignalSDK.Debug.Models;
+using OneSignalSDK.Notifications.Models;
+using OneSignalSDK.InAppMessages.Models;
+using OneSignalSDK.User.Models;
 using System.Collections.Generic;
 
 // ReSharper disable InconsistentNaming

OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle

@@ -21,7 +21,7 @@ apply plugin: 'com.android.library'
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 // Android Resolver Dependencies Start
-    implementation 'com.onesignal:OneSignal:4.8.3' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6
+    implementation 'com.onesignal:OneSignal:5.0.0-beta1' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6
 // Android Resolver Dependencies End
 **DEPS**}
 

OneSignalExample/ProjectSettings/AndroidResolverDependencies.xml

@@ -1,6 +1,6 @@
 <dependencies>
   <packages>
-    <package>com.onesignal:OneSignal:4.8.3</package>
+    <package>com.onesignal:OneSignal:5.0.0-beta1</package>
   </packages>
   <files />
   <settings>

com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml

@@ -3,6 +3,6 @@
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.onesignal:OneSignal:5.0.0-alpha1" />
+    <androidPackage spec="com.onesignal:OneSignal:5.0.0-beta1" />
   </androidPackages>
 </dependencies>

com.onesignal.unity.android/Runtime/AndroidDebugManager.cs

@@ -26,10 +26,10 @@
  */
 
 using UnityEngine;
-using OneSignalSDKNew.Debug;
-using OneSignalSDKNew.Debug.Models;
+using OneSignalSDK.Debug;
+using OneSignalSDK.Debug.Models;
 
-namespace OneSignalSDKNew.Android.Debug {
+namespace OneSignalSDK.Android.Debug {
     internal sealed class AndroidDebugManager : IDebugManager {
         private readonly AndroidJavaObject _debug;
 

com.onesignal.unity.android/Runtime/AndroidInAppMessagesManager.cs

@@ -28,11 +28,11 @@
 
 using UnityEngine;
 using System.Collections.Generic;
-using OneSignalSDKNew.InAppMessages;
-using OneSignalSDKNew.InAppMessages.Models;
-using OneSignalSDKNew.Android.Utilities;
+using OneSignalSDK.InAppMessages;
+using OneSignalSDK.InAppMessages.Models;
+using OneSignalSDK.Android.Utilities;
 
-namespace OneSignalSDKNew.Android.InAppMessages {
+namespace OneSignalSDK.Android.InAppMessages {
     internal sealed class AndroidInAppMessagesManager : IInAppMessagesManager {
         private readonly AndroidJavaObject _inAppMessages;
 

com.onesignal.unity.android/Runtime/AndroidLocationManager.cs

@@ -27,12 +27,10 @@
 
 using UnityEngine;
 using System.Threading.Tasks;
-using OneSignalSDKNew.Location;
-using OneSignalSDKNew.Android.Utilities;
+using OneSignalSDK.Location;
+using OneSignalSDK.Android.Utilities;
 
-using OneSignalSDKNew.Debug.Utilities;
-
-namespace OneSignalSDKNew.Android.Location {
+namespace OneSignalSDK.Android.Location {
     internal sealed class AndroidLocationManager : ILocationManager {
         private readonly AndroidJavaObject _location;
 

com.onesignal.unity.android/Runtime/AndroidNotificationsManager.cs

@@ -27,12 +27,12 @@
 
 using UnityEngine;
 using System.Threading.Tasks;
-using OneSignalSDKNew.Notifications;
-using OneSignalSDKNew.Notifications.Models;
-using OneSignalSDKNew.Android.Utilities;
+using OneSignalSDK.Notifications;
+using OneSignalSDK.Notifications.Models;
+using OneSignalSDK.Android.Utilities;
 using System.Collections.Generic;
 
-namespace OneSignalSDKNew.Android.Notifications {
+namespace OneSignalSDK.Android.Notifications {
     internal sealed class AndroidNotificationsManager : INotificationsManager {
         private readonly AndroidJavaObject _notifications;
 
@@ -55,8 +55,7 @@ public async Task<bool> RequestPermissionAsync(bool fallbackToSettings) {
         }
 
         public void ClearAllNotifications() {
-            var continuation = new Continuation();
-            _notifications.Call<AndroidJavaObject>("clearAllNotifications", continuation.Proxy);
+            _notifications.Call("clearAllNotifications");
         }
 
         public void Initialize() {

com.onesignal.unity.android/Runtime/AndroidPushSubscription.cs

@@ -27,10 +27,10 @@
 
 using System;
 using UnityEngine;
-using OneSignalSDKNew.User.Models;
-using OneSignalSDKNew.Android.Utilities;
+using OneSignalSDK.User.Models;
+using OneSignalSDK.Android.Utilities;
 
-namespace OneSignalSDKNew.Android.User.Models {
+namespace OneSignalSDK.Android.User.Models {
     internal sealed class AndroidPushSubscription : IPushSubscription {
         public event SubscriptionChangedDelegate Changed;
 

com.onesignal.unity.android/Runtime/AndroidSessionManager.cs

@@ -26,9 +26,9 @@
  */
 
 using UnityEngine;
-using OneSignalSDKNew.Session;
+using OneSignalSDK.Session;
 
-namespace OneSignalSDKNew.Android.Session {
+namespace OneSignalSDK.Android.Session {
     internal sealed class AndroidSessionManager : ISessionManager {
         private readonly AndroidJavaObject _session;
 

com.onesignal.unity.android/Runtime/AndroidUserManager.cs

@@ -28,12 +28,12 @@
 
 using UnityEngine;
 using System.Collections.Generic;
-using OneSignalSDKNew.User;
-using OneSignalSDKNew.User.Models;
-using OneSignalSDKNew.Android.User.Models;
-using OneSignalSDKNew.Android.Utilities;
+using OneSignalSDK.User;
+using OneSignalSDK.User.Models;
+using OneSignalSDK.Android.User.Models;
+using OneSignalSDK.Android.Utilities;
 
-namespace OneSignalSDKNew.Android.User {
+namespace OneSignalSDK.Android.User {
     internal sealed class AndroidUserManager : IUserManager {
         private readonly AndroidJavaObject _user;
         private AndroidPushSubscription _pushSubscription;

com.onesignal.unity.android/Runtime/OneSignalAndroid.cs

@@ -29,28 +29,30 @@
 using System.Linq;
 using System.Threading.Tasks;
 using UnityEngine;
-using OneSignalSDKNew.Notifications;
-using OneSignalSDKNew.InAppMessages;
-using OneSignalSDKNew.Debug;
-using OneSignalSDKNew.Debug.Utilities;
-using OneSignalSDKNew.Location;
-using OneSignalSDKNew.Session;
-using OneSignalSDKNew.User;
-using OneSignalSDKNew.Android.Notifications;
-using OneSignalSDKNew.Android.InAppMessages;
-using OneSignalSDKNew.Android.Debug;
-using OneSignalSDKNew.Android.Location;
-using OneSignalSDKNew.Android.Session;
-using OneSignalSDKNew.Android.User;
-
-namespace OneSignalSDKNew.Android { // TODO: Fix namespace to OneSignalSDK
+using OneSignalSDK.Notifications;
+using OneSignalSDK.InAppMessages;
+using OneSignalSDK.Debug;
+using OneSignalSDK.Debug.Utilities;
+using OneSignalSDK.Location;
+using OneSignalSDK.Session;
+using OneSignalSDK.User;
+using OneSignalSDK.Android.Notifications;
+using OneSignalSDK.Android.InAppMessages;
+using OneSignalSDK.Android.Debug;
+using OneSignalSDK.Android.Location;
+using OneSignalSDK.Android.Session;
+using OneSignalSDK.Android.User;
+
+namespace OneSignalSDK.Android {
     public sealed partial class OneSignalAndroid : OneSignal {
         private const string SDKPackage = "com.onesignal";
         private const string SDKClassName = "OneSignal";
         private const string QualifiedSDKClass = SDKPackage + "." + SDKClassName;
 
         private readonly AndroidJavaClass _sdkClass = new AndroidJavaClass(QualifiedSDKClass);
 
+        private readonly AndroidJavaClass _sdkWrapperClass = new AndroidJavaClass(SDKPackage + ".common.OneSignalWrapper");
+
         private static OneSignalAndroid _instance;
 
         private AndroidUserManager _user;
@@ -112,6 +114,9 @@ public override void Initialize(string appId) {
             var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
             var activity    = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
 
+            _sdkWrapperClass.CallStatic("setSdkType", "unity");
+            //_sdkWrapperClass.CallStatic("setSdkVersion", "050000");
+
             _sdkClass.CallStatic("initWithContext", activity, appId);
 
             if (_inAppMessages == null) {
@@ -141,7 +146,7 @@ public override void Initialize(string appId) {
         }
 
         public override void Login(string externalId, string jwtBearerToken = null) {
-            _sdkClass.CallStatic("login", externalId);
+            _sdkClass.CallStatic("login", externalId, jwtBearerToken);
         }
 
         public override void Logout() {

com.onesignal.unity.android/Runtime/OneSignalAndroidInit.cs

@@ -28,7 +28,7 @@
 #if UNITY_ANDROID && !UNITY_EDITOR
 using UnityEngine;
 
-namespace OneSignalSDKNew.Android {
+namespace OneSignalSDK.Android {
     /// <summary>
     /// 
     /// </summary>