@sodyo/react-native-sodyo-sdk 5.0.2 → 5.1.0

package/ios/RNSodyoSdk.m

@@ -35,6 +35,11 @@ RCT_EXPORT_METHOD(createCloseContentListener)
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sendCloseContentEvent) name:@"SodyoNotificationCloseIAD" object:nil];
 }
 
+// Issue #4 fix: remove notification observer on dealloc
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 RCT_EXPORT_METHOD(start)
 {
     NSLog(@"start");
@@ -92,7 +97,7 @@ RCT_EXPORT_METHOD(setDynamicProfileValue:(NSString *) key value:(NSString *) val
 RCT_EXPORT_METHOD(performMarker:(NSString *) markerId customProperties:(NSDictionary *) customProperties)
 {
     NSLog(@"performMarker");
-    UIViewController *rootViewController = [UIApplication sharedApplication].delegate.window.rootViewController;
+    UIViewController *rootViewController = [self getRootViewController];
     [SodyoSDK setPresentingViewController:rootViewController];
     [SodyoSDK performMarker:markerId customProperties:customProperties];
 }
@@ -100,28 +105,27 @@ RCT_EXPORT_METHOD(performMarker:(NSString *) markerId customProperties:(NSDictio
 RCT_EXPORT_METHOD(startTroubleshoot)
 {
     NSLog(@"startTroubleshoot");
-
-    [SodyoSDK startTroubleshoot:sodyoScanner];
+    UIViewController *scanner = [RNSodyoScanner getSodyoScanner];
+    [SodyoSDK startTroubleshoot:scanner];
 }
 
 
 RCT_EXPORT_METHOD(setTroubleshootMode)
 {
     NSLog(@"setTroubleshootMode");
-    sodyoScanner = [RNSodyoScanner getSodyoScanner];
-
-    [SodyoSDK setMode:sodyoScanner mode:SodyoModeTroubleshoot];
+    UIViewController *scanner = [RNSodyoScanner getSodyoScanner];
+    [SodyoSDK setMode:scanner mode:SodyoModeTroubleshoot];
 }
 
 RCT_EXPORT_METHOD(setNormalMode)
 {
     NSLog(@"setNormalMode");
-    sodyoScanner = [RNSodyoScanner getSodyoScanner];
-
-    [SodyoSDK setMode:sodyoScanner mode:SodyoModeNormal];
+    UIViewController *scanner = [RNSodyoScanner getSodyoScanner];
+    [SodyoSDK setMode:scanner mode:SodyoModeNormal];
 }
 
-RCT_EXPORT_METHOD(setSodyoLogoVisible:(BOOL *) isVisible)
+// Issue #3 fix: BOOL instead of BOOL*
+RCT_EXPORT_METHOD(setSodyoLogoVisible:(BOOL) isVisible)
 {
     NSLog(@"setSodyoLogoVisible");
     if (isVisible) {
@@ -131,12 +135,18 @@ RCT_EXPORT_METHOD(setSodyoLogoVisible:(BOOL *) isVisible)
     [SodyoSDK hideDefaultOverlay];
 }
 
+// Issue #8 fix: guard against nil env value
 RCT_EXPORT_METHOD(setEnv:(NSString *) env)
 {
     NSLog(@"setEnv");
 
     NSDictionary *envs = @{ @"DEV": @"3", @"QA": @"1", @"PROD": @"0" };
-    NSDictionary *params = @{ @"SodyoAdEnv" : envs[env], @"ScanQR": @"false" };
+    NSString *envValue = envs[env];
+    if (!envValue) {
+        NSLog(@"RNSodyoSdk: Unknown env '%@', defaulting to PROD", env);
+        envValue = @"0";
+    }
+    NSDictionary *params = @{ @"SodyoAdEnv": envValue, @"ScanQR": @"false" };
     [SodyoSDK setScannerParams:params];
 }
 
@@ -145,29 +155,30 @@ RCT_EXPORT_METHOD(setEnv:(NSString *) env)
     return @[@"EventSodyoError", @"EventMarkerDetectSuccess", @"EventMarkerDetectError", @"EventMarkerContent", @"EventCloseSodyoContent", @"ModeChangeCallback"];
 }
 
+// Issue #2 fix: inverted null-check + use shared scanner accessor
 - (void) launchSodyoScanner {
     NSLog(@"launchSodyoScanner");
-    sodyoScanner = [RNSodyoScanner getSodyoScanner];
+    UIViewController *scanner = [RNSodyoScanner getSodyoScanner];
 
-
-    if (!sodyoScanner) {
-        [RNSodyoScanner setSodyoScanner:sodyoScanner];
+    if (!scanner) {
+        NSLog(@"Sodyo scanner not initialized");
+        return;
     }
 
-    if (sodyoScanner.isViewLoaded && sodyoScanner.view.window) {
+    if (scanner.isViewLoaded && scanner.view.window) {
         NSLog(@"Sodyo scanner already active");
         return;
     }
 
-    UIViewController *rootViewController = [UIApplication sharedApplication].delegate.window.rootViewController;
-    self->sodyoScanner.modalPresentationStyle = UIModalPresentationFullScreen;
+    UIViewController *rootViewController = [self getRootViewController];
+    scanner.modalPresentationStyle = UIModalPresentationFullScreen;
     [SodyoSDK setPresentingViewController:rootViewController];
-    [rootViewController presentViewController:self->sodyoScanner animated:YES completion:nil];
+    [rootViewController presentViewController:scanner animated:YES completion:nil];
 }
 
 - (void) closeScanner {
     NSLog(@"closeScanner");
-    UIViewController *rootViewController = [UIApplication sharedApplication].delegate.window.rootViewController;
+    UIViewController *rootViewController = [self getRootViewController];
     [rootViewController dismissViewControllerAnimated:YES completion:nil];
 }
 
@@ -187,40 +198,71 @@ RCT_EXPORT_METHOD(setEnv:(NSString *) env)
     }
 }
 
+// Issue #11 fix: UIScene-compatible root view controller access
+- (UIViewController *)getRootViewController {
+    UIWindow *keyWindow = nil;
+    if (@available(iOS 13.0, *)) {
+        for (UIWindowScene *scene in [UIApplication sharedApplication].connectedScenes) {
+            if (scene.activationState == UISceneActivationStateForegroundActive) {
+                for (UIWindow *window in scene.windows) {
+                    if (window.isKeyWindow) {
+                        keyWindow = window;
+                        break;
+                    }
+                }
+                if (keyWindow) break;
+            }
+        }
+    }
+    if (!keyWindow) {
+        keyWindow = [UIApplication sharedApplication].delegate.window;
+    }
+    return keyWindow.rootViewController;
+}
+
 #pragma mark - SodyoSDKDelegate
+// Issue #5 fix: nil both callbacks after either fires
 - (void) onSodyoAppLoadSuccess:(NSInteger)AppID {
     NSLog(@"onSodyoAppLoadSuccess");
 
     if (self.successStartCallback != nil) {
         self.successStartCallback(@[[NSNull null]]);
-        self.successStartCallback = nil;
     }
+    self.successStartCallback = nil;
+    self.errorStartCallback = nil;
 }
 
+// Issue #6 fix: serialize NSError to string
 - (void) onSodyoAppLoadFailed:(NSInteger)AppID error:(NSError *)error {
     NSLog(@"Failed loading Sodyo: %@", error);
     if (self.errorStartCallback != nil) {
-        self.errorStartCallback(@[@{@"error": error}]);
-        self.errorStartCallback = nil;
+        NSString *message = error.localizedDescription ?: @"Unknown error";
+        self.errorStartCallback(@[@{@"error": message}]);
     }
+    self.successStartCallback = nil;
+    self.errorStartCallback = nil;
 }
 
+// Issue #7 fix: guard against nil error description
 - (void) sodyoError:(NSError *)error {
     dispatch_async(dispatch_get_main_queue(), ^{
-        NSLog(@"sodyoError: %@", error.userInfo[@"NSLocalizedDescription"]);
-        NSArray* params = @[@"sodyoError", error.userInfo[@"NSLocalizedDescription"]];
-        [self sendEventWithName:@"EventSodyoError" body:@{@"error": params[1]}];
+        NSString *desc = error.localizedDescription ?: @"Unknown error";
+        NSLog(@"sodyoError: %@", desc);
+        [self sendEventWithName:@"EventSodyoError" body:@{@"error": desc}];
     });
 }
 
+// Issue #9 fix: guard against nil marker data
 - (void) SodyoMarkerDetectedWithData:(NSDictionary*)Data {
     NSLog(@"SodyoMarkerDetectedWithData: %@", Data[@"sodyoMarkerData"]);
-    [self sendEventWithName:@"EventMarkerDetectSuccess" body:@{@"data": Data[@"sodyoMarkerData"]}];
+    id markerData = Data[@"sodyoMarkerData"] ?: [NSNull null];
+    [self sendEventWithName:@"EventMarkerDetectSuccess" body:@{@"data": markerData}];
 }
 
 - (void) SodyoMarkerContent:(NSString *)markerId Data:(NSDictionary *)Data {
-    NSLog(@"SodyoMarkerDetectedWithData: %@", Data);
-    [self sendEventWithName:@"EventMarkerContent" body:@{@"markerId": markerId, @"data": Data}];
+    NSLog(@"SodyoMarkerContent: %@", Data);
+    id data = Data ?: @{};
+    [self sendEventWithName:@"EventMarkerContent" body:@{@"markerId": markerId ?: @"", @"data": data}];
 }
 
 
@@ -232,4 +274,4 @@ RCT_EXPORT_METHOD(setEnv:(NSString *) env)
     [self sendEventWithName:@"ModeChangeCallback" body:@{@"oldMode": fromConverted, @"newMode": toConverted}];
 }
 
-@end
+@end

package/ios/RNSodyoSdkManager.m

@@ -16,64 +16,87 @@
 #import "RNSodyoSdkView.h"
 #import "RNSodyoScanner.h"
 
-@interface RNSodyoSdkManager : RCTViewManager {
-}
+@interface RNSodyoSdkManager : RCTViewManager
 @end
 
 @implementation RNSodyoSdkManager
 
 RCT_EXPORT_MODULE(RNSodyoSdkView)
 
+// Issue #11 fix: UIScene-compatible root view controller access
+- (UIViewController *)getRootViewController {
+    UIWindow *keyWindow = nil;
+    if (@available(iOS 13.0, *)) {
+        for (UIWindowScene *scene in [UIApplication sharedApplication].connectedScenes) {
+            if (scene.activationState == UISceneActivationStateForegroundActive) {
+                for (UIWindow *window in scene.windows) {
+                    if (window.isKeyWindow) {
+                        keyWindow = window;
+                        break;
+                    }
+                }
+                if (keyWindow) break;
+            }
+        }
+    }
+    if (!keyWindow) {
+        keyWindow = [UIApplication sharedApplication].delegate.window;
+    }
+    return keyWindow.rootViewController;
+}
+
 RCT_CUSTOM_VIEW_PROPERTY(isEnabled, BOOL, UIView)
 {
     NSLog(@"RNSodyoSdkManager set isEnabled");
 
-    sodyoScanner = [RNSodyoScanner getSodyoScanner];
+    UIViewController *scanner = [RNSodyoScanner getSodyoScanner];
 
-    if (!sodyoScanner) {
+    if (!scanner) {
         return;
     }
 
     if ([RCTConvert BOOL:json]) {
-        [SodyoSDK startScanning:sodyoScanner];
+        [SodyoSDK startScanning:scanner];
         return;
     }
 
-    [SodyoSDK stopScanning:sodyoScanner];
+    [SodyoSDK stopScanning:scanner];
 }
 
+// Issue #13 fix: add false branch for troubleshooting toggle
 RCT_CUSTOM_VIEW_PROPERTY(isTroubleShootingEnabled, BOOL, UIView)
 {
     NSLog(@"RNSodyoSdkManager set isTroubleShootingEnabled");
 
-    sodyoScanner = [RNSodyoScanner getSodyoScanner];
+    UIViewController *scanner = [RNSodyoScanner getSodyoScanner];
 
-    if (!sodyoScanner) {
+    if (!scanner) {
         return;
     }
 
     if ([RCTConvert BOOL:json]) {
-        [SodyoSDK startTroubleshoot:sodyoScanner];
+        [SodyoSDK startTroubleshoot:scanner];
         return;
     }
+
+    [SodyoSDK setMode:scanner mode:SodyoModeNormal];
 }
 
 - (UIView *)view
 {
-    UIViewController *rootViewController = [UIApplication sharedApplication].delegate.window.rootViewController;
+    UIViewController *rootViewController = [self getRootViewController];
 
-    sodyoScanner = [SodyoSDK initSodyoScanner];
+    UIViewController *scanner = [SodyoSDK initSodyoScanner];
 
-    [RNSodyoScanner setSodyoScanner:sodyoScanner];
-    [rootViewController addChildViewController:sodyoScanner];
+    [RNSodyoScanner setSodyoScanner:scanner];
+    [rootViewController addChildViewController:scanner];
 
-    RNSodyoSdkView *view = [[RNSodyoSdkView alloc] initWithView:sodyoScanner.view];
+    RNSodyoSdkView *view = [[RNSodyoSdkView alloc] initWithView:scanner.view scanner:scanner];
 
     [SodyoSDK setPresentingViewController:rootViewController];
-    [sodyoScanner didMoveToParentViewController:rootViewController];
+    [scanner didMoveToParentViewController:rootViewController];
 
     return view;
 }
 
-@end
-
+@end

package/ios/RNSodyoSdkView.h

@@ -1,5 +1,7 @@
 #import <UIKit/UIKit.h>
 
 @interface RNSodyoSdkView : UIView
-- (instancetype)initWithView:(UIView *)view;
-@end
+@property (nonatomic, strong) UIView *scannerView;
+@property (nonatomic, weak) UIViewController *scannerViewController;
+- (instancetype)initWithView:(UIView *)view scanner:(UIViewController *)scanner;
+@end

package/ios/RNSodyoSdkView.m

@@ -2,27 +2,51 @@
 
 @implementation RNSodyoSdkView
 
-- (instancetype)initWithView:(UIView*) view {
+- (instancetype)initWithView:(UIView *)view scanner:(UIViewController *)scanner {
     NSLog(@"RNSodyoSdkView init");
     self = [super init];
 
-    if ( self ) {
-        [self setUp:view];
+    if (self) {
+        _scannerView = view;
+        _scannerViewController = scanner;
+        [self addSubview:view];
     }
 
     return self;
 }
 
-- (void)setUp:(UIView*) view {
-    NSLog(@"RNSodyoSdkView setup");
-    [self addSubview:view];
+- (void)willMoveToSuperview:(UIView *)newSuperview {
+    // Temporarily detach scanner view before Fabric re-parents us
+    if (_scannerView && _scannerView.superview == self) {
+        [_scannerView removeFromSuperview];
+    }
+    [super willMoveToSuperview:newSuperview];
+}
+
+- (void)didMoveToSuperview {
+    [super didMoveToSuperview];
+    // Reattach scanner view after re-parenting is complete
+    if (_scannerView && self.superview && _scannerView.superview != self) {
+        [self addSubview:_scannerView];
+        _scannerView.frame = self.bounds;
+    }
 }
 
-- (void) layoutSubviews {
-  [super layoutSubviews];
-  for(UIView* view in self.subviews) {
-    [view setFrame:self.bounds];
-  }
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    for (UIView *view in self.subviews) {
+        [view setFrame:self.bounds];
+    }
+}
+
+// Issue #12 fix: remove child view controller on cleanup
+- (void)removeFromSuperview {
+    if (_scannerViewController) {
+        [_scannerViewController willMoveToParentViewController:nil];
+        [_scannerViewController removeFromParentViewController];
+        _scannerViewController = nil;
+    }
+    [super removeFromSuperview];
 }
 
-@end
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sodyo/react-native-sodyo-sdk",
-  "version": "5.0.2",
+  "version": "5.1.0",
   "description": "RNSodyoSdk",
   "main": "sodyosdk.js",
   "typings": "./sodyosdk.d.ts",