Send Imei separately

Author: nonelse

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

@@ -10,6 +10,8 @@
 package com.adjust.sdk;
 
 import android.content.ContentResolver;
+import android.content.Context;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
 import org.json.JSONObject;
@@ -273,8 +275,11 @@ private void injectConfig(Map<String, String> parameters) {
         PackageBuilder.addString(parameters, "secret_id", adjustConfig.secretId);
         PackageBuilder.addString(parameters, "app_secret", adjustConfig.appSecret);
         if (adjustConfig.readMobileEquipmentIdentity) {
-            String mobileEquipmentId = Util.getMobileEquipmentIdentity(adjustConfig.context);
-            PackageBuilder.addString(parameters, "mobile_equipment_id", mobileEquipmentId);
+            TelephonyManager telephonyManager = (TelephonyManager)adjustConfig.context.getSystemService(Context.TELEPHONY_SERVICE);
+
+            PackageBuilder.addString(parameters, "device_id", Util.getTelephonyId(telephonyManager));
+            PackageBuilder.addString(parameters, "IMEI", Util.getIMEI(telephonyManager));
+            PackageBuilder.addString(parameters, "MEID", Util.getMEID(telephonyManager));
         }
     }
 

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

@@ -89,17 +89,6 @@ public static String getAndroidId(Context context) {
         }
     }
 
-    public static String getMobileEquipmentIdentity(Context context) {
-        try {
-            String mobileEquipmentIdentity = (String) invokeStaticMethod("com.adjust.sdk.plugin.MobileEquipmentIdentityUtil", "getMobileEquipmentIdentity"
-                    , new Class[]{Context.class}, context);
-
-            return mobileEquipmentIdentity;
-        } catch (Throwable t) {
-            return null;
-        }
-    }
-
     public static String getLinkIMEI(TelephonyManager telephonyManager) {
         // return telephonyManager.getImei();
         try {

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

@@ -126,8 +126,17 @@ public static Map<String, String> getPluginKeys(Context context) {
     public static String getAndroidId(Context context) {
         return Reflection.getAndroidId(context);
     }
-    public static String getMobileEquipmentIdentity(Context context) {
-        return Reflection.getMobileEquipmentIdentity(context);
+
+    public static String getTelephonyId(TelephonyManager telephonyManager) {
+        return Reflection.getTelephonyId(telephonyManager);
+    }
+
+    public static String getIMEI(TelephonyManager telephonyManager) {
+        return Reflection.getLinkIMEI(telephonyManager);
+    }
+
+    public static String getMEID(TelephonyManager telephonyManager) {
+        return Reflection.getLinkMEID(telephonyManager);
     }
 
     public static <T> T readObject(Context context, String filename, String objectName, Class<T> type) {

Adjust/adjust/src/main/java/com/adjust/sdk/plugin/MobileEquipmentIdentityUtil.java

@@ -6,15 +6,18 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
     <application
         android:name=".GlobalApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
+
         <receiver
             android:name="com.adjust.sdk.AdjustReferrerReceiver"
-            android:exported="true">
+            android:exported="true" >
             <intent-filter>
                 <action android:name="com.android.vending.INSTALL_REFERRER" />
             </intent-filter>