Merge branch 'dev_1_9_14_26' into dev

Author: tys282000

build.gradle

@@ -36,7 +36,7 @@ ext {
     javaVersion = JavaVersion.VERSION_1_8
 
     GROUP = 'com.tencent.tinker'
-    VERSION_NAME = '1.9.14.25.3'
+    VERSION_NAME = '1.9.14.26'
 
     POM_DESCRIPTION = 'Tinker is a hot-fix solution library for Android, it supports dex, library and resources update without reinstalling apk.'
     POM_URL = 'https://github.com/Tencent/tinker'

tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/patch/BasePatchInternal.java

@@ -17,6 +17,7 @@
 package com.tencent.tinker.lib.patch;
 
 import com.tencent.tinker.commons.util.IOHelper;
+import com.tencent.tinker.loader.shareutil.ShareTinkerInternals;
 import com.tencent.tinker.loader.shareutil.ShareTinkerLog;
 import com.tencent.tinker.loader.shareutil.ShareConstants;
 import com.tencent.tinker.loader.shareutil.SharePatchFileUtil;
@@ -66,6 +67,7 @@ public static boolean extract(ZipFile zipFile, ZipEntry entryFile, File extractT
             try {
                 is = new BufferedInputStream(zipFile.getInputStream(entryFile));
                 os = new BufferedOutputStream(new FileOutputStream(extractTo));
+                extractTo.setReadOnly();
                 byte[] buffer = new byte[ShareConstants.BUFFER_SIZE];
                 int length = 0;
                 while ((length = is.read(buffer)) > 0) {

tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/patch/DexDiffPatchInternal.java

@@ -280,6 +280,7 @@ private static boolean mergeClassNDexFiles(final Context context, final File pat
         AlignedZipOutputStream out = null;
         try {
             out = new AlignedZipOutputStream(new BufferedOutputStream(new FileOutputStream(classNFile)));
+            classNFile.setReadOnly();
             for (ShareDexDiffPatchInfo info : classNDexInfo.keySet()) {
                 File dexFile = classNDexInfo.get(info);
                 if (info.isJarMode) {
@@ -648,6 +649,10 @@ private static boolean extractDexToJar(ZipFile zipFile, ZipEntry entryFile, File
             try {
                 zos = new ZipOutputStream(new
                     BufferedOutputStream(new FileOutputStream(extractTo)));
+                if (ShareTinkerInternals.isNewerOrEqualThanVersion(33, true)) {
+                    extractTo.setReadOnly();
+                }
+
                 bis = new BufferedInputStream(zipFile.getInputStream(entryFile));
 
                 byte[] buffer = new byte[ShareConstants.BUFFER_SIZE];
@@ -719,6 +724,9 @@ private static void patchDexFile(
         try {
             oldDexStream = new BufferedInputStream(baseApk.getInputStream(oldDexEntry));
             patchFileStream = (patchFileEntry != null ? new BufferedInputStream(patchPkg.getInputStream(patchFileEntry)) : null);
+            if (ShareTinkerInternals.isNewerOrEqualThanVersion(33, true)) {
+                patchedDexFile.setReadOnly();
+            }
 
             final boolean isRawDexFile = SharePatchFileUtil.isRawDexFile(patchInfo.rawName);
             if (!isRawDexFile || patchInfo.isJarMode) {

tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/patch/ResDiffPatchInternal.java

@@ -135,6 +135,7 @@ private static boolean extractResourceDiffInternals(Context context, String dir,
             int totalEntryCount = 0;
             try {
                 out = new TinkerZipOutputStream(new BufferedOutputStream(new FileOutputStream(resOutput)));
+                resOutput.setReadOnly();
                 oldApk = new TinkerZipFile(apkPath);
                 newApk = new TinkerZipFile(patchFile);
                 final Enumeration<? extends TinkerZipEntry> entries = oldApk.entries();

tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/patch/UpgradePatch.java

@@ -126,9 +126,15 @@ public boolean tryPatch(Context context, String tempPatchPath, boolean useEmerge
             // if it is interpret now, use changing flag to wait main process
             final String finalOatDir = usingInterpret ? ShareConstants.CHANING_DEX_OPTIMIZE_PATH : oldInfo.oatDir;
             if (!patchMd5.equals(oldInfo.newVersion) && !oldInfo.newVersion.equals(oldInfo.oldVersion)) {
+                // Mark previous new version to old one before delete current new version so that all processes can stay at the
+                // same version after restart but before the latest new version finish applying.
+                final String lastNewVersion = oldInfo.newVersion;
+                oldInfo.newVersion = oldInfo.oldVersion;
+                SharePatchInfo.rewritePatchInfoFileWithLock(patchInfoFile, oldInfo, patchInfoLockFile);
+
                 // Currently applied patch is not the same as last applied one and the last applied one is not loaded,
                 // so we can delete the last applied patch to avoid patch artifacts accumulating.
-                final String patchName = SharePatchFileUtil.getPatchVersionDirectory(oldInfo.newVersion);
+                final String patchName = SharePatchFileUtil.getPatchVersionDirectory(lastNewVersion);
                 SharePatchFileUtil.deleteDir(new File(patchDirectory, patchName));
             }
             final String versionToRemove;

tinker-android/tinker-android-loader-no-op/src/main/java/com/tencent/tinker/loader/shareutil/ShareConstants.java

@@ -102,7 +102,7 @@ public class ShareConstants {
     public static final String PATCH_TEMP_DIRECTORY_NAME  = "tinker_temp";
     public static final String PATCH_TEMP_LAST_CRASH_NAME = "tinker_last_crash";
 
-    public static final String PATCH_INFO_NAME      = "patch.info";
+    public static final String PATCH_INFO_NAME      = "patch_meta.info";
     public static final String PATCH_INFO_LOCK_NAME = "info.lock";
 
     public static final String META_SUFFIX = "meta.txt";