Add GDPR allow for iOS Sentry

irov · Aug 27, 2023 · 1bf462b · 1bf462b
1 parent f0cea39
commit 1bf462b
Show file tree

Hide file tree

Showing 15 changed files with 158 additions and 37 deletions.
diff --git a/src/Environment/iOS/CMakeLists.txt b/src/Environment/iOS/CMakeLists.txt
@@ -8,6 +8,7 @@ src
     iOSDetail.h
     iOSDetail.mm
 
+    UIMainApplicationDelegateInterface.h
     UIProxyApplicationDelegateInterface.h
 )
 

diff --git a/src/Environment/iOS/UIMainApplicationDelegateInterface.h b/src/Environment/iOS/UIMainApplicationDelegateInterface.h
@@ -1,9 +1,14 @@
 #include "Config/Config.h"
 
+#import "Environment/iOS/UIProxyApplicationDelegateInterface.h"
+
 #import <Foundation/Foundation.h>
 
 @protocol UIMainApplicationDelegateInterface <NSObject>
 
-- (void)notify:(NSString *)id args:(NSArray *)args;
+- (NSArray<UIProxyApplicationDelegateInterface> *)getPluginDelegates;
+
+- (void)notify:(NSString *)name args:(id)firstArg, ... NS_REQUIRES_NIL_TERMINATION;
+- (void)notify:(NSString *)name arrayArgs:(NSArray<id> *)args;
 
 @end
diff --git a/src/Environment/iOS/UIProxyApplicationDelegateInterface.h b/src/Environment/iOS/UIProxyApplicationDelegateInterface.h
@@ -10,6 +10,8 @@
 
 @optional
 
+- (void)event:(NSString *)name args:(NSArray *)args;
+
 #pragma mark - UISceneSession lifecycle
 
 - (void)applicationWillResignActive:(UIApplication *)application;

diff --git a/src/Environment/iOS/iOSDetail.h b/src/Environment/iOS/iOSDetail.h
@@ -2,6 +2,8 @@
 
 #include "Config/Config.h"
 
+#import "Environment/iOS/UIProxyApplicationDelegateInterface.h"
+
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
@@ -11,5 +13,7 @@ namespace Mengine
     {
         UIViewController * iOSGetRootViewController();
         NSUUID * iOSGetAdIdentifier();
+        id iOSGetUIProxyApplicationDelegate( Class delegateClass );
+        void iOSPluginApplicationDelegateEventNotify( NSString * name, id firstArg, ... );
     }
 }
diff --git a/src/Environment/iOS/iOSDetail.mm b/src/Environment/iOS/iOSDetail.mm
@@ -1,5 +1,7 @@
 #include "iOSDetail.h"
 
+#import "Environment/iOS/UIMainApplicationDelegateInterface.h"
+
 #import <AdSupport/ASIdentifierManager.h>
 
 namespace Mengine
@@ -23,5 +25,38 @@
             return idfa_uuid;
         }
         //////////////////////////////////////////////////////////////////////////
+        id iOSGetUIProxyApplicationDelegate( Class delegateClass )
+        {
+            NSObject<UIMainApplicationDelegateInterface> * delegate = (NSObject<UIMainApplicationDelegateInterface> *)[[UIApplication sharedApplication] delegate];
+
+            NSArray<UIProxyApplicationDelegateInterface> * pluginDelegates = [delegate getPluginDelegates];
+
+            for( NSObject<UIProxyApplicationDelegateInterface> * delegate : pluginDelegates ) {
+                if( [delegate isMemberOfClass:delegateClass] == YES ) {
+                    return delegate;
+                }
+            }
+
+            return nil;
+        }
+        //////////////////////////////////////////////////////////////////////////
+        void iOSPluginApplicationDelegateEventNotify( NSString * name, id firstArg, ... )
+        {
+            NSObject<UIMainApplicationDelegateInterface> * delegate = (NSObject<UIMainApplicationDelegateInterface> *)[[UIApplication sharedApplication] delegate];
+
+            va_list args;
+            va_start(args, firstArg);
+
+            NSMutableArray * send_args = [[NSMutableArray alloc] init];
+
+            for( NSString *arg = firstArg; arg != nil; arg = va_arg(args, NSString*) ) {
+                [send_args addObject:firstArg];
+            }
+
+            va_end(args);
+
+            [delegate notify:name arrayArgs:send_args];
+        }
+        //////////////////////////////////////////////////////////////////////////
     }
 }
diff --git a/...lDataProtectionRegulationPlugin/AppleGeneralDataProtectionRegulationApplicationDelegate.h b/...lDataProtectionRegulationPlugin/AppleGeneralDataProtectionRegulationApplicationDelegate.h
@@ -2,4 +2,7 @@
 
 @interface AppleGeneralDataProtectionRegulationApplicationDelegate : NSObject<UIProxyApplicationDelegateInterface>
 
+- (void) setGDPRPass:(BOOL) passGDPR;
+- (BOOL) isGDPRPass;
+
 @end
diff --git a/...DataProtectionRegulationPlugin/AppleGeneralDataProtectionRegulationApplicationDelegate.mm b/...DataProtectionRegulationPlugin/AppleGeneralDataProtectionRegulationApplicationDelegate.mm
@@ -1,14 +1,28 @@
 #import "AppleGeneralDataProtectionRegulationApplicationDelegate.h"
 
-#include "Environment/Apple/AppleUserDefaults.h"
+#import "Environment/iOS/iOSDetail.h"
+#import "Environment/Apple/AppleUserDefaults.h"
 
 @implementation AppleGeneralDataProtectionRegulationApplicationDelegate
 
+- (void)setGDPRPass:(BOOL)passGDPR {
+    Mengine::Helper::AppleSetUserDefaultsBoolean( "mengine.gdpr.pass", passGDPR );
+
+    Mengine::Helper::iOSPluginApplicationDelegateEventNotify( @"NOTIFICATION_GDPR_PASS", @(passGDPR), nil );
+}
+
+- (BOOL)isGDPRPass {
+    bool passGDPR = Mengine::Helper::AppleGetUserDefaultsBoolean( "mengine.gdpr.pass", false );
+
+    return passGDPR;
+}
+
 #pragma mark - UIProxyApplicationDelegateInterface
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     bool passGDPR = Mengine::Helper::AppleGetUserDefaultsBoolean( "mengine.gdpr.pass", false );
 
+    Mengine::Helper::iOSPluginApplicationDelegateEventNotify( @"NOTIFICATION_GDPR_PASS", @(passGDPR), nil );
 
     return YES;
 }

diff --git a/.../AppleGeneralDataProtectionRegulationPlugin/AppleGeneralDataProtectionRegulationService.h b/.../AppleGeneralDataProtectionRegulationPlugin/AppleGeneralDataProtectionRegulationService.h
@@ -19,9 +19,6 @@ namespace Mengine
 
     public:
         void setGDPRPass( bool _passGDPR ) override;
-        bool isGDPRPass() const override;
-
-    protected:
-        bool m_passGDPR;
+        bool isGDPRPass() const override;        
     };
 }
diff --git a/...AppleGeneralDataProtectionRegulationPlugin/AppleGeneralDataProtectionRegulationService.mm b/...AppleGeneralDataProtectionRegulationPlugin/AppleGeneralDataProtectionRegulationService.mm
@@ -1,17 +1,21 @@
 #include "AppleGeneralDataProtectionRegulationService.h"
 
-#include "Environment/Apple/AppleUserDefaults.h"
+#import "AppleGeneralDataProtectionRegulationApplicationDelegate.h"
+
+#import "Environment/iOS/iOSDetail.h"
+#import "Environment/Apple/AppleUserDefaults.h"
 
 #include "Kernel/Logger.h"
 
+#import <UIKit/UIKit.h>
+
 ////////////////////////////////////////////////////////////////////////////
 SERVICE_FACTORY( AppleGeneralDataProtectionRegulationService, Mengine::AppleGeneralDataProtectionRegulationService );
 //////////////////////////////////////////////////////////////////////////
 namespace Mengine
 {
     //////////////////////////////////////////////////////////////////////////
     AppleGeneralDataProtectionRegulationService::AppleGeneralDataProtectionRegulationService()
-        : m_passGDPR(false)
     {
     }
     //////////////////////////////////////////////////////////////////////////
@@ -21,9 +25,7 @@
     /////////////////////////////////////////////////////////////////////////////
     bool AppleGeneralDataProtectionRegulationService::_initializeService()
     {
-        bool passGDPR = Helper::AppleGetUserDefaultsBoolean( "mengine.gdpr.pass", false );
-
-        m_passGDPR = passGDPR;
+        //Empty
 
         return true;
     }
@@ -39,14 +41,18 @@
             , _passGDPR
         );
 
-        Helper::AppleSetUserDefaultsBoolean( "mengine.gdpr.pass", _passGDPR );
-
-        m_passGDPR = _passGDPR;
+        AppleGeneralDataProtectionRegulationApplicationDelegate * delegate = Helper::iOSGetUIProxyApplicationDelegate([AppleGeneralDataProtectionRegulationApplicationDelegate class]);
+        
+        [delegate setGDPRPass:(BOOL)_passGDPR];
     }
     //////////////////////////////////////////////////////////////////////////
     bool AppleGeneralDataProtectionRegulationService::isGDPRPass() const
     {
-        return m_passGDPR;
+        AppleGeneralDataProtectionRegulationApplicationDelegate * delegate = Helper::iOSGetUIProxyApplicationDelegate([AppleGeneralDataProtectionRegulationApplicationDelegate class]);
+
+        BOOL passGDPR = [delegate isGDPRPass];
+
+        return passGDPR;
     }
     //////////////////////////////////////////////////////////////////////////
 }
diff --git a/src/Plugins/AppleMARSDKPlugin/AppleMARSDKAdRewardedDelegate.mm b/src/Plugins/AppleMARSDKPlugin/AppleMARSDKAdRewardedDelegate.mm
@@ -11,7 +11,7 @@ @implementation AppleMARSDKAdRewardedDelegate
 
 @synthesize m_service;
 
-- (instancetype _Nonnull)initWithService: (Mengine::AppleMARSDKServiceInterface* _Nonnull)service {
+- (instancetype _Nonnull)initWithService:(Mengine::AppleMARSDKServiceInterface* _Nonnull)service {
     self = [super init];
 
     self.m_service = service;
@@ -21,7 +21,7 @@ - (instancetype _Nonnull)initWithService: (Mengine::AppleMARSDKServiceInterface*
 
 #pragma mark - MARAdRewardedDelegate
 
-- (void) MARAdRewardedDidFailed: (MARAdErrorCode)code withMessage: (NSString *)message adDict:(NSDictionary *)adDict {
+- (void) MARAdRewardedDidFailed:(MARAdErrorCode)code withMessage: (NSString *)message adDict:(NSDictionary *)adDict {
     LOGGER_MESSAGE( "MARAdRewardedDidFailed code: %d message: %s adDict: %s"
         , (int32_t)code
         , [message UTF8String]
@@ -38,7 +38,7 @@ - (void) MARAdRewardedDidFailed: (MARAdErrorCode)code withMessage: (NSString *)m
     provider->onAdRewardedDidFailed();
 }
 
-- (void) MARAdRewardedDidLoaded :(NSDictionary *)adDict {
+- (void) MARAdRewardedDidLoaded:(NSDictionary *)adDict {
     LOGGER_MESSAGE( "MARAdRewardedDidLoaded adDict: %s"
         , [[NSString stringWithFormat:@"%@", adDict] UTF8String]
     );
@@ -53,7 +53,7 @@ - (void) MARAdRewardedDidLoaded :(NSDictionary *)adDict {
     provider->onAdRewardedDidLoaded();
 }
 
-- (void) MARAdRewardedDidShow :(NSDictionary *)adDict {
+- (void) MARAdRewardedDidShow:(NSDictionary *)adDict {
     LOGGER_MESSAGE( "MARAdRewardedDidShow adDict: %s"
         , [[NSString stringWithFormat:@"%@", adDict] UTF8String]
     );
@@ -68,7 +68,7 @@ - (void) MARAdRewardedDidShow :(NSDictionary *)adDict {
     provider->onAdRewardedDidShow();
 }
 
-- (void) MARAdRewardedDidShowFailed :(NSDictionary *)adDict {
+- (void) MARAdRewardedDidShowFailed:(NSDictionary *)adDict {
     LOGGER_MESSAGE( "MARAdRewardedDidShowFailed adDict: %s"
         , [[NSString stringWithFormat:@"%@", adDict] UTF8String]
     );
@@ -83,7 +83,7 @@ - (void) MARAdRewardedDidShowFailed :(NSDictionary *)adDict {
     provider->onAdRewardedDidShowFailed();
 }
 
-- (void) MARAdRewardedDidClicked :(NSDictionary *)adDict {
+- (void) MARAdRewardedDidClicked:(NSDictionary *)adDict {
     LOGGER_MESSAGE( "MARAdRewardedDidClicked adDict: %s"
         , [[NSString stringWithFormat:@"%@", adDict] UTF8String]
     );
@@ -98,7 +98,7 @@ - (void) MARAdRewardedDidClicked :(NSDictionary *)adDict {
     provider->onAdRewardedDidClicked();
 }
 
-- (void) MARAdRewardedDidClosed :(NSDictionary *)adDict {
+- (void) MARAdRewardedDidClosed:(NSDictionary *)adDict {
     LOGGER_MESSAGE( "MARAdRewardedDidClosed adDict: %s"
         , [[NSString stringWithFormat:@"%@", adDict] UTF8String]
     );
@@ -113,7 +113,7 @@ - (void) MARAdRewardedDidClosed :(NSDictionary *)adDict {
     provider->onAdRewardedDidClosed();
 }
 
-- (void) MARAdRewardedDidSkipped :(NSDictionary *)adDict {
+- (void) MARAdRewardedDidSkipped:(NSDictionary *)adDict {
     LOGGER_MESSAGE( "MARAdRewardedDidSkipped adDict: %s"
         , [[NSString stringWithFormat:@"%@", adDict] UTF8String]
     );
@@ -128,7 +128,7 @@ - (void) MARAdRewardedDidSkipped :(NSDictionary *)adDict {
     provider->onAdRewardedDidSkipped();
 }
 
-- (void) MARAdRewardedDidFinished: (NSString *)itemName itemNum:(int)itemNum adDict:(NSDictionary *)adDict {
+- (void) MARAdRewardedDidFinished:(NSString *)itemName itemNum:(int)itemNum adDict:(NSDictionary *)adDict {
     LOGGER_MESSAGE( "MARAdRewardedDidFinished adDict: %s"
         , [[NSString stringWithFormat:@"%@", adDict] UTF8String]
     );

diff --git a/src/Plugins/AppleSentryPlugin/AppleSentryApplicationDelegate.h b/src/Plugins/AppleSentryPlugin/AppleSentryApplicationDelegate.h
@@ -2,4 +2,6 @@
 
 @interface AppleSentryApplicationDelegate : NSObject<UIProxyApplicationDelegateInterface>
 
+@property (assign) BOOL m_sendAllow;
+
 @end
diff --git a/src/Plugins/AppleSentryPlugin/AppleSentryApplicationDelegate.mm b/src/Plugins/AppleSentryPlugin/AppleSentryApplicationDelegate.mm
@@ -10,6 +10,26 @@ @implementation AppleSentryApplicationDelegate
 
 #pragma mark - UIProxyApplicationDelegateInterface
 
+- (instancetype _Nonnull)init {
+    self = [super init];
+
+    self.m_sendAllow = NO;
+
+    return self;
+}
+
+- (void)event:(NSString *)name args:(NSArray *)args {
+    if( [name isEqualToString:@"NOTIFICATION_GDPR_PASS"] == true ) {
+        BOOL passGDPR = [args[0] boolValue];
+
+        if( passGDPR == YES ) {
+            self.m_sendAllow = YES;
+        } else {
+            self.m_sendAllow = NO;
+        }
+    }
+}
+
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     NSString * AppleSentryPlugin_DSN = Mengine::Helper::AppleGetBundlePluginConfigString( @("MengineAppleSentryPlugin"), @("DSN"), nil );
 
@@ -36,11 +56,17 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
         options.environment = @(ENVIRONMENT);
 
         options.beforeSend = ^SentryEvent * _Nullable(SentryEvent * _Nonnull event) {
+            if( self.m_sendAllow == NO ) {
+                return nil;
+            }
 
             return event;
         };
 
         options.beforeBreadcrumb = ^SentryBreadcrumb * _Nullable(SentryBreadcrumb * _Nonnull breadcrumb) {
+            if( self.m_sendAllow == NO ) {
+                return nil;
+            }
 
             return breadcrumb;
         };

diff --git a/src/SDLApplication/SDLUIApplicationDelegate.h b/src/SDLApplication/SDLUIApplicationDelegate.h
@@ -1,7 +1,9 @@
 #import <UIKit/UIKit.h>
 
-@interface SDLUIApplicationDelegate : NSObject<UIApplicationDelegate>
+#import "Environment/iOS/UIMainApplicationDelegateInterface.h"
 
-@property (nonatomic, strong) NSMutableArray<id> * m_pluginDelegates;
+@interface SDLUIApplicationDelegate : NSObject<UIApplicationDelegate, UIMainApplicationDelegateInterface>
+
+@property (nonatomic, strong) NSMutableArray<UIProxyApplicationDelegateInterface> * m_pluginDelegates;
 
 @end