From 0781faf8b7c3deeb097626dd621bd6e83baa4450 Mon Sep 17 00:00:00 2001 From: Christopher Maier Date: Tue, 2 Jul 2019 15:42:07 -0400 Subject: [PATCH 1/5] check key in plist --- Sources/GiphyCore.swift | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Sources/GiphyCore.swift b/Sources/GiphyCore.swift index 695bbc7b..9d90a8e5 100644 --- a/Sources/GiphyCore.swift +++ b/Sources/GiphyCore.swift @@ -15,7 +15,7 @@ import Foundation @objc public class GiphyCore: NSObject { static let enableLogs = false - static let enableOM = false + static var enableOM = false class func log(_ items: Any..., separator: String = " ", terminator: String = "\n") { if GiphyCore.enableLogs { print(items,separator,terminator) @@ -36,6 +36,15 @@ import Foundation #if os(iOS) GiphyPingbacks.configure(apiKey: apiKey) GiphyPingbacks.enableDebugLogging(false) + + if let plist = Bundle.main.path(forResource: "Info", ofType: "plist"), + let dict = NSDictionary(contentsOfFile: plist), + let omKey = dict["GiphyDisableOpenMeasurement"] as? String, + omKey == "true" { + print("TEST: DISABLING OPEN MEASUREMENT") + GiphyCore.enableOM = false + } + GiphyCore.setupOpenMeasurement() #endif From aabd277b69fa85a098f546bce58b70a1db614fc7 Mon Sep 17 00:00:00 2001 From: Christopher Maier Date: Tue, 2 Jul 2019 15:52:24 -0400 Subject: [PATCH 2/5] cleanup --- Sources/GiphyCore.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Sources/GiphyCore.swift b/Sources/GiphyCore.swift index 9d90a8e5..c0419104 100644 --- a/Sources/GiphyCore.swift +++ b/Sources/GiphyCore.swift @@ -40,8 +40,7 @@ import Foundation if let plist = Bundle.main.path(forResource: "Info", ofType: "plist"), let dict = NSDictionary(contentsOfFile: plist), let omKey = dict["GiphyDisableOpenMeasurement"] as? String, - omKey == "true" { - print("TEST: DISABLING OPEN MEASUREMENT") + omKey == "YES" { GiphyCore.enableOM = false } From 42e7207e9e4d1142d24fbf2b93edc242d37ce9dc Mon Sep 17 00:00:00 2001 From: Christopher Maier Date: Tue, 2 Jul 2019 16:06:10 -0400 Subject: [PATCH 3/5] pr feedback --- Sources/GiphyCore.swift | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Sources/GiphyCore.swift b/Sources/GiphyCore.swift index c0419104..d09b20dc 100644 --- a/Sources/GiphyCore.swift +++ b/Sources/GiphyCore.swift @@ -37,13 +37,10 @@ import Foundation GiphyPingbacks.configure(apiKey: apiKey) GiphyPingbacks.enableDebugLogging(false) - if let plist = Bundle.main.path(forResource: "Info", ofType: "plist"), - let dict = NSDictionary(contentsOfFile: plist), - let omKey = dict["GiphyDisableOpenMeasurement"] as? String, - omKey == "YES" { + if let omVal = Bundle.main.object(forInfoDictionaryKey: "GiphyDisableOpenMeasurement") as? Bool, + omVal == true { GiphyCore.enableOM = false } - GiphyCore.setupOpenMeasurement() #endif From c562af57fc985459b104d50bfe997a6ffd50d834 Mon Sep 17 00:00:00 2001 From: Christopher Maier Date: Tue, 2 Jul 2019 16:10:50 -0400 Subject: [PATCH 4/5] add print for test --- Sources/GiphyCore.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/GiphyCore.swift b/Sources/GiphyCore.swift index d09b20dc..fa48c8f5 100644 --- a/Sources/GiphyCore.swift +++ b/Sources/GiphyCore.swift @@ -39,6 +39,7 @@ import Foundation if let omVal = Bundle.main.object(forInfoDictionaryKey: "GiphyDisableOpenMeasurement") as? Bool, omVal == true { + print("DISABLING OM") GiphyCore.enableOM = false } GiphyCore.setupOpenMeasurement() From 55aa9495ee35a0323985448cf142f895ac68e60b Mon Sep 17 00:00:00 2001 From: Christopher Maier Date: Tue, 2 Jul 2019 16:34:59 -0400 Subject: [PATCH 5/5] remove print --- Sources/GiphyCore.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Sources/GiphyCore.swift b/Sources/GiphyCore.swift index fa48c8f5..a1789e49 100644 --- a/Sources/GiphyCore.swift +++ b/Sources/GiphyCore.swift @@ -38,8 +38,7 @@ import Foundation GiphyPingbacks.enableDebugLogging(false) if let omVal = Bundle.main.object(forInfoDictionaryKey: "GiphyDisableOpenMeasurement") as? Bool, - omVal == true { - print("DISABLING OM") + omVal == true { GiphyCore.enableOM = false } GiphyCore.setupOpenMeasurement()