Skip to content

Commit f1c063b

Browse files
authored
Merge pull request #770 from adjust/v544
Version 5.4.4
2 parents c142415 + 036a510 commit f1c063b

File tree

20 files changed

+76
-42
lines changed

20 files changed

+76
-42
lines changed

Adjust.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "Adjust"
33
s.module_name = "AdjustSdk"
4-
s.version = "5.4.3"
4+
s.version = "5.4.4"
55
s.summary = "This is the iOS SDK of Adjust. You can read more about it at https://adjust.com."
66
s.homepage = "https://github.com/adjust/ios_sdk"
77
s.license = { :type => 'MIT', :file => 'LICENSE' }

Adjust/Adjust.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Adjust.h
33
// Adjust SDK
44
//
5-
// V5.4.3
5+
// V5.4.4
66
// Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
77
// Copyright (c) 2012-Present Adjust GmbH. All rights reserved.
88
//

Adjust/Internal/ADJActivityHandler.m

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ @interface ADJActivityHandler()
129129
@property (nonatomic, strong) ADJOdmManager *odmManager;
130130

131131
- (void)prepareDeeplinkI:(ADJActivityHandler *_Nullable)selfI
132-
responseData:(ADJAttributionResponseData *_Nullable)attributionResponseData NS_EXTENSION_UNAVAILABLE_IOS("");
132+
deeplink:(NSURL *_Nullable)deeplink NS_EXTENSION_UNAVAILABLE_IOS("");
133133

134134
@end
135135

@@ -1546,6 +1546,10 @@ - (void)launchSessionResponseTasksI:(ADJActivityHandler *)selfI
15461546
[selfI.attributionHandler getAttribution];
15471547
}
15481548

1549+
if (sessionResponseData) {
1550+
[selfI prepareDeeplinkI:selfI deeplink:sessionResponseData.deeplink];
1551+
}
1552+
15491553
selfI.internalState.sessionResponseProcessed = YES;
15501554
}
15511555

@@ -1593,7 +1597,10 @@ - (void)launchAttributionResponseTasksI:(ADJActivityHandler *)selfI
15931597
withObject:attributionResponseData.attribution];
15941598
}
15951599

1596-
[selfI prepareDeeplinkI:selfI responseData:attributionResponseData];
1600+
if (attributionResponseData) {
1601+
[selfI prepareDeeplinkI:selfI deeplink:attributionResponseData.deeplink];
1602+
}
1603+
15971604
}
15981605

15991606
- (void)launchPurchaseVerificationResponseTasksI:(ADJActivityHandler *)selfI
@@ -1616,27 +1623,24 @@ - (void)launchPurchaseVerificationResponseTasksI:(ADJActivityHandler *)selfI
16161623
}
16171624

16181625
- (void)prepareDeeplinkI:(ADJActivityHandler *)selfI
1619-
responseData:(ADJAttributionResponseData *)attributionResponseData {
1620-
if (attributionResponseData == nil) {
1621-
return;
1622-
}
1626+
deeplink:(NSURL *)deeplink {
16231627

1624-
if (attributionResponseData.deeplink == nil) {
1628+
if (deeplink == nil) {
16251629
return;
16261630
}
16271631

1628-
[selfI.logger info:@"Open deep link (%@)", attributionResponseData.deeplink.absoluteString];
1632+
[selfI.logger info:@"Open deep link (%@)", deeplink.absoluteString];
16291633

16301634
[ADJUtil launchInMainThread:^{
16311635
BOOL toLaunchDeeplink = YES;
16321636

16331637
if ([selfI.adjustDelegate respondsToSelector:@selector(adjustDeferredDeeplinkReceived:)]) {
16341638
toLaunchDeeplink = [selfI.adjustDelegate
1635-
adjustDeferredDeeplinkReceived:attributionResponseData.deeplink];
1639+
adjustDeferredDeeplinkReceived:deeplink];
16361640
}
16371641

16381642
if (toLaunchDeeplink) {
1639-
[ADJUtil launchDeepLinkMain:attributionResponseData.deeplink];
1643+
[ADJUtil launchDeepLinkMain:deeplink];
16401644
}
16411645
}];
16421646
}

Adjust/Internal/ADJAttributionHandler.m

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ - (void)resumeSending {
118118
- (void)checkSessionResponseI:(ADJAttributionHandler*)selfI
119119
sessionResponseData:(ADJSessionResponseData *)sessionResponseData {
120120
[selfI checkAttributionI:selfI responseData:sessionResponseData];
121-
121+
122+
[selfI checkDeeplinkInSessionResponseI:selfI sessionResponseData:sessionResponseData];
123+
122124
[selfI.activityHandler launchSessionResponseTasks:sessionResponseData];
123125
}
124126

@@ -133,7 +135,7 @@ - (void)checkAttributionResponseI:(ADJAttributionHandler*)selfI
133135
attributionResponseData:(ADJAttributionResponseData *)attributionResponseData {
134136
[selfI checkAttributionI:selfI responseData:attributionResponseData];
135137

136-
[selfI checkDeeplinkI:selfI attributionResponseData:attributionResponseData];
138+
[selfI checkDeeplinkInAttributionResponseI:selfI attributionResponseData:attributionResponseData];
137139

138140
[selfI.activityHandler launchAttributionResponseTasks:attributionResponseData];
139141
}
@@ -162,23 +164,37 @@ - (void)checkAttributionI:(ADJAttributionHandler*)selfI
162164
responseData.attribution = [[ADJAttribution alloc] initWithJsonDict:jsonAttribution];
163165
}
164166

165-
- (void)checkDeeplinkI:(ADJAttributionHandler*)selfI
166-
attributionResponseData:(ADJAttributionResponseData *)attributionResponseData {
167+
- (void)checkDeeplinkInAttributionResponseI:(ADJAttributionHandler*)selfI
168+
attributionResponseData:(ADJAttributionResponseData *)attributionResponseData {
167169
if (attributionResponseData.jsonResponse == nil) {
168170
return;
169171
}
170172

171-
NSDictionary * jsonAttribution = [attributionResponseData.jsonResponse objectForKey:@"attribution"];
173+
NSDictionary *jsonAttribution = [attributionResponseData.jsonResponse objectForKey:@"attribution"];
172174
if (jsonAttribution == nil) {
173175
return;
174176
}
175177

176-
NSString *deepLink = [jsonAttribution objectForKey:@"deeplink"];
177-
if (deepLink == nil) {
178+
NSString *deeplink = [jsonAttribution objectForKey:@"deeplink"];
179+
if (deeplink == nil) {
180+
return;
181+
}
182+
183+
attributionResponseData.deeplink = [NSURL URLWithString:deeplink];
184+
}
185+
186+
- (void)checkDeeplinkInSessionResponseI:(ADJAttributionHandler*)selfI
187+
sessionResponseData:(ADJSessionResponseData *)sessionResponseData {
188+
if (sessionResponseData.jsonResponse == nil) {
189+
return;
190+
}
191+
192+
NSString *deeplink = [sessionResponseData.jsonResponse objectForKey:@"deeplink"];
193+
if (deeplink == nil) {
178194
return;
179195
}
180196

181-
attributionResponseData.deeplink = [NSURL URLWithString:deepLink];
197+
sessionResponseData.deeplink = [NSURL URLWithString:deeplink];
182198
}
183199

184200
- (void)requestAttributionI:(ADJAttributionHandler*)selfI {

Adjust/Internal/ADJResponseData.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ typedef NS_ENUM(int, ADJTrackingState) {
6565

6666
- (ADJSessionFailure *)failureResponseData;
6767

68+
@property (nonatomic, strong) NSURL *deeplink;
69+
6870
@end
6971

7072
@interface ADJSdkClickResponseData : ADJResponseData

Adjust/Internal/ADJUtil.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
static NSRegularExpression *goLinkUniversalLinkRegex = nil;
3232
static NSRegularExpression *excludedDeeplinkRegex = nil;
3333

34-
static NSString * const kClientSdk = @"ios5.4.3";
34+
static NSString * const kClientSdk = @"ios5.4.4";
3535
static NSString * const kDeeplinkParam = @"deep_link=";
3636
static NSString * const kSchemeDelimiter = @"://";
3737
static NSString * const kDefaultScheme = @"AdjustUniversalScheme";

AdjustBridge/AdjustBridgeRegister.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ function canSend(okCheck, errReason) {
176176
if (this.sdkPrefix) {
177177
return this.sdkPrefix;
178178
} else {
179-
return 'web-bridge5.4.3';
179+
return 'web-bridge5.4.4';
180180
}
181181
},
182182

AdjustTests/AdjustTestApp/AdjustTestApp.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@
509509
"$(inherited)",
510510
"@executable_path/Frameworks",
511511
);
512-
PRODUCT_BUNDLE_IDENTIFIER = com.adjust.AdjustTestApp;
512+
PRODUCT_BUNDLE_IDENTIFIER = com.adjust.examples;
513513
PRODUCT_NAME = "$(TARGET_NAME)";
514514
TARGETED_DEVICE_FAMILY = "1,2";
515515
};
@@ -526,7 +526,7 @@
526526
"$(inherited)",
527527
"@executable_path/Frameworks",
528528
);
529-
PRODUCT_BUNDLE_IDENTIFIER = com.adjust.AdjustTestApp;
529+
PRODUCT_BUNDLE_IDENTIFIER = com.adjust.examples;
530530
PRODUCT_NAME = "$(TARGET_NAME)";
531531
TARGETED_DEVICE_FAMILY = "1,2";
532532
};

AdjustTests/AdjustTestApp/AdjustTestApp/Info.plist

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,17 @@
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
1818
<string>1.0</string>
19+
<key>CFBundleURLTypes</key>
20+
<array>
21+
<dict>
22+
<key>CFBundleURLName</key>
23+
<string>com.adjust.AdjustTestApp</string>
24+
<key>CFBundleURLSchemes</key>
25+
<array>
26+
<string>adjust-test</string>
27+
</array>
28+
</dict>
29+
</array>
1930
<key>CFBundleVersion</key>
2031
<string>1</string>
2132
<key>LSRequiresIPhoneOS</key>
@@ -41,16 +52,5 @@
4152
<string>UIInterfaceOrientationLandscapeLeft</string>
4253
<string>UIInterfaceOrientationLandscapeRight</string>
4354
</array>
44-
<key>CFBundleURLTypes</key>
45-
<array>
46-
<dict>
47-
<key>CFBundleURLName</key>
48-
<string>com.adjust.AdjustTestApp</string>
49-
<key>CFBundleURLSchemes</key>
50-
<array>
51-
<string>adjust-test</string>
52-
</array>
53-
</dict>
54-
</array>
5555
</dict>
5656
</plist>

AdjustTests/AdjustTestApp/AdjustTestApp/ViewController.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
//static NSString * urlOverwrite = @"http://127.0.0.1:8080";
1313
//static NSString * controlUrl = @"ws://127.0.0.1:1987";
1414
// device
15-
static NSString * urlOverwrite = @"http://192.168.1.121:8080";
16-
static NSString * controlUrl = @"ws://192.168.1.121:1987";
15+
static NSString * urlOverwrite = @"http://192.168.21.180:8080";
16+
static NSString * controlUrl = @"ws://192.168.21.180:1987";
1717

1818
@interface ViewController : UIViewController
1919

0 commit comments

Comments
 (0)