refac: reintroduce coppa setting via config

adjust · Aug 2, 2024 · c18d7a9 · c18d7a9
1 parent 58c3660
commit c18d7a9
Show file tree

Hide file tree

Showing 10 changed files with 116 additions and 207 deletions.
diff --git a/Adjust/ADJConfig.h b/Adjust/ADJConfig.h
@@ -184,6 +184,11 @@ typedef NS_ENUM(NSUInteger, ADJLogLevel);
  */
 @property (nonatomic, readonly) BOOL isDataResidency;
 
+/**
+ * @brief Indicator of whether SDK should start in COPPA compliant mode or not.
+ */
+@property (nonatomic, readonly) BOOL isCoppaComplianceEnabled;
+
 #pragma mark - AdjustConfig assignable properties
 
 /**
@@ -328,6 +333,11 @@ typedef NS_ENUM(NSUInteger, ADJLogLevel);
  */
 - (void)enableCostDataInAttribution;
 
+/**
+ * @brief A method to configure SDK to start in COPPA compliant mode.
+ */
+- (void)enableCoppaCompliance;
+
 /**
  * @brief A method to set custom URL strategy.
  *
@@ -343,10 +353,4 @@ typedef NS_ENUM(NSUInteger, ADJLogLevel);
          useSubdomains:(BOOL)useSubdomains
        isDataResidency:(BOOL)isDataResidency;
 
-
-@property (nonatomic, copy, readonly, nullable) NSString *coppaStatus;
-- (void)setCoppaStatusAsEnabled;
-- (void)setCoppaStatusAsDisabled;
-- (void)setCoppaStatusAsUnknown;
-
 @end
diff --git a/Adjust/ADJConfig.m b/Adjust/ADJConfig.m
@@ -62,6 +62,7 @@ - (nullable ADJConfig *)initWithAppToken:(nonnull NSString *)appToken
     _eventDeduplicationIdsMaxSize = -1;
     _isDeviceIdsReadingOnceEnabled = NO;
     _isCostDataInAttributionEnabled = NO;
+    _isCoppaComplianceEnabled = NO;
 
     return self;
 }
@@ -108,6 +109,10 @@ - (void)enableCostDataInAttribution {
     _isCostDataInAttributionEnabled = YES;
 }
 
+- (void)enableCoppaCompliance {
+    _isCoppaComplianceEnabled = YES;
+}
+
 - (void)setUrlStrategy:(nullable NSArray *)urlStrategyDomains
          useSubdomains:(BOOL)useSubdomains
        isDataResidency:(BOOL)isDataResidency {
@@ -126,17 +131,6 @@ - (void)setUrlStrategy:(nullable NSArray *)urlStrategyDomains
     _isDataResidency = isDataResidency;
 }
 
-- (void)setCoppaStatusAsEnabled {
-    _coppaStatus = @"enabled";
-}
-- (void)setCoppaStatusAsDisabled {
-    _coppaStatus = @"disabled";
-}
-- (void)setCoppaStatusAsUnknown {
-    _coppaStatus = @"unknown";
-}
-
-
 - (void)setDelegate:(NSObject<AdjustDelegate> *)delegate {
     BOOL hasResponseDelegate = NO;
     BOOL implementsDeeplinkCallback = NO;
@@ -231,6 +225,7 @@ - (id)copyWithZone:(NSZone *)zone {
         copy.attConsentWaitingInterval = self.attConsentWaitingInterval;
         copy.externalDeviceId = [self.externalDeviceId copyWithZone:zone];
         copy->_isCostDataInAttributionEnabled = self.isCostDataInAttributionEnabled;
+        copy->_isCoppaComplianceEnabled = self.isCoppaComplianceEnabled;
         copy->_isSkanAttributionEnabled = self.isSkanAttributionEnabled;
         copy->_urlStrategyDomains = [self.urlStrategyDomains copyWithZone:zone];
         copy->_useSubdomains = self.useSubdomains;
@@ -240,7 +235,6 @@ - (id)copyWithZone:(NSZone *)zone {
         copy->_isIdfvReadingEnabled = self.isIdfvReadingEnabled;
         copy->_isDeviceIdsReadingOnceEnabled = self.isDeviceIdsReadingOnceEnabled;
         copy.eventDeduplicationIdsMaxSize = self.eventDeduplicationIdsMaxSize;
-        copy->_coppaStatus = [self.coppaStatus copyWithZone:zone];
         // AdjustDelegate not copied
     }
 

diff --git a/Adjust/Adjust.h b/Adjust/Adjust.h
@@ -4,7 +4,7 @@
 //
 //  V5.0.0
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
-//  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2012-Present Adjust GmbH. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
@@ -294,16 +294,6 @@ extern NSString * __nonnull const ADJEnvironmentProduction;
 + (void)verifyAppStorePurchase:(nonnull ADJAppStorePurchase *)purchase
          withCompletionHandler:(nonnull ADJVerificationResultBlock)completion;
 
-/**
- * @brief Enable COPPA (Children's Online Privacy Protection Act) compliant for the application.
- */
-//+ (void)enableCoppaCompliance;
-
-/**
- * @brief Disable COPPA (Children's Online Privacy Protection Act) compliant for the application.
- */
-//+ (void)disableCoppaCompliance;
-
 /**
  * @brief Verify in-app-purchase and track event upon successfully completed verification.
  *

diff --git a/Adjust/Adjust.m b/Adjust/Adjust.m
@@ -721,33 +721,7 @@ - (void)verifyAppStorePurchase:(nonnull ADJAppStorePurchase *)purchase
     [self.activityHandler verifyAppStorePurchase:purchase
                            withCompletionHandler:completion];
 }
-/*
-- (void)enableCoppaCompliance {
-    [ADJUserDefaults saveCoppaComplianceWithValue:YES];
-    if ([self checkActivityHandler:@"enable coppa compliance"]) {
-        [self.activityHandler setCoppaCompliance:YES];
-    } else {
-        if (self.savedPreLaunch.preLaunchAdjustThirdPartySharingArray == nil) {
-            self.savedPreLaunch.preLaunchAdjustThirdPartySharingArray =
-                [[NSMutableArray alloc] init];
-        }
-        [self.savedPreLaunch.preLaunchAdjustThirdPartySharingArray addObject:@(YES)];
-    }
-}
 
-- (void)disableCoppaCompliance {
-    [ADJUserDefaults saveCoppaComplianceWithValue:NO];
-    if ([self checkActivityHandler:@"disable coppa compliance"]) {
-        [self.activityHandler setCoppaCompliance:NO];
-    } else {
-        if (self.savedPreLaunch.preLaunchAdjustThirdPartySharingArray == nil) {
-            self.savedPreLaunch.preLaunchAdjustThirdPartySharingArray =
-                [[NSMutableArray alloc] init];
-        }
-        [self.savedPreLaunch.preLaunchAdjustThirdPartySharingArray addObject:@(NO)];
-    }
-}
-*/
 - (void)verifyAndTrackAppStorePurchase:(nonnull ADJEvent *)event
                  withCompletionHandler:(void (^_Nonnull)(ADJPurchaseVerificationResult * _Nonnull verificationResult))completion {
     if (![self checkActivityHandler]) {

diff --git a/Adjust/Internal/ADJActivityHandler.h b/Adjust/Internal/ADJActivityHandler.h
@@ -109,7 +109,6 @@
          withCompletionHandler:(nonnull ADJVerificationResultBlock)completion;
 - (void)attributionWithCompletionHandler:(nonnull ADJAttributionGetterBlock)completion;
 - (void)adidWithCompletionHandler:(nonnull ADJAdidGetterBlock)completion;
-//- (void)setCoppaCompliance:(BOOL)isCoppaComplianceEnabled;
 - (void)verifyAndTrackAppStorePurchase:(nonnull ADJEvent *)event
                  withCompletionHandler:(nonnull ADJVerificationResultBlock)completion;