see 08/26 log

Author: Blankj

README-CN.md

@@ -41,7 +41,7 @@
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.19.2-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.19.3-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

README.md

@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.19.2-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.19.3-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

app/src/main/java/com/blankj/androidutilcode/feature/core/app/AppActivity.java

@@ -86,7 +86,9 @@ public void initView(Bundle savedInstanceState, View contentView) {
                 .appendLine("getAppPath: " + AppUtils.getAppPath())
                 .appendLine("getAppVersionName: " + AppUtils.getAppVersionName())
                 .appendLine("getAppVersionCode: " + AppUtils.getAppVersionCode())
-                .append("getAppSignatureSHA1: " + AppUtils.getAppSignatureSHA1())
+                .appendLine("getAppSignatureSHA1: " + AppUtils.getAppSignatureSHA1())
+                .appendLine("getAppSignatureSHA256: " + AppUtils.getAppSignatureSHA256())
+                .append("getAppSignatureMD5: " + AppUtils.getAppSignatureMD5())
                 .create());
     }
 

config.gradle

@@ -6,8 +6,8 @@ ext {
             compileSdkVersion: 27,
             minSdkVersion    : 14,
             targetSdkVersion : 27,
-            versionCode      : 1_019_002,
-            versionName      : '1.19.2'// E.g 1.9.72 => 1,009,072
+            versionCode      : 1_019_003,
+            versionName      : '1.19.3'// E.g. 1.9.72 => 1,009,072
     ]
 
     versionConfig = [
@@ -19,6 +19,7 @@ ext {
             gson       : '2.8.2',
             glide      : '4.7.1',
             leakcanary : '1.5.4',
+            retrofit   : '2.4.0',
             // test
             junit      : '4.12',
             robolectric: '3.1.2'
@@ -39,6 +40,7 @@ ext {
             ],
             gson                : "com.google.code.gson:gson:$versionConfig.gson",
             glide               : "com.github.bumptech.glide:glide:$versionConfig.glide",
+            retrofit            : "com.squareup.retrofit2:retrofit:$versionConfig.retrofit",
 
             junit               : "junit:junit:$versionConfig.junit",
             robolectric         : "org.robolectric:robolectric:$versionConfig.robolectric",
@@ -167,7 +169,7 @@ def configAppDependencies(Project pro) {
         // LeakCanary
         debugImplementation depConfig.leakcanary.android
         releaseImplementation depConfig.leakcanary.android_no_op
-//        implementation 'com.blankj:utilcode:1.19.2'
+//        implementation 'com.blankj:utilcode:1.19.3'
     }
 }
 
@@ -191,6 +193,7 @@ def configSubUtilDependencies(Project pro) {
         api(depConfig.glide) {
             exclude group: "com.android.support"
         }
+        api depConfig.retrofit
 
         testImplementation depConfig.junit
         testImplementation depConfig.robolectric

update_log.md

@@ -1,3 +1,4 @@
+* 18/08/26 新增 AppUtils#getAppSignatureSHA256 和 AppUtils#getAppSignatureMD5，发布 1.19.3
 * 18/08/24 新增 ScreenUtils#restoreAdaptScreen，利用 FileProvider4UtilCode 不再需要初始化，发布 1.19.2
 * 18/08/23 修复适配后 ToastUtils 原生 Toast 尺寸发生改变的问题，修复 KeyboardUtils#fixSoftInputLeaks，发布 1.19.1
 * 18/08/10 修复 ScreenUtils#adaptxx 导致获取状态栏和导航栏尺寸不对问题，发布 1.19.0

utilcode/README-CN.md

@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.19.2'
+implementation 'com.blankj:utilcode:1.19.3'
 ```
 
 
@@ -51,6 +51,8 @@ getAppVersionName                 : 获取 App 版本号
 getAppVersionCode                 : 获取 App 版本码
 getAppSignature                   : 获取 App 签名
 getAppSignatureSHA1               : 获取应用签名的的 SHA1 值
+getAppSignatureSHA256             : 获取应用签名的的 SHA256 值
+getAppSignatureMD5                : 获取应用签名的的 MD5 值
 getAppInfo                        : 获取 App 信息
 getAppsInfo                       : 获取所有已安装 App 信息
 ```

utilcode/README.md

@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.19.2'
+implementation 'com.blankj:utilcode:1.19.3'
 ```
 
 
@@ -51,6 +51,8 @@ getAppVersionName
 getAppVersionCode
 getAppSignature
 getAppSignatureSHA1
+getAppSignatureSHA256
+getAppSignatureMD5
 getAppInfo
 getAppsInfo
 ```

utilcode/src/main/java/com/blankj/utilcode/util/AppUtils.java

@@ -650,11 +650,53 @@ public static String getAppSignatureSHA1() {
      * @return the application's signature for SHA1 value
      */
     public static String getAppSignatureSHA1(final String packageName) {
+        return getAppSignatureHash(packageName, "SHA1");
+    }
+
+    /**
+     * Return the application's signature for SHA256 value.
+     *
+     * @return the application's signature for SHA256 value
+     */
+    public static String getAppSignatureSHA256() {
+        return getAppSignatureSHA256(Utils.getApp().getPackageName());
+    }
+
+    /**
+     * Return the application's signature for SHA256 value.
+     *
+     * @param packageName The name of the package.
+     * @return the application's signature for SHA256 value
+     */
+    public static String getAppSignatureSHA256(final String packageName) {
+        return getAppSignatureHash(packageName, "SHA256");
+    }
+
+    /**
+     * Return the application's signature for MD5 value.
+     *
+     * @return the application's signature for MD5 value
+     */
+    public static String getAppSignatureMD5() {
+        return getAppSignatureMD5(Utils.getApp().getPackageName());
+    }
+
+    /**
+     * Return the application's signature for MD5 value.
+     *
+     * @param packageName The name of the package.
+     * @return the application's signature for MD5 value
+     */
+    public static String getAppSignatureMD5(final String packageName) {
+        return getAppSignatureHash(packageName, "MD5");
+    }
+
+    private static String getAppSignatureHash(final String packageName, final String algorithm) {
         if (isSpace(packageName)) return "";
         Signature[] signature = getAppSignature(packageName);
         if (signature == null || signature.length <= 0) return "";
-        return encryptSHA1ToString(signature[0].toByteArray()).
-                replaceAll("(?<=[0-9A-F]{2})[0-9A-F]{2}", ":$0");
+        return bytes2HexString(hashTemplate(signature[0].toByteArray(), algorithm))
+                .replaceAll("(?<=[0-9A-F]{2})[0-9A-F]{2}", ":$0");
     }
 
     /**
@@ -860,14 +902,10 @@ private static boolean isDeviceRooted() {
     private static final char HEX_DIGITS[] =
             {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
 
-    private static String encryptSHA1ToString(final byte[] data) {
-        return bytes2HexString(encryptSHA1(data));
-    }
-
-    private static byte[] encryptSHA1(final byte[] data) {
+    private static byte[] hashTemplate(final byte[] data, final String algorithm) {
         if (data == null || data.length <= 0) return null;
         try {
-            MessageDigest md = MessageDigest.getInstance("SHA1");
+            MessageDigest md = MessageDigest.getInstance(algorithm);
             md.update(data);
             return md.digest();
         } catch (NoSuchAlgorithmException e) {