refactor(DTXUISyncResource): Reenable IMPLICIT_RETAIN_SELF and fix issues

ball-hayden · ball-hayden · commit 716e2a7ad0c8 · 2022-04-18T16:16:32.000+01:00
diff --git a/DetoxSync/DetoxSync.xcodeproj/project.pbxproj b/DetoxSync/DetoxSync.xcodeproj/project.pbxproj
@@ -1224,7 +1224,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1255,7 +1254,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
diff --git a/DetoxSync/DetoxSync/SyncResources/DTXUISyncResource.m b/DetoxSync/DetoxSync/SyncResources/DTXUISyncResource.m
@@ -113,45 +113,45 @@ - (void)_untrackForParam:(NSUInteger*)param eventIdentifier:(NSString*(NS_NOESCA
 - (void)trackViewNeedsLayout:(UIView *)view
 {
 	NSString* identifier = [self _trackForParam:&_viewNeedsLayoutCount eventDescription:_DTXStringReturningBlock(@"View Layout") objectDescription:_DTXStringReturningBlock(view.__detox_sync_safeDescription)];
-	
+
 	__detox_sync_orig_dispatch_async(dispatch_get_main_queue(), ^ {
-		[self _untrackForParam:&_viewNeedsLayoutCount eventIdentifier:_DTXStringReturningBlock(identifier)];
+		[self _untrackForParam:&self->_viewNeedsLayoutCount eventIdentifier:_DTXStringReturningBlock(identifier)];
 	});
 }
 
 - (void)trackViewNeedsDisplay:(UIView *)view
 {
 	NSString* identifier = [self _trackForParam:&_viewNeedsDisplayCount eventDescription:_DTXStringReturningBlock(@"View Display") objectDescription:_DTXStringReturningBlock(view.__detox_sync_safeDescription)];
-	
+
 	__detox_sync_orig_dispatch_async(dispatch_get_main_queue(), ^ {
-		[self _untrackForParam:&_viewNeedsDisplayCount eventIdentifier:_DTXStringReturningBlock(identifier)];
+		[self _untrackForParam:&self->_viewNeedsDisplayCount eventIdentifier:_DTXStringReturningBlock(identifier)];
 	});
 }
 
 - (void)trackLayerNeedsLayout:(CALayer *)layer
 {
 	NSString* identifier = [self _trackForParam:&_layerNeedsLayoutCount eventDescription:_DTXStringReturningBlock(@"Layer Layout") objectDescription:_DTXStringReturningBlock(layer.description)];
-	
+
 	__detox_sync_orig_dispatch_async(dispatch_get_main_queue(), ^ {
-		[self _untrackForParam:&_layerNeedsLayoutCount eventIdentifier:_DTXStringReturningBlock(identifier)];
+		[self _untrackForParam:&self->_layerNeedsLayoutCount eventIdentifier:_DTXStringReturningBlock(identifier)];
 	});
 }
 
 - (void)trackLayerNeedsDisplay:(CALayer *)layer
 {
 	NSString* identifier = [self _trackForParam:&_layerNeedsDisplayCount eventDescription:_DTXStringReturningBlock(@"Layer Display") objectDescription:_DTXStringReturningBlock(layer.description)];
-	
+
 	__detox_sync_orig_dispatch_async(dispatch_get_main_queue(), ^ {
-		[self _untrackForParam:&_layerNeedsDisplayCount eventIdentifier:_DTXStringReturningBlock(identifier)];
+		[self _untrackForParam:&self->_layerNeedsDisplayCount eventIdentifier:_DTXStringReturningBlock(identifier)];
 	});
 }
 
 - (void)trackLayerPendingAnimation:(CALayer*)layer
 {
 	NSString* identifier = [self _trackForParam:&_layerPendingAnimationCount eventDescription:_DTXStringReturningBlock(@"Layer Pending Animation") objectDescription:_DTXStringReturningBlock(layer.description)];
-	
+
 	__detox_sync_orig_dispatch_async(dispatch_get_main_queue(), ^ {
-		[self _untrackForParam:&_layerPendingAnimationCount eventIdentifier:_DTXStringReturningBlock(identifier)];
+		[self _untrackForParam:&self->_layerPendingAnimationCount eventIdentifier:_DTXStringReturningBlock(identifier)];
 	});
 }
 
@@ -160,9 +160,9 @@ - (void)trackViewControllerWillAppear:(UIViewController *)vc
 	if(vc.transitionCoordinator)
 	{
 		NSString* identifier = [self _trackForParam:&_viewControllerWillAppearCount eventDescription:_DTXStringReturningBlock(@"View Layout") objectDescription:_DTXStringReturningBlock(vc.description)];
-		
+
 		[vc.transitionCoordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
-			[self _untrackForParam:&_viewControllerWillAppearCount eventIdentifier:_DTXStringReturningBlock(identifier)];
+			[self _untrackForParam:&self->_viewControllerWillAppearCount eventIdentifier:_DTXStringReturningBlock(identifier)];
 		}];
 	}
 }
@@ -172,9 +172,9 @@ - (void)trackViewControllerWillDisappear:(UIViewController *)vc
 	if(vc.transitionCoordinator)
 	{
 		NSString* identifier = [self _trackForParam:&_viewControllerWillDisappearCount eventDescription:_DTXStringReturningBlock(@"View Layout") objectDescription:_DTXStringReturningBlock(vc.description)];
-		
+
 		[vc.transitionCoordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
-			[self _untrackForParam:&_viewControllerWillDisappearCount eventIdentifier:_DTXStringReturningBlock(identifier)];
+			[self _untrackForParam:&self->_viewControllerWillDisappearCount eventIdentifier:_DTXStringReturningBlock(identifier)];
 		}];
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -113,45 +113,45 @@ - (void)_untrackForParam:(NSUInteger)param eventIdentifier:(NSString(NS_NOESCA`
`113`	`113`	`- (void)trackViewNeedsLayout:(UIView *)view`
`114`	`114`	`{`
`115`	`115`	`NSString* identifier = [self _trackForParam:&_viewNeedsLayoutCount eventDescription:_DTXStringReturningBlock(@"View Layout") objectDescription:_DTXStringReturningBlock(view.__detox_sync_safeDescription)];`
`116`		`-`
	`116`	`+`
`117`	`117`	`__detox_sync_orig_dispatch_async(dispatch_get_main_queue(), ^ {`
`118`		`- [self _untrackForParam:&_viewNeedsLayoutCount eventIdentifier:_DTXStringReturningBlock(identifier)];`
	`118`	`+ [self _untrackForParam:&self->_viewNeedsLayoutCount eventIdentifier:_DTXStringReturningBlock(identifier)];`
`119`	`119`	`});`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`- (void)trackViewNeedsDisplay:(UIView *)view`
`123`	`123`	`{`
`124`	`124`	`NSString* identifier = [self _trackForParam:&_viewNeedsDisplayCount eventDescription:_DTXStringReturningBlock(@"View Display") objectDescription:_DTXStringReturningBlock(view.__detox_sync_safeDescription)];`
`125`		`-`
	`125`	`+`
`126`	`126`	`__detox_sync_orig_dispatch_async(dispatch_get_main_queue(), ^ {`
`127`		`- [self _untrackForParam:&_viewNeedsDisplayCount eventIdentifier:_DTXStringReturningBlock(identifier)];`
	`127`	`+ [self _untrackForParam:&self->_viewNeedsDisplayCount eventIdentifier:_DTXStringReturningBlock(identifier)];`
`128`	`128`	`});`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`- (void)trackLayerNeedsLayout:(CALayer *)layer`
`132`	`132`	`{`
`133`	`133`	`NSString* identifier = [self _trackForParam:&_layerNeedsLayoutCount eventDescription:_DTXStringReturningBlock(@"Layer Layout") objectDescription:_DTXStringReturningBlock(layer.description)];`
`134`		`-`
	`134`	`+`
`135`	`135`	`__detox_sync_orig_dispatch_async(dispatch_get_main_queue(), ^ {`
`136`		`- [self _untrackForParam:&_layerNeedsLayoutCount eventIdentifier:_DTXStringReturningBlock(identifier)];`
	`136`	`+ [self _untrackForParam:&self->_layerNeedsLayoutCount eventIdentifier:_DTXStringReturningBlock(identifier)];`
`137`	`137`	`});`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`- (void)trackLayerNeedsDisplay:(CALayer *)layer`
`141`	`141`	`{`
`142`	`142`	`NSString* identifier = [self _trackForParam:&_layerNeedsDisplayCount eventDescription:_DTXStringReturningBlock(@"Layer Display") objectDescription:_DTXStringReturningBlock(layer.description)];`
`143`		`-`
	`143`	`+`
`144`	`144`	`__detox_sync_orig_dispatch_async(dispatch_get_main_queue(), ^ {`
`145`		`- [self _untrackForParam:&_layerNeedsDisplayCount eventIdentifier:_DTXStringReturningBlock(identifier)];`
	`145`	`+ [self _untrackForParam:&self->_layerNeedsDisplayCount eventIdentifier:_DTXStringReturningBlock(identifier)];`
`146`	`146`	`});`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`- (void)trackLayerPendingAnimation:(CALayer*)layer`
`150`	`150`	`{`
`151`	`151`	`NSString* identifier = [self _trackForParam:&_layerPendingAnimationCount eventDescription:_DTXStringReturningBlock(@"Layer Pending Animation") objectDescription:_DTXStringReturningBlock(layer.description)];`
`152`		`-`
	`152`	`+`
`153`	`153`	`__detox_sync_orig_dispatch_async(dispatch_get_main_queue(), ^ {`
`154`		`- [self _untrackForParam:&_layerPendingAnimationCount eventIdentifier:_DTXStringReturningBlock(identifier)];`
	`154`	`+ [self _untrackForParam:&self->_layerPendingAnimationCount eventIdentifier:_DTXStringReturningBlock(identifier)];`
`155`	`155`	`});`
`156`	`156`	`}`
`157`	`157`
`@@ -160,9 +160,9 @@ - (void)trackViewControllerWillAppear:(UIViewController *)vc`
`160`	`160`	`if(vc.transitionCoordinator)`
`161`	`161`	`{`
`162`	`162`	`NSString* identifier = [self _trackForParam:&_viewControllerWillAppearCount eventDescription:_DTXStringReturningBlock(@"View Layout") objectDescription:_DTXStringReturningBlock(vc.description)];`
`163`		`-`
	`163`	`+`
`164`	`164`	`[vc.transitionCoordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {`
`165`		`- [self _untrackForParam:&_viewControllerWillAppearCount eventIdentifier:_DTXStringReturningBlock(identifier)];`
	`165`	`+ [self _untrackForParam:&self->_viewControllerWillAppearCount eventIdentifier:_DTXStringReturningBlock(identifier)];`
`166`	`166`	`}];`
`167`	`167`	`}`
`168`	`168`	`}`
`@@ -172,9 +172,9 @@ - (void)trackViewControllerWillDisappear:(UIViewController *)vc`
`172`	`172`	`if(vc.transitionCoordinator)`
`173`	`173`	`{`
`174`	`174`	`NSString* identifier = [self _trackForParam:&_viewControllerWillDisappearCount eventDescription:_DTXStringReturningBlock(@"View Layout") objectDescription:_DTXStringReturningBlock(vc.description)];`
`175`		`-`
	`175`	`+`
`176`	`176`	`[vc.transitionCoordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {`
`177`		`- [self _untrackForParam:&_viewControllerWillDisappearCount eventIdentifier:_DTXStringReturningBlock(identifier)];`
	`177`	`+ [self _untrackForParam:&self->_viewControllerWillDisappearCount eventIdentifier:_DTXStringReturningBlock(identifier)];`
`178`	`178`	`}];`
`179`	`179`	`}`
`180`	`180`	`}`