From bbe0d88bc2ade5e7970942d3ba14845165fc002d Mon Sep 17 00:00:00 2001 From: Elad Gil Date: Thu, 2 Jul 2020 16:13:45 +0300 Subject: [PATCH 1/6] added support for new url.intent event --- sdk/EkoPlayerSDK/EkoPlayerView.swift | 2 +- sdk/EkoPlayerSDK/EkoProjectLoader.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/EkoPlayerSDK/EkoPlayerView.swift b/sdk/EkoPlayerSDK/EkoPlayerView.swift index f48b28d..531b0bd 100644 --- a/sdk/EkoPlayerSDK/EkoPlayerView.swift +++ b/sdk/EkoPlayerSDK/EkoPlayerView.swift @@ -303,7 +303,7 @@ enum PlayerEventError : LocalizedError { } // the URL might not be encoded, so encode it before passing it to the delegate - if (eventName == "eko.urls.openinparent") { + if (eventName == "eko.urls.intent") { if let args = json["args"] as? Array { if !args.isEmpty, let urlString = args[0]["url"] as? String { if let escapedString = urlString.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) { diff --git a/sdk/EkoPlayerSDK/EkoProjectLoader.swift b/sdk/EkoPlayerSDK/EkoProjectLoader.swift index d1a90e6..9dc7aed 100644 --- a/sdk/EkoPlayerSDK/EkoProjectLoader.swift +++ b/sdk/EkoPlayerSDK/EkoProjectLoader.swift @@ -40,8 +40,8 @@ class EkoProjectLoader: NSObject { options.events.append("eko.canplay") } } - if (!options.events.contains("urls.openinparent")) { - options.events.append("urls.openinparent") + if (!options.events.contains("urls.intent")) { + options.events.append("urls.intent") } if (!options.events.contains("share.intent")) { options.events.append("share.intent") @@ -73,7 +73,7 @@ class EkoProjectLoader: NSObject { } else { // attempt to get the embed url from the response, throw an error if unable to if let projectEmbed = data["embedUrl"] as? String { - totalUrl = "\(projectEmbed)?embedapi=1.0&sharemode=proxy\(urlParam)" + totalUrl = "\(projectEmbed)?embedapi=1.0&sharemode=proxy&urlmode=proxy\(urlParam)" } else { throw LoadingError.malformedResponse(message: "Embed url not found - Missing embed url in response") } From 4399dc816e3ff45e8126d2903400278ea995688d Mon Sep 17 00:00:00 2001 From: Elad Gil Date: Thu, 2 Jul 2020 16:14:14 +0300 Subject: [PATCH 2/6] v bump sample app 5 --- samples/HelloEko/HelloEko.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/HelloEko/HelloEko.xcodeproj/project.pbxproj b/samples/HelloEko/HelloEko.xcodeproj/project.pbxproj index 13f1ce6..1fcd4d0 100644 --- a/samples/HelloEko/HelloEko.xcodeproj/project.pbxproj +++ b/samples/HelloEko/HelloEko.xcodeproj/project.pbxproj @@ -366,7 +366,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 5; DEVELOPMENT_TEAM = 32U3WAAGM3; INFOPLIST_FILE = HelloEko/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -385,7 +385,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 5; DEVELOPMENT_TEAM = 32U3WAAGM3; INFOPLIST_FILE = HelloEko/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( From f580bab038c1c5853c705dc8b7beaf42e861b437 Mon Sep 17 00:00:00 2001 From: Elad Gil Date: Mon, 6 Jul 2020 16:48:17 +0300 Subject: [PATCH 3/6] fixed "iOS sdk - linkout works only after turning on and of "handle URLs"" ([asana](https://app.asana.com/0/1181963223581663/1183261577568221/f)) --- samples/HelloEko/HelloEko/ViewController.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/samples/HelloEko/HelloEko/ViewController.swift b/samples/HelloEko/HelloEko/ViewController.swift index dd1e1da..49999cf 100644 --- a/samples/HelloEko/HelloEko/ViewController.swift +++ b/samples/HelloEko/HelloEko/ViewController.swift @@ -113,7 +113,6 @@ class ViewController: UIViewController, EkoPlayerViewDelegate, EkoUrlDelegate, E self.view.addSubview(playerView) playerView.frame = CGRect(x: 20, y: 369, width: 374, height: 260) playerView.delegate = self - playerView.urlDelegate = self playerView.appName = "SampleApp" } From 33328cd7fdaf34336c85a864319ae3f049019b7d Mon Sep 17 00:00:00 2001 From: Elad Gil Date: Mon, 6 Jul 2020 16:48:37 +0300 Subject: [PATCH 4/6] v bump sample app 6 --- samples/HelloEko/HelloEko.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/HelloEko/HelloEko.xcodeproj/project.pbxproj b/samples/HelloEko/HelloEko.xcodeproj/project.pbxproj index 1fcd4d0..20df5a2 100644 --- a/samples/HelloEko/HelloEko.xcodeproj/project.pbxproj +++ b/samples/HelloEko/HelloEko.xcodeproj/project.pbxproj @@ -366,7 +366,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 6; DEVELOPMENT_TEAM = 32U3WAAGM3; INFOPLIST_FILE = HelloEko/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -385,7 +385,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 6; DEVELOPMENT_TEAM = 32U3WAAGM3; INFOPLIST_FILE = HelloEko/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( From 3c688c9d8c67af7e096cb4d199e817b030b53ef6 Mon Sep 17 00:00:00 2001 From: Elad Gil Date: Wed, 22 Jul 2020 14:50:59 +0300 Subject: [PATCH 5/6] changed urlmode to urlsmode --- sdk/EkoPlayerSDK/EkoProjectLoader.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/EkoPlayerSDK/EkoProjectLoader.swift b/sdk/EkoPlayerSDK/EkoProjectLoader.swift index 9dc7aed..a84d22d 100644 --- a/sdk/EkoPlayerSDK/EkoProjectLoader.swift +++ b/sdk/EkoPlayerSDK/EkoProjectLoader.swift @@ -73,7 +73,7 @@ class EkoProjectLoader: NSObject { } else { // attempt to get the embed url from the response, throw an error if unable to if let projectEmbed = data["embedUrl"] as? String { - totalUrl = "\(projectEmbed)?embedapi=1.0&sharemode=proxy&urlmode=proxy\(urlParam)" + totalUrl = "\(projectEmbed)?embedapi=1.0&sharemode=proxy&urlsmode=proxy\(urlParam)" } else { throw LoadingError.malformedResponse(message: "Embed url not found - Missing embed url in response") } From 0bb4e8367642babaec4105d1f6a2800e4d470ed3 Mon Sep 17 00:00:00 2001 From: Elad Gil Date: Wed, 22 Jul 2020 14:51:21 +0300 Subject: [PATCH 6/6] v bump sample app 7 --- samples/HelloEko/HelloEko.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/HelloEko/HelloEko.xcodeproj/project.pbxproj b/samples/HelloEko/HelloEko.xcodeproj/project.pbxproj index 20df5a2..0d7595e 100644 --- a/samples/HelloEko/HelloEko.xcodeproj/project.pbxproj +++ b/samples/HelloEko/HelloEko.xcodeproj/project.pbxproj @@ -366,7 +366,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = 32U3WAAGM3; INFOPLIST_FILE = HelloEko/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -385,7 +385,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = 32U3WAAGM3; INFOPLIST_FILE = HelloEko/Info.plist; LD_RUNPATH_SEARCH_PATHS = (