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

code review

Browse Source
This commit is contained in:
Kyle Matthew Hedden 2023-03-15 09:04:58 -04:00
parent ab0c13efaf
commit a07807e693
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m
View File

@ -440,8 +440,6 @@
NSString *messageStyle = [loadObject.responseInfoMap string:KeyMessageStyle];
if (messageStyle && (!loadObject.operation.backgroundLoad || loadObject.requestParameters.allowAlertsIfBackgroundRequest)) {
loadObject.operation.alertToShow = YES;
} else {
error.silentError = YES;
}
}
@ -521,13 +519,13 @@
if (viewController) {
// Display or finish
if (error.errorScreenError || !loadObject.requestParameters.dontDisplayViewController) {
if (error.errorScreenError) {
error.silentError = NO;
if (error.errorScreenError || error.nativeDrivenErrorScreen) { // Suppress alert errors if there is a full screen error.
loadObject.operation.alertToShow = NO;
loadObject.operation.errorForAlertToShow = nil;
if (error.nativeDrivenErrorScreen) {
[MVMCoreLoggingHandler addErrorToLog:error];
}
[MVMCoreLoggingHandler addErrorToLog:error];
[MVMCoreLoadRequestOperation displayViewController:viewController loadObject:loadObject error:error];
} else if (!loadObject.requestParameters.dontDisplayViewController) {
[MVMCoreLoadRequestOperation displayViewController:viewController loadObject:loadObject error:error];
} else {
[MVMCoreLoggingHandler addErrorToLog:error];

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

@ -93,7 +93,7 @@
errorObject = [[MVMCoreErrorObject alloc]
initWithTitle:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle]
message:[error localizedDescription] ?: [MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorUnableToProcess]
messageToLog:[error localizedFailureReason] ?: [error localizedDescription] ?: [MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorUnableToProcess]
messageToLog:[error description]
code:[error code]
domain:ErrorDomainSystem
location:location];