fix: fix the compatible issue with macOSSonoma (#463)

amplitude · Sep 15, 2023 · fd9495f · fd9495f
1 parent 94160a5
commit fd9495f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/Sources/Amplitude/AMPIdentifyInterceptor.m b/Sources/Amplitude/AMPIdentifyInterceptor.m
@@ -141,7 +141,7 @@ - (NSMutableDictionary *)intercept:(NSMutableDictionary *_Nonnull)event {
             [self scheduleTransfer];
 
             // Event is intercepted, return nil
-            return nil;
+            return [NSMutableDictionary dictionary];
        } else if ([userPropertyOperations objectForKey:AMP_OP_CLEAR_ALL] != nil) {
             // Clear all pending intercepted Identify's
             [_dbHelper removeInterceptedIdentifys:[_dbHelper getLastSequenceNumber]];

diff --git a/Sources/Amplitude/Amplitude.m b/Sources/Amplitude/Amplitude.m
@@ -727,7 +727,7 @@ - (void)logEvent:(NSString *)eventType withEventProperties:(NSDictionary *)event
         }
 
         event = [self->_identifyInterceptor intercept:event];
-        if (event != nil) {
+        if ([event count] != 0) {
             // convert event dictionary to JSON String
             NSError *error = nil;
             NSData *jsonData = [NSJSONSerialization dataWithJSONObject:[AMPUtils makeJSONSerializable:event] options:0 error:&error];

diff --git a/Tests/IdentifyInterceptorTests.m b/Tests/IdentifyInterceptorTests.m
@@ -80,7 +80,7 @@ - (void)testIdentifyWithOnlySetIsIntercepted {
 
     event = [self->_identifyInterceptor intercept:event];
 
-    XCTAssertEqual(event, nil);
+    XCTAssertEqual([event count], 0);
     XCTAssertEqual(self->_dbHelper.getIdentifyCount, 0);
     XCTAssertEqual(self->_dbHelper.getInterceptedIdentifyCount, 1);
 
@@ -141,7 +141,7 @@ - (void)testInterceptedIdentifyIsTransferredOnNextActiveIdentify {
 
     event1 = [self->_identifyInterceptor intercept:event1];
 
-    XCTAssertNil(event1);
+    XCTAssertEqual([event1 count], 0);
     XCTAssertEqual(self->_dbHelper.getLastSequenceNumber, 1);
     XCTAssertEqual(self->_dbHelper.getInterceptedIdentifyCount, 1);
     XCTAssertEqual(self->_dbHelper.getIdentifyCount, 0);
@@ -183,7 +183,7 @@ - (void)testMultipleInterceptedIdentifyIsTransferredOnNextActiveIdentify {
 
     event1 = [self->_identifyInterceptor intercept:event1];
 
-    XCTAssertNil(event1);
+    XCTAssertEqual([event1 count], 0);
     XCTAssertEqual(self->_dbHelper.getLastSequenceNumber, 1);
     XCTAssertEqual(self->_dbHelper.getInterceptedIdentifyCount, 1);
     XCTAssertEqual(self->_dbHelper.getIdentifyCount, 0);
@@ -195,7 +195,7 @@ - (void)testMultipleInterceptedIdentifyIsTransferredOnNextActiveIdentify {
 
     event2 = [self->_identifyInterceptor intercept:event2];
 
-    XCTAssertNil(event2);
+    XCTAssertEqual([event2 count], 0);
     XCTAssertEqual(self->_dbHelper.getLastSequenceNumber, 2);
     XCTAssertEqual(self->_dbHelper.getInterceptedIdentifyCount, 2);
     XCTAssertEqual(self->_dbHelper.getIdentifyCount, 0);
@@ -244,7 +244,7 @@ - (void)testMultipleInterceptedIdentifyIsTransferredOnNextActiveIdentifyWithSetO
 
     event1 = [self->_identifyInterceptor intercept:event1];
 
-    XCTAssertNil(event1);
+    XCTAssertEqual([event1 count], 0);
     XCTAssertEqual(self->_dbHelper.getLastSequenceNumber, 1);
     XCTAssertEqual(self->_dbHelper.getInterceptedIdentifyCount, 1);
     XCTAssertEqual(self->_dbHelper.getIdentifyCount, 0);
@@ -256,7 +256,7 @@ - (void)testMultipleInterceptedIdentifyIsTransferredOnNextActiveIdentifyWithSetO
 
     event2 = [self->_identifyInterceptor intercept:event2];
 
-    XCTAssertNil(event2);
+    XCTAssertEqual([event2 count], 0);
     XCTAssertEqual(self->_dbHelper.getLastSequenceNumber, 2);
     XCTAssertEqual(self->_dbHelper.getInterceptedIdentifyCount, 2);
     XCTAssertEqual(self->_dbHelper.getIdentifyCount, 0);
@@ -308,7 +308,7 @@ - (void)testInterceptedIdentifyIsTransferredOnNextActiveEvent {
 
     event = [self->_identifyInterceptor intercept:event];
 
-    XCTAssertNil(event);
+    XCTAssertEqual([event count], 0);
     XCTAssertEqual(self->_dbHelper.getLastSequenceNumber, 1);
     XCTAssertEqual(self->_dbHelper.getInterceptedIdentifyCount, 1);
     XCTAssertEqual(self->_dbHelper.getIdentifyCount, 0);
@@ -345,7 +345,7 @@ - (void)testMultipleInterceptedIdentifyIsTransferredNextActiveEvent {
 
     event1 = [self->_identifyInterceptor intercept:event1];
 
-    XCTAssertNil(event1);
+    XCTAssertEqual([event1 count], 0);
     XCTAssertEqual(self->_dbHelper.getLastSequenceNumber, 1);
     XCTAssertEqual(self->_dbHelper.getInterceptedIdentifyCount, 1);
     XCTAssertEqual(self->_dbHelper.getIdentifyCount, 0);
@@ -357,7 +357,7 @@ - (void)testMultipleInterceptedIdentifyIsTransferredNextActiveEvent {
 
     event2 = [self->_identifyInterceptor intercept:event2];
 
-    XCTAssertNil(event2);
+    XCTAssertEqual([event2 count], 0);
     XCTAssertEqual(self->_dbHelper.getLastSequenceNumber, 2);
     XCTAssertEqual(self->_dbHelper.getInterceptedIdentifyCount, 2);
     XCTAssertEqual(self->_dbHelper.getIdentifyCount, 0);
@@ -396,7 +396,7 @@ - (void)testNullValuesInIdentifySetAreIgnoredOnActiveIdentify {
 
     event1 = [self->_identifyInterceptor intercept:event1];
 
-    XCTAssertNil(event1);
+    XCTAssertEqual([event1 count], 0);
     XCTAssertEqual(self->_dbHelper.getLastSequenceNumber, 1);
     XCTAssertEqual(self->_dbHelper.getInterceptedIdentifyCount, 1);
     XCTAssertEqual(self->_dbHelper.getIdentifyCount, 0);
@@ -409,7 +409,7 @@ - (void)testNullValuesInIdentifySetAreIgnoredOnActiveIdentify {
 
     event2 = [self->_identifyInterceptor intercept:event2];
 
-    XCTAssertNil(event2);
+    XCTAssertEqual([event2 count], 0);
     XCTAssertEqual(self->_dbHelper.getLastSequenceNumber, 2);
     XCTAssertEqual(self->_dbHelper.getInterceptedIdentifyCount, 2);
     XCTAssertEqual(self->_dbHelper.getIdentifyCount, 0);
@@ -454,7 +454,7 @@ - (void)testNullValuesInIdentifySetAreIgnoredOnActiveEvent {
 
     event1 = [self->_identifyInterceptor intercept:event1];
 
-    XCTAssertNil(event1);
+    XCTAssertEqual([event1 count], 0);
     XCTAssertEqual(self->_dbHelper.getLastSequenceNumber, 1);
     XCTAssertEqual(self->_dbHelper.getInterceptedIdentifyCount, 1);
     XCTAssertEqual(self->_dbHelper.getIdentifyCount, 0);
@@ -467,7 +467,7 @@ - (void)testNullValuesInIdentifySetAreIgnoredOnActiveEvent {
 
     event2 = [self->_identifyInterceptor intercept:event2];
 
-    XCTAssertNil(event2);
+    XCTAssertEqual([event2 count], 0);
     XCTAssertEqual(self->_dbHelper.getLastSequenceNumber, 2);
     XCTAssertEqual(self->_dbHelper.getInterceptedIdentifyCount, 2);
     XCTAssertEqual(self->_dbHelper.getIdentifyCount, 0);