Shift logging load errors until after background handling is resolved.
This commit is contained in:
parent
5006517bb1
commit
a74aa6ef2d
@ -439,6 +439,8 @@
|
|||||||
NSString *messageStyle = [loadObject.responseInfoMap string:KeyMessageStyle];
|
NSString *messageStyle = [loadObject.responseInfoMap string:KeyMessageStyle];
|
||||||
if (messageStyle && (!loadObject.operation.backgroundLoad || loadObject.requestParameters.allowAlertsIfBackgroundRequest)) {
|
if (messageStyle && (!loadObject.operation.backgroundLoad || loadObject.requestParameters.allowAlertsIfBackgroundRequest)) {
|
||||||
loadObject.operation.alertToShow = YES;
|
loadObject.operation.alertToShow = YES;
|
||||||
|
} else {
|
||||||
|
error.silentError = YES;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -750,17 +752,19 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Logs the error.
|
|
||||||
if (error.logError) {
|
|
||||||
[MVMCoreLoggingHandler addErrorToLog:error];
|
|
||||||
}
|
|
||||||
|
|
||||||
MVMCoreLog(@"Error: %@ %@ %@ %@ %@",[error stringErrorCode], error.domain, error.location,error.messageToDisplay, error.messageToLog);
|
MVMCoreLog(@"Error: %@ %@ %@ %@ %@",[error stringErrorCode], error.domain, error.location,error.messageToDisplay, error.messageToLog);
|
||||||
|
|
||||||
if (showAlertForErrorIfApplicable && (!loadObject.operation.backgroundLoad || loadObject.requestParameters.allowAlertsIfBackgroundRequest) && !loadObject.requestParameters.handleErrorsSilently && !error.silentError && !error.errorScreenError) {
|
if (showAlertForErrorIfApplicable && (!loadObject.operation.backgroundLoad || loadObject.requestParameters.allowAlertsIfBackgroundRequest) && !loadObject.requestParameters.handleErrorsSilently && !error.silentError && !error.errorScreenError) {
|
||||||
|
|
||||||
// Show alert for error.
|
// Show alert for error.
|
||||||
[MVMCoreLoadRequestOperation createAndShowAlertForLoadObject:loadObject error:error delegateObject:loadObject.operation.delegateObject];
|
[MVMCoreLoadRequestOperation createAndShowAlertForLoadObject:loadObject error:error delegateObject:loadObject.operation.delegateObject];
|
||||||
|
} else {
|
||||||
|
error.silentError = YES;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Logs the error.
|
||||||
|
if (error.logError) {
|
||||||
|
[MVMCoreLoggingHandler addErrorToLog:error];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user