mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitlab.verizon.com:BPHV_MIPS/mvm_core into develop

Browse Source
This commit is contained in:
Kevin G Christiano 2020-08-12 14:11:50 -04:00
commit 588b80bc06
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
View File

@ -449,8 +449,10 @@ NSString * const KeyActionTypeOpen = @"openPage";
if (!error.silentError) { if (!error.silentError) {
// Show alert // Show alert
MVMCoreAlertObject *alertObject = [[MVMCoreAlertObject alloc] initPopupAlertWithError:error isGreedy:NO]; [MVMCoreDispatchUtility performBlockOnMainThread:^{
[[MVMCoreAlertHandler sharedAlertHandler] showAlertWithAlertObject:alertObject]; MVMCoreAlertObject *alertObject = [[MVMCoreAlertObject alloc] initPopupAlertWithError:error isGreedy:NO];
[[MVMCoreAlertHandler sharedAlertHandler] showAlertWithAlertObject:alertObject];
}];
} }
} }

8
MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertObject.m
View File

@ -50,11 +50,9 @@ NSUInteger const TopAlertDismissTime = 5;
self.useNewStyle = [responseInfo boolForKey:@"newTopAlertStyle"]; self.useNewStyle = [responseInfo boolForKey:@"newTopAlertStyle"];
// Server driven dismiss time. // Server driven dismiss time.
if (self.useNewStyle) { NSNumber *topAlertTime = [responseInfo optionalNumberForKey:@"topAlertTime"];
NSNumber *topAlertTime = [responseInfo optionalNumberForKey:@"topAlertTime"]; if (topAlertTime != nil) {
if (topAlertTime != nil) { self.topAlertDismissTime = [topAlertTime integerValue];
self.topAlertDismissTime = [topAlertTime integerValue];
}
} }
} }
return self; return self;

5
MVMCore/MVMCore/Utility/MVMCoreErrorObject.m
View File

@ -57,8 +57,9 @@
self.domain = domain; self.domain = domain;
self.location = location; self.location = location;
self.date = [NSDate date]; self.date = [NSDate date];
self.applicationState = [UIApplication sharedApplication].applicationState; [MVMCoreDispatchUtility performSyncBlockOnMainThread:^{
self.applicationState = [UIApplication sharedApplication].applicationState;
}];
// We don't log server errors. // We don't log server errors.
if (![domain isEqualToString:ErrorDomainServer]) { if (![domain isEqualToString:ErrorDomainServer]) {
self.logError = YES; self.logError = YES;