Merge pull request #493 from adjust/v4282

Version 4.28.2
adjust · Jun 11, 2021 · ae53b7f · ae53b7f
2 parents af7043f + 8ed51c4
commit ae53b7f
Show file tree

Hide file tree

Showing 26 changed files with 208 additions and 34 deletions.
diff --git a/Adjust/build.gradle b/Adjust/build.gradle
@@ -9,7 +9,7 @@ ext {
     coreMinSdkVersion = 9
     coreCompileSdkVersion = 30
     coreTargetSdkVersion = 30
-    coreVersionName = '4.28.1'
+    coreVersionName = '4.28.2'
     defaultVersionCode = 1
     webbridgeMinSdkVersion = 17
 

diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java
@@ -32,7 +32,7 @@ private Adjust() {
      */
     public static synchronized AdjustInstance getDefaultInstance() {
         @SuppressWarnings("unused")
-        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.28.1";
+        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.28.2";
 
         if (defaultInstance == null) {
             defaultInstance = new AdjustInstance();

diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java
@@ -29,7 +29,7 @@ public interface Constants {
 
     String SCHEME = "https";
     String AUTHORITY = "app.adjust.com";
-    String CLIENT_SDK = "android4.28.1";
+    String CLIENT_SDK = "android4.28.2";
     String LOGTAG = "Adjust";
     String REFTAG = "reftag";
     String INSTALL_REFERRER = "install_referrer";

diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/PackageFactory.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/PackageFactory.java
@@ -87,12 +87,27 @@ public static ActivityPackage buildDeeplinkSdkClickPackage(final Uri url,
             return null;
         }
 
-        AdjustFactory.getLogger().verbose("Url to parse (%s)", url);
+        String urlStringDecoded;
+
+        try {
+            urlStringDecoded = URLDecoder.decode(urlString, ENCODING);
+        } catch (UnsupportedEncodingException e) {
+            urlStringDecoded = urlString;
+            AdjustFactory.getLogger().error("Deeplink url decoding failed due to UnsupportedEncodingException. Message: (%s)", e.getMessage());
+        } catch (IllegalArgumentException e) {
+            urlStringDecoded = urlString;
+            AdjustFactory.getLogger().error("Deeplink url decoding failed due to IllegalArgumentException. Message: (%s)", e.getMessage());
+        } catch (Exception e) {
+            urlStringDecoded = urlString;
+            AdjustFactory.getLogger().error("Deeplink url decoding failed. Message: (%s)", e.getMessage());
+        }
+
+        AdjustFactory.getLogger().verbose("Url to parse (%s)", urlStringDecoded);
 
         UrlQuerySanitizer querySanitizer = new UrlQuerySanitizer();
         querySanitizer.setUnregisteredParameterValueSanitizer(UrlQuerySanitizer.getAllButNulLegal());
         querySanitizer.setAllowUnregisteredParamaters(true);
-        querySanitizer.parseUrl(urlString);
+        querySanitizer.parseUrl(urlStringDecoded);
 
         PackageBuilder clickPackageBuilder = queryStringClickPackageBuilder(
                 querySanitizer.getParameterList(),

diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/SharedPreferencesManager.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/SharedPreferencesManager.java
@@ -235,8 +235,6 @@ public synchronized String getPreinstallReferrer() {
 
     /**
      * Remove saved preinstall referrer string from shared preferences.
-     *
-     * @return referrer Preinstall referrer string
      */
     public synchronized void removePreinstallReferrer() {
         remove(PREFS_KEY_PREINSTALL_SYSTEM_INSTALLER_REFERRER);

diff --git a/Adjust/sdk-plugin-criteo/build.gradle b/Adjust/sdk-plugin-criteo/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.1'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.2'
 }
 
 task adjustCriteoAndroidAar (type: Copy) {

diff --git a/Adjust/sdk-plugin-imei/build.gradle b/Adjust/sdk-plugin-imei/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.1'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.2'
 }
 
 task adjustImeiAndroidAar (type: Copy) {

diff --git a/Adjust/sdk-plugin-oaid/build.gradle b/Adjust/sdk-plugin-oaid/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.1'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.2'
 }
 
 task adjustOaidAndroidAar (type: Copy) {

diff --git a/Adjust/sdk-plugin-sociomantic/build.gradle b/Adjust/sdk-plugin-sociomantic/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.1'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.2'
 }
 
 task adjustSociomanticAndroidAar (type: Copy) {

diff --git a/Adjust/sdk-plugin-trademob/build.gradle b/Adjust/sdk-plugin-trademob/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.1'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.2'
 }
 
 task adjustTrademobAndroidAar (type: Copy) {

diff --git a/Adjust/sdk-plugin-webbridge/build.gradle b/Adjust/sdk-plugin-webbridge/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.1'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.2'
 }
 
 task adjustWebBridgeAndroidAar (type: Copy) {

diff --git a/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js b/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js
@@ -211,7 +211,7 @@ var Adjust = {
         if (this.adjustConfig) {
             return this.adjustConfig.getSdkPrefix();
         } else {
-            return 'web-bridge4.28.1';
+            return 'web-bridge4.28.2';
         }
     },
 

diff --git a/Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java b/Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java
@@ -53,7 +53,7 @@ public TestActivityPackage(ActivityPackage activityPackage) {
         // default values
         appToken = "123456789012";
         environment = "sandbox";
-        clientSdk = "android4.28.1";
+        clientSdk = "android4.28.2";
         suffix = "";
         attribution = new AdjustAttribution();
         playServices = true;

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### Version 4.28.2 (11th June 2021)
+#### Changed
+- Added deep link URL decoding before parsing its parameters.
+
+---
+
 ### Version 4.28.1 (12th May 2021)
 #### Added
 - [beta] Added data residency support for US region. You can choose this setting by calling `setUrlStrategy` method of `AdjustConfig` instance with `AdjustConfig.DATA_RESIDENCY_US` parameter.

diff --git a/README.md b/README.md
@@ -104,14 +104,14 @@ These are the minimum required steps to integrate the Adjust SDK in your Android
 If you are using Maven, add the following to your `build.gradle` file:
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android:4.28.1'
+implementation 'com.adjust.sdk:adjust-android:4.28.2'
 implementation 'com.android.installreferrer:installreferrer:2.2'
 ```
 
 If you would prefer to use the Adjust SDK inside web views in your app, please include this additional dependency as well:
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.1'
+implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.2'
 ```
 
 **Note**: The minimum supported Android API level for the web view extension is 17 (Jelly Bean).

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.28.1
+4.28.2
diff --git a/doc/chinese/README.md b/doc/chinese/README.md
@@ -102,14 +102,14 @@
 如果您使用的是 Maven，请添加下行到您的 `build.gradle` 文件：
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android:4.28.1'
+implementation 'com.adjust.sdk:adjust-android:4.28.2'
 implementation 'com.android.installreferrer:installreferrer:2.2'
 ```
 
 如果您想在应用 web view 中使用 Adjust SDK，请也添加下列附加依赖项：
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.1'
+implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.2'
 ```
 
 **请注意:** web view 扩展支持的最低安卓 API 级别为 17 (Jelly Bean)。

diff --git a/doc/chinese/plugins/oaid.md b/doc/chinese/plugins/oaid.md
@@ -13,8 +13,8 @@ OAID 是由移动安全联盟 (MSA) 推出的广告 ID。所有中国国内的
 如果您使用的是 Maven，请将以下 OAID 插件依赖项添加到现有 Adjust SDK 依赖项旁的 `build.gradle` 文件：
 
 ```
-implementation 'com.adjust.sdk:adjust-android:4.28.1'
-implementation 'com.adjust.sdk:adjust-android-oaid:4.28.1'
+implementation 'com.adjust.sdk:adjust-android:4.28.2'
+implementation 'com.adjust.sdk:adjust-android-oaid:4.28.2'
 ```
 
 您还可以将 Adjust OAID 插件作为 JAR 文件进行添加，该文件可从我们的 [版本页面][releases] 下载。

diff --git a/doc/english/migration/migrate.md b/doc/english/migration/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your Adjust SDK for Android to 4.28.1 from 3.6.2
+## Migrate your Adjust SDK for Android to 4.28.2 from 3.6.2
 
 ### The Application class
 

diff --git a/doc/english/plugins/oaid.md b/doc/english/plugins/oaid.md
@@ -12,8 +12,8 @@ To enable the Adjust SDK to collect and track OAID, follow these steps. To only
 If you are using Maven, add the following OAID plugin dependency to your `build.gradle` file next to the existing Adjust SDK dependency:
 
 ```
-implementation 'com.adjust.sdk:adjust-android:4.28.1'
-implementation 'com.adjust.sdk:adjust-android-oaid:4.28.1'
+implementation 'com.adjust.sdk:adjust-android:4.28.2'
+implementation 'com.adjust.sdk:adjust-android-oaid:4.28.2'
 ```
 
 You can also add the Adjust OAID plugin as JAR file, which you can download from our [releases page][releases].

diff --git a/doc/japanese/README.md b/doc/japanese/README.md
@@ -101,14 +101,14 @@ Adjust SDKをAndroidプロジェクトに実装する手順を説明します。
 Mavenを使用している場合は、以下の内容を`build.gradle`ファイルに追加します。file:
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android:4.28.1'
+implementation 'com.adjust.sdk:adjust-android:4.28.2'
 implementation 'com.android.installreferrer:installreferrer:2.2'
 ```
 
 アプリの WebView内でAdjust SDKを使用したい場合は、以下のdependencyを追加してください。
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.1'
+implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.2'
 ```
 
 **注意**：WebView拡張機能用にサポートされている最小のAndroid APIレベルは17（Jelly Bean）です。

diff --git a/doc/japanese/migration/migrate.md b/doc/japanese/migration/migrate.md
@@ -1,4 +1,4 @@
-## Android用adjust SDKのv3.6.2からv4.28.1への移行
+## Android用adjust SDKのv3.6.2からv4.28.2への移行
 
 ### アプリケーションクラス
 

diff --git a/doc/japanese/plugins/oaid.md b/doc/japanese/plugins/oaid.md
@@ -13,8 +13,8 @@ Adjust SDKがOAID値を収集し計測するための設定手順は、以下の
 Mavenを使用している場合は、以下のOAIDプラグイン dependencyを、既存のAdjust SDKのdependencyの隣にあるbuild.gradle` file に追加します：
 
 ```
-implementation 'com.adjust.sdk:adjust-android:4.28.1'
-implementation 'com.adjust.sdk:adjust-android-oaid:4.28.1'
+implementation 'com.adjust.sdk:adjust-android:4.28.2'
+implementation 'com.adjust.sdk:adjust-android-oaid:4.28.2'
 ```
 
 Adjust OAIDプラグインを JARファイルとして追加することもできます。JARファイルは、[releases page][releases] からダウンロードすることができます。

diff --git a/doc/korean/README.md b/doc/korean/README.md
@@ -104,14 +104,14 @@ Adjust™의 Android SDK에 관한 문서입니다. Adjust™에 대한 자세
 Maven을 사용하는 경우, 다음을 `build.gradle` 파일에 추가하시기 바랍니다.
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android:4.28.1'
+implementation 'com.adjust.sdk:adjust-android:4.28.2'
 implementation 'com.android.installreferrer:installreferrer:2.2'
 ```
 
 앱의 웹뷰 안에서 Adjust SDK를 사용하고자 하는 경우, 다음의 추가적인 dependency를 추가하시기 바랍니다.
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.1'
+implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.2'
 ```
 
 **참고**: 웹뷰 확장에 필요한 Android API의 최소 지원 레벨은 17(Jelley Bean)입니다.