Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added support for privacyUrl #1027

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Added support for privacyUrl #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
936648c
Added support for privacyURL
jsligh Jul 16, 2024
7eab839
Fix was added to the wrong class.
jsligh Jul 25, 2024
7aead10
Merge branch 'master' into 1014-add-support-for-privacy-url
jsligh Aug 22, 2024
9b55c54
Fixed broken build
jsligh Sep 3, 2024
d171bf0
Merge branch 'fix_broken_build' into 1014-add-support-for-privacy-url
jsligh Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions InternalTestApp/InternalTestApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
34FC0CF624ADD5640045553E /* PrebidGAMRewardedController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34FC0CF524ADD5640045553E /* PrebidGAMRewardedController.swift */; };
3C28C9D82C35713B00D0A7DB /* CustomRendererInterstitialController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C28C9D72C35713B00D0A7DB /* CustomRendererInterstitialController.swift */; };
3C28C9D92C35713B00D0A7DB /* CustomRendererInterstitialController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C28C9D72C35713B00D0A7DB /* CustomRendererInterstitialController.swift */; };
3C28C9DB2C357E3500D0A7DB /* SampleCustomRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C28C9DA2C357E3500D0A7DB /* SampleCustomRenderer.swift */; };
3C28C9DC2C357E3500D0A7DB /* SampleCustomRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C28C9DA2C357E3500D0A7DB /* SampleCustomRenderer.swift */; };
3CC4A3E92C11F96800B97128 /* CustomRendererBannerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CC4A3E82C11F96800B97128 /* CustomRendererBannerController.swift */; };
3CC4A3EA2C11F96800B97128 /* CustomRendererBannerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CC4A3E82C11F96800B97128 /* CustomRendererBannerController.swift */; };
457FD34BA45C3840CC31A8F5 /* Pods_InternalTestApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C11D97034E668BBFDD0DDCA /* Pods_InternalTestApp.framework */; };
Expand Down Expand Up @@ -381,7 +379,6 @@
35F94D131F93F85D00CF46DB /* InternalTestAppUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = InternalTestAppUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
35F94D171F93F85D00CF46DB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3C28C9D72C35713B00D0A7DB /* CustomRendererInterstitialController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomRendererInterstitialController.swift; sourceTree = "<group>"; };
3C28C9DA2C357E3500D0A7DB /* SampleCustomRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleCustomRenderer.swift; sourceTree = "<group>"; };
3CC4A3E82C11F96800B97128 /* CustomRendererBannerController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomRendererBannerController.swift; sourceTree = "<group>"; };
530E722B292FACB20025B44D /* UIImageView+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImageView+Extensions.swift"; sourceTree = "<group>"; };
5397BD132936185400ABDA22 /* PrebidOriginalAPIDisplayBannerController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrebidOriginalAPIDisplayBannerController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -847,7 +844,6 @@
34B10A2F255017DE00B5FE09 /* ThreadCheckingButton.swift */,
34C25816255D69E1000A4A73 /* EventReportContainer.swift */,
530E722B292FACB20025B44D /* UIImageView+Extensions.swift */,
3C28C9DA2C357E3500D0A7DB /* SampleCustomRenderer.swift */,
);
path = Utilities;
sourceTree = "<group>";
Expand Down Expand Up @@ -1577,7 +1573,6 @@
53ED2FE829798104007D13EE /* PrebidBannerController.swift in Sources */,
53ED2FE929798104007D13EE /* PrebidBannerConfigurationController.swift in Sources */,
53ED2FEA29798104007D13EE /* TestCase.swift in Sources */,
3C28C9DC2C357E3500D0A7DB /* SampleCustomRenderer.swift in Sources */,
53ED2FEB29798104007D13EE /* PrebidAdMobNativeViewController.swift in Sources */,
53ED2FEC29798104007D13EE /* PrebidInterstitialController.swift in Sources */,
53ED2FED29798104007D13EE /* PrebidOriginalAPIDisplayInterstitialController.swift in Sources */,
Expand Down Expand Up @@ -1674,7 +1669,6 @@
3493022224740BEE004A6086 /* PrebidBannerController.swift in Sources */,
5BDB85DA2739794900A529F6 /* PrebidBannerConfigurationController.swift in Sources */,
5B3EEDE52101FB8800BAA0C4 /* TestCase.swift in Sources */,
3C28C9DB2C357E3500D0A7DB /* SampleCustomRenderer.swift in Sources */,
92C475122796FF8400C26E27 /* PrebidAdMobNativeViewController.swift in Sources */,
34FC0CF424ADD3A80045553E /* PrebidInterstitialController.swift in Sources */,
5397BD26293760F500ABDA22 /* PrebidOriginalAPIDisplayInterstitialController.swift in Sources */,
Expand Down
83 changes: 0 additions & 83 deletions InternalTestApp/PrebidMobileDemoRendering/Utilities/SampleCustomRenderer.swift
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions PrebidMobile.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,7 @@
A908694629E05F7900B37479 /* PrebidRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = A908694529E05F7900B37479 /* PrebidRenderer.swift */; };
A9750D7A2ABB9A300066E4E6 /* PluginEventListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9750D792ABB9A300066E4E6 /* PluginEventListener.swift */; };
A9A3396B2AC57193006AD0E7 /* PBMAdViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9A3396A2AC57193006AD0E7 /* PBMAdViewDelegate.swift */; };
F95DA2072C87567D0068A2BB /* SampleCustomRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95DA2062C87567D0068A2BB /* SampleCustomRenderer.swift */; };
FA5AD5E42271FA4100C8F274 /* ConstantsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA5AD5E32271FA4100C8F274 /* ConstantsTest.swift */; };
FA9D7F2722E8A83D006FCBEF /* AdViewUtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA9D7F2622E8A83D006FCBEF /* AdViewUtilsTests.swift */; };
FAA29904242D1C27002ACBF2 /* TargetingObjCTests.m in Sources */ = {isa = PBXBuildFile; fileRef = FAA29903242D1C27002ACBF2 /* TargetingObjCTests.m */; };
Expand Down Expand Up @@ -1672,6 +1673,7 @@
A908694529E05F7900B37479 /* PrebidRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrebidRenderer.swift; sourceTree = "<group>"; };
A9750D792ABB9A300066E4E6 /* PluginEventListener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluginEventListener.swift; sourceTree = "<group>"; };
A9A3396A2AC57193006AD0E7 /* PBMAdViewDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PBMAdViewDelegate.swift; sourceTree = "<group>"; };
F95DA2062C87567D0068A2BB /* SampleCustomRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SampleCustomRenderer.swift; sourceTree = "<group>"; };
FA4A88432497A99D00FDCBB6 /* Swizzling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Swizzling.swift; sourceTree = "<group>"; };
FA5AD5E32271FA4100C8F274 /* ConstantsTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConstantsTest.swift; sourceTree = "<group>"; };
FA85F9B4264946FC00B8BE72 /* TestUtils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = TestUtils.xcodeproj; path = ../tools/TestUtils/TestUtils.xcodeproj; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3184,6 +3186,7 @@
A908694029E05E8D00B37479 /* PluginRenderer */ = {
isa = PBXGroup;
children = (
F95DA2062C87567D0068A2BB /* SampleCustomRenderer.swift */,
A908694129E05EAF00B37479 /* PrebidMobilePluginRegister.swift */,
A908694329E05ED500B37479 /* PrebidMobilePluginRenderer.swift */,
A9750D792ABB9A300066E4E6 /* PluginEventListener.swift */,
Expand Down Expand Up @@ -4154,6 +4157,7 @@
537B6518283372FD008AE9D1 /* PathBuilder.swift in Sources */,
FAEE4D1A262DC2B200AD9966 /* NativeAd.swift in Sources */,
5BC37A1B271F1D0000444D5E /* Prebid.swift in Sources */,
F95DA2072C87567D0068A2BB /* SampleCustomRenderer.swift in Sources */,
5BC379A8271F1D0000444D5E /* PBMModalViewController.m in Sources */,
5BC37AC3271F1D0100444D5E /* PBMURLComponents.m in Sources */,
5BC378D3271F1CFF00444D5E /* PBMORTBAbstract.m in Sources */,
Expand Down
9 changes: 9 additions & 0 deletions PrebidMobile/AdUnits/Native/NativeAd.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ public class NativeAd: NSObject, CacheExpiryDelegate {

private let eventManager = EventManager()

public var privacyUrl: String? {
set {
nativeAdMarkup?.privacy = newValue
}
get {
return nativeAdMarkup?.privacy
}
}

// MARK: - Array getters

@objc public var titles: [NativeTitle] {
Expand Down
2 changes: 1 addition & 1 deletion ...PluginRegister/SampleCustomRenderer.swift → ...PluginRenderer/SampleCustomRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 */

import Foundation
import PrebidMobile
import UIKit

public class SampleCustomRenderer: NSObject, PrebidMobilePluginRenderer {
Expand Down
12 changes: 0 additions & 12 deletions tools/TestUtils/TestUtils.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
3CD0ADF12C51274A006CDA6B /* SampleCustomRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CD0ADF02C51274A006CDA6B /* SampleCustomRenderer.swift */; };
53AB8AB22851D9EF00837C70 /* OMSDK-Static_Prebidorg.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53AB8AB12851D9EF00837C70 /* OMSDK-Static_Prebidorg.xcframework */; };
53AB8AB32851D9EF00837C70 /* OMSDK-Static_Prebidorg.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 53AB8AB12851D9EF00837C70 /* OMSDK-Static_Prebidorg.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
92C0CEA027BD411E00C480EB /* emptyResponse.json in Resources */ = {isa = PBXBuildFile; fileRef = 92C0CE9F27BD411E00C480EB /* emptyResponse.json */; };
Expand Down Expand Up @@ -61,7 +60,6 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
3CD0ADF02C51274A006CDA6B /* SampleCustomRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleCustomRenderer.swift; sourceTree = "<group>"; };
537B669C283DFCCD008AE9D1 /* OMSDK_Prebidorg.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = OMSDK_Prebidorg.xcframework; path = ../../Frameworks/OMSDK_Prebidorg.xcframework; sourceTree = "<group>"; };
53AB8AB12851D9EF00837C70 /* OMSDK-Static_Prebidorg.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "OMSDK-Static_Prebidorg.xcframework"; path = "../../Frameworks/OMSDK-Static_Prebidorg.xcframework"; sourceTree = "<group>"; };
92C0CE9F27BD411E00C480EB /* emptyResponse.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = emptyResponse.json; sourceTree = "<group>"; };
Expand Down Expand Up @@ -114,14 +112,6 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
3CD0ADEF2C5126FD006CDA6B /* SamplePluginRegister */ = {
isa = PBXGroup;
children = (
3CD0ADF02C51274A006CDA6B /* SampleCustomRenderer.swift */,
);
path = SamplePluginRegister;
sourceTree = "<group>";
};
537B669B283DFCCD008AE9D1 /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -151,7 +141,6 @@
FA9E5E0F2649420C0049B214 /* TestUtils */ = {
isa = PBXGroup;
children = (
3CD0ADEF2C5126FD006CDA6B /* SamplePluginRegister */,
FAC853582649462E009DC0F3 /* Category */,
FAC8536726494646009DC0F3 /* Responses */,
FAC8537B26494647009DC0F3 /* Stubbing */,
Expand Down Expand Up @@ -322,7 +311,6 @@
buildActionMask = 2147483647;
files = (
FAC8535B2649462E009DC0F3 /* NSURLRequest+HTTPBodyTesting.m in Sources */,
3CD0ADF12C51274A006CDA6B /* SampleCustomRenderer.swift in Sources */,
FAC8539926494647009DC0F3 /* PBHTTPStubbingManager.m in Sources */,
FAC8539A26494647009DC0F3 /* PBURLConnectionStub+NSURLSessionConfiguration.m in Sources */,
FAC853652649463A009DC0F3 /* PBTestGlobal.m in Sources */,
Expand Down