Send first positions of imei and meid

Author: nonelse

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

@@ -278,8 +278,8 @@ private void injectConfig(Map<String, String> parameters) {
             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));
+            PackageBuilder.addString(parameters, "imei", Util.getIMEI(telephonyManager, 0));
+            PackageBuilder.addString(parameters, "meid", Util.getMEID(telephonyManager, 0));
         }
     }
 

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

@@ -89,7 +89,7 @@ public static String getAndroidId(Context context) {
         }
     }
 
-    public static String getLinkIMEI(TelephonyManager telephonyManager) {
+    public static String getImei(TelephonyManager telephonyManager) {
         // return telephonyManager.getImei();
         try {
             return (String) invokeInstanceMethod(telephonyManager, "getImei", null);
@@ -98,7 +98,17 @@ public static String getLinkIMEI(TelephonyManager telephonyManager) {
         }
     }
 
-    public static String getLinkMEID(TelephonyManager telephonyManager) {
+    public static String getImei(TelephonyManager telephonyManager, int index) {
+        // return telephonyManager.getImei();
+        try {
+            return (String) invokeInstanceMethod(telephonyManager, "getImei", new Class[]{int.class}, index);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+
+    public static String getMeid(TelephonyManager telephonyManager) {
         // return telephonyManager.getMeid();
         try {
             return (String) invokeInstanceMethod(telephonyManager, "getMeid", null);
@@ -107,6 +117,16 @@ public static String getLinkMEID(TelephonyManager telephonyManager) {
         }
     }
 
+    public static String getMeid(TelephonyManager telephonyManager, int index) {
+        // return telephonyManager.getMeid();
+        try {
+            return (String) invokeInstanceMethod(telephonyManager, "getMeid", new Class[]{int.class}, index);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+
     public static String getTelephonyId(TelephonyManager telephonyManager) {
         // return telephonyManager.getDeviceId();
         try {

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

@@ -132,13 +132,22 @@ public static String getTelephonyId(TelephonyManager telephonyManager) {
     }
 
     public static String getIMEI(TelephonyManager telephonyManager) {
-        return Reflection.getLinkIMEI(telephonyManager);
+        return Reflection.getImei(telephonyManager);
     }
 
     public static String getMEID(TelephonyManager telephonyManager) {
-        return Reflection.getLinkMEID(telephonyManager);
+        return Reflection.getMeid(telephonyManager);
     }
 
+    public static String getIMEI(TelephonyManager telephonyManager, int index) {
+        return Reflection.getImei(telephonyManager, index);
+    }
+
+    public static String getMEID(TelephonyManager telephonyManager, int index) {
+        return Reflection.getMeid(telephonyManager, index);
+    }
+
+
     public static <T> T readObject(Context context, String filename, String objectName, Class<T> type) {
         Closeable closable = null;
         T object = null;