Merge branch 'master' into g_master

Tencent · Nov 18, 2024 · 72b8c37 · 72b8c37
2 parents 7b298ea + a19134e
commit 72b8c37
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 20 deletions.
diff --git a/soter-client-sdk/gradle.properties b/soter-client-sdk/gradle.properties
@@ -14,6 +14,6 @@
 # org.gradle.parallel=true
 #Tue May 09 20:42:37 CST 2017
 org.gradle.internal.publish.checksums.insecure=true
-VERSION_NAME_PREFIX=2.1.14
+VERSION_NAME_PREFIX=2.1.15
 VERSION_NAME_SUFFIX=
 #VERSION_NAME_SUFFIX=-SNAPSHOT
diff --git a/...-client-sdk/soter-wrapper/src/main/java/com/tencent/soter/wrapper/wrap_task/TaskInit.java b/...-client-sdk/soter-wrapper/src/main/java/com/tencent/soter/wrapper/wrap_task/TaskInit.java
@@ -19,6 +19,7 @@
 import android.util.Log;
 
 import com.tencent.soter.core.SoterCore;
+import com.tencent.soter.core.model.CertUtil;
 import com.tencent.soter.core.model.ConstantsSoter;
 import com.tencent.soter.core.model.ISoterLogger;
 import com.tencent.soter.core.model.SLogger;
@@ -194,28 +195,32 @@ private String getCompatDistinguishSalt(@NonNull String previousSalt) {
 
     // check if there's any keys invalid and need to be deleted
     private void removeAbnormalKeys() {
-        SharedPreferences preferences = SoterDataCenter.getInstance().getStatusSharedPreference();
-        int askStatus = preferences.getInt(SoterCoreData.getInstance().getAskName(), ConstantsSoterProcess.KeyStatus.KEY_STATUS_UNDEFINED);
-        SLogger.d(TAG, "soter: ask status: %d", askStatus);
-        if(isKeyStatusInvalid(askStatus) && SoterCore.hasAppGlobalSecureKey()) {
-            SLogger.i(TAG, "invalid ask, remove all key");
-            SoterCore.removeAppGlobalSecureKey();
-            for (int scene : scenes) {
-                String keyName = SoterDataCenter.getInstance().getAuthKeyNames().get(scene, "");
-                SoterCore.removeAuthKey(keyName, false);
-            }
-        } else {
-            for (int scene : scenes) {
-                String keyName = SoterDataCenter.getInstance().getAuthKeyNames().get(scene, "");
-                if(!SoterCoreUtil.isNullOrNil(keyName)) {
-                    int keyStatus = preferences.getInt(keyName, ConstantsSoterProcess.KeyStatus.KEY_STATUS_NORMAL);
-                    SLogger.d(TAG, "soter: %s status: %d", keyName, keyStatus);
-                    if(isKeyStatusInvalid(keyStatus) && SoterCore.hasAuthKey(keyName)) {
-                        SLogger.i(TAG, "remove invalid ask: %s", keyName);
-                        SoterCore.removeAuthKey(keyName, false);
+        try{
+            SharedPreferences preferences = SoterDataCenter.getInstance().getStatusSharedPreference();
+            int askStatus = preferences.getInt(SoterCoreData.getInstance().getAskName(), ConstantsSoterProcess.KeyStatus.KEY_STATUS_UNDEFINED);
+            SLogger.d(TAG, "soter: ask status: %d", askStatus);
+            if(isKeyStatusInvalid(askStatus) && SoterCore.hasAppGlobalSecureKey()) {
+                SLogger.i(TAG, "invalid ask, remove all key");
+                SoterCore.removeAppGlobalSecureKey();
+                for (int scene : scenes) {
+                    String keyName = SoterDataCenter.getInstance().getAuthKeyNames().get(scene, "");
+                    SoterCore.removeAuthKey(keyName, false);
+                }
+            } else {
+                for (int scene : scenes) {
+                    String keyName = SoterDataCenter.getInstance().getAuthKeyNames().get(scene, "");
+                    if(!SoterCoreUtil.isNullOrNil(keyName)) {
+                        int keyStatus = preferences.getInt(keyName, ConstantsSoterProcess.KeyStatus.KEY_STATUS_NORMAL);
+                        SLogger.d(TAG, "soter: %s status: %d", keyName, keyStatus);
+                        if(isKeyStatusInvalid(keyStatus) && SoterCore.hasAuthKey(keyName)) {
+                            SLogger.i(TAG, "remove invalid ask: %s", keyName);
+                            SoterCore.removeAuthKey(keyName, false);
+                        }
                     }
                 }
             }
+        }catch (Exception e){
+            SLogger.printErrStackTrace(TAG, e, "soter: removeAbnormalKeys failed");
         }
     }