From d1ea9518a086624b870e81608fc21ef624b83122 Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Mon, 25 Oct 2021 13:56:39 -0400 Subject: [PATCH 1/2] NSA launch --- MVMCore/MVMCore/Constants/MVMCoreConstants.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/MVMCore/MVMCore/Constants/MVMCoreConstants.h b/MVMCore/MVMCore/Constants/MVMCoreConstants.h index e653ffe..21148ad 100644 --- a/MVMCore/MVMCore/Constants/MVMCoreConstants.h +++ b/MVMCore/MVMCore/Constants/MVMCoreConstants.h @@ -9,13 +9,6 @@ #import #import -typedef NS_ENUM(NSInteger, MVMAppContext) { - MVMAppContextNone = 0, - MVMAppContextMF, - MVMAppContextMFPrepay, - MVMAppContextContentTransfer -}; - typedef NS_ENUM(NSInteger, NavigationType) { NavigationTypePush = 0, NavigationTypeSet, From d3bf9481fc7bfc5cd69eccb3d735773f99ed913f Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Mon, 25 Oct 2021 17:32:18 -0400 Subject: [PATCH 2/2] change mdn calculation default errors not received from server --- MVMCore/MVMCore/Utility/MVMCoreErrorObject.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/Utility/MVMCoreErrorObject.m b/MVMCore/MVMCore/Utility/MVMCoreErrorObject.m index d16a7a5..d61075b 100644 --- a/MVMCore/MVMCore/Utility/MVMCoreErrorObject.m +++ b/MVMCore/MVMCore/Utility/MVMCoreErrorObject.m @@ -91,7 +91,9 @@ NSString *type = [errorInfo string:KeyType]; if (![ValueTypeSuccess isEqualToString:type]) { - MVMCoreErrorObject *error = [[MVMCoreErrorObject alloc] initWithTitle:[errorInfo stringForKey:KeyErrorHeading] message:[errorInfo stringForKey:KeyUserMessage] messageToLog:[errorInfo stringForKey:KeyMessage] code:errorCode domain:ErrorDomainServer location:location]; + NSString *title = [errorInfo string:KeyErrorHeading] ?: [MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle]; + NSString *message = [errorInfo string:KeyUserMessage] ?: [MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorUnableToProcess]; + MVMCoreErrorObject *error = [[MVMCoreErrorObject alloc] initWithTitle:title message:message messageToLog:[errorInfo string:KeyMessage] code:errorCode domain:ErrorDomainServer location:location]; if ([ValueTypeErrorScreen isEqualToString:type]) { // If this is a server error screen, there should be no additional alerts... It will be handled by the load handler.