Merge pull request #741 from OneSignal/fix/multipleOneSignalInstance

[Fix]Multiple OneSignal instance
OneSignal · Jul 3, 2024 · 65abdaa · 65abdaa
2 parents d5650a4 + aa776fd
commit 65abdaa
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 156 deletions.
diff --git a/OneSignalExample/Assets/OneSignal/CHANGELOG.md b/OneSignalExample/Assets/OneSignal/CHANGELOG.md
@@ -5,6 +5,9 @@ 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]
+### Fixed
+- Additional instance of OneSignal error when calling OneSignal methods in Awake()
+
 ## [5.1.6]
 ### Fixed
 - iOS build error: No type or protocol named OSLiveActivities

diff --git a/com.onesignal.unity.android/Runtime/OneSignalAndroid.cs b/com.onesignal.unity.android/Runtime/OneSignalAndroid.cs
@@ -68,8 +68,10 @@ public sealed partial class OneSignalAndroid : OneSignalPlatform {
         /// Used to provide a reference for the global callbacks
         /// </summary>
         public OneSignalAndroid() {
-            if (_instance != null)
+            if (_instance != null) {
                 SDKDebug.Error("Additional instance of OneSignalAndroid created.");
+                return;
+            }
 
             _instance = this;
             _debug = new AndroidDebugManager(_sdkClass);

diff --git a/com.onesignal.unity.android/Runtime/OneSignalAndroidInit.cs b/com.onesignal.unity.android/Runtime/OneSignalAndroidInit.cs
diff --git a/com.onesignal.unity.android/Runtime/OneSignalAndroidInit.cs.meta b/com.onesignal.unity.android/Runtime/OneSignalAndroidInit.cs.meta
diff --git a/com.onesignal.unity.core/Editor/Platform/OneSignalNativeInit.cs b/com.onesignal.unity.core/Editor/Platform/OneSignalNativeInit.cs
diff --git a/com.onesignal.unity.core/Editor/Platform/OneSignalNativeInit.cs.meta b/com.onesignal.unity.core/Editor/Platform/OneSignalNativeInit.cs.meta
diff --git a/com.onesignal.unity.core/Runtime/OneSignal.cs b/com.onesignal.unity.core/Runtime/OneSignal.cs
@@ -46,10 +46,8 @@ public static partial class OneSignal {
         /// The default static instance of the OneSignal Unity SDK
         /// </summary>
         public static OneSignalPlatform Default {
-            private get => _getDefaultInstance();
-            set {
-                UnityEngine.Debug.Log($"[OneSignal] OneSignal set to platform SDK {value.GetType()}. Current version is {Version}");
-                _default = value;
+            get {
+                return _getDefaultInstance();
             }
         }
 

diff --git a/com.onesignal.unity.core/Runtime/OneSignalPlatform.cs b/com.onesignal.unity.core/Runtime/OneSignalPlatform.cs
@@ -43,11 +43,9 @@ public abstract class OneSignalPlatform {
         internal static event Action<string> OnInitialize;
 
         internal static string AppId { get; private set; }
-        internal static bool DidInitialize { get; private set; }
 
         protected static void _completedInit(string appId) {
             AppId         = appId;
-            DidInitialize = true;
             OnInitialize?.Invoke(AppId);
         }
 

diff --git a/com.onesignal.unity.ios/Runtime/OneSignaliOS.cs b/com.onesignal.unity.ios/Runtime/OneSignaliOS.cs
@@ -69,8 +69,10 @@ public sealed partial class OneSignaliOS : OneSignalPlatform {
         /// Used to provide a reference for and sets up the global callbacks
         /// </summary>
         public OneSignaliOS() {
-            if (_instance != null)
+            if (_instance != null) {
                 SDKDebug.Error("Additional instance of OneSignaliOS created.");
+                return;
+            }
 
             _instance = this;
             _debug = new iOSDebugManager();

diff --git a/com.onesignal.unity.ios/Runtime/OneSignaliOSInit.cs b/com.onesignal.unity.ios/Runtime/OneSignaliOSInit.cs
diff --git a/com.onesignal.unity.ios/Runtime/OneSignaliOSInit.cs.meta b/com.onesignal.unity.ios/Runtime/OneSignaliOSInit.cs.meta