SDK-1831 simpler design, does result in a minor behavior change need to vet

Author: echo-branch

BranchSDK/BranchPluginSupport.m

@@ -13,28 +13,10 @@
 #import "Branch.h"
 #import "BranchJsonConfig.h"
 
-// since most params are nullable, let's explicitly record the entry method
-typedef NS_ENUM(NSUInteger, BNCEntryMethodType) {
-    BNCEntryMethodTypeUnknown,
-    BNCEntryMethodTypeInitSession,
-    BNCEntryMethodTypeHandleDeepLink,
-    BNCEntryMethodTypeContinueUserActivity
-};
-
 @interface BranchPluginSupport()
 
 @property (nonatomic, assign, readwrite) BOOL deferInitForPlugin;
-
-// cached entry params
-@property (nonatomic, assign, readwrite) BNCEntryMethodType entry;
-@property (nonatomic, strong, readwrite) NSDictionary *options;
-@property (nonatomic, assign, readwrite) BOOL isReferrable;
-@property (nonatomic, assign, readwrite) BOOL explicitlyRequestedReferrable;
-@property (nonatomic, assign, readwrite) BOOL automaticallyDisplayController;
-@property (nonatomic, copy, nullable) void (^callback)(BNCInitSessionResponse * _Nullable initResponse, NSError * _Nullable error);
-@property (nonatomic, copy, readwrite) NSString *sceneIdentifier;
-@property (nonatomic, strong, readwrite) NSURL *url;
-@property (nonatomic, strong, readwrite) NSUserActivity *userActivity;
+@property (nonatomic, copy, nullable) void (^cachedBlock)(void);
 
 @end
 
@@ -52,182 +34,63 @@ + (BranchPluginSupport *)instance {
 - (instancetype)init {
     self = [super init];
     if (self) {
-        // load initial value from branch.json
-        self.deferInitForPlugin = [[BranchJsonConfig instance] deferInitForPlugin];
+        self.deferInitForPlugin = [BranchJsonConfig instance].deferInitForPlugin;
     }
     return self;
 }
 
 - (void)initSessionWithLaunchOptions:(nullable NSDictionary *)options registerDeepLinkHandler:(void (^)(NSDictionary * _Nullable params, NSError * _Nullable error))callback {
-    [self initSessionWithLaunchOptions:options isReferrable:YES explicitlyRequestedReferrable:NO automaticallyDisplayController:NO registerDeepLinkHandler:callback];
-}
-
-- (void)initSessionWithLaunchOptions:(nullable NSDictionary *)options registerDeepLinkHandlerUsingBranchUniversalObject:(void (^)(BranchUniversalObject * _Nullable universalObject, BranchLinkProperties * _Nullable linkProperties, NSError * _Nullable error))callback {
-    [self initSessionWithLaunchOptions:options isReferrable:YES explicitlyRequestedReferrable:NO automaticallyDisplayController:NO registerDeepLinkHandlerUsingBranchUniversalObject:callback];
-}
-
-// Maps BNCInitSessionResponse callback to dictionary callback
-- (void)initSessionWithLaunchOptions:(NSDictionary *)options
-                        isReferrable:(BOOL)isReferrable
-       explicitlyRequestedReferrable:(BOOL)explicitlyRequestedReferrable
-      automaticallyDisplayController:(BOOL)automaticallyDisplayController
-registerDeepLinkHandlerUsingBranchUniversalObject:(callbackWithBranchUniversalObject)callback {
-    [self initSceneSessionWithLaunchOptions:options
-                               isReferrable:isReferrable
-              explicitlyRequestedReferrable:explicitlyRequestedReferrable
-             automaticallyDisplayController:automaticallyDisplayController
-                    registerDeepLinkHandler:^(BNCInitSessionResponse * _Nullable initResponse, NSError * _Nullable error) {
-        if (callback) {
-            if (initResponse) {
-                callback(initResponse.universalObject, initResponse.linkProperties, error);
-            } else {
-                callback([BranchUniversalObject new], [BranchLinkProperties new], error);
-            }
-        }
+    [self deferBlock:^{
+        [[Branch getInstance] initSessionWithLaunchOptions:options andRegisterDeepLinkHandler:callback];
     }];
 }
 
-// Maps BNCInitSessionResponse callback to BUO callback
-- (void)initSessionWithLaunchOptions:(NSDictionary *)options
-                        isReferrable:(BOOL)isReferrable
-       explicitlyRequestedReferrable:(BOOL)explicitlyRequestedReferrable
-      automaticallyDisplayController:(BOOL)automaticallyDisplayController
-             registerDeepLinkHandler:(callbackWithParams)callback {
-
-    [self initSceneSessionWithLaunchOptions:options
-                               isReferrable:isReferrable
-              explicitlyRequestedReferrable:explicitlyRequestedReferrable
-             automaticallyDisplayController:automaticallyDisplayController
-                    registerDeepLinkHandler:^(BNCInitSessionResponse * _Nullable initResponse, NSError * _Nullable error) {
-        if (callback) {
-            if (initResponse) {
-                callback(initResponse.params, error);
-            } else {
-                callback([NSDictionary new], error);
-            }
-        }
+- (void)initSessionWithLaunchOptions:(nullable NSDictionary *)options registerDeepLinkHandlerUsingBranchUniversalObject:(void (^)(BranchUniversalObject * _Nullable universalObject, BranchLinkProperties * _Nullable linkProperties, NSError * _Nullable error))callback {
+    [self deferBlock:^{
+        [[Branch getInstance] initSessionWithLaunchOptions:options andRegisterDeepLinkHandlerUsingBranchUniversalObject:callback];
     }];
 }
 
-// initSession with optional caching. Requires the branch.json deferInitForPlugin option
-- (void)initSceneSessionWithLaunchOptions:(NSDictionary *)options
-                             isReferrable:(BOOL)isReferrable
-            explicitlyRequestedReferrable:(BOOL)explicitlyRequestedReferrable
-           automaticallyDisplayController:(BOOL)automaticallyDisplayController
-                  registerDeepLinkHandler:(void (^)(BNCInitSessionResponse * _Nullable initResponse, NSError * _Nullable error))callback {
-    BOOL didCache = NO;
-    @synchronized (self) {
-        if (self.deferInitForPlugin) {
-            [self clearCachedParams];
-            self.entry = BNCEntryMethodTypeInitSession;
-            self.options = options;
-            self.isReferrable = isReferrable;
-            self.explicitlyRequestedReferrable = explicitlyRequestedReferrable;
-            self.automaticallyDisplayController = automaticallyDisplayController;
-            self.callback = callback;
-        }
-    }
-    
-    if (!didCache) {
-        [[Branch getInstance] initSceneSessionWithLaunchOptions:options
-                                                   isReferrable:isReferrable
-                                  explicitlyRequestedReferrable:explicitlyRequestedReferrable
-                                 automaticallyDisplayController:automaticallyDisplayController
-                                        registerDeepLinkHandler:callback];
-    }
-}
-
 - (BOOL)handleDeepLink:(nullable NSURL *)url {
-    return [self handleDeepLink:url sceneIdentifier:nil];
-}
- 
-- (BOOL)handleDeepLink:(nullable NSURL *)url sceneIdentifier:(nullable NSString *)sceneIdentifier {
-    BOOL didCache = NO;
-    @synchronized (self) {
-        if (self.deferInitForPlugin) {
-            [self clearCachedParams];
-            self.entry = BNCEntryMethodTypeHandleDeepLink;
-            self.url = url;
-            self.sceneIdentifier = sceneIdentifier;
-        }
-    }
-    
-    if (didCache) {
-        return NO;
-    } else {
-        return [[Branch getInstance] handleDeepLink:url sceneIdentifier:sceneIdentifier];
-    }
+    [self deferBlock:^{
+        [[Branch getInstance] handleDeepLink:url sceneIdentifier:nil];
+    }];
+    return YES;
 }
 
 - (BOOL)continueUserActivity:(nullable NSUserActivity *)userActivity {
-    return [self continueUserActivity:userActivity sceneIdentifier:nil];
+    [self deferBlock:^{
+        [[Branch getInstance] continueUserActivity:userActivity sceneIdentifier:nil];
+    }];
+    return YES;
 }
 
-- (BOOL)continueUserActivity:(nullable NSUserActivity *)userActivity sceneIdentifier:(nullable  NSString *)sceneIdentifier {
-    BOOL didCache = NO;
+- (BOOL)deferBlock:(void (^)(void))block {
+    BOOL deferred = NO;
     @synchronized (self) {
         if (self.deferInitForPlugin) {
-            [self clearCachedParams];
-            self.entry = BNCEntryMethodTypeContinueUserActivity;
-            self.userActivity = userActivity;
-            self.sceneIdentifier = sceneIdentifier;
-            didCache = YES;
+            self.cachedBlock = block;
+            deferred = YES;
         }
     }
 
-    if (didCache) {
-        return NO;
-    } else {
-        return [[Branch getInstance] continueUserActivity:userActivity sceneIdentifier:sceneIdentifier];
-    }
-}
-
-- (void)clearCachedParams {
-    @synchronized (self) {
-        self.entry = BNCEntryMethodTypeUnknown;
-        self.options = nil;
-        self.isReferrable = NO;
-        self.explicitlyRequestedReferrable = NO;
-        self.automaticallyDisplayController = NO;
-        self.callback = nil;
-        self.sceneIdentifier = nil;
-        self.url = nil;
-        self.userActivity = nil;
+    if (!deferred && block) {
+        block();
     }
+    return deferred;
 }
 
 - (void)notifyNativeToInit {
     @synchronized (self) {
-        // call cached entry method
-        switch (self.entry) {
-            case BNCEntryMethodTypeInitSession:
-                [[Branch getInstance] initSceneSessionWithLaunchOptions:self.options
-                                                           isReferrable:self.isReferrable
-                                          explicitlyRequestedReferrable:self.explicitlyRequestedReferrable
-                                         automaticallyDisplayController:self.automaticallyDisplayController
-                                                registerDeepLinkHandler:self.callback];
-                break;
-                
-            case BNCEntryMethodTypeHandleDeepLink:
-                [[Branch getInstance] handleDeepLink:self.url sceneIdentifier:self.sceneIdentifier];
-                break;
-                
-            case BNCEntryMethodTypeContinueUserActivity:
-                [[Branch getInstance] continueUserActivity:self.userActivity sceneIdentifier:self.sceneIdentifier];
-                break;
-                
-            case BNCEntryMethodTypeUnknown:
-                break;
-            default:
-                break;
-        }
-        
-        [self clearCachedParams];
         self.deferInitForPlugin = NO;
     }
+    
+    if (self.cachedBlock) {
+        self.cachedBlock();
+    }
+    self.cachedBlock = nil;
 }
 
-
 - (NSDictionary<NSString *, NSString *> *)deviceDescription {
     NSMutableDictionary<NSString *, NSString *> *dictionary = [NSMutableDictionary new];
     BNCDeviceInfo *deviceInfo = [BNCDeviceInfo getInstance];