feat: update store info logic

Author: shashanksu

Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustStoreInfo.java

@@ -1,19 +1,19 @@
 package com.adjust.sdk;
 
 public class AdjustStoreInfo {
-    String storeType;
-    String appId;
+    String storeName;
+    String storeAppId;
 
-    public AdjustStoreInfo(String storeType, String appId) {
-        this.storeType = storeType;
-        this.appId = appId;
+    public AdjustStoreInfo(String storeName, String storeAppId) {
+        this.storeName = storeName;
+        this.storeAppId = storeAppId;
     }
 
-    public String getStoreType() {
-        return storeType;
+    public String getStoreName() {
+        return storeName;
     }
 
-    public String getAppId() {
-        return appId;
+    public String getStoreAppId() {
+        return storeAppId;
     }
 }

Adjust/sdk-core/src/main/java/com/adjust/sdk/DeviceInfo.java

@@ -100,9 +100,8 @@ class DeviceInfo {
     int connectivityType;
     String mcc;
     String mnc;
-    AdjustStoreInfo storeInfoApi;
-    AdjustStoreInfo storeInfoManifest;
-    String storeIdSystem;
+    AdjustStoreInfo storeInfoFromClient;
+    String storeIdFromSystem;
 
     DeviceInfo(AdjustConfig adjustConfig) {
         Context context = adjustConfig.context;
@@ -140,9 +139,8 @@ class DeviceInfo {
         if (Util.canReadPlayIds(adjustConfig)) {
             appSetId = Reflection.getAppSetId(context);
         }
-        storeInfoApi = StoreInfoUtil.getStoreInfoFromApi(adjustConfig);
-        storeInfoManifest = StoreInfoUtil.getStoreInfoFromManifest(context);
-        storeIdSystem = StoreInfoUtil.getStoreIdFromSystem(context);
+        storeInfoFromClient = StoreInfoUtil.getStoreInfoFromClient(adjustConfig, context);
+        storeIdFromSystem = StoreInfoUtil.getStoreIdFromSystem(context);
     }
 
     void reloadPlayIds(final AdjustConfig adjustConfig) {

Adjust/sdk-core/src/main/java/com/adjust/sdk/PackageBuilder.java

@@ -1257,15 +1257,11 @@ private void injectFeatureFlagsWithParameters(Map<String, String> parameters) {
     }
 
     private void injectStoreInfoToParameters(Map<String, String> parameters) {
-        if (deviceInfo.storeInfoApi != null) {
-            PackageBuilder.addString(parameters, "store_api", deviceInfo.storeInfoApi.storeType);
-            PackageBuilder.addString(parameters, "app_id_api", deviceInfo.storeInfoApi.appId);
+        if (deviceInfo.storeInfoFromClient != null) {
+            PackageBuilder.addString(parameters, "store_name_from_client", deviceInfo.storeInfoFromClient.storeName);
+            PackageBuilder.addString(parameters, "store_app_id_from_client", deviceInfo.storeInfoFromClient.storeAppId);
         }
-        if (deviceInfo.storeInfoManifest != null) {
-            PackageBuilder.addString(parameters, "store_manifest", deviceInfo.storeInfoManifest.storeType);
-            PackageBuilder.addString(parameters, "app_id_manifest", deviceInfo.storeInfoManifest.appId);
-        }
-        PackageBuilder.addString(parameters, "store_system", deviceInfo.storeIdSystem);
+        PackageBuilder.addString(parameters, "store_name_from_system", deviceInfo.storeIdFromSystem);
     }
 
     public static void addString(Map<String, String> parameters, String key, String value) {

Adjust/sdk-core/src/main/java/com/adjust/sdk/StoreInfoUtil.java

@@ -24,28 +24,24 @@ public static String getStoreIdFromSystem(final Context context) {
         }
     }
 
-    public static AdjustStoreInfo getStoreInfoFromManifest(final Context context) {
+    public static AdjustStoreInfo getStoreInfoFromClient(final AdjustConfig adjustConfig, final Context context) {
         try {
             ApplicationInfo applicationInfo = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
             Bundle metaData = applicationInfo.metaData;
             if (metaData == null) {
-                return null;
+                return adjustConfig.adjustStoreInfo;
             }
 
-            String storeType = metaData.getString("ADJUST_STORE_TYPE");
-            String storeAppId = metaData.getString("ADJUST_STORE_APP_ID");
-
-            if (storeType == null || storeAppId == null) {
-                return null;
+            String storeName = metaData.getString("ADJUST_STORE_NAME");
+            if (storeName == null || storeName.isEmpty()) {
+                return adjustConfig.adjustStoreInfo;
             }
 
-            return new AdjustStoreInfo(storeType, storeAppId);
+            String storeAppId = metaData.getString("ADJUST_STORE_APP_ID");
+
+            return new AdjustStoreInfo(storeName, storeAppId);
         } catch (Exception e) {
-            return null;
+            return adjustConfig.adjustStoreInfo;
         }
     }
-
-    public static AdjustStoreInfo getStoreInfoFromApi(final AdjustConfig adjustConfig) {
-        return adjustConfig.adjustStoreInfo;
-    }
 }