Finishing touches, still need to add property

Author: fhboswell

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSUserInternalImpl.swift

@@ -75,6 +75,7 @@ class OSUserInternalImpl: NSObject, OSUserInternal {
         pushSubscriptionModel = OSSubscriptionModel(type: .push, address: token, subscriptionId: subscriptionId, accepted: true, isDisabled: false, changeNotifier: OSEventProducer())
         print("🔥 OSUserInternalImpl has set pushSubcription for testing")
         return pushSubscriptionModel
+        
     }
 
     init(identityModel: OSIdentityModel, propertiesModel: OSPropertiesModel, pushSubscriptionModel: OSSubscriptionModel) {

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -104,6 +104,7 @@ - (id)initWith:(NSString * _Nonnull)activityId
        withSuccess:(OSResultSuccessBlock _Nullable)successBlock
        withFailure:(OSFailureBlock _Nullable)failureBlock;
 @end
+
 @implementation OSPendingLiveActivityUpdate
 
 - (id)initWith:(NSString *)activityId
@@ -120,6 +121,18 @@ - (id)initWith:(NSString *)activityId
 };
 @end
 
+@interface OSSubscriptionObserver: NSObject<OSPushSubscriptionObserver>
+@end
+
+@implementation OSSubscriptionObserver
+
+- (void)onOSPushSubscriptionChangedWithStateChanges:(OSPushSubscriptionStateChanges * _Nonnull)stateChanges {
+    if(stateChanges.to.subscriptionId){
+        [OneSignal executePendingLiveActivityUpdates];
+    }
+}
+@end
+
 @implementation OneSignal
 
 static NSString* mSDKType = @"native";
@@ -129,6 +142,8 @@ @implementation OneSignal
 static OSFailureBlock pendingGetTagsFailureBlock;
 
 static NSMutableArray* pendingLiveActivityUpdates;
+static OSSubscriptionObserver* _subscriptionObserver;
+
 
 // Has attempted to register for push notifications with Apple since app was installed.
 static BOOL registeredWithApple = NO;
@@ -174,6 +189,7 @@ + (ObservablePermissionStateChangesType*)permissionStateChangesObserver {
     return _permissionStateChangesObserver;
 }
 
+
 /*
  Indicates if the iOS params request has started
  Set to true when the method is called and set false if the request's failure callback is triggered
@@ -413,16 +429,19 @@ + (void)enterLiveActivity:(NSString * _Nonnull)activityId withToken:(NSString *
         return;
     }
 
-    
-    if(self.currentSubscriptionState.userId) {
-        [OneSignalClient.sharedClient executeRequest:[OSRequestLiveActivityEnter withUserId:self.currentSubscriptionState.userId appId:appId activityId:activityId token:token]
+    NSString *subscriptionId = [OneSignalUserManagerImpl.sharedInstance addObserver:_subscriptionObserver].subscriptionId;
+    if(subscriptionId) {
+        [OneSignalClient.sharedClient executeRequest:[OSRequestLiveActivityEnter withUserId:subscriptionId appId:appId activityId:activityId token:token]
                                            onSuccess:^(NSDictionary *result) {
             [self callSuccessBlockOnMainThread:successBlock withResult:result];
         } onFailure:^(NSError *error) {
             [self callFailureBlockOnMainThread:failureBlock withError:error];
         }];
     } else {
+        _subscriptionObserver = [OSSubscriptionObserver new];
+        
         [self addPendingLiveActivityUpdate:activityId withToken:token isEnter:true withSuccess:successBlock withFailure:failureBlock];
+        
     }
 }
 
@@ -443,8 +462,10 @@ + (void)exitLiveActivity:(NSString * _Nonnull)activityId withSuccess:(OSResultSu
         }
         return;
     }
-    if(self.currentSubscriptionState.userId) {
-        [OneSignalClient.sharedClient executeRequest:[OSRequestLiveActivityExit withUserId:self.currentSubscriptionState.userId appId:appId activityId:activityId]
+    
+    NSString *subscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscription.subscriptionId;
+    if(subscriptionId) {
+        [OneSignalClient.sharedClient executeRequest:[OSRequestLiveActivityExit withUserId:subscriptionId appId:appId activityId:activityId]
                                            onSuccess:^(NSDictionary *result) {
             [self callSuccessBlockOnMainThread:successBlock withResult:result];
         } onFailure:^(NSError *error) {
@@ -455,6 +476,22 @@ + (void)exitLiveActivity:(NSString * _Nonnull)activityId withSuccess:(OSResultSu
     }
 }
 
++ (void)callFailureBlockOnMainThread:(OSFailureBlock)failureBlock withError:(NSError *)error {
+    if (failureBlock) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            failureBlock(error);
+        });
+    }
+}
+
++ (void)callSuccessBlockOnMainThread:(OSResultSuccessBlock)successBlock withResult:(NSDictionary *)result{
+    if (successBlock) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            successBlock(result);
+        });
+    }
+}
+
 + (void)addPendingLiveActivityUpdate:(NSString * _Nonnull)activityId
                            withToken:(NSString * _Nullable)token
                              isEnter:(BOOL)isEnter

iOS_SDK/OneSignalSDK/Source/OneSignalFramework.h

@@ -118,6 +118,8 @@ NS_SWIFT_NAME(login(externalId:token:));
 + (void)exitLiveActivity:(NSString * _Nonnull)activityId;
 + (void)exitLiveActivity:(NSString * _Nonnull)activityId withSuccess:(OSResultSuccessBlock _Nullable)successBlock withFailure:(OSFailureBlock _Nullable)failureBlock;
 
++ (void)executePendingLiveActivityUpdates;
+
 #pragma mark Logging
 + (Class<OSDebug>)Debug NS_REFINED_FOR_SWIFT;