ref: Unify ANRTrackerDelegate

Merge SentryANRTrackerDelegate and SentryANRTrackerDelegateV2 into one
implementation to reduce complexity.

Sources/Sentry/SentryANRTracker.m

@@ -143,7 +143,7 @@ - (void)ANRDetected
     }
 
     for (id<SentryANRTrackerDelegate> target in localListeners) {
-        [target anrDetected];
+        [target anrDetectedWithType:SentryANRTypeUnknown];
     }
 }
 

Sources/Sentry/SentryANRTrackerV2.m

@@ -26,7 +26,7 @@ @interface SentryANRTrackerV2 ()
 @property (nonatomic, strong) SentryCrashWrapper *crashWrapper;
 @property (nonatomic, strong) SentryDispatchQueueWrapper *dispatchQueueWrapper;
 @property (nonatomic, strong) SentryThreadWrapper *threadWrapper;
-@property (nonatomic, strong) NSHashTable<id<SentryANRTrackerV2Delegate>> *listeners;
+@property (nonatomic, strong) NSHashTable<id<SentryANRTrackerDelegate>> *listeners;
 @property (nonatomic, strong) SentryFramesTracker *framesTracker;
 @property (nonatomic, assign) NSTimeInterval timeoutInterval;
 
@@ -199,7 +199,7 @@ - (void)ANRDetected:(enum SentryANRType)type
         localListeners = [self.listeners allObjects];
     }
 
-    for (id<SentryANRTrackerV2Delegate> target in localListeners) {
+    for (id<SentryANRTrackerDelegate> target in localListeners) {
         [target anrDetectedWithType:type];
     }
 }
@@ -211,12 +211,12 @@ - (void)ANRStopped
         targets = [self.listeners allObjects];
     }
 
-    for (id<SentryANRTrackerV2Delegate> target in targets) {
+    for (id<SentryANRTrackerDelegate> target in targets) {
         [target anrStopped];
     }
 }
 
-- (void)addListener:(id<SentryANRTrackerV2Delegate>)listener
+- (void)addListener:(id<SentryANRTrackerDelegate>)listener
 {
     @synchronized(self.listeners) {
         [self.listeners addObject:listener];
@@ -234,7 +234,7 @@ - (void)addListener:(id<SentryANRTrackerV2Delegate>)listener
     }
 }
 
-- (void)removeListener:(id<SentryANRTrackerV2Delegate>)listener
+- (void)removeListener:(id<SentryANRTrackerDelegate>)listener
 {
     @synchronized(self.listeners) {
         [self.listeners removeObject:listener];

Sources/Sentry/SentryANRTrackingIntegration.m

@@ -75,7 +75,7 @@ - (void)dealloc
     [self uninstall];
 }
 
-- (void)anrDetected
+- (void)anrDetectedWithType:(enum SentryANRType)type
 {
     if (self.reportAppHangs == NO) {
         SENTRY_LOG_DEBUG(@"AppHangTracking paused. Ignoring reported app hang.")

Sources/Sentry/SentryWatchdogTerminationTrackingIntegration.m

@@ -102,7 +102,7 @@ - (void)uninstall
     [self.anrTracker removeListener:self];
 }
 
-- (void)anrDetected
+- (void)anrDetectedWithType:(enum SentryANRType)type
 {
     [self.appStateManager
         updateAppState:^(SentryAppState *appState) { appState.isANROngoing = YES; }];

Sources/Sentry/include/SentryANRTracker.h

@@ -1,4 +1,5 @@
 #import "SentryDefines.h"
+#import "SentrySwift.h"
 
 @class SentryOptions, SentryCrashWrapper, SentryDispatchQueueWrapper, SentryThreadWrapper;
 
@@ -36,15 +37,4 @@ SENTRY_NO_INIT
 
 @end
 
-/**
- * The ``SentryANRTracker`` calls the methods from background threads.
- */
-@protocol SentryANRTrackerDelegate <NSObject>
-
-- (void)anrDetected;
-
-- (void)anrStopped;
-
-@end
-
 NS_ASSUME_NONNULL_END

Sources/Sentry/include/SentryANRTrackerV2.h

@@ -29,9 +29,9 @@ SENTRY_NO_INIT
                           threadWrapper:(SentryThreadWrapper *)threadWrapper
                           framesTracker:(SentryFramesTracker *)framesTracker;
 
-- (void)addListener:(id<SentryANRTrackerV2Delegate>)listener;
+- (void)addListener:(id<SentryANRTrackerDelegate>)listener;
 
-- (void)removeListener:(id<SentryANRTrackerV2Delegate>)listener;
+- (void)removeListener:(id<SentryANRTrackerDelegate>)listener;
 
 // Function used for tests
 - (void)clear;

Sources/Sentry/include/SentryANRTrackingIntegrationV2.h

@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 static NSString *const SentryANRExceptionTypeV2 = @"App Hanging";
 
 @interface SentryANRTrackingIntegrationV2
-    : SentryBaseIntegration <SentryIntegrationProtocol, SentryANRTrackerV2Delegate>
+    : SentryBaseIntegration <SentryIntegrationProtocol, SentryANRTrackerDelegate>
 
 - (void)pauseAppHangTracking;
 - (void)resumeAppHangTracking;

Sources/Swift/Integrations/ANR/SentryANRTrackerV2Delegate.swift

@@ -1,7 +1,8 @@
 import Foundation
 
+/// The  methods are called from a  background thread.
 @objc
-protocol SentryANRTrackerV2Delegate {
+protocol SentryANRTrackerDelegate {
     func anrDetected(type: SentryANRType)
     func anrStopped()
 }
@@ -10,4 +11,5 @@ protocol SentryANRTrackerV2Delegate {
 enum SentryANRType: Int {
     case fullyBlocking
     case nonFullyBlocking
+    case unknown
 }

Tests/SentryTests/Integrations/ANR/SentryANRTrackerTests.swift

@@ -205,7 +205,7 @@ class SentryANRTrackerTests: XCTestCase, SentryANRTrackerDelegate {
         XCTAssertEqual(1, fixture.threadWrapper.threadFinishedInvocations.count)
     }
 
-    func anrDetected() {
+    func anrDetected(type: Sentry.SentryANRType) {
         anrDetectedExpectation.fulfill()
     }
 
@@ -231,7 +231,7 @@ class SentryANRTrackerTestDelegate: NSObject, SentryANRTrackerDelegate {
         anrStoppedExpectation.fulfill()
     }
 
-    func anrDetected() {
+    func anrDetected(type: Sentry.SentryANRType) {
         anrDetectedExpectation.fulfill()
     }
 }

Tests/SentryTests/Integrations/ANR/SentryANRTrackerV2Tests.swift

@@ -453,7 +453,7 @@ class SentryANRTrackerV2Tests: XCTestCase {
 
 }
 
-class SentryANRTrackerV2TestDelegate: NSObject, SentryANRTrackerV2Delegate {
+class SentryANRTrackerV2TestDelegate: NSObject, SentryANRTrackerDelegate {
 
     let anrDetectedExpectation = XCTestExpectation(description: "Test Delegate ANR Detection")
     let anrStoppedExpectation  = XCTestExpectation(description: "Test Delegate ANR Stopped")