Keep the internal changed handler in memory

remove test calls to User.OneSignalId and User.ExternalId
OneSignal · Mar 21, 2024 · 9f6c4f5 · 9f6c4f5
1 parent 62b79a8
commit 9f6c4f5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/OneSignalSDK.DotNet.Android/AndroidUserManager.cs b/OneSignalSDK.DotNet.Android/AndroidUserManager.cs
@@ -15,9 +15,12 @@ public string Language
 
         public IPushSubscription PushSubscription { get; } = new AndroidPushSubscription();
 
+        private InternalUserChangedHandler? _userChangedHandler;
+
         public void Initialize()
         {
-            OneSignalNative.User.AddObserver(new InternalUserChangedHandler(this));
+            _userChangedHandler = new InternalUserChangedHandler(this);
+            OneSignalNative.User.AddObserver(_userChangedHandler);
             ((AndroidPushSubscription)PushSubscription).Initialize();
         }
 

diff --git a/OneSignalSDK.DotNet.iOS/iOSUserManager.cs b/OneSignalSDK.DotNet.iOS/iOSUserManager.cs
@@ -18,9 +18,12 @@ public string Language
 
         public IPushSubscription PushSubscription { get; } = new iOSPushSubscription();
 
+        private InternalUserChangedHandler _userChangedHandler;
+
         public void Initialize()
         {
-            OneSignalNative.User.AddObserver(new InternalUserChangedHandler(this));
+            _userChangedHandler = new InternalUserChangedHandler(this);
+            OneSignalNative.User.AddObserver(_userChangedHandler);
             ((iOSPushSubscription)PushSubscription).Initialize();
         }
 
@@ -33,7 +36,7 @@ public string ExternalId
         {
             get => OneSignalNative.User.ExternalId;
         }
-        public event EventHandler<UserStateChangedEventArgs> Changed;
+        public event EventHandler<UserStateChangedEventArgs>? Changed;
 
         public void AddAlias(string label, string id) => OneSignalNative.User.AddAliasWithLabel(label, id);
         public void AddAliases(IDictionary<string, string> aliases) => OneSignalNative.User.AddAliases(NativeConversion.DictToNSDict(aliases));
@@ -73,7 +76,7 @@ public InternalUserChangedHandler(iOSUserManager manager)
                 _manager = manager;
             }
 
-            public void OnUserStateDidChangeWithState(OSUserChangedState state)
+            public override void OnUserStateDidChangeWithState(OSUserChangedState state)
             {
                 var current = new InternalUserState(state.Current.OnesignalId, state.Current.ExternalId);
                 var userChangedState = new UserChangedState(current);

diff --git a/Samples/OneSignalApp/Models/MainPageModel.cs b/Samples/OneSignalApp/Models/MainPageModel.cs
@@ -203,9 +203,6 @@ public MainPageModel(Page page)
             OneSignal.InAppMessages.DidDismiss += InAppMessages_DidDismiss;
             OneSignal.InAppMessages.Clicked += InAppMessages_Clicked;
 
-            string onesignalId = OneSignal.User.OneSignalId;
-            string externalId = OneSignal.User.ExternalId;
-
             IsPushEnabled = OneSignal.User.PushSubscription.OptedIn;
             HasPushPermission = OneSignal.Notifications.Permission;
             IsIAMPaused = OneSignal.InAppMessages.Paused;