Use interface for Logger

Adjust/nonplay/src/main/java/com/adjust/sdk/nonplay/TelephonyIdsUtil.java

@@ -5,7 +5,7 @@
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
-import com.adjust.sdk.Logger;
+import com.adjust.sdk.ILogger;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,7 +14,7 @@
 import static com.adjust.sdk.nonplay.Util.addStringToMap;
 
 public class TelephonyIdsUtil {
-    static void injectIMEI(Map<String, String> parameters, Context context, Logger logger) {
+    static void injectIMEI(Map<String, String> parameters, Context context, ILogger logger) {
         if (!AdjustNonPlay.isReadIMEIset) {
             return;
         }
@@ -25,7 +25,7 @@ static void injectIMEI(Map<String, String> parameters, Context context, Logger l
         addStringToMap(parameters, "meids", getMEIDs(telephonyManager, logger));
     }
 
-    private static String getTelephonyIds(TelephonyManager telephonyManager, Logger logger) {
+    private static String getTelephonyIds(TelephonyManager telephonyManager, ILogger logger) {
         List<String> telephonyIdList = new ArrayList<String>();
 
         String telephonyNoIdx = getDefaultTelephonyId(telephonyManager, logger);
@@ -42,7 +42,7 @@ private static String getTelephonyIds(TelephonyManager telephonyManager, Logger
     }
 
     // XXX test difference mentioned here https://stackoverflow.com/a/35343531
-    private static String getDefaultTelephonyId(TelephonyManager telephonyManager, Logger logger) {
+    private static String getDefaultTelephonyId(TelephonyManager telephonyManager, ILogger logger) {
         try {
             return telephonyManager.getDeviceId();
         } catch (SecurityException e) {
@@ -51,7 +51,7 @@ private static String getDefaultTelephonyId(TelephonyManager telephonyManager, L
         return null;
     }
 
-    private static String getTelephonyIdByIndex(TelephonyManager telephonyManager, int index, Logger logger) {
+    private static String getTelephonyIdByIndex(TelephonyManager telephonyManager, int index, ILogger logger) {
         try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 return telephonyManager.getDeviceId(index);
@@ -62,7 +62,7 @@ private static String getTelephonyIdByIndex(TelephonyManager telephonyManager, i
         return null;
     }
 
-    private static String getIMEIs(TelephonyManager telephonyManager, Logger logger) {
+    private static String getIMEIs(TelephonyManager telephonyManager, ILogger logger) {
         List<String> imeiList = new ArrayList<String>();
 
         String imeiNoIdx = getDefaultIMEI(telephonyManager, logger);
@@ -78,7 +78,7 @@ private static String getIMEIs(TelephonyManager telephonyManager, Logger logger)
         return TextUtils.join(",", imeiList);
     }
 
-    private static String getDefaultIMEI(TelephonyManager telephonyManager, Logger logger) {
+    private static String getDefaultIMEI(TelephonyManager telephonyManager, ILogger logger) {
         try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 return telephonyManager.getImei();
@@ -89,7 +89,7 @@ private static String getDefaultIMEI(TelephonyManager telephonyManager, Logger l
         return null;
     }
 
-    private static String getIMEIbyIndex(TelephonyManager telephonyManager, int index, Logger logger) {
+    private static String getIMEIbyIndex(TelephonyManager telephonyManager, int index, ILogger logger) {
         try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 return telephonyManager.getImei(index);
@@ -100,7 +100,7 @@ private static String getIMEIbyIndex(TelephonyManager telephonyManager, int inde
         return null;
     }
 
-    public static String getMEIDs(TelephonyManager telephonyManager, Logger logger) {
+    public static String getMEIDs(TelephonyManager telephonyManager, ILogger logger) {
         List<String> meidList = new ArrayList<String>();
 
         String meidNoIdx = getDefaultMEID(telephonyManager, logger);
@@ -116,7 +116,7 @@ public static String getMEIDs(TelephonyManager telephonyManager, Logger logger)
         return TextUtils.join(",", meidList);
     }
 
-    private static String getDefaultMEID(TelephonyManager telephonyManager, Logger logger) {
+    private static String getDefaultMEID(TelephonyManager telephonyManager, ILogger logger) {
         try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 return telephonyManager.getMeid();
@@ -127,7 +127,7 @@ private static String getDefaultMEID(TelephonyManager telephonyManager, Logger l
         return null;
     }
 
-    private static String getMEIDbyIndex(TelephonyManager telephonyManager, int index, Logger logger) {
+    private static String getMEIDbyIndex(TelephonyManager telephonyManager, int index, ILogger logger) {
         try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 return telephonyManager.getMeid(index);

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

@@ -4,6 +4,7 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 
+import com.adjust.sdk.ILogger;
 import com.adjust.sdk.Logger;
 
 import java.util.HashMap;
@@ -13,7 +14,7 @@
 import static com.adjust.sdk.nonplay.TelephonyIdsUtil.injectIMEI;
 
 public class Util {
-    public static Map<String, String> getNonPlayParameters(Context context, Logger logger) {
+    public static Map<String, String> getNonPlayParameters(Context context, ILogger logger) {
         Map<String, String> parameters = new HashMap<String, String>();
 
         injectIMEI(parameters, context, logger);