Merge pull request #547 from qonversion/adjustFix

Updated adjust user id fetching logic
qonversion · Oct 14, 2024 · 310ce33 · 310ce33
2 parents c661d3f + 113dbbb
commit 310ce33
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/QonversionTests/QDeviceTests.m b/QonversionTests/QDeviceTests.m
@@ -52,9 +52,4 @@ - (void)testVendorID {
     XCTAssertEqualObjects(_device.vendorID, [[[UIDevice currentDevice] identifierForVendor] UUIDString]);
 }
 
-- (void)testAfUserID {
-    XCTAssertNil(_device.afUserID);
-    XCTAssertNil(_device.adjustUserID);
-}
-
 @end
diff --git a/Sources/Qonversion/Qonversion/Main/QNUserPropertiesManager/QNUserPropertiesManager.m b/Sources/Qonversion/Qonversion/Main/QNUserPropertiesManager/QNUserPropertiesManager.m
@@ -223,10 +223,11 @@ - (void)collectIntegrationsData {
 }
 
 - (void)collectIntegrationsDataInBackground {
-  NSString *adjustUserID = _device.adjustUserID;
-  if (![QNUtils isEmptyString:adjustUserID]) {
-    [self setUserProperty:@"_q_adjust_adid" value:adjustUserID];
-  }
+  [_device adjustUserIDWithCompletion:^(NSString * _Nullable userId) {
+    if (![QNUtils isEmptyString:userId]) {
+      [self setUserProperty:@"_q_adjust_adid" value:userId];
+    }
+  }];
 
   NSString *fbAnonID = _device.fbAnonID;
   if (![QNUtils isEmptyString:fbAnonID]) {

diff --git a/Sources/Qonversion/Qonversion/Utils/QNDevice/QNDevice.h b/Sources/Qonversion/Qonversion/Utils/QNDevice/QNDevice.h
@@ -19,9 +19,10 @@
 @property (readonly, copy, nonatomic) NSString *vendorID;
 
 @property (readonly, copy, nonatomic) NSString *afUserID;
-@property (readonly, copy, nonatomic) NSString *adjustUserID;
 @property (readonly, copy, nonatomic) NSString *fbAnonID;
 
 @property (readonly, copy, nonatomic) NSString *installDate;
 
+- (void)adjustUserIDWithCompletion:(void(^)(NSString *userId))completion;
+
 @end
diff --git a/Sources/Qonversion/Qonversion/Utils/QNDevice/QNDevice.m b/Sources/Qonversion/Qonversion/Utils/QNDevice/QNDevice.m
@@ -258,20 +258,26 @@ - (nullable NSString *)fbAnonID {
   return nil;
 }
 
-- (nullable NSString *)adjustUserID {
+- (void)adjustUserIDWithCompletion:(void(^)(NSString *userId))completion {
   Class Adjust = NSClassFromString(@"Adjust");
-  SEL adid = NSSelectorFromString(@"adid");
-  if (Adjust && adid) {
-    id (*imp1)(id, SEL) = (id (*)(id, SEL))[Adjust methodForSelector:adid];
-    NSString *adidString = nil;
-    if (imp1) {
-      adidString = imp1(Adjust, adid);
+  if (Adjust) {
+    SEL adid = NSSelectorFromString(@"adid");
+    SEL adidWithCompletion = NSSelectorFromString(@"adidWithCompletionHandler:");
+    if ([Adjust respondsToSelector:adid]) {
+      id (*imp1)(id, SEL) = (id (*)(id, SEL))[Adjust methodForSelector:adid];
+      NSString *adidString = nil;
+      if (imp1) {
+        adidString = imp1(Adjust, adid);
+      }
+
+      completion(adidString);
+    } else if ([Adjust respondsToSelector:adidWithCompletion]) {
+      id (*imp1)(id, SEL, id) = (id (*)(id, SEL, id))[Adjust methodForSelector:adidWithCompletion];
+      if (imp1) {
+        imp1(Adjust, adidWithCompletion, completion);
+      }
     }
-
-    return adidString;
   }
-
-  return nil;
 }
 
 - (NSString *)vendorID {