fix missing IDFA

c933cebae6b2b1af5ce984f8b9ab6fb6c1319331
appmetrica · May 22, 2024 · 7c31414 · 7c31414
1 parent b70e855
commit 7c31414
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 1 deletion.
diff --git a/AppMetricaCore/Sources/Model/Reporter/AMASessionStorage.h b/AppMetricaCore/Sources/Model/Reporter/AMASessionStorage.h
@@ -31,6 +31,7 @@
 
 - (BOOL)saveSessionAsLastSession:(AMASession *)session error:(NSError **)error;
 - (BOOL)updateSession:(AMASession *)session pauseTime:(NSDate *)pauseTime error:(NSError **)error;
+- (BOOL)updateSession:(AMASession *)session appState:(AMAApplicationState *)appState error:(NSError **)error;
 - (BOOL)finishSession:(AMASession *)session atDate:(NSDate *)date error:(NSError **)error;
 
 @end
diff --git a/AppMetricaCore/Sources/Model/Reporter/AMASessionStorage.m b/AppMetricaCore/Sources/Model/Reporter/AMASessionStorage.m
@@ -148,6 +148,24 @@ - (BOOL)updateSession:(AMASession *)session pauseTime:(NSDate *)pauseTime error:
     }];
 }
 
+- (BOOL)updateSession:(AMASession *)session appState:(AMAApplicationState *)appState error:(NSError **)error
+{
+    NSError *internalError = nil;
+    session.appState = appState;
+    NSData *data = [self.serializer commonDataForSession:session error:&internalError];
+
+    if (data == nil || internalError != nil) {
+        AMALogError(@"Failed to serialize session data: %@", internalError);
+        if (error != nil) {
+            *error = internalError;
+        }
+        return NO;
+    }
+
+    NSDictionary *updateDictionary = @{ kAMACommonTableFieldData: data };
+    return [self updateSessionFields:updateDictionary forSession:session error:error onSuccess:nil];
+}
+
 - (BOOL)finishSession:(AMASession *)session atDate:(NSDate *)date error:(NSError **)error
 {
     NSDate *pauseTime = date ?: session.pauseTime;

diff --git a/AppMetricaCore/Sources/Model/Reporter/Serialization/AMASessionSerializer.h b/AppMetricaCore/Sources/Model/Reporter/Serialization/AMASessionSerializer.h
@@ -7,6 +7,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface AMASessionSerializer : NSObject
 
+- (NSData *)commonDataForSession:(AMASession *)session error:(NSError **)error;
 - (NSDictionary *)dictionaryForSession:(AMASession *)session error:(NSError **)error;
 - (AMASession *)sessionForDictionary:(NSDictionary *)dictionary error:(NSError **)error;
 

diff --git a/AppMetricaCore/Sources/Model/Reporter/Serialization/AMASessionSerializer.m b/AppMetricaCore/Sources/Model/Reporter/Serialization/AMASessionSerializer.m
@@ -57,7 +57,7 @@ - (NSDictionary *)dictionaryForSession:(AMASession *)session error:(NSError **)e
     dictionary[kAMACommonTableFieldDataEncryptionType] = @(self.encryptionType);
 
     NSError *internalError = nil;
-    dictionary[kAMACommonTableFieldData] = [self.encoder encodeData:[self dataForSession:session] error:&internalError];
+    dictionary[kAMACommonTableFieldData] = [self commonDataForSession:session error:&internalError];
 
     if (internalError != nil) {
         AMALogError(@"Failed to serialize session: %@", internalError);
@@ -67,6 +67,11 @@ - (NSDictionary *)dictionaryForSession:(AMASession *)session error:(NSError **)e
     return [dictionary copy];
 }
 
+- (NSData *)commonDataForSession:(AMASession *)session error:(NSError **)error
+{
+    return [self.encoder encodeData:[self dataForSession:session] error:error];
+}
+
 - (NSNumber *)numberForDate:(NSDate *)date
 {
     if (date == nil) {

diff --git a/AppMetricaCore/Sources/Reporter/AMAReporter.m b/AppMetricaCore/Sources/Reporter/AMAReporter.m
@@ -1121,6 +1121,17 @@ - (void)privacyTimerDidFire:(AMAPrivacyTimer *)privacyTimer
     BOOL needSent = [self.adProvider isAdvertisingTrackingEnabled] && self.privacyTimer.timerStorage.isResendPeriodOutdated;
     AMALogInfo(@"send privacy event: %@ %d", self.apiKey, needSent);
     if (needSent) {
+        NSError *error = nil;
+        AMASession *session = [self lastSession];
+        AMAApplicationState *newState = [AMAApplicationStateManager applicationState];
+        [self.reporterStorage.sessionStorage updateSession:session
+                                                  appState:newState
+                                                     error:&error];
+
+        if (error != nil) {
+            AMALogError(@"Failed to update session %@ with appState %@ : %@", session, newState, error);
+        }
+
         [self reportEventWithType:AMAEventTypeApplePrivacy
                              name:nil
                             value:nil

diff --git a/AppMetricaCore/Tests/AMASessionStorageTests.m b/AppMetricaCore/Tests/AMASessionStorageTests.m
@@ -13,6 +13,7 @@
 #import "AMADatabaseHelper.h"
 #import "AMAEnvironmentContainer.h"
 #import "AMAAppStateManagerTestHelper.h"
+#import "AMAApplicationStateManager.h"
 #import "AMAMetricaConfigurationTestUtilities.h"
 #import <AppMetricaTestUtils/AppMetricaTestUtils.h>
 
@@ -483,6 +484,25 @@
                         [[session.appState should] equal:appState];
                     });
                 });
+                context(@"App state", ^{
+                    NSString *newIDFA = @"3264429A-3997-4786-AC2A-1790482363BC";
+                    AMAMutableApplicationState *newState = [[AMAApplicationStateManager applicationState] mutableCopy];
+                    newState.IFA = newIDFA;
+
+                    beforeEach(^{
+                        NSError *error = nil;
+                        BOOL result = [storage updateSession:session appState:newState error:&error];
+                        [[error should] beNil];
+                        [[theValue(result) should] equal:theValue(YES)];
+
+                        session = [storage lastSessionWithError:nil];
+                    });
+
+                    it(@"should update IDFA", ^{
+                        [[session.appState should] equal:newState];
+                        [[session.appState.IFA should] equal:newIDFA];
+                    });
+                });
             });
         });
         context(@"Error", ^{