Merge branch 'dev' of github.com:adaptyteam/AdaptySDK-Unity into dev

# Conflicts: # ProjectSettings/GvhProjectSettings.xml
adaptyteam · Jan 17, 2023 · b93a420 · b93a420
2 parents dc5be1a + a560d92
commit b93a420
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 15 deletions.
diff --git a/Assets/Adapty.meta b/Assets/Adapty.meta
diff --git a/Assets/Adapty/Plugins.meta b/Assets/Adapty/Plugins.meta
diff --git a/Assets/AdaptySDK/Editor/AdaptySDKDependencies.xml b/Assets/AdaptySDK/Editor/AdaptySDKDependencies.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dependencies>
 	<androidPackages>
-		<androidPackage spec="com.adapty.internal:unity-wrapper:2.2.2">
-			<repositories>
-				<repository>Assets/GeneratedLocalRepo</repository>
-			</repositories>
-		</androidPackage>
-		<androidPackage spec="com.adapty.internal:crossplatform:2.2.1">
-			<repositories>
-				<repository>Assets/GeneratedLocalRepo</repository>
-			</repositories>
-		</androidPackage>
 		<androidPackage spec="com.github.adaptyteam:AdaptySDK-Android:2.2.2">
 			<repositories>
 				<repository>https://jitpack.io</repository>

diff --git a/Assets/GeneratedLocalRepo/com/adapty/internal/unity-wrapper/2.2.2/unity-wrapper-2.2.2.aar b/Assets/GeneratedLocalRepo/com/adapty/internal/unity-wrapper/2.2.2/unity-wrapper-2.2.2.aar
diff --git a/Assets/GeneratedLocalRepo/com/adapty/internal/unity-wrapper/2.2.2/unity-wrapper-2.2.2.pom b/Assets/GeneratedLocalRepo/com/adapty/internal/unity-wrapper/2.2.2/unity-wrapper-2.2.2.pom
@@ -5,4 +5,5 @@
   <artifactId>unity-wrapper</artifactId>
   <version>2.2.2</version>
   <packaging>aar</packaging>
+  <dependencies/>
 </project>
diff --git a/Assets/Plugins/Android/androidx.lifecycle.lifecycle-process-2.2.0.aar b/Assets/Plugins/Android/androidx.lifecycle.lifecycle-process-2.2.0.aar
diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml
@@ -1,7 +1,5 @@
 <dependencies>
   <packages>
-    <package>com.adapty.internal:crossplatform:2.2.1</package>
-    <package>com.adapty.internal:unity-wrapper:2.2.2</package>
     <package>com.github.adaptyteam:AdaptySDK-Android:2.2.2</package>
   </packages>
   <files>

diff --git a/ProjectSettings/GvhProjectSettings.xml b/ProjectSettings/GvhProjectSettings.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <projectSettings>
   <projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
+  <projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
+  <projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />
+  <projectSetting name="GooglePlayServices.PromptBeforeAutoResolution" value="False" />
+  <projectSetting name="GooglePlayServices.UseJetifier" value="True" />
 </projectSettings>
diff --git a/adaptyandroidwrapper/unitywrapper/src/main/java/com/adapty/unity/AdaptyAndroidWrapper.java b/adaptyandroidwrapper/unitywrapper/src/main/java/com/adapty/unity/AdaptyAndroidWrapper.java
@@ -2,6 +2,8 @@
 
 import static com.adapty.unity.Constants.ADAPTY_ERROR_CODE_DECODING_FAILED;
 import static com.adapty.unity.Constants.ADAPTY_ERROR_CODE_KEY;
+import static com.adapty.unity.Constants.ADAPTY_ERROR_DECODING_FAILED_MESSAGE;
+import static com.adapty.unity.Constants.ADAPTY_ERROR_DETAIL_KEY;
 import static com.adapty.unity.Constants.ADAPTY_ERROR_KEY;
 import static com.adapty.unity.Constants.ADAPTY_ERROR_MESSAGE_KEY;
 import static com.adapty.unity.Constants.ADAPTY_ONBOARDING_NAME_KEY;
@@ -264,15 +266,19 @@ private static void sendMessageWithResult(String message, AdaptyAndroidCallback
     }
 
     private static void sendParameterError(String paramKey, String methodName, AdaptyAndroidCallback callback) {
-        String errorMessage = "Error while parsing parameter: " +paramKey + ", method: " + methodName;
         Map<String, Object> message = new HashMap<>();
         Map<String, Object> errorMap = new HashMap<>();
-        errorMap.put(ADAPTY_ERROR_MESSAGE_KEY, errorMessage);
+        errorMap.put(ADAPTY_ERROR_MESSAGE_KEY, ADAPTY_ERROR_DECODING_FAILED_MESSAGE);
         errorMap.put(ADAPTY_ERROR_CODE_KEY, ADAPTY_ERROR_CODE_DECODING_FAILED);
+        errorMap.put(ADAPTY_ERROR_DETAIL_KEY, createErrorDetailsString(paramKey, methodName));
         message.put(ADAPTY_ERROR_KEY, errorMap);
         sendMessageWithResult(helper.toJson(message), callback);
     }
 
+    private static String createErrorDetailsString(String paramKey, String methodName) {
+        return "AdaptyPluginError.decodingFailed(Error while parsing parameter: " + paramKey + ", method: " + methodName + ")";
+    }
+
     private static void sendEmptyResultOrError(AdaptyError error, AdaptyAndroidCallback callback) {
         Map<String, Object> message = new HashMap<>();
         if (error != null) {
@@ -295,12 +301,14 @@ private static void sendDataToMessageHandler(String key, String data) {
 class Constants {
 
     public static final String ADAPTY_SUCCESS_KEY = "success";
-    public static final String ADAPTY_PROFILE_UPDATE_KEY = "purchaser_info_update";
+    public static final String ADAPTY_PROFILE_UPDATE_KEY = "did_load_latest_profile";
     public static final String ADAPTY_ONBOARDING_NAME_KEY = "onboarding_name";
     public static final String ADAPTY_ONBOARDING_SCREEN_NAME_KEY = "onboarding_screen_name";
     public static final String ADAPTY_ONBOARDING_SCREEN_ORDER_KEY = "onboarding_screen_order";
     public static final String ADAPTY_ERROR_KEY = "error";
     public static final String ADAPTY_ERROR_CODE_KEY = "adapty_code";
     public static final String ADAPTY_ERROR_MESSAGE_KEY = "message";
+    public static final String ADAPTY_ERROR_DETAIL_KEY = "detail";
+    public static final String ADAPTY_ERROR_DECODING_FAILED_MESSAGE = "Decoding failed";
     public static final int ADAPTY_ERROR_CODE_DECODING_FAILED = 2006;
 }