From 71523fe67670cd6309777f8e5f1fb19473e638bf Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Tue, 30 Oct 2018 16:48:05 -0400 Subject: [PATCH] pass controller instead --- MVMCore/MVMCore/AlertHandling/MVMCoreAlertController.m | 2 +- .../MVMCore/MainProtocols/MVMCoreLoggingDelegateProtocol.h | 4 +++- MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.h | 3 ++- MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.m | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/MVMCore/MVMCore/AlertHandling/MVMCoreAlertController.m b/MVMCore/MVMCore/AlertHandling/MVMCoreAlertController.m index d9ab5f9..684a382 100644 --- a/MVMCore/MVMCore/AlertHandling/MVMCoreAlertController.m +++ b/MVMCore/MVMCore/AlertHandling/MVMCoreAlertController.m @@ -24,7 +24,7 @@ [self willChangeValueForKey:@"isVisible"]; self.visible = YES; [self didChangeValueForKey:@"isVisible"]; - [MVMCoreLoggingHandler logAlertForAlertObject:self.alertObject delegate:self.delegate]; + [MVMCoreLoggingHandler logAlertForAlertController:self]; } - (void)viewDidDisappear:(BOOL)animated { diff --git a/MVMCore/MVMCore/MainProtocols/MVMCoreLoggingDelegateProtocol.h b/MVMCore/MVMCore/MainProtocols/MVMCoreLoggingDelegateProtocol.h index 43c0e0a..647c154 100644 --- a/MVMCore/MVMCore/MainProtocols/MVMCoreLoggingDelegateProtocol.h +++ b/MVMCore/MVMCore/MainProtocols/MVMCoreLoggingDelegateProtocol.h @@ -7,6 +7,7 @@ // #import +@class MVMCoreAlertController; @protocol MVMCoreLoggingDelegateProtocol @@ -25,5 +26,6 @@ - (void)logLoadFinished:(nullable MVMCoreLoadObject *)loadObject loadedViewController:(nullable UIViewController *)loadedViewController error:(nullable MVMCoreErrorObject *)error; // Log alert -+ (void)logAlertForAlertObject:(nullable MVMCoreAlertObject *)alertObject delegate:(_Nullable id)delegate; ++ (void)logAlertForAlertController:(nullable MVMCoreAlertController *)alertController; + @end diff --git a/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.h b/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.h index b20ef75..12d0e2a 100644 --- a/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.h +++ b/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.h @@ -10,6 +10,7 @@ #import #import #import +@class MVMCoreAlertController; #define MVMCoreLog(fmt, ...) \ [MVMCoreLoggingHandler logDebugMessageWithDelegate:[NSString stringWithFormat:(@"%s [Line %d] " fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__]]; @@ -20,6 +21,6 @@ + (void)logDebugMessageWithDelegate:(nullable NSString *)message; + (void)logWithDelegateWithObject:(nullable id)object withName:(nullable NSString *)name withExtraInfo:(nullable NSDictionary *)extra; + (void)logWithDelegateLoadFinished:(nullable MVMCoreLoadObject *)loadObject loadedViewController:(nullable UIViewController *)loadedViewController error:(nullable MVMCoreErrorObject *)error; -+ (void)logAlertForAlertObject:(nullable MVMCoreAlertObject *)alertObject delegate:(_Nullable id)delegate; ++ (void)logAlertForAlertController:(nullable MVMCoreAlertController *)alertController; @end diff --git a/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.m b/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.m index 5df86d2..65e2659 100644 --- a/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.m +++ b/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.m @@ -35,9 +35,9 @@ } } -+ (void)logAlertForAlertObject:(nullable MVMCoreAlertObject *)alertObject delegate:(_Nullable id)delegate { - if ([[MVMCoreObject sharedInstance].loggingDelegate respondsToSelector:@selector(logAlertForAlertObject:delegate:)]) { - [[MVMCoreObject sharedInstance].loggingDelegate logAlertForAlertObject:alertObject delegate:delegate]; ++ (void)logAlertForAlertController:(nullable MVMCoreAlertController *)alertController { + if ([[MVMCoreObject sharedInstance].loggingDelegate respondsToSelector:@selector(logAlertForAlertController:)]) { + [[MVMCoreObject sharedInstance].loggingDelegate logAlertForAlertController:alertController]; } }