Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Adjust.podspec
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Pod::Spec.new do |s|
s.name = "Adjust"
s.version = "4.26.0"
s.version = "4.26.1"
s.summary = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
s.homepage = "https://github.com/adjust/ios_sdk"
s.license = { :type => 'MIT', :file => 'MIT-LICENSE' }
s.author = { "Christian Wellenbrock" => "welle@adjust.com" }
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.26.0" }
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.26.1" }
s.ios.deployment_target = '6.0'
s.tvos.deployment_target = '9.0'
s.framework = 'SystemConfiguration'
Expand Down
4 changes: 1 addition & 3 deletions Adjust/ADJActivityHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
@property (nonatomic, assign) BOOL firstLaunch;
@property (nonatomic, assign) BOOL sessionResponseProcessed;

- (_Nullable id)init;

- (BOOL)isEnabled;
- (BOOL)isDisabled;
- (BOOL)isOffline;
Expand All @@ -49,7 +47,7 @@
@property (nonatomic, strong) NSMutableArray *_Nullable preLaunchAdjustThirdPartySharingArray;
@property (nonatomic, copy) NSNumber *_Nullable lastMeasurementConsentTracked;

- (id _Nullable)init;
- (nonnull id)init;

@end

Expand Down
15 changes: 4 additions & 11 deletions Adjust/ADJActivityHandler.m
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,6 @@

@implementation ADJInternalState

- (id)init {
self = [super init];
if (self == nil) return nil;

return self;
}

- (BOOL)isEnabled { return self.enabled; }
- (BOOL)isDisabled { return !self.enabled; }
- (BOOL)isOffline { return self.offline; }
Expand All @@ -72,10 +65,10 @@ @implementation ADJSavedPreLaunch

- (id)init {
self = [super init];
if (self == nil) return nil;

// online by default
self.offline = NO;
if (self) {
// online by default
self.offline = NO;
}
return self;
}

Expand Down
1 change: 1 addition & 0 deletions Adjust/ADJAdjustFactory.m
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ + (void)teardown:(BOOL)deleteState {
internalRequestTimeout = -1;
packageHandlerBackoffStrategy = nil;
sdkClickHandlerBackoffStrategy = nil;
installSessionBackoffStrategy = nil;
internalTesting = NO;
internalMaxDelayStart = -1;
internalBaseUrl = nil;
Expand Down
7 changes: 2 additions & 5 deletions Adjust/ADJPackageBuilder.m
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ - (ADJActivityPackage *)buildSubscriptionPackage:(ADJSubscription *)subscription
subscriptionPackage.parameters = parameters;

if (isInDelay) {
subscriptionPackage.callbackParameters = subscriptionPackage.callbackParameters;
subscriptionPackage.partnerParameters = subscriptionPackage.partnerParameters;
subscriptionPackage.callbackParameters = subscription.callbackParameters;
subscriptionPackage.partnerParameters = subscription.partnerParameters;
}

[self signWithSigV2Plugin:subscriptionPackage];
Expand All @@ -264,9 +264,6 @@ + (void)parameters:(NSMutableDictionary *)parameters setDictionary:(NSDictionary
if (dictionary.count == 0) {
return;
}
if (dictionary.count == 0) {
return;
}

NSDictionary *convertedDictionary = [ADJUtil convertDictionaryValues:dictionary];
[ADJPackageBuilder parameters:parameters setDictionaryJson:convertedDictionary forKey:key];
Expand Down
2 changes: 1 addition & 1 deletion Adjust/ADJUtil.m
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
static CTTelephonyNetworkInfo *networkInfo = nil;
#endif

static NSString * const kClientSdk = @"ios4.26.0";
static NSString * const kClientSdk = @"ios4.26.1";
static NSString * const kDeeplinkParam = @"deep_link=";
static NSString * const kSchemeDelimiter = @"://";
static NSString * const kDefaultScheme = @"AdjustUniversalScheme";
Expand Down
2 changes: 1 addition & 1 deletion Adjust/Adjust.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Adjust.h
// Adjust
//
// V4.26.0
// V4.26.1
// Created by Christian Wellenbrock (wellle) on 23rd July 2013.
// Copyright © 2012-2017 Adjust GmbH. All rights reserved.
//
Expand Down
2 changes: 1 addition & 1 deletion AdjustBridge/AdjustBridgeRegister.m
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ + (NSString *)adjust_js {
if (this.sdkPrefix) {
return this.sdkPrefix;
} else {
return 'web-bridge4.26.0';
return 'web-bridge4.26.1';
}
},
setTestOptions: function(testOptions) {
Expand Down
2 changes: 1 addition & 1 deletion AdjustTests/AdjustUnitTests/ADJPackageFields.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ - (id) init {

// default values
self.appToken = @"qwerty123456";
self.clientSdk = @"ios4.26.0";
self.clientSdk = @"ios4.26.1";
self.suffix = @"";
self.environment = @"sandbox";

Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
### Version 4.26.1 (5th February 2021)

#### Fixed
- Fixed nullability warnings.

---

### Version 4.26.0 (3rd February 2021)
#### Added
- Added wrapper method `updateConversionValue:` method to `Adjust` API to allow updating SKAdNetwork conversion value via SDK API.
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ We will describe the steps to integrate the Adjust SDK into your iOS project. We
If you're using [CocoaPods][cocoapods], you can add the following line to your `Podfile` and continue from [this step](#sdk-integrate):

```ruby
pod 'Adjust', '~> 4.26.0'
pod 'Adjust', '~> 4.26.1'
```

or:

```ruby
pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.26.0'
pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.26.1'
```

---
Expand Down Expand Up @@ -771,7 +771,8 @@ You can notify Adjust when a user disables, enables, and re-enables data sharing
Call the following method to instruct the Adjust SDK to communicate the user's choice to disable data sharing to the Adjust backend:

```objc
[Adjust disableThirdPartySharing];
ADJThirdPartySharing *adjustThirdPartySharing = [[ADJThirdPartySharing alloc] initWithIsEnabledNumberBool:NO];
[Adjust trackThirdPartySharing:adjustThirdPartySharing];
```

Upon receiving this information, Adjust will block the sharing of that specific user's data to partners and the Adjust SDK will continue to work as usual.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.26.0
4.26.1
4 changes: 2 additions & 2 deletions doc/chinese/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ Read this in other languages: [English][en-readme], [中文][zh-readme], [日本
如果您正在使用[CocoaPods][cocoapods],您可以将以下代码行添加至 `Podfile`,然后继续进行[此步骤](#sdk-integrate):

```ruby
pod 'Adjust', '~> 4.26.0'
pod 'Adjust', '~> 4.26.1'
```

或:

```ruby
pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.26.0'
pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.26.1'
```

---
Expand Down
2 changes: 1 addition & 1 deletion doc/english/migrate.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Migrate your Adjust SDK for iOS to v4.26.0 from v3.4.0
## Migrate your Adjust SDK for iOS to v4.26.1 from v3.4.0

### Initial setup

Expand Down
2 changes: 1 addition & 1 deletion doc/english/web_views.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ We will describe the steps to integrate the Adjust SDK into your iOS project. We
If you're using [CocoaPods][cocoapods], you can add the following line to your `Podfile` and continue from [this step](#sdk-integrate):

```ruby
pod 'Adjust/WebBridge', '~> 4.26.0'
pod 'Adjust/WebBridge', '~> 4.26.1'
```

---
Expand Down
4 changes: 2 additions & 2 deletions doc/japanese/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ adjust SDKをiOSプロジェクトに連携する手順を説明します。
[こちらの手順](#sdk-integrate)に進んでください。

```ruby
pod 'Adjust', '~> 4.26.0'
pod 'Adjust', '~> 4.26.1'
```

または

```ruby
pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.26.0'
pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.26.1'
```

---
Expand Down
4 changes: 2 additions & 2 deletions doc/korean/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ iOS 개발용 Xcode를 사용한다는 가정하에 iOS 프로젝트에 Adjust S
[CocoaPods][cocoapods]를 사용하는 경우, 다음 내용을 `Podfile`에 추가한 후 [해당 단계](#sdk-integrate)를 완료하세요.

```ruby
pod 'Adjust', '~> 4.26.0'
pod 'Adjust', '~> 4.26.1'
```

또는:

```ruby
pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.26.0'
pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.26.1'
```

---
Expand Down
2 changes: 1 addition & 1 deletion doc/korean/web_views.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ iOS 개발용 Xcode를 사용한다는 가정하에 iOS 프로젝트에 Adjust S
[CocoaPods][cocoapods]를 사용하는 경우, 다음 내용을 'Podfile'에 추가한 후 [해당 단계](#sdk-integrate)를 완료하세요.

```ruby
pod 'Adjust/WebBridge', '~> 4.26.0'
pod 'Adjust/WebBridge', '~> 4.26.1'
```

---
Expand Down
2 changes: 1 addition & 1 deletion doc/migrate.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Migrate your Adjust SDK for iOS to v4.26.0 from v3.4.0
## Migrate your Adjust SDK for iOS to v4.26.1 from v3.4.0

### Initial setup

Expand Down