Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: double calling of delegate #600

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: double calling of delegate #600

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions Objective-C/TOCropViewController/TOCropViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,14 +888,11 @@ - (void)dismissCropViewController
{
bool isDelegateOrCallbackHandled = NO;

// Check if the delegate method was implemented and call if so
// Check if the delegate method/block version was implemented and call if so
if ([self.delegate respondsToSelector:@selector(cropViewController:didFinishCancelled:)]) {
[self.delegate cropViewController:self didFinishCancelled:YES];
isDelegateOrCallbackHandled = YES;
}

// Check if the block version was implemented and call if so
if (self.onDidFinishCancelled != nil) {
} else if (self.onDidFinishCancelled != nil) {
self.onDidFinishCancelled(YES);
isDelegateOrCallbackHandled = YES;
}
Expand Down Expand Up @@ -943,13 +940,12 @@ - (void)doneButtonTapped

bool isCallbackOrDelegateHandled = NO;

if (self.onDidFinishCancelled != nil) {
self.onDidFinishCancelled(NO);
isCallbackOrDelegateHandled = YES;
}
if ([self.delegate respondsToSelector:@selector(cropViewController:didFinishCancelled:)]) {
[self.delegate cropViewController:self didFinishCancelled:NO];
isCallbackOrDelegateHandled = YES;
} else if (self.onDidFinishCancelled != nil) {
self.onDidFinishCancelled(NO);
isCallbackOrDelegateHandled = YES;
}

if (!isCallbackOrDelegateHandled) {
Expand All @@ -974,9 +970,7 @@ - (void)doneButtonTapped
if ([self.delegate respondsToSelector:@selector(cropViewController:didCropImageToRect:angle:)]) {
[self.delegate cropViewController:self didCropImageToRect:cropFrame angle:angle];
isCallbackOrDelegateHandled = YES;
}

if (self.onDidCropImageToRect != nil) {
} else if (self.onDidCropImageToRect != nil) {
self.onDidCropImageToRect(cropFrame, angle);
isCallbackOrDelegateHandled = YES;
}
Expand All @@ -997,8 +991,7 @@ - (void)doneButtonTapped
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.03f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
if (isCircularImageDelegateAvailable) {
[self.delegate cropViewController:self didCropToCircularImage:image withRect:cropFrame angle:angle];
}
if (isCircularImageCallbackAvailable) {
} else if (isCircularImageCallbackAvailable) {
self.onDidCropToCircleImage(image, cropFrame, angle);
}
});
Expand All @@ -1019,9 +1012,7 @@ - (void)doneButtonTapped
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.03f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
if (isDidCropToImageDelegateAvailable) {
[self.delegate cropViewController:self didCropToImage:image withRect:cropFrame angle:angle];
}

if (isDidCropToImageCallbackAvailable) {
} else if (isDidCropToImageCallbackAvailable) {
self.onDidCropToRect(image, cropFrame, angle);
}
});
Expand Down