fix: Get Adobe cloud id directly from SDK (#19)

Author: einsteinx2

mParticle-Adobe-Media/MPKitAdobeMedia.m

@@ -77,11 +77,11 @@ @implementation MPIAdobeApi
 @interface MPKitAdobeMedia ()
 
 @property (nonatomic) NSString *organizationId;
-@property (nonatomic) MPIAdobe *adobe;
 @property id<AEPMediaTracker> defaultMediaTracker;
 @property (nonatomic, strong, nonnull) NSMutableDictionary<NSString *, id<AEPMediaTracker>> *mediaTrackers;
 @property (nonatomic) NSString *pushToken;
 @property (nonatomic) NSString *audienceManagerServer;
+@property (atomic) BOOL syncingId;
 
 @end
 
@@ -150,6 +150,8 @@ - (void)start {
         }
 
         self->_started = YES;
+        
+        [self syncId];
 
         dispatch_async(dispatch_get_main_queue(), ^{
             NSDictionary *userInfo = @{mParticleKitInstanceKey:[[self class] kitCode]};
@@ -179,7 +181,6 @@ - (MPKitExecStatus *)logBaseEvent:(MPBaseEvent *)event {
      MPKitExecStatus *status = nil;
      if ([event isKindOfClass:[MPMediaEvent class]]) {
          MPMediaEvent *mediaEvent = (MPMediaEvent *)event;
-
          status = [self routeMediaEvent:mediaEvent];
      } else if ([event isKindOfClass:[MPEvent class]]) {
          status = [self execStatus:MPKitReturnCodeSuccess];
@@ -341,11 +342,11 @@ - (AEPMediaType)contentTypeForMediaEvent:(MPMediaEvent *)mediaEvent  {
 }
 
 - (void)didEnterBackground:(NSNotification *)notification {
-    [self sendNetworkRequest];
+    [self syncId];
 }
 
 - (void)willTerminate:(NSNotification *)notification {
-    [self sendNetworkRequest];
+    [self syncId];
 }
 
 - (FilteredMParticleUser *)currentUser {
@@ -386,75 +387,51 @@ - (NSString *)pushToken {
     return _pushToken;
 }
 
-- (void)sendNetworkRequest {
-    NSString *marketingCloudId = [self marketingCloudIdFromIntegrationAttributes];
-    if (!marketingCloudId) {
-        marketingCloudId = [_adobe marketingCloudIdFromUserDefaults];
-        if (marketingCloudId.length) {
-            [[MParticle sharedInstance] setIntegrationAttributes:@{marketingCloudIdIntegrationAttributeKey: marketingCloudId} forKit:[[self class] kitCode]];
-        }
-    }
+- (void)syncId {
+    if (self.syncingId) return;
 
-    NSString *advertiserId = [self advertiserId];
-    NSString *pushToken = [self pushToken];
-    FilteredMParticleUser *user = [self currentUser];
-    NSDictionary *userIdentities = user.userIdentities;
-    [_adobe sendRequestWithMarketingCloudId:marketingCloudId advertiserId:advertiserId pushToken:pushToken organizationId:_organizationId userIdentities:userIdentities audienceManagerServer:_audienceManagerServer completion:^(NSString *marketingCloudId, NSString *locationHint, NSString *blob, NSError *error) {
+    self.syncingId = YES;
+    [AEPMobileIdentity getExperienceCloudId:^(NSString * _Nullable mid, NSError * _Nullable error) {
         if (error) {
-            NSLog(@"mParticle -> Adobe kit request failed with error: %@", error);
-            return;
-        }
-        
-        NSMutableDictionary *integrationAttributes = [NSMutableDictionary dictionary];
-        NSString *existingMarketingCloudId = [self marketingCloudIdFromIntegrationAttributes];
-        if (marketingCloudId.length && existingMarketingCloudId.length == 0) {
-            [integrationAttributes setObject:marketingCloudId forKey:marketingCloudIdIntegrationAttributeKey];
+            NSLog(@"mParticle -> Adobe Media - Error getting Adobe cloud experience Id (marketing cloud Id): %@", error);
         } else {
-            [integrationAttributes setObject:existingMarketingCloudId forKey:marketingCloudIdIntegrationAttributeKey];
-        }
-        if (locationHint.length) {
-            [integrationAttributes setObject:locationHint forKey:locationHintIntegrationAttributeKey];
-        }
-        if (blob.length) {
-            [integrationAttributes setObject:blob forKey:blobIntegrationAttributeKey];
-        }
-        
-        if (integrationAttributes.count) {
-            [[MParticle sharedInstance] setIntegrationAttributes:integrationAttributes forKit:[[self class] kitCode]];
+            NSString *existingMid = [self marketingCloudIdFromIntegrationAttributes];
+            if (mid.length > 0 && ![mid isEqualToString:existingMid]) {
+                [[MParticle sharedInstance] setIntegrationAttributes:@{marketingCloudIdIntegrationAttributeKey: mid} forKit:[[self class] kitCode]];
+            }
         }
+        self.syncingId = NO;
     }];
 }
 
 - (MPKitExecStatus *)setDeviceToken:(NSData *)deviceToken {
     _pushToken = [[NSString alloc] initWithData:deviceToken encoding:NSUTF8StringEncoding];
-    [self sendNetworkRequest];
+    [self syncId];
     MPKitExecStatus *execStatus = [[MPKitExecStatus alloc] initWithSDKCode:[[self class] kitCode] returnCode:MPKitReturnCodeSuccess];
     return execStatus;
 }
 
 - (MPKitExecStatus *)setUserIdentity:(NSString *)identityString identityType:(MPUserIdentity)identityType {
-    [self sendNetworkRequest];
+    [self syncId];
     MPKitExecStatus *execStatus = [[MPKitExecStatus alloc] initWithSDKCode:[[self class] kitCode] returnCode:MPKitReturnCodeSuccess];
     return execStatus;
 }
 
 - (nonnull MPKitExecStatus *)didBecomeActive {
-    [self sendNetworkRequest];
-    
+    [self syncId];
     MPKitExecStatus *execStatus = [[MPKitExecStatus alloc] initWithSDKCode:@(MPKitInstanceAdobe) returnCode:MPKitReturnCodeSuccess];
     return execStatus;
 }
 
 - (BOOL)shouldDelayMParticleUpload {
     NSString *marketingCloudId = [self marketingCloudIdFromIntegrationAttributes];
-    return marketingCloudId.length == 0;
+    return marketingCloudId.length == 0 || self.syncingId;
 }
 
 - (MPKitAPI *)kitApi {
     if (_kitApi == nil) {
         _kitApi = [[MPKitAPI alloc] init];
     }
-    
     return _kitApi;
 }