From f86c6fd5d2985a5c0ab884d9d6d108973e201e10 Mon Sep 17 00:00:00 2001 From: "Chintakrinda, Arun Kumar (Arun)" Date: Thu, 23 Jan 2020 17:02:25 +0530 Subject: [PATCH 1/3] Missing properties added for openURL --- .../MVMCore/Models/ActionType/ActionOpenUrlModel.swift | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift index 1316d6a..52acd33 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift @@ -16,8 +16,16 @@ import Foundation public var analyticsData: JSONValueDictionary? // Temporary fix till server changes public var title: String? + + //Missing params + public var openOauthWebView: Bool? + public var showNativeNavigation: Bool? + public var openInWebview: Bool? - public init(browserUrl: String) { + public init(browserUrl: String, openOauthWebView: Bool?, showNativeNavigation: Bool?, openInWebview: Bool?) { self.browserUrl = browserUrl + self.openOauthWebView = openOauthWebView ?? false + self.showNativeNavigation = showNativeNavigation ?? false + self.openInWebview = openInWebview ?? false } } From 79b894e58201865c5b554053bdd8dbc9f57b03b0 Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Thu, 23 Jan 2020 10:37:09 -0500 Subject: [PATCH 2/3] remove optional property from init --- MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift | 5 +---- .../HardCodedServerResponse/MFHardCodedServerResponse.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift index 52acd33..7b384eb 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift @@ -22,10 +22,7 @@ import Foundation public var showNativeNavigation: Bool? public var openInWebview: Bool? - public init(browserUrl: String, openOauthWebView: Bool?, showNativeNavigation: Bool?, openInWebview: Bool?) { + public init(browserUrl: String) { self.browserUrl = browserUrl - self.openOauthWebView = openOauthWebView ?? false - self.showNativeNavigation = showNativeNavigation ?? false - self.openInWebview = openInWebview ?? false } } diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h index eb9fba9..efa33b6 100644 --- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h +++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h @@ -9,7 +9,7 @@ #import #import "MVMCoreRequestParameters.h" -#define ENABLE_HARD_CODED_RESPONSE 0 && DEBUG +#define ENABLE_HARD_CODED_RESPONSE 1 && DEBUG #if ENABLE_HARD_CODED_RESPONSE From 1da5034dc6c0925e665cea123fa0cc1753edb7ed Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Thu, 23 Jan 2020 10:39:09 -0500 Subject: [PATCH 3/3] comments --- MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift | 2 ++ .../Utility/HardCodedServerResponse/MFHardCodedServerResponse.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift index 7b384eb..09299e6 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift @@ -17,6 +17,8 @@ import Foundation // Temporary fix till server changes public var title: String? + + //TODO: Should be removed in future releases. This should be MF specific. //Missing params public var openOauthWebView: Bool? public var showNativeNavigation: Bool? diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h index efa33b6..eb9fba9 100644 --- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h +++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h @@ -9,7 +9,7 @@ #import #import "MVMCoreRequestParameters.h" -#define ENABLE_HARD_CODED_RESPONSE 1 && DEBUG +#define ENABLE_HARD_CODED_RESPONSE 0 && DEBUG #if ENABLE_HARD_CODED_RESPONSE