Join available imeis

Author: nonelse

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

@@ -277,9 +277,9 @@ private void injectConfig(Map<String, String> parameters) {
         if (adjustConfig.readMobileEquipmentIdentity) {
             TelephonyManager telephonyManager = (TelephonyManager)adjustConfig.context.getSystemService(Context.TELEPHONY_SERVICE);
 
-            PackageBuilder.addString(parameters, "device_id", Util.getTelephonyId(telephonyManager));
-            PackageBuilder.addString(parameters, "imei", Util.getIMEI(telephonyManager, 0));
-            PackageBuilder.addString(parameters, "meid", Util.getMEID(telephonyManager, 0));
+            PackageBuilder.addString(parameters, "device_ids", Util.getTelephonyIds(telephonyManager));
+            PackageBuilder.addString(parameters, "imeis", Util.getIMEIs(telephonyManager));
+            PackageBuilder.addString(parameters, "meids", Util.getMEIDs(telephonyManager));
         }
     }
 

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

@@ -136,6 +136,15 @@ public static String getTelephonyId(TelephonyManager telephonyManager) {
         }
     }
 
+    public static String getTelephonyId(TelephonyManager telephonyManager, int index) {
+        // return telephonyManager.getDeviceId();
+        try {
+            return (String) invokeInstanceMethod(telephonyManager, "getDeviceId", new Class[]{int.class}, index);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
     private static Object getAdvertisingInfoObject(Context context)
             throws Exception {
         return invokeStaticMethod("com.google.android.gms.ads.identifier.AdvertisingIdClient",

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

@@ -34,7 +34,9 @@
 import java.security.MessageDigest;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
@@ -147,6 +149,66 @@ public static String getMEID(TelephonyManager telephonyManager, int index) {
         return Reflection.getMeid(telephonyManager, index);
     }
 
+    public static String getTelephonyId(TelephonyManager telephonyManager, int index) {
+        return Reflection.getTelephonyId(telephonyManager, index);
+    }
+
+    public static String getTelephonyIds(TelephonyManager telephonyManager) {
+        List<String> telephonyIds = new ArrayList<String>();
+
+        String telephonyId0 = getTelephonyId(telephonyManager, 0);
+        if (telephonyId0 != null) {
+            telephonyIds.add(telephonyId0);
+        }
+
+        for (int i = 1; i < 10; i++) {
+            String telephonyId = getTelephonyId(telephonyManager, i);
+            if (telephonyId == null) {
+                break;
+            }
+            telephonyIds.add(telephonyId);
+        }
+
+        return TextUtils.join(",", telephonyIds);
+    }
+
+    public static String getIMEIs(TelephonyManager telephonyManager) {
+        List<String> imeis = new ArrayList<String>();
+
+        String imei0 = getIMEI(telephonyManager, 0);
+        if (imei0!= null) {
+            imeis.add(imei0);
+        }
+
+        for (int i = 1; i < 10; i++) {
+            String imei = getIMEI(telephonyManager, i);
+            if (imei == null) {
+                break;
+            }
+            imeis.add(imei);
+        }
+
+        return TextUtils.join(",", imeis);
+    }
+
+    public static String getMEIDs(TelephonyManager telephonyManager) {
+        List<String> meids = new ArrayList<String>();
+
+        String meid0 = getMEID(telephonyManager, 0);
+        if (meid0 != null) {
+            meids.add(meid0);
+        }
+
+        for (int i = 1; i < 10; i++) {
+            String meid = getMEID(telephonyManager, i);
+            if (meid == null) {
+                break;
+            }
+            meids.add(meid);
+        }
+
+        return TextUtils.join(",", meids);
+    }
 
     public static <T> T readObject(Context context, String filename, String objectName, Class<T> type) {
         Closeable closable = null;