[tinker] Adjust clearPatch logic.

Author: tangyinsheng

tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/tinker/Tinker.java

@@ -30,13 +30,12 @@
 import com.tencent.tinker.lib.service.AbstractResultService;
 import com.tencent.tinker.lib.service.DefaultTinkerResultService;
 import com.tencent.tinker.lib.service.TinkerPatchService;
-import com.tencent.tinker.loader.shareutil.ShareTinkerLog;
 import com.tencent.tinker.lib.util.TinkerServiceInternals;
 import com.tencent.tinker.loader.TinkerRuntimeException;
 import com.tencent.tinker.loader.shareutil.ShareConstants;
 import com.tencent.tinker.loader.shareutil.SharePatchFileUtil;
-import com.tencent.tinker.loader.shareutil.SharePatchInfo;
 import com.tencent.tinker.loader.shareutil.ShareTinkerInternals;
+import com.tencent.tinker.loader.shareutil.ShareTinkerLog;
 
 import java.io.File;
 
@@ -256,20 +255,7 @@ public int getTinkerFlags() {
      * clean all patch files
      */
     public void cleanPatch() {
-        if (patchDirectory == null) {
-            return;
-        }
-        final File patchInfoFile = SharePatchFileUtil.getPatchInfoFile(patchDirectory.getAbsolutePath());
-        if (!patchInfoFile.exists()) {
-            ShareTinkerLog.printErrStackTrace(TAG, new Throwable(), "try to clean patch while patch info file does not exist.");
-            return;
-        }
-        final File patchInfoLockFile = SharePatchFileUtil.getPatchInfoLockFile(patchDirectory.getAbsolutePath());
-        final SharePatchInfo patchInfo = SharePatchInfo.readAndCheckPropertyWithLock(patchInfoFile, patchInfoLockFile);
-        if (patchInfo != null) {
-            patchInfo.versionToRemove = patchInfo.newVersion;
-            SharePatchInfo.rewritePatchInfoFileWithLock(patchInfoFile, patchInfo, patchInfoLockFile);
-        }
+        ShareTinkerInternals.cleanPatch(getContext());
     }
 
     /**

tinker-android/tinker-android-loader/src/main/java/com/tencent/tinker/loader/TinkerLoader.java

@@ -128,7 +128,7 @@ private void tryLoadPatchFilesInternal(TinkerApplication app, Intent resultInten
 
         if (mainProcess) {
             if (!ShareTinkerInternals.isNullOrNil(versionToRemove)) {
-                if (versionToRemove.equals(newVersion)) {
+                if (newVersion.equals(versionToRemove)) {
                     ShareTinkerLog.w(TAG, "found new version clean patch mark and we are in main process, delete patch file now.");
                     final String patchName = SharePatchFileUtil.getPatchVersionDirectory(newVersion);
                     if (patchName != null) {

tinker-android/tinker-android-loader/src/main/java/com/tencent/tinker/loader/shareutil/ShareTinkerInternals.java

@@ -17,7 +17,6 @@
 package com.tencent.tinker.loader.shareutil;
 
 import android.app.ActivityManager;
-import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
@@ -704,11 +703,11 @@ public static String toVisualString(String src) {
         }
     }
 
-    public static void cleanPatch(Application app) {
-        if (app == null) {
-            throw new TinkerRuntimeException("app is null");
+    public static void cleanPatch(Context context) {
+        if (context == null) {
+            throw new TinkerRuntimeException("context is null");
         }
-        final File tinkerDir = SharePatchFileUtil.getPatchDirectory(app);
+        final File tinkerDir = SharePatchFileUtil.getPatchDirectory(context);
         if (!tinkerDir.exists()) {
             ShareTinkerLog.printErrStackTrace(TAG, new Throwable(),"try to clean patch while there're not any applied patches.");
             return;
@@ -721,8 +720,18 @@ public static void cleanPatch(Application app) {
         final File patchInfoLockFile = SharePatchFileUtil.getPatchInfoLockFile(tinkerDir.getAbsolutePath());
         final SharePatchInfo patchInfo = SharePatchInfo.readAndCheckPropertyWithLock(patchInfoFile, patchInfoLockFile);
         if (patchInfo != null) {
-            patchInfo.versionToRemove = patchInfo.newVersion;
+            if (!patchInfo.newVersion.equals(patchInfo.oldVersion)) {
+                // newVersion hasn't been loaded yet, we can remove it directly now.
+                final String patchName = SharePatchFileUtil.getPatchVersionDirectory(patchInfo.newVersion);
+                SharePatchFileUtil.deleteDir(new File(tinkerDir, patchName));
+                patchInfo.newVersion = patchInfo.oldVersion;
+                patchInfo.versionToRemove = "";
+            } else {
+                patchInfo.versionToRemove = patchInfo.newVersion;
+            }
             SharePatchInfo.rewritePatchInfoFileWithLock(patchInfoFile, patchInfo, patchInfoLockFile);
+        } else {
+            ShareTinkerLog.printErrStackTrace(TAG, new Throwable(), "fail to get patchInfo.");
         }
     }
 }