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.

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

Version 4.11.1 #51

Merged
merged 11 commits into from
Apr 25, 2017
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
232 changes: 128 additions & 104 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2012-2016 adjust GmbH, http://www.adjust.com
Copyright (c) 2012-2017 adjust GmbH, http://www.adjust.com

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This is the Cordova SDK of Adjust™. You can read more about Adjust™ at [adjust.com].

N.B. At the moment, SDK 4.11.0 for Cordova supports Android platform version `4.0.0 and higher` and iOS platform version
N.B. At the moment, SDK 4.11.1 for Cordova supports Android platform version `4.0.0 and higher` and iOS platform version
`3.0.0 and higher`. Windows platform is **not supported** at the moment.

## Table of contents
Expand Down Expand Up @@ -90,7 +90,7 @@ Installing "com.adjust.sdk" for android
Installing "com.adjust.sdk" for ios
```

<a id="sdk-cocoon">**Note:** Starting from **Adjust SDK v4.11.0**, `npm` plugin and `master` branch are compatible with `cocoon.io`. There is no need to use SDK from `cocoon` branch anymore.
<a id="sdk-cocoon">**Note:** Starting from **Adjust SDK v4.11.1**, `npm` plugin and `master` branch are compatible with `cocoon.io`. There is no need to use SDK from `cocoon` branch anymore.

### <a id="sdk-integrate">Integrate the SDK into your app

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.11.0
4.11.1
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 Cordova to 4.11.0 from 3.4.1
## Migrate your adjust SDK for Cordova to 4.11.1 from 3.4.1

### Migration procedure

Expand Down
2 changes: 1 addition & 1 deletion example/config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.adjust.examples" version="4.11.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="com.adjust.examples" version="4.11.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>adjust-example-app</name>
<description>
</description>
Expand Down
4 changes: 2 additions & 2 deletions example/www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<meta name="msapplication-tap-highlight" content="no">
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
<link rel="stylesheet" type="text/css" href="css/index.css">
<title>Adjust Example App v4.11.0</title>
<title>Adjust Example App v4.11.1</title>
</head>
<body>
<div class="app">
<h1>Adjust Example App v4.11.0</h1>
<h1>Adjust Example App v4.11.1</h1>
<button id="btnTrackSimpleEvent">Track Simple Event</button>
<button id="btnTrackRevenueEvent">Track Revenue Event</button>
<button id="btnTrackCallbackEvent">Track Callback Event</button>
Expand Down
2 changes: 1 addition & 1 deletion ext/Android/sdk
Submodule sdk updated 34 files
+2 −2 Adjust/adjust/build.gradle
+79 −33 Adjust/adjust/src/main/java/com/adjust/sdk/ActivityHandler.java
+0 −8 Adjust/adjust/src/main/java/com/adjust/sdk/AdjustFactory.java
+13 −30 Adjust/adjust/src/main/java/com/adjust/sdk/AttributionHandler.java
+1 −1 Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java
+23 −14 Adjust/adjust/src/main/java/com/adjust/sdk/CustomScheduledExecutor.java
+32 −1 Adjust/adjust/src/main/java/com/adjust/sdk/DeviceInfo.java
+2 −1 Adjust/adjust/src/main/java/com/adjust/sdk/PackageBuilder.java
+1 −1 Adjust/adjust/src/main/java/com/adjust/sdk/PackageHandler.java
+2 −9 Adjust/adjust/src/main/java/com/adjust/sdk/RequestHandler.java
+2 −8 Adjust/adjust/src/main/java/com/adjust/sdk/SdkClickHandler.java
+13 −15 Adjust/adjust/src/main/java/com/adjust/sdk/TimerCycle.java
+7 −13 Adjust/adjust/src/main/java/com/adjust/sdk/TimerOnce.java
+1 −192 Adjust/adjust/src/main/java/com/adjust/sdk/Util.java
+230 −0 Adjust/adjust/src/main/java/com/adjust/sdk/UtilNetworking.java
+1 −1 Adjust/build.gradle
+1 −1 Adjust/example/build.gradle
+2 −2 Adjust/gradle/wrapper/gradle-wrapper.properties
+1 −1 Adjust/pom.xml
+1 −1 Adjust/pom_criteo.xml
+1 −1 Adjust/pom_sociomantic.xml
+1 −1 Adjust/pom_trademob.xml
+1 −1 Adjust/test/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java
+2 −0 Adjust/test/src/androidTest/java/com/adjust/sdk/TestAttributionHandler.java
+31 −0 CHANGELOG.md
+1 −1 MIT-LICENSE
+4 −4 README.md
+1 −1 VERSION
+47 −0 doc/english/adobe.md
+34 −10 doc/english/criteo_plugin.md
+1 −1 doc/english/migrate.md
+1 −1 doc/english/sociomantic_plugin.md
+1 −1 doc/english/trademob_plugin.md
+61 −0 doc/japanese/multiple_process_app_ja.md
2 changes: 1 addition & 1 deletion ext/iOS/sdk
Submodule sdk updated 145 files
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"version": "4.11.0",
"version": "4.11.1",
"name": "com.adjust.sdk",
"cordova_name": "Adjust SDK Cordova Plugin",
"description": "Cordova plugin for the Adjust SDK 4.11.0",
"description": "Cordova plugin for the Adjust SDK 4.11.1",
"license": "MIT License",
"platforms": [
"ios",
Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="com.adjust.sdk"
version="4.11.0">
version="4.11.1">

<name>Adjust</name>
<description>Adjust plugin for Cordova</description>
Expand Down
Binary file modified src/Android/adjust-android.jar
Binary file not shown.
Binary file modified src/iOS/AdjustSdk.framework/AdjustSdk
Binary file not shown.
83 changes: 60 additions & 23 deletions src/iOS/AdjustSdk.framework/Headers/ADJAttribution.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,40 +8,77 @@

#import <Foundation/Foundation.h>

/**
* @brief Adjust attribution object.
*/
@interface ADJAttribution : NSObject <NSCoding, NSCopying>

// the following attributes are only set when error is nil
// (when activity was tracked successfully and response could be parsed)
/**
* @brief Tracker token.
*/
@property (nonatomic, copy, nullable) NSString *trackerToken;

// tracker token of current device
@property (nonatomic, copy) NSString *trackerToken;
/**
* @brief Tracker name.
*/
@property (nonatomic, copy, nullable) NSString *trackerName;

// tracker name of current device
@property (nonatomic, copy) NSString *trackerName;
/**
* @brief Network name.
*/
@property (nonatomic, copy, nullable) NSString *network;

// tracker network
@property (nonatomic, copy) NSString *network;
/**
* @brief Campaign name.
*/
@property (nonatomic, copy, nullable) NSString *campaign;

// tracker campaign
@property (nonatomic, copy) NSString *campaign;
/**
* @brief Adgroup name.
*/
@property (nonatomic, copy, nullable) NSString *adgroup;

// tracker adgroup
@property (nonatomic, copy) NSString *adgroup;
/**
* @brief Creative name.
*/
@property (nonatomic, copy, nullable) NSString *creative;

// tracker creative
@property (nonatomic, copy) NSString *creative;
/**
* @brief Click label content.
*/
@property (nonatomic, copy, nullable) NSString *clickLabel;

// tracker click_label
@property (nonatomic, copy) NSString *clickLabel;
/**
* @brief Adjust identifier value.
*/
@property (nonatomic, copy, nullable) NSString *adid;

@property (nonatomic, copy) NSString *adid;
/**
* @brief Make attribution object.
*
* @param jsonDict Dictionary holding attribution key value pairs.
* @param adid Adjust identifier value.
*
* @return Adjust attribution object.
*/
+ (nullable ADJAttribution *)dataWithJsonDict:(nonnull NSDictionary *)jsonDict adid:(nonnull NSString *)adid;

- (BOOL)isEqualToAttribution:(ADJAttribution *)attribution;
- (nullable id)initWithJsonDict:(nonnull NSDictionary *)jsonDict adid:(nonnull NSString *)adid;

+ (ADJAttribution *)dataWithJsonDict:(NSDictionary *)jsonDict
adid:(NSString *)adid;
- (id)initWithJsonDict:(NSDictionary *)jsonDict
adid:(NSString *)adid;
- (NSDictionary *)dictionary;
/**
* @brief Check if given attribution equals current one.
*
* @param attribution Attribution object to be compared with current one.
*
* @return Boolean indicating whether two attribution objects are the equal.
*/
- (BOOL)isEqualToAttribution:(nonnull ADJAttribution *)attribution;

/**
* @brief Get attribution value as dictionary.
*
* @return Dictionary containing attribution as key-value pairs.
*/
- (nullable NSDictionary *)dictionary;

@end
Loading