Extract hash functions to util

Author: nonelse

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

@@ -11,20 +11,15 @@
 import android.os.Build;
 import android.util.DisplayMetrics;
 
-import java.math.BigInteger;
-import java.security.MessageDigest;
 import java.util.Locale;
 import java.util.Map;
 
-import static com.adjust.sdk.Constants.ENCODING;
 import static com.adjust.sdk.Constants.HIGH;
 import static com.adjust.sdk.Constants.LARGE;
 import static com.adjust.sdk.Constants.LONG;
 import static com.adjust.sdk.Constants.LOW;
-import static com.adjust.sdk.Constants.MD5;
 import static com.adjust.sdk.Constants.MEDIUM;
 import static com.adjust.sdk.Constants.NORMAL;
-import static com.adjust.sdk.Constants.SHA1;
 import static com.adjust.sdk.Constants.SMALL;
 import static com.adjust.sdk.Constants.XLARGE;
 
@@ -214,7 +209,7 @@ private String getMacSha1(String macAddress) {
         if (macAddress == null) {
             return null;
         }
-        String macSha1 = sha1(macAddress);
+        String macSha1 = Util.sha1(macAddress);
 
         return macSha1;
     }
@@ -224,7 +219,7 @@ private String getMacShortMd5(String macAddress) {
             return null;
         }
         String macShort = macAddress.replaceAll(":", "");
-        String macShortMd5 = md5(macShort);
+        String macShortMd5 = Util.md5(macShort);
 
         return macShortMd5;
     }
@@ -237,33 +232,6 @@ private String getAndroidId(Context context, boolean isGooglePlayServicesAvailab
         }
     }
 
-    private String sha1(final String text) {
-        return hash(text, SHA1);
-    }
-
-    private String md5(final String text) {
-        return hash(text, MD5);
-    }
-
-    private String hash(final String text, final String method) {
-        String hashString = null;
-        try {
-            final byte[] bytes = text.getBytes(ENCODING);
-            final MessageDigest mesd = MessageDigest.getInstance(method);
-            mesd.update(bytes, 0, bytes.length);
-            final byte[] hash = mesd.digest();
-            hashString = convertToHex(hash);
-        } catch (Exception e) {
-        }
-        return hashString;
-    }
-
-    private static String convertToHex(final byte[] bytes) {
-        final BigInteger bigInt = new BigInteger(1, bytes);
-        final String formatString = "%0" + (bytes.length << 1) + "x";
-        return String.format(Locale.US, formatString, bigInt);
-    }
-
     private String getFacebookAttributionId(final Context context) {
         try {
             final ContentResolver contentResolver = context.getContentResolver();

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

@@ -31,13 +31,19 @@
 import java.io.NotSerializableException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.math.BigInteger;
+import java.security.MessageDigest;
 import java.text.SimpleDateFormat;
 import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static com.adjust.sdk.Constants.ENCODING;
+import static com.adjust.sdk.Constants.MD5;
+import static com.adjust.sdk.Constants.SHA1;
+
 /**
  * Collects utility functions used by Adjust.
  */
@@ -322,4 +328,31 @@ public static int hashMap(Map value) {
         }
         return value.entrySet().hashCode();
     }
+
+    public static String sha1(final String text) {
+        return hash(text, SHA1);
+    }
+
+    public static String md5(final String text) {
+        return hash(text, MD5);
+    }
+
+    public static String hash(final String text, final String method) {
+        String hashString = null;
+        try {
+            final byte[] bytes = text.getBytes(ENCODING);
+            final MessageDigest mesd = MessageDigest.getInstance(method);
+            mesd.update(bytes, 0, bytes.length);
+            final byte[] hash = mesd.digest();
+            hashString = convertToHex(hash);
+        } catch (Exception e) {
+        }
+        return hashString;
+    }
+
+    public static String convertToHex(final byte[] bytes) {
+        final BigInteger bigInt = new BigInteger(1, bytes);
+        final String formatString = "%0" + (bytes.length << 1) + "x";
+        return String.format(Locale.US, formatString, bigInt);
+    }
 }