Merge pull request #32 from adjust/v4130

Version 4.13.0

Author: uerceg

.gitmodules

@@ -1,8 +1,8 @@
 [submodule "ext/Android/sdk"]
 	path = ext/Android/sdk
-	url = [email protected]:adjust/android_sdk_dev.git
+	url = [email protected]:adjust/android_sdk.git
 	branch = master
 [submodule "ext/iOS/sdk"]
 	path = ext/iOS/sdk
-	url = [email protected]:adjust/ios_sdk_dev.git
+	url = [email protected]:adjust/ios_sdk.git
 	branch = master

CHANGELOG.md

@@ -1,3 +1,13 @@
+### Version 4.13.0 (22nd May 2018)
+#### Added
+- Added `gdprForgetMe` method to `Adjust` 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]
+
+---
+
 ### Version 4.12.3 (12th March 2018)
 #### Native changes
 - https://github.com/adjust/android_sdk/blob/master/CHANGELOG.md#version-4124-9th-march-2018
@@ -203,6 +213,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.10.4]: https://github.com/adjust/android_sdk/tree/v4.10.4
 [android_sdk_v4.11.0]: https://github.com/adjust/android_sdk/tree/v4.11.0
@@ -214,3 +225,4 @@
 [android_sdk_v4.12.2]: https://github.com/adjust/android_sdk/tree/v4.12.2
 [android_sdk_v4.12.3]: https://github.com/adjust/android_sdk/tree/v4.12.3
 [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

README.md

@@ -24,26 +24,27 @@ This is the React Native SDK of Adjust™. You can read more about Adjust™ at
       * [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)
+   * [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)
       * [Google Play Services advertising identifier](#di-gps-adid)
       * [Amazon advertising identifier](#di-fire-adid)
       * [Adjust device identifier](#di-adid)
-    * [Push token](#push-token)
-    * [Track additional device identifiers](#track-additional-ids)
-    * [Pre-installed trackers](#pre-installed-trackers)
-    * [Deep linking](#deeplinking)
+   * [Push token](#push-token)
+   * [Track additional device identifiers](#track-additional-ids)
+   * [Pre-installed trackers](#pre-installed-trackers)
+   * [Deep linking](#deeplinking)
       * [Standard deep linking](#deeplinking-standard)
       * [Deferred deep linking](#deeplinking-deferred)
       * [Reattribution via deep links](#deeplinking-reattribution)
@@ -614,6 +615,16 @@ adjustConfig.setEventBufferingEnabled(true);
 Adjust.create(adjustConfig);
 ```
 
+### <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:
+
+```js
+Adjust.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.

VERSION

@@ -1 +1 @@
-4.12.3
+4.13.0

android/libs/adjust-android.jar

@@ -1,10 +1,9 @@
 //
 //  Adjust.java
-//  Adjust
+//  Adjust SDK
 //
-//  Created by Abdullah Obaied on 2016-10-19.
-//  Copyright (c) 2016 adjust GmbH. All rights reserved.
-//  See the file MIT-LICENSE for copying permission.
+//  Created by Abdullah Obaied (@obaied) on 19th Octover 2016.
+//  Copyright (c) 2016-2018 Adjust GmbH. All rights reserved.
 //
 
 package com.adjust.nativemodule;
@@ -116,7 +115,7 @@ public void create(ReadableMap mapConfig) {
         boolean isDeviceKnown               = false;
         boolean readMobileEquipmentIdentity = false;
 
-        // Check for isLogLevelSuppress.
+        // Suppress log level
         if (!mapConfig.isNull("logLevel")) {
             logLevel = mapConfig.getString("logLevel");
 
@@ -125,7 +124,7 @@ public void create(ReadableMap mapConfig) {
             }
         }
 
-        // Check for appToken and environment.
+        // App token and environment.
         appToken    = mapConfig.getString("appToken");
         environment = mapConfig.getString("environment");
 
@@ -277,7 +276,7 @@ public void trackEvent(ReadableMap mapEvent) {
         final Map<String, Object> partnerParameters  = AdjustUtil.toMap(mapEvent.getMap("partnerParameters"));
 
         AdjustEvent event = new AdjustEvent(eventToken);
-        
+
         if (event.isValid()) {
             if (!mapEvent.isNull("revenue")) {
                 event.setRevenue(mapEvent.getDouble("revenue"), currency);
@@ -315,9 +314,7 @@ public void isEnabled(Callback callback) {
 
     @ReactMethod
     public void setReferrer(String referrer) {
-        com.adjust.sdk.Adjust.setReferrer(
-                referrer,
-                getReactApplicationContext());
+        com.adjust.sdk.Adjust.setReferrer(referrer, getReactApplicationContext());
     }
 
     @ReactMethod
@@ -327,7 +324,7 @@ public void setOfflineMode(Boolean enabled) {
 
     @ReactMethod
     public void setPushToken(String token) {
-        com.adjust.sdk.Adjust.setPushToken(token);
+        com.adjust.sdk.Adjust.setPushToken(token, getReactApplicationContext());
     }
 
     @ReactMethod
@@ -371,6 +368,11 @@ public void resetSessionPartnerParameters() {
         com.adjust.sdk.Adjust.resetSessionPartnerParameters();
     }
 
+    @ReactMethod
+    public void gdprForgetMe() {
+        com.adjust.sdk.Adjust.gdprForgetMe(getReactApplicationContext());
+    }
+
     @ReactMethod
     public void getIdfa(Callback callback) {
         callback.invoke("");

android/src/main/java/com/adjust/sdk/Adjust.java

@@ -1,10 +1,9 @@
 //
 //  AdjustPackage.java
-//  Adjust
+//  Adjust SDK
 //
-//  Created by Abdullah Obaied on 2016-10-19.
-//  Copyright (c) 2016 adjust GmbH. All rights reserved.
-//  See the file MIT-LICENSE for copying permission.
+//  Created by Abdullah Obaied (@obaied) on 19th Octover 2016.
+//  Copyright (c) 2016-2018 Adjust GmbH. All rights reserved.
 //
 
 package com.adjust.nativemodule;

android/src/main/java/com/adjust/sdk/AdjustPackage.java

@@ -1,10 +1,9 @@
 //
 //  AdjustUtil.java
-//  Adjust
+//  Adjust SDK
 //
-//  Created by Abdullah Obaied on 2016-10-19.
-//  Copyright (c) 2016 adjust GmbH. All rights reserved.
-//  See the file MIT-LICENSE for copying permission.
+//  Created by Abdullah Obaied (@obaied) on 19th Octover 2016.
+//  Copyright (c) 2016-2018 Adjust GmbH. All rights reserved.
 //
 
 package com.adjust.nativemodule;

android/src/main/java/com/adjust/sdk/AdjustUtil.java

@@ -12,14 +12,19 @@
 ; For RN Apps installed via npm, "Libraries" folder is inside
 ; "node_modules/react-native" but in the source repo it is in the root
 .*/Libraries/react-native/React.js
-.*/Libraries/react-native/ReactNative.js
+
+; Ignore polyfills
+.*/Libraries/polyfills/.*
+
+; Ignore metro
+.*/node_modules/metro/.*
 
 [include]
 
 [libs]
 node_modules/react-native/Libraries/react-native/react-native-interface.js
-node_modules/react-native/flow
-flow/
+node_modules/react-native/flow/
+node_modules/react-native/flow-github/
 
 [options]
 emoji=true
@@ -30,16 +35,20 @@ munge_underscores=true
 
 module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
 
+module.file_ext=.js
+module.file_ext=.jsx
+module.file_ext=.json
+module.file_ext=.native.js
+
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
-suppress_type=$FixMe
+suppress_type=$FlowFixMeProps
+suppress_type=$FlowFixMeState
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
-unsafe.enable_getters_and_setters=true
-
 [version]
-^0.49.1
+^0.67.0

example/.flowconfig

@@ -46,8 +46,11 @@ buck-out/
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+# https://docs.fastlane.tools/best-practices/source-control/
 
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
+*/fastlane/report.xml
+*/fastlane/Preview.html
+*/fastlane/screenshots
+
+# Bundle artifact
+*.jsbundle