refac: clean up a bit

adjust · Jan 10, 2025 · f08a3f9 · f08a3f9
1 parent 15cd8b9
commit f08a3f9
Show file tree

Hide file tree

Showing 5 changed files with 242 additions and 248 deletions.
diff --git a/Adjust/Adjust.m b/Adjust/Adjust.m
@@ -625,17 +625,16 @@ - (void)updateSkanConversionValue:(NSInteger)conversionValue
                       coarseValue:(nullable NSString *)coarseValue
                        lockWindow:(nullable NSNumber *)lockWindow
             withCompletionHandler:(void (^_Nullable)(NSError *_Nullable error))completion {
-
     [[ADJSKAdNetwork getInstance] updateConversionValue:[NSNumber numberWithInteger:conversionValue]
                                             coarseValue:coarseValue
                                              lockWindow:lockWindow
-                                                 source:ADJSKAdNetworkCallSourceClient
+                                                 source:ADJSkanSourceClient
                                   withCompletionHandler:^(NSDictionary * _Nonnull result) {
         if ([self checkActivityHandler]) {
             [self.activityHandler invokeClientSkanUpdateCallbackWithResult:result];
         }
         if (completion != nil) {
-            completion([result objectForKey:ADJSKAdNetworkCallErrorKey]);
+            completion([result objectForKey:ADJSkanClientCompletionErrorKey]);
         }
     }];
 }

diff --git a/Adjust/Internal/ADJActivityHandler.m b/Adjust/Internal/ADJActivityHandler.m
@@ -2768,7 +2768,7 @@ - (void)checkConversionValue:(ADJResponseData *)responseData {
     [[ADJSKAdNetwork getInstance] updateConversionValue:conversionValue
                                             coarseValue:coarseValue
                                              lockWindow:lockWindow
-                                                 source:ADJSKAdNetworkCallSourceBackend
+                                                 source:ADJSkanSourceBackend
                                   withCompletionHandler:^(NSDictionary * _Nonnull result) {
         [self invokeClientSkanUpdateCallbackWithResult:result];
     }];
@@ -2847,7 +2847,7 @@ - (BOOL)shouldDisableThirdPartySharingWhenCoppaEnabled:(ADJActivityHandler *)sel
 }
 
 - (void)invokeClientSkanUpdateCallbackWithResult:(NSDictionary * _Nonnull)result {
-    NSDictionary *conversionParams = [result objectForKey:ADJSKAdNetworkCallActualConversionParamsKey];
+    NSDictionary *conversionParams = [result objectForKey:ADJSkanClientCallbackParamsKey];
     // Ping the callback method if implemented
     if ([self.adjustDelegate respondsToSelector:@selector(adjustSkanUpdatedWithConversionData:)]) {
         [self.logger debug:@"Launching delegate's method adjustSkanUpdatedWithConversionData:"];

diff --git a/Adjust/Internal/ADJPackageBuilder.m b/Adjust/Internal/ADJPackageBuilder.m
@@ -1040,7 +1040,7 @@ - (void)injectFeatureFlagsWithParameters:(NSMutableDictionary *)parameters {
 }
 
 - (void)injectLastSkanUpdateWithParameters:(NSMutableDictionary *)parameters {
-    NSDictionary *lastSkanUpdateData = [[ADJSKAdNetwork getInstance] lastSKAdNetworkUpdateData];
+    NSDictionary *lastSkanUpdateData = [[ADJSKAdNetwork getInstance] lastSkanUpdateData];
     if (lastSkanUpdateData != nil) {
         [ADJPackageBuilder parameters:parameters setDictionaryJson:lastSkanUpdateData forKey:@"last_skan_update"];
     }

diff --git a/Adjust/Internal/ADJSKAdNetwork.h b/Adjust/Internal/ADJSKAdNetwork.h
@@ -10,11 +10,11 @@
 
 @interface ADJSKAdNetwork : NSObject
 
-extern NSString * _Nonnull const ADJSKAdNetworkCallSourceSdk;
-extern NSString * _Nonnull const ADJSKAdNetworkCallSourceBackend;
-extern NSString * _Nonnull const ADJSKAdNetworkCallSourceClient;
-extern NSString * _Nonnull const ADJSKAdNetworkCallActualConversionParamsKey;
-extern NSString * _Nonnull const ADJSKAdNetworkCallErrorKey;
+extern NSString * _Nonnull const ADJSkanSourceSdk;
+extern NSString * _Nonnull const ADJSkanSourceBackend;
+extern NSString * _Nonnull const ADJSkanSourceClient;
+extern NSString * _Nonnull const ADJSkanClientCallbackParamsKey;
+extern NSString * _Nonnull const ADJSkanClientCompletionErrorKey;
 
 + (nullable instancetype)getInstance;
 
@@ -29,5 +29,6 @@ extern NSString * _Nonnull const ADJSKAdNetworkCallErrorKey;
                        source:(nonnull NSString *)source
         withCompletionHandler:(void (^_Nonnull)(NSDictionary *_Nonnull result))completion;
 
-- (NSDictionary * _Nullable)lastSKAdNetworkUpdateData;
+- (NSDictionary * _Nullable)lastSkanUpdateData;
+
 @end