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

Make Parsing Methods Type Safe #1040

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

Make Parsing Methods Type Safe #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
828786a
Make type safe
Aug 20, 2024
4e05712
Type check before init
Aug 20, 2024
7a20e10
Check for passthrough response type
Aug 22, 2024
1be1079
Remove Unnecessary change
Aug 22, 2024
d5133f6
Update PrebidMobile/PrebidMobileRendering/Utilities/PBMFunctions.m
ankit-thanekar007 Aug 22, 2024
acdc1b5
Update PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/ORTB/Prebid/…
ankit-thanekar007 Aug 22, 2024
364cebd
Update PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/ORTB/Prebid/…
ankit-thanekar007 Aug 22, 2024
71c98c1
Update PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/ORTB/Prebid/…
ankit-thanekar007 Aug 22, 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
3 changes: 2 additions & 1 deletion PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/ORTB/Prebid/PBMORTBBidExt.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ - (instancetype)initWithJsonDictionary:(PBMJsonDictionary *)jsonDictionary {
}

#if DEBUG
NSArray * const passthroughDics = jsonDictionary[@"passthrough"];

NSArray<PBMJsonDictionary *> *const passthroughDics = [PBMFunctions dictionariesForPassthrough:jsonDictionary[@"passthrough"]];
_passthrough = nil;
if (passthroughDics) {
NSMutableArray * const newPassthrough = [[NSMutableArray alloc] initWithCapacity:passthroughDics.count];
Expand Down
2 changes: 1 addition & 1 deletion PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/ORTB/Prebid/PBMORTBBidExtPrebid.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ - (instancetype)initWithJsonDictionary:(PBMJsonDictionary *)jsonDictionary {
_targeting = jsonDictionary[@"targeting"];
_type = jsonDictionary[@"type"];

NSArray * const passthroughDics = jsonDictionary[@"passthrough"];
NSArray<PBMJsonDictionary *> *const passthroughDics = [PBMFunctions dictionariesForPassthrough:jsonDictionary[@"passthrough"]];
_passthrough = nil;
if (passthroughDics) {
NSMutableArray * const newPassthrough = [[NSMutableArray alloc] initWithCapacity:passthroughDics.count];
Expand Down
2 changes: 1 addition & 1 deletion PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/ORTB/Prebid/PBMORTBBidResponseExtPrebid.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ - (instancetype)initWithJsonDictionary:(PBMJsonDictionary *)jsonDictionary {
return nil;
}

NSArray * const passthroughDics = jsonDictionary[@"passthrough"];
NSArray<PBMJsonDictionary *> *const passthroughDics = [PBMFunctions dictionariesForPassthrough:jsonDictionary[@"passthrough"]];
_passthrough = nil;
if (passthroughDics) {
NSMutableArray * const newPassthrough = [[NSMutableArray alloc] initWithCapacity:passthroughDics.count];
Expand Down
3 changes: 2 additions & 1 deletion PrebidMobile/PrebidMobileRendering/Utilities/PBMFunctions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import "PBMConstants.h"

NS_ASSUME_NONNULL_BEGIN
@interface PBMFunctions : NSObject
Expand All @@ -24,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
+ (NSDictionary<NSString *, NSString *> *)extractVideoAdParamsFromTheURLString:(NSString *)urlString forKeys:(NSArray *)keys;
+ (BOOL)canLoadVideoAdWithDomain:(NSString *)domain adUnitID:(nullable NSString *)adUnitID adUnitGroupID:(nullable NSString *)adUnitGroupID;
+ (void)checkCertificateChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable))completionHandler;

+ (nullable NSArray<PBMJsonDictionary *> *)dictionariesForPassthrough:(id)passthrough;
//FIXME: move to private fucntions ??
#pragma mark - SDK Info

Expand Down
13 changes: 12 additions & 1 deletion PrebidMobile/PrebidMobileRendering/Utilities/PBMFunctions.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#import "PBMFunctions+Private.h"
#import "PBMFunctions+Testing.h"

#import "PBMConstants.h"
#import "PBMError.h"

#import "PrebidMobileSwiftHeaders.h"
Expand Down Expand Up @@ -231,6 +230,18 @@ + (nullable NSString *)toStringJsonDictionary:(nonnull PBMJsonDictionary *)jsonD
return [jsonString stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
}

+ (nullable NSArray<PBMJsonDictionary *> *)dictionariesForPassthrough:(id)passthrough {
if ([passthrough isKindOfClass:[NSArray<PBMJsonDictionary*> class]]) {
NSArray<PBMJsonDictionary *> *response = passthrough;
return response;
} else if ([passthrough isKindOfClass:[PBMJsonDictionary class]]) {
NSDictionary *response = passthrough;
return @[response];
} else {
return nil;
}
}

#pragma mark - SDK Info

+ (nonnull NSBundle *)bundleForSDK {
Expand Down