1. [bugfix] fix large file bsdiff memory error # 348

2. [bugfix] edit apk-parser to 1.2.0, fix issue Tencent#249
3. [bugfix] fix webview resource error Tencent#374
4. [enhancement] add tinker ota splash activity
5. [enhancement] use origin classloader to load Application with AndroidNClassloader

Author: shwenzhang

third-party/bsdiff-util/src/main/java/com/tencent/tinker/bsdiff/BSPatch.java

@@ -110,10 +110,10 @@ public static int patchLessMemory(RandomAccessFile oldFile, int oldsize, byte[]
             return RETURN_DIFF_FILE_ERR;
         }
 
-        int commentLenPos = oldsize - extLen - 2;
-        if (commentLenPos <= 2) {
-            return RETURN_OLD_FILE_ERR;
-        }
+//        int commentLenPos = oldsize - extLen - 2;
+//        if (commentLenPos <= 2) {
+//            return RETURN_OLD_FILE_ERR;
+//        }
 
         DataInputStream diffIn = new DataInputStream(new ByteArrayInputStream(diffBuf, 0, diffSize));
 
@@ -167,10 +167,10 @@ public static int patchLessMemory(RandomAccessFile oldFile, int oldsize, byte[]
                     return RETURN_DIFF_FILE_ERR;
                 }
                 for (int i = 0; i < ctrl[0]; i++) {
-                    if (oldpos + i == commentLenPos) {
-                        oldBuffer[i] = 0;
-                        oldBuffer[i + 1] = 0;
-                    }
+//                    if (oldpos + i == commentLenPos) {
+//                        oldBuffer[i] = 0;
+//                        oldBuffer[i + 1] = 0;
+//                    }
 
                     if ((oldpos + i >= 0) && (oldpos + i < oldsize)) {
                         buffer[i] += oldBuffer[i];

tinker-android/tinker-android-anno/src/main/java/com/tencent/tinker/anno/AnnotationProcessor.java

@@ -93,7 +93,8 @@ private void processDefaultLifeCycle(Set<? extends Element> elements) {
                 .replaceAll("%APPLICATION_LIFE_CYCLE%", lifeCyclePackageName + "." + lifeCycleClassName)
                 .replaceAll("%TINKER_FLAGS%", "" + ca.flags())
                 .replaceAll("%TINKER_LOADER_CLASS%", "" + loaderClassName)
-                .replaceAll("%TINKER_LOAD_VERIFY_FLAG%", "" + ca.loadVerifyFlag());
+                .replaceAll("%TINKER_LOAD_VERIFY_FLAG%", "" + ca.loadVerifyFlag())
+                .replaceAll("%OTA_SPLASH_ACTIVITY%", "" + ca.otaSplashActivity());
 
             try {
                 JavaFileObject fileObject = processingEnv.getFiler().createSourceFile(applicationPackageName + "." + applicationClassName);

tinker-android/tinker-android-anno/src/main/java/com/tencent/tinker/anno/DefaultLifeCycle.java

@@ -40,5 +40,5 @@
 
     boolean loadVerifyFlag() default false;
 
-
+    boolean otaSplashActivity() default false;
 }

tinker-android/tinker-android-anno/src/main/resources/TinkerAnnoApplication.tmpl

@@ -10,7 +10,7 @@ import com.tencent.tinker.loader.app.TinkerApplication;
 public class %APPLICATION% extends TinkerApplication {
 
     public %APPLICATION%() {
-        super(%TINKER_FLAGS%, "%APPLICATION_LIFE_CYCLE%", "%TINKER_LOADER_CLASS%", %TINKER_LOAD_VERIFY_FLAG%);
+        super(%TINKER_FLAGS%, "%APPLICATION_LIFE_CYCLE%", "%TINKER_LOADER_CLASS%", %TINKER_LOAD_VERIFY_FLAG%, %OTA_SPLASH_ACTIVITY%);
     }
 
 }

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

@@ -195,6 +195,8 @@ private static boolean extractResourceDiffInternals(Context context, String dir,
                     ResUtil.extractTinkerEntry(newApk, modZipEntry, out);
                     totalEntryCount++;
                 }
+                // set comment back
+                out.setComment(oldApk.getComment());
             } finally {
                 if (out != null) {
                     out.close();

tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/reporter/DefaultLoadReporter.java

@@ -58,7 +58,7 @@ public DefaultLoadReporter(Context context) {
      */
     @Override
     public void onLoadPatchListenerReceiveFail(File patchFile, int errorCode) {
-        TinkerLog.i(TAG, "patch loadReporter onLoadPatchListenerReceiveFail: patch receive fail:%s, code:%d",
+        TinkerLog.i(TAG, "patch loadReporter onLoadPatchListenerReceiveFail: patch receive fail: %s, code: %d",
             patchFile.getAbsolutePath(), errorCode);
     }
 
@@ -122,7 +122,7 @@ public void onLoadPatchVersionChanged(String oldVersion, String newVersion, File
      */
     @Override
     public void onLoadFileNotFound(File file, int fileType, boolean isDirectory) {
-        TinkerLog.i(TAG, "patch loadReporter onLoadFileNotFound: patch file not found: %s, fileType:%d, isDirectory:%b",
+        TinkerLog.i(TAG, "patch loadReporter onLoadFileNotFound: patch file not found: %s, fileType: %d, isDirectory: %b",
             file.getAbsolutePath(), fileType, isDirectory);
 
         checkAndCleanPatch();
@@ -142,7 +142,7 @@ public void onLoadFileNotFound(File file, int fileType, boolean isDirectory) {
      */
     @Override
     public void onLoadFileMd5Mismatch(File file, int fileType) {
-        TinkerLog.i(TAG, "patch load Reporter onLoadFileMd5Mismatch: patch file md5 mismatch file: %s, fileType:%d", file.getAbsolutePath(), fileType);
+        TinkerLog.i(TAG, "patch load Reporter onLoadFileMd5Mismatch: patch file md5 mismatch file: %s, fileType: %d", file.getAbsolutePath(), fileType);
         //clean patch for safety
         checkAndCleanPatch();
     }
@@ -174,7 +174,7 @@ public void onLoadPatchInfoCorrupted(String oldVersion, String newVersion, File
      */
     @Override
     public void onLoadResult(File patchDirectory, int loadCode, long cost) {
-        TinkerLog.i(TAG, "patch loadReporter onLoadResult: patch load result, path:%s, code:%d, cost:%d", patchDirectory.getAbsolutePath(), loadCode, cost);
+        TinkerLog.i(TAG, "patch loadReporter onLoadResult: patch load result, path:%s, code: %d, cost: %dms", patchDirectory.getAbsolutePath(), loadCode, cost);
         //you can just report the result here
     }
 
@@ -251,7 +251,7 @@ public void onLoadException(Throwable e, int errorCode) {
     @Override
     public void onLoadPackageCheckFail(File patchFile, int errorCode) {
         TinkerLog.i(TAG, "patch loadReporter onLoadPackageCheckFail: "
-            + "load patch package check fail file path:%s, errorCode:%d", patchFile.getAbsolutePath(), errorCode);
+            + "load patch package check fail file path: %s, errorCode: %d", patchFile.getAbsolutePath(), errorCode);
         checkAndCleanPatch();
     }
 

tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/reporter/DefaultPatchReporter.java

@@ -73,7 +73,7 @@ public void onPatchServiceStart(Intent intent) {
      */
     @Override
     public void onPatchPackageCheckFail(File patchFile, int errorCode) {
-        TinkerLog.i(TAG, "patchReporter onPatchPackageCheckFail: package check failed. path:%s, code:%d",
+        TinkerLog.i(TAG, "patchReporter onPatchPackageCheckFail: package check failed. path: %s, code: %d",
             patchFile.getAbsolutePath(), errorCode);
         //only meta corrupted, need to delete temp files. others is just in the check time!
         if (errorCode == ShareConstants.ERROR_PACKAGE_CHECK_DEX_META_CORRUPTED
@@ -94,7 +94,7 @@ public void onPatchPackageCheckFail(File patchFile, int errorCode) {
      */
     @Override
     public void onPatchVersionCheckFail(File patchFile, SharePatchInfo oldPatchInfo, String patchFileVersion) {
-        TinkerLog.i(TAG, "patchReporter onPatchVersionCheckFail: patch version exist. path:%s, version:%s",
+        TinkerLog.i(TAG, "patchReporter onPatchVersionCheckFail: patch version exist. path: %s, version: %s",
             patchFile.getAbsolutePath(), patchFileVersion);
         //no need to delete temp files, because it is only in the check time!
     }
@@ -114,7 +114,7 @@ public void onPatchVersionCheckFail(File patchFile, SharePatchInfo oldPatchInfo,
      */
     @Override
     public void onPatchTypeExtractFail(File patchFile, File extractTo, String filename, int fileType) {
-        TinkerLog.i(TAG, "patchReporter onPatchTypeExtractFail: file extract fail type:%s, path:%s, extractTo:%s, filename:%s",
+        TinkerLog.i(TAG, "patchReporter onPatchTypeExtractFail: file extract fail type: %s, path: %s, extractTo: %s, filename: %s",
             ShareTinkerInternals.getTypeString(fileType), patchFile.getPath(), extractTo.getPath(), filename);
         //delete temp files
         Tinker.with(context).cleanPatchByVersion(patchFile);
@@ -130,7 +130,7 @@ public void onPatchTypeExtractFail(File patchFile, File extractTo, String filena
      */
     @Override
     public void onPatchDexOptFail(File patchFile, File dexFile, String optDirectory, String dexName, Throwable t) {
-        TinkerLog.i(TAG, "patchReporter onPatchDexOptFail: dex opt fail path:%s, dexPath:%s, optDir:%s, dexName:%s",
+        TinkerLog.i(TAG, "patchReporter onPatchDexOptFail: dex opt fail path: %s, dexPath: %s, optDir: %s, dexName: %s",
             patchFile.getAbsolutePath(), dexFile.getPath(), optDirectory, dexName);
         TinkerLog.printErrStackTrace(TAG, t, "onPatchDexOptFail:");
         //delete temp files
@@ -146,7 +146,7 @@ public void onPatchDexOptFail(File patchFile, File dexFile, String optDirectory,
      */
     @Override
     public void onPatchResult(File patchFile, boolean success, long cost) {
-        TinkerLog.i(TAG, "patchReporter onPatchResult: patch all result path:%s, success:%b, cost:%d",
+        TinkerLog.i(TAG, "patchReporter onPatchResult: patch all result path: %s, success: %b, cost: %d",
             patchFile.getAbsolutePath(), success, cost);
         //you can just report the result here
     }
@@ -161,7 +161,7 @@ public void onPatchResult(File patchFile, boolean success, long cost) {
      */
     @Override
     public void onPatchInfoCorrupted(File patchFile, String oldVersion, String newVersion) {
-        TinkerLog.i(TAG, "patchReporter onPatchInfoCorrupted: patch info is corrupted. old:%s, new:%s",
+        TinkerLog.i(TAG, "patchReporter onPatchInfoCorrupted: patch info is corrupted. old: %s, new: %s",
             oldVersion, newVersion);
         //patch.info is corrupted, just clean all patch
         Tinker.with(context).cleanPatch();
@@ -177,7 +177,7 @@ public void onPatchInfoCorrupted(File patchFile, String oldVersion, String newVe
      */
     @Override
     public void onPatchException(File patchFile, Throwable e) {
-        TinkerLog.i(TAG, "patchReporter onPatchException: patch exception path:%s, throwable:%s",
+        TinkerLog.i(TAG, "patchReporter onPatchException: patch exception path: %s, throwable: %s",
             patchFile.getAbsolutePath(), e.getMessage());
         TinkerLog.e(TAG, "tinker patch exception, welcome to submit issue to us: https://github.com/Tencent/tinker/issues");
 //        if (e.getMessage().contains(ShareConstants.CHECK_VM_PROPERTY_FAIL)) {

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

@@ -74,8 +74,11 @@ public boolean parseTinkerResult(Context context, Intent intentResult) {
 
         costTime = ShareIntentUtil.getIntentPatchCostTime(intentResult);
         systemOTA = ShareIntentUtil.getBooleanExtra(intentResult, ShareIntentUtil.INTENT_PATCH_SYSTEM_OTA, false);
+        final boolean isMainProcess = tinker.isMainProcess();
+
+        TinkerLog.i(TAG, "parseTinkerResult loadCode:%d, process name:%s, main process:%b, systemOTA:%b",
+            loadCode, ShareTinkerInternals.getProcessName(context), isMainProcess, systemOTA);
 
-        TinkerLog.i(TAG, "parseTinkerResult loadCode:%d, systemOTA:%b", loadCode, systemOTA);
         //@Nullable
         final String oldVersion = ShareIntentUtil.getStringExtra(intentResult, ShareIntentUtil.INTENT_PATCH_OLD_VERSION);
         //@Nullable
@@ -84,8 +87,6 @@ public boolean parseTinkerResult(Context context, Intent intentResult) {
         final File patchDirectory = tinker.getPatchDirectory();
         final File patchInfoFile = tinker.getPatchInfoFile();
 
-        final boolean isMainProcess = tinker.isMainProcess();
-
 
         if (oldVersion != null && newVersion != null) {
             if (isMainProcess) {

tinker-android/tinker-android-loader/src/main/AndroidManifest.xml

@@ -1,8 +1,18 @@
-<manifest
-    package="com.tencent.tinker.loader">
-
+<manifest package="com.tencent.tinker.loader"
+          xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
-
+        <activity
+            android:name=".splash.TinkerOTASplashActivity"
+            android:configChanges="keyboardHidden"
+            android:excludeFromRecents="true"
+            android:exported="false"
+            android:launchMode="singleTop"
+            android:process=":otasplash">
+        </activity>
+        <receiver
+            android:name=".splash.TinkerSplashBroadCast"
+            android:exported="false"
+            android:process=":otasplash"/>
     </application>
 
 </manifest>

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

@@ -25,5 +25,5 @@
  * Created by zhangshaowen on 16/4/30.
  */
 public abstract class AbstractTinkerLoader {
-    abstract public Intent tryLoad(TinkerApplication app, int tinkerFlag, boolean tinkerLoadVerifyFlag);
+    abstract public Intent tryLoad(TinkerApplication app);
 }