From 9da141cdb8fc0716d40f5522b61088e72c49278c Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Fri, 12 Jun 2020 14:43:02 -0400 Subject: [PATCH 1/2] Update accessibility for numberd left variable --- MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m | 6 ++++-- MVMCore/MVMCore/Utility/MVMCoreErrorObject.m | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m index 8eff939..b4a79eb 100644 --- a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m +++ b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m @@ -431,8 +431,10 @@ NSString * const KeyActionTypeOpen = @"openPage"; if (!error.silentError) { // Show alert - MVMCoreAlertObject *alertObject = [[MVMCoreAlertObject alloc] initPopupAlertWithError:error isGreedy:NO]; - [[MVMCoreAlertHandler sharedAlertHandler] showAlertWithAlertObject:alertObject]; + [MVMCoreDispatchUtility performBlockOnMainThread:^{ + MVMCoreAlertObject *alertObject = [[MVMCoreAlertObject alloc] initPopupAlertWithError:error isGreedy:NO]; + [[MVMCoreAlertHandler sharedAlertHandler] showAlertWithAlertObject:alertObject]; + }]; } } diff --git a/MVMCore/MVMCore/Utility/MVMCoreErrorObject.m b/MVMCore/MVMCore/Utility/MVMCoreErrorObject.m index 2f16308..d16a7a5 100644 --- a/MVMCore/MVMCore/Utility/MVMCoreErrorObject.m +++ b/MVMCore/MVMCore/Utility/MVMCoreErrorObject.m @@ -57,8 +57,9 @@ self.domain = domain; self.location = location; self.date = [NSDate date]; - self.applicationState = [UIApplication sharedApplication].applicationState; - + [MVMCoreDispatchUtility performSyncBlockOnMainThread:^{ + self.applicationState = [UIApplication sharedApplication].applicationState; + }]; // We don't log server errors. if (![domain isEqualToString:ErrorDomainServer]) { self.logError = YES; From 9f84958602d6df827c3828b8042998139ca175fe Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Mon, 10 Aug 2020 14:45:54 -0400 Subject: [PATCH 2/2] update --- MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertObject.m | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertObject.m b/MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertObject.m index 45819d4..72b6de4 100644 --- a/MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertObject.m +++ b/MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertObject.m @@ -50,11 +50,9 @@ NSUInteger const TopAlertDismissTime = 5; self.useNewStyle = [responseInfo boolForKey:@"newTopAlertStyle"]; // Server driven dismiss time. - if (self.useNewStyle) { - NSNumber *topAlertTime = [responseInfo optionalNumberForKey:@"topAlertTime"]; - if (topAlertTime != nil) { - self.topAlertDismissTime = [topAlertTime integerValue]; - } + NSNumber *topAlertTime = [responseInfo optionalNumberForKey:@"topAlertTime"]; + if (topAlertTime != nil) { + self.topAlertDismissTime = [topAlertTime integerValue]; } } return self;