修复编译错误

Author: ronghao

app/build.gradle

@@ -26,7 +26,7 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-//  compile project(':library')
-    compile 'com.github.ronghao:CacheManage:1.3.5'
+  compile project(':library')
+//    compile 'com.github.ronghao:CacheManage:1.3.5'
     compile 'com.android.support:appcompat-v7:25.3.1'
 }

library/src/main/java/com/haohaohu/cachemanage/strategy/Des3EncryptStrategy.java

@@ -2,7 +2,9 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.os.Build;
 import android.provider.Settings;
+import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 
 import com.haohaohu.cachemanage.util.Des3Util;
@@ -83,15 +85,8 @@ public String getAndroidID() {
         return Settings.Secure.getString(mContext.getContentResolver(), Settings.Secure.ANDROID_ID);
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.KITKAT)
     public void createKeyStoreSecretKey() {
-        try {
-            KeyStoreHelper.createKeys(mContext, mContext.getPackageName());
-        } catch (NoSuchProviderException e) {
-            e.printStackTrace();
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (InvalidAlgorithmParameterException e) {
-            e.printStackTrace();
-        }
+        KeyStoreHelper.createKeys(mContext, mContext.getPackageName());
     }
 }

library/src/main/java/com/haohaohu/cachemanage/util/KeyStoreHelper.java

@@ -9,6 +9,7 @@
 import android.security.KeyPairGeneratorSpec;
 import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyProperties;
+import android.support.annotation.RequiresApi;
 
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
@@ -31,7 +32,6 @@
 import javax.crypto.spec.SecretKeySpec;
 import javax.security.auth.x500.X500Principal;
 
-import kotlin.text.Charsets;
 import mohapps.modified.java.util.Base64;
 
 
@@ -43,6 +43,7 @@
  * @author haohao on 2017/8/24 10:37
  * @version v1.0
  */
+@RequiresApi(api = Build.VERSION_CODES.KITKAT)
 public class KeyStoreHelper {
     private static final String TAG = "KeyStoreHelper";
 
@@ -207,7 +208,7 @@ private static KeyStore.PrivateKeyEntry getPrivateKeyEntry(String alias) {
             return null;
         }
     }
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+    @RequiresApi(api = Build.VERSION_CODES.KITKAT)
     private static SecretKey getSecretKeyJBMR2(Context context, String alias) {
         SharedPreferences pref = context.getSharedPreferences(SecurityConstants.ENCRYPTION, Context.MODE_PRIVATE);
         String aesKey = pref.getString(SecurityConstants.AES_KEY, "");
@@ -217,14 +218,14 @@ private static SecretKey getSecretKeyJBMR2(Context context, String alias) {
                 keygen.init(128);
                 SecretKey secretKey = keygen.generateKey();
                 SharedPreferences.Editor editor = pref.edit();
-                editor.putString(SecurityConstants.AES_KEY, encryptKey(alias, new String(secretKey.getEncoded(), Charsets.ISO_8859_1)));
+                editor.putString(SecurityConstants.AES_KEY, encryptKey(alias, new String(secretKey.getEncoded(), StandardCharsets.ISO_8859_1)));
                 editor.apply();
                 return secretKey;
             } catch (NoSuchAlgorithmException e) {
                 e.printStackTrace();
             }
         } else {
-            return new SecretKeySpec(decryptKey(alias, aesKey).getBytes(Charsets.ISO_8859_1), 0, 16, SecurityConstants.KEY_ALGORITHM_AES);
+            return new SecretKeySpec(decryptKey(alias, aesKey).getBytes(StandardCharsets.ISO_8859_1), 0, 16, SecurityConstants.KEY_ALGORITHM_AES);
         }
         return null;
     }