From 4dee1866ed7bb46b30eeb7b02bddb4b53b3a1f70 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Thu, 12 Mar 2020 12:54:53 -0400 Subject: [PATCH 1/3] corecting name --- MVMCore/MVMCore/Constants/MVMCoreJSONConstants.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MVMCore/MVMCore/Constants/MVMCoreJSONConstants.m b/MVMCore/MVMCore/Constants/MVMCoreJSONConstants.m index b30d03c..019f879 100644 --- a/MVMCore/MVMCore/Constants/MVMCoreJSONConstants.m +++ b/MVMCore/MVMCore/Constants/MVMCoreJSONConstants.m @@ -18,8 +18,8 @@ NSString * const KeyErrorHeading = @"errorHdg"; NSString * const KeyPage = @"Page"; NSString * const KeyPageType = @"pageType"; -NSString * const KeyShareText = @"shareText"; -NSString * const KeyShareType = @"shareType"; +NSString * const KeyShareText = @"sharedText"; +NSString * const KeyShareType = @"sharedType"; NSString * const KeyModuleMap = @"ModuleMap"; NSString * const KeyModuleList = @"modules"; NSString * const KeyPageMap = @"PageMap"; From 30d0b6f90cd9cdc3ba3bb98f80f72c3ad8012e0e Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Fri, 13 Mar 2020 09:20:00 -0400 Subject: [PATCH 2/3] matching name change in model --- .../MVMCore/Models/ActionType/ActionShareModel.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/MVMCore/MVMCore/Models/ActionType/ActionShareModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionShareModel.swift index 44cd06e..c40fbcd 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionShareModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionShareModel.swift @@ -8,7 +8,7 @@ import UIKit -class ActionShareModel: ActionModelProtocol { +@objcMembers public class ActionShareModel: ActionModelProtocol { //-------------------------------------------------- // MARK: - Properties //-------------------------------------------------- @@ -17,8 +17,8 @@ class ActionShareModel: ActionModelProtocol { public var actionType: String? public var title: String? - public var shareType: String - public var shareText: String + public var sharedType: String + public var sharedText: String public var extraParameters: JSONValueDictionary? public var analyticsData: JSONValueDictionary? @@ -26,8 +26,8 @@ class ActionShareModel: ActionModelProtocol { // MARK: - Initializer //-------------------------------------------------- - public init(shareText: String,shareType: String) { - self.shareType = shareType - self.shareText = shareText + public init(sharedText: String,sharedType: String) { + self.sharedType = sharedType + self.sharedText = sharedText } } From 2725c39d3e6b38a13ff27f9dae1126255c7fef59 Mon Sep 17 00:00:00 2001 From: "Khan, Arshad" Date: Fri, 13 Mar 2020 20:59:11 +0530 Subject: [PATCH 3/3] customUserAgent data type fix --- MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift index 909989e..d0b4f30 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift @@ -23,7 +23,7 @@ import Foundation public var openOauthWebView: Bool? public var showNativeNavigation: Bool? public var openInWebview: Bool? - public var customUserAgent: JSONValueDictionary? + public var customUserAgent: String? public var postRequest: Bool? public var dontShowProgress: Bool? public var headerParameters: JSONValueDictionary?