Skip to content

Commit 2ff472e

Browse files
echo-branchecho-branch
authored
Merge pull request #1269 from BranchMetrics/SDK-2002-test-macCatalyst-PR
WIP: SDK-2002 test mac catalyst PR
2 parents 7c865c5 + 04c2d22 commit 2ff472e

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

‎Branch-TestBed/Branch-SDK-Tests/BNCPasteboardTests.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ - (void)testCheckForBranchLink_noLink {
145145
// This test fails intermittently when executed with other tests - depending upon the order in which its executed
146146
- (void) testPassPasteControl {
147147
#if !TARGET_OS_TV
148-
if (@available(iOS 16.0, *)) {
148+
if (@available(iOS 16.0, macCatalyst 16.0, *)) {
149149

150150
long long timeStamp = ([[NSDate date] timeIntervalSince1970] - 5*60)*1000; // 5 minute earlier timestamp
151151
NSString *urlString = [NSString stringWithFormat:@"https://bnctestbed-alternate.app.link/9R7MbTmnRtb?__branch_flow_type=viewapp&__branch_flow_id=1105940563590163783&__branch_mobile_deepview_type=1&nl_opt_in=1&_cpts=%lld", timeStamp];

‎Branch-TestBed/Branch-SDK-Tests/BNCSKAdNetworkTests.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ - (void)tearDown {
4747

4848
- (void)testDefaultMaxTimeout {
4949
NSTimeInterval days;
50-
if (@available(iOS 16.1, *)) {
50+
if (@available(iOS 16.1, macCatalyst 16.1, *)) {
5151
days = 3600.0 * 24.0 * 60.0; // one day
5252
} else {
5353
days = 3600.0 * 24.0; // one day
@@ -66,7 +66,7 @@ - (void)testShouldAttemptSKAdNetworkCalloutFalse {
6666

6767
- (void)testPostbackCall {
6868

69-
if (@available(iOS 16.1, *)) {
69+
if (@available(iOS 16.1, macCatalyst 16.1, *)) {
7070
self.skAdNetwork.maxTimeSinceInstall = 3600.0 * 24.0 * 60.0;
7171
} else {
7272
self.skAdNetwork.maxTimeSinceInstall = 3600.0 * 24.0; // one day
@@ -94,7 +94,7 @@ - (void)testPostbackCall {
9494

9595
- (void)testSKAN4ParamsDefaultValues {
9696

97-
if (@available(iOS 16.1, *)) {
97+
if (@available(iOS 16.1, macCatalyst 16.1, *)) {
9898
NSString *coarseValue = [[BNCSKAdNetwork sharedInstance] getCoarseConversionValueFromDataResponse:@{}];
9999
XCTAssertTrue([coarseValue isEqualToString:@"low"]);
100100

@@ -108,7 +108,7 @@ - (void)testSKAN4ParamsDefaultValues {
108108

109109
- (void)testSKAN4ParamsValues {
110110

111-
if (@available(iOS 16.1, *)) {
111+
if (@available(iOS 16.1, macCatalyst 16.1, *)) {
112112

113113
NSDictionary *response = @{@"update_conversion_value": @16, @"coarse_key": @"high", @"locked": @YES, @"ascending_only":@NO };
114114
BNCSKAdNetwork *adNetwork = [BNCSKAdNetwork sharedInstance];

‎Branch-TestBed/Branch-SDK-Tests/BranchShareLinkTests.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ - (void)testAddLPLinkMetadata {
2323

2424
BranchShareLink *bsl = [[BranchShareLink alloc] initWithUniversalObject:buo linkProperties:lp];
2525

26-
if (@available(iOS 13.0, *)) {
26+
if (@available(iOS 13.0, macCatalyst 13.0, *)) {
2727
NSURL *imageURL = [NSURL URLWithString:@"https://cdn.branch.io/branch-assets/1598575682753-og_image.png"];
2828
NSData *imageData = [NSData dataWithContentsOfURL:imageURL];
2929
UIImage *iconImage = [UIImage imageWithData:imageData];

‎Branch-TestBed/Branch-TestBed/PasteControlViewController.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ @implementation PasteControlViewController
2525

2626
- (void)viewDidLoad {
2727
[super viewDidLoad];
28-
if (@available(iOS 16.0, *)) {
29-
28+
29+
if (@available(iOS 16.0, macCatalyst 16.0, *)) {
3030
CGRect rectPC = CGRectMake(0, 0, _applePasteControlView.frame.size.width, _applePasteControlView.frame.size.height);
3131
UIPasteControl *pc = [[UIPasteControl alloc] initWithFrame:rectPC];
3232
pc.target = self;
@@ -41,14 +41,14 @@ - (void)viewDidLoad {
4141
}
4242

4343
- (void)pasteItemProviders:(NSArray<NSItemProvider *> *)itemProviders {
44-
if (@available(iOS 16, *)) {
44+
if (@available(iOS 16, macCatalyst 16.0, *)) {
4545
[[Branch getInstance] passPasteItemProviders:itemProviders];
4646
}
4747
}
4848

4949
- (BOOL)canPasteItemProviders:(NSArray<NSItemProvider *> *)itemProviders {
5050
for (NSItemProvider* item in itemProviders)
51-
if (@available(iOS 14.0, *)) {
51+
if (@available(iOS 14.0, macCatalyst 14.0, *)) {
5252
if ( [item hasItemConformingToTypeIdentifier: UTTypeURL.identifier] )
5353
return true;
5454
}

‎Branch-TestBed/Branch-TestBed/ViewController.m‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ - (void)viewDidLoad {
7373
[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(hideKeyboard)];
7474
[self.tableView addGestureRecognizer:gestureRecognizer];
7575

76-
if (@available(iOS 13.0, *)) {
76+
if (@available(iOS 13.0, macCatalyst 13.0, *)) {
7777
activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleMedium];
7878
} else {
7979
activityIndicator = [[UIActivityIndicatorView alloc] init];
@@ -128,24 +128,24 @@ - (void)viewDidLoad {
128128

129129
if ([Branch trackingDisabled]) {
130130
[self.disableTrackingButton setTitle:@"Enable Tracking" forState:UIControlStateNormal];
131-
if (@available(iOS 13.0, *)) {
131+
if (@available(iOS 13.0, macCatalyst 13.0, *)) {
132132
[self.disableTrackingButton setImage:[UIImage systemImageNamed:@"eye.fill"] forState:UIControlStateNormal];
133133
}
134134
} else {
135135
[self.disableTrackingButton setTitle:@"Disable Tracking" forState:UIControlStateNormal];
136-
if (@available(iOS 13.0, *)) {
136+
if (@available(iOS 13.0, macCatalyst 13.0, *)) {
137137
[self.disableTrackingButton setImage:[UIImage systemImageNamed:@"eye.slash.fill"] forState:UIControlStateNormal];
138138
}
139139
}
140140

141141
if (hasSetPartnerParams) {
142142
[self.setParnerParamsButton setTitle:@"Clear Partner Params" forState:UIControlStateNormal];
143-
if (@available(iOS 13.0, *)) {
143+
if (@available(iOS 13.0, macCatalyst 13.0, *)) {
144144
[self.setParnerParamsButton setImage:[UIImage systemImageNamed:@"folder.badge.minus"] forState:UIControlStateNormal];
145145
}
146146
} else {
147147
[self.setParnerParamsButton setTitle:@"Set Partner Params" forState:UIControlStateNormal];
148-
if (@available(iOS 13.0, *)) {
148+
if (@available(iOS 13.0, macCatalyst 13.0, *)) {
149149
[self.setParnerParamsButton setImage:[UIImage systemImageNamed:@"folder.badge.plus"] forState:UIControlStateNormal];
150150
}
151151
}
@@ -388,7 +388,7 @@ - (IBAction)shareLinkButtonTouchUpInside:(id)sender {
388388
@"Shared from Branch-TestBed at %@.",
389389
[self.dateFormatter stringFromDate:[NSDate date]]];
390390

391-
if (@available(iOS 13.0, *)) {
391+
if (@available(iOS 13.0, macCatalyst 13.0, *)) {
392392
LPLinkMetadata *tempLinkMetatData = [[LPLinkMetadata alloc] init];
393393
tempLinkMetatData.title = @"Branch URL";
394394
UIImage *img = [UIImage imageNamed:@"Brand Assets"];
@@ -769,7 +769,7 @@ - (IBAction)togglePartnerParams:(id)sender {
769769
[self showAlert:@"Cleared Partner Parameters" withDescription:@""];
770770
hasSetPartnerParams = false;
771771
[self.setParnerParamsButton setTitle:@"Set Partner Params" forState:UIControlStateNormal];
772-
if (@available(iOS 13.0, *)) {
772+
if (@available(iOS 13.0, macCatalyst 13.0, *)) {
773773
[self.setParnerParamsButton setImage:[UIImage systemImageNamed:@"folder.badge.plus"] forState:UIControlStateNormal];
774774
}
775775
} else {
@@ -779,7 +779,7 @@ - (IBAction)togglePartnerParams:(id)sender {
779779
[self showAlert:@"Set Partner Parameters" withDescription:@""];
780780
hasSetPartnerParams = true;
781781
[self.setParnerParamsButton setTitle:@"Clear Partner Params" forState:UIControlStateNormal];
782-
if (@available(iOS 13.0, *)) {
782+
if (@available(iOS 13.0, macCatalyst 13.0, *)) {
783783
[self.setParnerParamsButton setImage:[UIImage systemImageNamed:@"folder.badge.minus"] forState:UIControlStateNormal];
784784
}
785785
}
@@ -806,13 +806,13 @@ - (IBAction)disableTracking:(id)sender {
806806
if ([title isEqualToString:@"Disable Tracking"]) {
807807
[Branch setTrackingDisabled:YES];
808808
[self.disableTrackingButton setTitle:@"Enable Tracking" forState:UIControlStateNormal];
809-
if (@available(iOS 13.0, *)) {
809+
if (@available(iOS 13.0, macCatalyst 13.0, *)) {
810810
[self.disableTrackingButton setImage:[UIImage systemImageNamed:@"eye.fill"] forState:UIControlStateNormal];
811811
}
812812
} else {
813813
[Branch setTrackingDisabled:NO];
814814
[self.disableTrackingButton setTitle:@"Disable Tracking" forState:UIControlStateNormal];
815-
if (@available(iOS 13.0, *)) {
815+
if (@available(iOS 13.0, macCatalyst 13.0, *)) {
816816
[self.disableTrackingButton setImage:[UIImage systemImageNamed:@"eye.slash.fill"] forState:UIControlStateNormal];
817817
}
818818
}
@@ -863,7 +863,7 @@ - (IBAction)shareLinkWithMetadata:(id)sender {
863863

864864
BranchShareLink *bsl = [[BranchShareLink alloc] initWithUniversalObject:buo linkProperties:lp];
865865

866-
if (@available(iOS 13.0, *)) {
866+
if (@available(iOS 13.0, macCatalyst 13.0, *)) {
867867
[bsl addLPLinkMetadata:@"LPLinkMetadata Link" icon:iconImg];
868868
}
869869

‎ChangeLog.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ v.1.40.0
104104

105105
```objective-c
106106
    // LPLinkMetadata example
107-
    if (@available(iOS 13.0, *)) {
107+
    if (@available(iOS 13.0, macCatalyst 13.0, *)) {
108108
        LPLinkMetadata *tempLinkMetatData = [[LPLinkMetadata alloc] init];
109109
        tempLinkMetatData.title = @"Branch URL";
110110
        UIImage *img = [UIImage imageNamed:@"Brand Assets"];

0 commit comments

Comments
 (0)