From f569d5279d1fc992aa23dc9f5f1f8df9977c545d Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Mon, 1 Nov 2021 11:54:35 -0400 Subject: [PATCH 1/3] static MVMCoreLoggingHandler addError --- .../ActionType/Client Parameters/ClientParameterHandler.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterHandler.swift b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterHandler.swift index d40534b..fe420ef 100644 --- a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterHandler.swift +++ b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterHandler.swift @@ -18,7 +18,7 @@ return parameterType.init(clientParameterModel) } catch { if let errorObject = MVMCoreErrorObject.createErrorObject(for: error, location: #function) { - MVMCoreLoggingHandler.shared()?.addError(toLog: errorObject) + MVMCoreLoggingHandler.addError(toLog: errorObject) } return nil } From 35b96b2fdea6983aa6cbc4e0289480cea821e9e9 Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Tue, 2 Nov 2021 16:38:57 -0400 Subject: [PATCH 2/3] add missing pass through --- .../MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m index 957b3f1..6ac92d8 100644 --- a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m +++ b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m @@ -884,6 +884,14 @@ } } +- (void)navigationController:(UINavigationController *)navigationController interactiveTransitionWasCanceled:(BOOL)canceled { + if (self.delegateObject.presentationDelegate && [self.delegateObject.presentationDelegate respondsToSelector:@selector(navigationController:interactiveTransitionWasCanceled:)]) { + return [self.delegateObject.presentationDelegate navigationController:navigationController interactiveTransitionWasCanceled:canceled]; + } else { + return; + } +} + - (void)viewController:(UIViewController *)presentingViewController willPresentViewController:(UIViewController *)presentedViewController { if ([self.delegateObject.presentationDelegate respondsToSelector:@selector(viewController:willPresentViewController:)]) { From 64f6624e00cb7db29c5d97d3aed32dc73256b135 Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Thu, 4 Nov 2021 14:16:21 -0400 Subject: [PATCH 3/3] silly! --- MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m index 6ac92d8..8d5280b 100644 --- a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m +++ b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m @@ -886,14 +886,11 @@ - (void)navigationController:(UINavigationController *)navigationController interactiveTransitionWasCanceled:(BOOL)canceled { if (self.delegateObject.presentationDelegate && [self.delegateObject.presentationDelegate respondsToSelector:@selector(navigationController:interactiveTransitionWasCanceled:)]) { - return [self.delegateObject.presentationDelegate navigationController:navigationController interactiveTransitionWasCanceled:canceled]; - } else { - return; + [self.delegateObject.presentationDelegate navigationController:navigationController interactiveTransitionWasCanceled:canceled]; } } - (void)viewController:(UIViewController *)presentingViewController willPresentViewController:(UIViewController *)presentedViewController { - if ([self.delegateObject.presentationDelegate respondsToSelector:@selector(viewController:willPresentViewController:)]) { [self.delegateObject.presentationDelegate viewController:presentingViewController willPresentViewController:presentedViewController]; }