Merge pull request #84 from adjust/v4210

Version 4.21.0

Author: uerceg

.gitmodules

@@ -6,3 +6,6 @@
 	path = ext/ios/sdk
 	url = https://github.com/adjust/ios_sdk.git
 	branch = master
+[submodule "ext/scripts"]
+	path = ext/scripts
+	url = https://github.com/adjust/sdk_scripts.git

.npmignore

@@ -12,6 +12,5 @@ node_modules
 
 # Adjust SDK
 ext/
-scripts/
 example/
 test/

CHANGELOG.md

@@ -1,3 +1,17 @@
+### Version 4.21.0 (1st April 2020)
+#### Added
+- Added `disableThirdPartySharing` method to `Adjust` interface to allow disabling of data sharing with third parties outside of Adjust ecosystem.
+- Added support for signature library as a plugin.
+- Added more aggressive sending retry logic for install session package.
+- Added additional parameters to `ad_revenue` package payload.
+- Added external device ID support.
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.21.0]
+- [[email protected]][android_sdk_v4.21.0]
+
+---
+
 ### Version 4.18.2 (11th October 2019)
 #### Added
 - Added `convertUniversalLink` method from native iOS SDK to JS API (thanks to @tootsweet).
@@ -322,6 +336,7 @@
 [ios_sdk_v4.17.2]: https://github.com/adjust/ios_sdk/tree/v4.17.2
 [ios_sdk_v4.18.0]: https://github.com/adjust/ios_sdk/tree/v4.18.0
 [ios_sdk_v4.18.3]: https://github.com/adjust/ios_sdk/tree/v4.18.3
+[ios_sdk_v4.21.0]: https://github.com/adjust/ios_sdk/tree/v4.21.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
@@ -339,3 +354,4 @@
 [android_sdk_v4.17.0]: https://github.com/adjust/android_sdk/tree/v4.17.0
 [android_sdk_v4.18.0]: https://github.com/adjust/android_sdk/tree/v4.18.0
 [android_sdk_v4.18.3]: https://github.com/adjust/android_sdk/tree/v4.18.3
+[android_sdk_v4.21.0]: https://github.com/adjust/android_sdk/tree/v4.21.0

README.md

@@ -35,6 +35,7 @@ This is the React Native SDK of Adjust™. You can read more about Adjust™ at
    * [Offline mode](#offline-mode)
    * [Event buffering](#event-buffering)
    * [GDPR right to be forgotten](#gdpr-forget-me)
+   * [Disable third-party sharing](#disable-third-party-sharing)
    * [SDK signature](#sdk-signature)
    * [Background tracking](#background-tracking)
    * [Device IDs](#device-ids)
@@ -638,6 +639,19 @@ 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="disable-third-party-sharing"></a>Disable third-party sharing for specific users
+
+You can now notify Adjust when a user has exercised their right to stop sharing their data with partners for marketing purposes, but has allowed it to be shared for statistics purposes. 
+
+Call the following method to instruct the Adjust SDK to communicate the user's choice to disable data sharing to the Adjust backend:
+
+
+```cs
+Adjust.disableThirdPartySharing();
+```
+
+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.
+
 ### <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.18.2
+4.21.0

android/libs/adjust-android.jar

@@ -107,6 +107,7 @@ public void create(ReadableMap mapConfig) {
         String userAgent = null;
         String processName = null;
         String defaultTracker = null;
+        String externalDeviceId = null;
         long secretId  = 0L;
         long info1 = 0L;
         long info2 = 0L;
@@ -189,6 +190,12 @@ public void create(ReadableMap mapConfig) {
             adjustConfig.setDefaultTracker(defaultTracker);
         }
 
+        // External device ID.
+        if (checkKey(mapConfig, "externalDeviceId")) {
+            externalDeviceId = mapConfig.getString("externalDeviceId");
+            adjustConfig.setExternalDeviceId(externalDeviceId);
+        }
+
         // User agent.
         if (checkKey(mapConfig, "userAgent")) {
             userAgent = mapConfig.getString("userAgent");
@@ -429,6 +436,11 @@ public void gdprForgetMe() {
         com.adjust.sdk.Adjust.gdprForgetMe(getReactApplicationContext());
     }
 
+    @ReactMethod
+    public void disableThirdPartySharing() {
+        com.adjust.sdk.Adjust.disableThirdPartySharing(getReactApplicationContext());
+    }
+
     @ReactMethod
     public void getIdfa(Callback callback) {
         callback.invoke("");

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

@@ -21,7 +21,7 @@ node_modules/warning/.*
 [include]
 
 [libs]
-node_modules/react-native/Libraries/react-native/react-native-interface.js
+node_modules/react-native/interface.js
 node_modules/react-native/flow/
 
 [options]
@@ -36,9 +36,8 @@ module.file_ext=.ios.js
 
 munge_underscores=true
 
-module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation'
 module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
-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\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
+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\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
 
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
@@ -72,4 +71,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.105.0
+^0.113.0

example/.flowconfig

@@ -3,7 +3,7 @@
  * https://github.com/facebook/react-native
  *
  * @format
- * @flow
+ * @flow strict-local
  */
 
 import React from 'react';
@@ -320,4 +320,4 @@ const styles = StyleSheet.create({
   },
 });
 
-export default App;
+export default App;

example/App.js

@@ -15,7 +15,9 @@ import com.android.build.OutputFile
  *   // the name of the generated asset file containing your JS bundle
  *   bundleAssetName: "index.android.bundle",
  *
- *   // the entry file for bundle generation
+ *   // the entry file for bundle generation. If none specified and
+ *   // "index.android.js" exists, it will be used. Otherwise "index.js" is
+ *   // default. Can be overridden with ENTRY_FILE environment variable.
  *   entryFile: "index.android.js",
  *
  *   // https://facebook.github.io/react-native/docs/performance#enable-the-ram-format
@@ -76,7 +78,6 @@ import com.android.build.OutputFile
  */
 
 project.ext.react = [
-    entryFile: "index.js",
     enableHermes: false,  // clean and rebuild if changing
 ]
 
@@ -132,7 +133,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.0"
+        versionName "4.21.0"
     }
     splits {
         abi {
@@ -162,6 +163,14 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
+
+    packagingOptions {
+        pickFirst "lib/armeabi-v7a/libc++_shared.so"
+        pickFirst "lib/arm64-v8a/libc++_shared.so"
+        pickFirst "lib/x86/libc++_shared.so"
+        pickFirst "lib/x86_64/libc++_shared.so"
+    }
+
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
@@ -179,10 +188,24 @@ android {
 }
 
 dependencies {
-    implementation project(':react-native-adjust')
     implementation fileTree(dir: "libs", include: ["*.jar"])
+    //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
 
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+
+    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
+      exclude group:'com.facebook.fbjni'
+    }
+
+    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.flipper'
+    }
+
+    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.flipper'
+    }
+
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";
         debugImplementation files(hermesPath + "hermes-debug.aar")