Merge pull request #27 from adjust/v4130

Version 4.13.0

Adjust/ADJAdjust2dx.h

@@ -30,6 +30,7 @@ class ADJAdjust2dx {
     static void setOfflineMode(bool isOffline);
 
     static void sendFirstPackages();
+    static void gdprForgetMe();
     static void addSessionCallbackParameter(std::string key, std::string value);
     static void addSessionPartnerParameter(std::string key, std::string value);
     static void removeSessionCallbackParameter(std::string key);

Adjust/ADJAdjust2dx.mm

@@ -77,6 +77,10 @@
     [Adjust sendFirstPackages];
 }
 
+void ADJAdjust2dx::gdprForgetMe() {
+    [Adjust gdprForgetMe];
+}
+
 void ADJAdjust2dx::addSessionCallbackParameter(std::string key, std::string value) {
     [Adjust addSessionCallbackParameter:[NSString stringWithUTF8String:key.c_str()] value:[NSString stringWithUTF8String:value.c_str()]];
 }

Adjust/Adjust2dx.cpp

@@ -164,6 +164,31 @@ void Adjust2dx::sendFirstPackages() {
 #endif
 }
 
+void Adjust2dx::gdprForgetMe() {
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
+    ADJAdjust2dx::gdprForgetMe();
+#elif (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+    cocos2d::JniMethodInfo miGdprForgetMe;
+
+    if (!cocos2d::JniHelper::getStaticMethodInfo(miGdprForgetMe, "com/adjust/sdk/Adjust", "gdprForgetMe", "(Landroid/content/Context;)V")) {
+        return;
+    }
+
+    cocos2d::JniMethodInfo miGetContext;
+
+    if (!cocos2d::JniHelper::getStaticMethodInfo(miGetContext, "org/cocos2dx/lib/Cocos2dxActivity", "getContext", "()Landroid/content/Context;")) {
+        return;
+    }
+
+    jobject jContext = (jobject)miGetContext.env->CallStaticObjectMethod(miGetContext.classID, miGetContext.methodID);
+    miGdprForgetMe.env->CallStaticVoidMethod(miGdprForgetMe.classID, miGdprForgetMe.methodID, jContext);
+
+    miGetContext.env->DeleteLocalRef(jContext);
+#elif (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
+
+#endif
+}
+
 void Adjust2dx::addSessionCallbackParameter(std::string key, std::string value) {
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
     ADJAdjust2dx::addSessionCallbackParameter(key, value);

Adjust/Adjust2dx.h

@@ -28,6 +28,7 @@ class Adjust2dx {
     static void setDeviceToken(std::string deviceToken);
 
     static void sendFirstPackages();
+    static void gdprForgetMe();
     static void addSessionCallbackParameter(std::string key, std::string value);
     static void addSessionPartnerParameter(std::string key, std::string value);
     static void removeSessionCallbackParameter(std::string key);

Adjust/AdjustConfig2dx.cpp

@@ -98,7 +98,7 @@ static int fileReadCallback(const char* fileName, int* size) {
 #endif
 
 void AdjustConfig2dx::initConfig(std::string appToken, std::string environment, bool allowSuppressLogLevel) {
-    std::string sdkPrefix = "cocos2d-x4.12.1";
+    std::string sdkPrefix = "cocos2d-x4.13.0";
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     cocos2d::JniMethodInfo miInit;

CHANGELOG.md

@@ -1,3 +1,14 @@
+### Version 4.13.0 (22nd May 2018)
+#### Added
+- Added `gdprForgetMe` method to `Adjust2dx` interface to enable possibility for user to be forgotten in accordance with GDPR law.
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.13.0]
+- [[email protected]][android_sdk_v4.13.0]
+- [Windows SDK 4.0.3][windows_sdk_v4.0.3]
+
+---
+
 ### Version 4.12.1 (12th March 2018)
 #### Native changes
 - Updated Android SDK to `v4.12.4`.
@@ -19,9 +30,9 @@
 - https://github.com/adjust/android_sdk/blob/master/CHANGELOG.md#version-4122-28th-february-2018
 
 #### Added
-- Added `getAmazonAdId` method to `Adjust` interface.
-- Added `setReadMobileEquipmentIdentity` method to `AdjustConfig` interface.
-- Added `setAppSecret` method to `AdjustConfig` interface (**iOS and Android only**).
+- Added `getAmazonAdId` method to `Adjust2dx` interface.
+- Added `setReadMobileEquipmentIdentity` method to `AdjustConfig2dx` interface.
+- Added `setAppSecret` method to `AdjustConfig2dx` interface (**iOS and Android only**).
 
 #### Native SDKs
 - [[email protected]][ios_sdk_v4.12.3]
@@ -222,6 +233,7 @@
 [ios_sdk_v4.11.5]: https://github.com/adjust/ios_sdk/tree/v4.11.5
 [ios_sdk_v4.12.1]: https://github.com/adjust/ios_sdk/tree/v4.12.1
 [ios_sdk_v4.12.3]: https://github.com/adjust/ios_sdk/tree/v4.12.3
+[ios_sdk_v4.13.0]: https://github.com/adjust/ios_sdk/tree/v4.13.0
 
 [android_sdk_v4.0.8]: https://github.com/adjust/android_sdk/tree/v4.0.8
 [android_sdk_v4.1.0]: https://github.com/adjust/android_sdk/tree/v4.1.0
@@ -235,5 +247,6 @@
 [android_sdk_v4.12.0]: https://github.com/adjust/android_sdk/tree/v4.12.0
 [android_sdk_v4.12.2]: https://github.com/adjust/android_sdk/tree/v4.12.2
 [android_sdk_v4.12.4]: https://github.com/adjust/android_sdk/tree/v4.12.4
+[android_sdk_v4.13.0]: https://github.com/adjust/android_sdk/tree/v4.13.0
 
 [windows_sdk_v4.0.3]: https://github.com/adjust/windows_sdk/tree/v4.0.3

VERSION

@@ -1 +1 @@
-4.12.1
+4.13.0

doc/android/android.md

@@ -35,6 +35,7 @@ This is the Cocos2d-x SDK of Adjust™. You can read more about Adjust™ at [ad
    * [Disable tracking](#disable-tracking)
    * [Offline mode](#offline-mode)
    * [Event buffering](#event-buffering)
+   * [GDPR right to be forgotten](#gdpr-forget-me)
    * [SDK signature](#sdk-signature)
    * [Background tracking](#background-tracking)
    * [Device IDs](#device-ids)
@@ -734,6 +735,16 @@ bool AppDelegate::applicationDidFinishLaunching() {
 
 If nothing is set here, event buffering is **disabled by default**.
 
+### <a id="gdpr-forget-me"></a>GDPR right to be forgotten
+
+In accordance with article 17 of the EU's General Data Protection Regulation (GDPR), you can notify Adjust when a user has exercised their right to be forgotten. Calling the following method will instruct the Adjust SDK to communicate the user's choice to be forgotten to the Adjust backend:
+
+```cpp
+Adjust2dx::gdprForgetMe();
+```
+
+Upon receiving this information, Adjust will erase the user's data and the Adjust SDK will stop tracking the user. No requests from this device will be sent to Adjust in the future.
+
 ### <a id="sdk-signature"></a>SDK signature
 
 An account manager must activate the Adjust SDK signature. Contact Adjust support ([email protected]) if you are interested in using this feature.

doc/ios/ios.md

@@ -19,27 +19,28 @@ This is the Cocos2d-x SDK of Adjust™. You can read more about Adjust™ at [Ad
       * [In-app purchase verification](#iap-verification)
       * [Callback parameters](#callback-parameters)
       * [Partner parameters](#partner-parameters)
-    * [Session parameters](#session-parameters)
+   * [Session parameters](#session-parameters)
       * [Session callback parameters](#session-callback-parameters)
       * [Session partner parameters](#session-partner-parameters)
       * [Delay start](#delay-start)
-    * [Attribution callback](#attribution-callback)
-    * [Session and event callbacks](#session-event-callbacks)
-    * [Disable tracking](#disable-tracking)
-    * [Offline mode](#offline-mode)
-    * [Event buffering](#event-buffering)
-    * [SDK signature](#sdk-signature)
-    * [Background tracking](#background-tracking)
-    * [Device IDs](#device-ids)
-        * [iOS advertising identifier](#di-idfa)
-        * [Adjust device identifier](#di-adid)
-        * [User attribution](#user-attribution)
-    * [Push token](#push-token)
-    * [Pre-installed trackers](#pre-installed-trackers)
-    * [Deep linking](#deeplinking)
-        * [Standard deep linking](#deeplinking-standard)
-        * [Deferred deep linking](#deeplinking-deferred)
-        * [Deep link handling for iOS apps](#deeplinking-ios)
+   * [Attribution callback](#attribution-callback)
+   * [Session and event callbacks](#session-event-callbacks)
+   * [Disable tracking](#disable-tracking)
+   * [Offline mode](#offline-mode)
+   * [Event buffering](#event-buffering)
+   * [GDPR right to be forgotten](#gdpr-forget-me)
+   * [SDK signature](#sdk-signature)
+   * [Background tracking](#background-tracking)
+   * [Device IDs](#device-ids)
+      * [iOS advertising identifier](#di-idfa)
+      * [Adjust device identifier](#di-adid)
+      * [User attribution](#user-attribution)
+   * [Push token](#push-token)
+   * [Pre-installed trackers](#pre-installed-trackers)
+   * [Deep linking](#deeplinking)
+      * [Standard deep linking](#deeplinking-standard)
+      * [Deferred deep linking](#deeplinking-deferred)
+      * [Deep link handling for iOS apps](#deeplinking-ios)
 * [License](#license)
 
 ## <a id="basic-integration"></a>Basic integration
@@ -548,6 +549,15 @@ bool AppDelegate::applicationDidFinishLaunching() {
 
 If nothing is set here, event buffering is **disabled by default**.
 
+### <a id="gdpr-forget-me"></a>GDPR right to be forgotten
+
+In accordance with article 17 of the EU's General Data Protection Regulation (GDPR), you can notify Adjust when a user has exercised their right to be forgotten. Calling the following method will instruct the Adjust SDK to communicate the user's choice to be forgotten to the Adjust backend:
+
+```cpp
+Adjust2dx::gdprForgetMe();
+```
+
+Upon receiving this information, Adjust will erase the user's data and the Adjust SDK will stop tracking the user. No requests from this device will be sent to Adjust in the future.
 
 ### <a id="sdk-signature"></a>SDK signature
 

doc/migrate.md

@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for Cocos2d-x to 4.12.1 from 4.0.x
+## Migrate your adjust SDK for Cocos2d-x to 4.13.0 from 4.0.x
 
 ### SDK initialization
 

iOS/AdjustSdk.framework/Versions/A/Headers/Adjust.h

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust
 //
-//  V4.12.3
+//  V4.13.0
 //  Created by Christian Wellenbrock (wellle) on 23rd July 2013.
 //  Copyright © 2012-2017 Adjust GmbH. All rights reserved.
 //
@@ -14,7 +14,9 @@
 @interface AdjustTestOptions : NSObject
 
 @property (nonatomic, copy, nullable) NSString *baseUrl;
+@property (nonatomic, copy, nullable) NSString *gdprUrl;
 @property (nonatomic, copy, nullable) NSString *basePath;
+@property (nonatomic, copy, nullable) NSString *gdprPath;
 @property (nonatomic, copy, nullable) NSNumber *timerIntervalInMilliseconds;
 @property (nonatomic, copy, nullable) NSNumber *timerStartInMilliseconds;
 @property (nonatomic, copy, nullable) NSNumber *sessionIntervalInMilliseconds;
@@ -205,6 +207,11 @@ extern NSString * __nonnull const ADJEnvironmentProduction;
  */
 + (void)resetSessionPartnerParameters;
 
+/**
+ * @brief Give right user to be forgotten in accordance with GDPR law.
+ */
++ (void)gdprForgetMe;
+
 /**
  * Obtain singleton Adjust object.
  */
@@ -244,6 +251,8 @@ extern NSString * __nonnull const ADJEnvironmentProduction;
 
 - (void)addSessionCallbackParameter:(nonnull NSString *)key value:(nonnull NSString *)value;
 
+- (void)gdprForgetMe;
+
 - (BOOL)isEnabled;
 
 - (nullable NSString *)adid;