Merge pull request #697 from OneSignal/fix/iOSNullPushSubIdAndToken

[Fix] iOS Null PushSubscription Id and Token crash
OneSignal · Feb 27, 2024 · 381e121 · 381e121
2 parents c1bf827 + 451382d
commit 381e121
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 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
+- iOS crash when calling OneSignal.User.PushSubscription.Id and OneSignal.User.PushSubscription.Token when they are null.
+
 ## [5.0.6]
 ### Fixed
 - Duplicate symbol errors when building with other iOS plugins

diff --git a/com.onesignal.unity.ios/Runtime/Plugins/iOS/OneSignalUnityBridgeUser.mm b/com.onesignal.unity.ios/Runtime/Plugins/iOS/OneSignalUnityBridgeUser.mm
@@ -161,10 +161,16 @@ void _oneSignalUserRemoveTags(const char* tagsJson) {
     }
 
     const char* _oneSignalPushSubscriptionGetId() {
+        if (OneSignal.User.pushSubscription.id == NULL) {
+            return NULL;
+        }
         return strdup([OneSignal.User.pushSubscription.id UTF8String]);
     }
 
     const char* _oneSignalPushSubscriptionGetToken() {
+        if (OneSignal.User.pushSubscription.token == NULL) {
+            return NULL;
+        }
         return strdup([OneSignal.User.pushSubscription.token UTF8String]);
     }