diff --git a/android/jni/DownloadTask.c b/android/jni/DownloadTask.c index d41793c..562714f 100644 --- a/android/jni/DownloadTask.c +++ b/android/jni/DownloadTask.c @@ -131,7 +131,7 @@ JNIEXPORT jbyteArray JNICALL Java_cn_reactnative_modules_update_DownloadTask_hdi hpatch_singleCompressedDiffInfo patInfo; _check(((originLength==0)||originPtr) && patchPtr && (patchLength>0),"Corrupt patch"); - _check(kHPatch_ok!=hpatch_getInfo_by_mem(&patInfo,(const uint8_t*)patchPtr,patchLength),"Error info in hpatch"); + _check(kHPatch_ok==hpatch_getInfo_by_mem(&patInfo,(const uint8_t*)patchPtr,patchLength),"Error info in hpatch"); _check(originLength==patInfo.oldDataSize,"Error oldDataSize in hpatch"); newsize=(size_t)patInfo.newDataSize; if (sizeof(size_t)!=sizeof(hpatch_StreamPos_t)) @@ -144,7 +144,7 @@ JNIEXPORT jbyteArray JNICALL Java_cn_reactnative_modules_update_DownloadTask_hdi _check(outPtr,"Corrupt JNIEnv::GetByteArrayElements"); } - _check(kHPatch_ok!=hpatch_by_mem((const uint8_t*)originPtr,originLength,(uint8_t*)outPtr,newsize, + _check(kHPatch_ok==hpatch_by_mem((const uint8_t*)originPtr,originLength,(uint8_t*)outPtr,newsize, (const uint8_t*)patchPtr,patchLength,&patInfo),"hpacth"); _clear: diff --git a/android/jni/hpatch.h b/android/jni/hpatch.h index 3046d02..516df4a 100644 --- a/android/jni/hpatch.h +++ b/android/jni/hpatch.h @@ -1,5 +1,5 @@ // hpatch.h -// import HDiffPatch, support patchfile created by "hdiffz -SD -C-lzma2 oldfile newfile patchfile" +// import HDiffPatch, support patchData created by "hdiffz -SD -c-lzma2 oldfile newfile patchfile" // Copyright 2021 housisong, All rights reserved #ifndef HDIFFPATCH_PATCH_H diff --git a/android/src/main/java/cn/reactnative/modules/update/DownloadTask.java b/android/src/main/java/cn/reactnative/modules/update/DownloadTask.java index 5ee4225..2f463fa 100644 --- a/android/src/main/java/cn/reactnative/modules/update/DownloadTask.java +++ b/android/src/main/java/cn/reactnative/modules/update/DownloadTask.java @@ -498,11 +498,11 @@ class DownloadTask extends AsyncTask { break; case DownloadTaskParams.TASK_TYPE_PATCH_FROM_APK: case DownloadTaskParams.TASK_TYPE_HPATCH_FROM_APK: - doPatchFromApk(params[0],type); + doPatchFromApk(params[0],taskType); break; case DownloadTaskParams.TASK_TYPE_PATCH_FROM_PPK: case DownloadTaskParams.TASK_TYPE_HPATCH_FROM_PPK: - doPatchFromPpk(params[0],type); + doPatchFromPpk(params[0],taskType); break; case DownloadTaskParams.TASK_TYPE_CLEANUP: doCleanUp(params[0]); diff --git a/android/src/main/java/cn/reactnative/modules/update/DownloadTaskParams.java b/android/src/main/java/cn/reactnative/modules/update/DownloadTaskParams.java index fbddeb3..7d7c538 100644 --- a/android/src/main/java/cn/reactnative/modules/update/DownloadTaskParams.java +++ b/android/src/main/java/cn/reactnative/modules/update/DownloadTaskParams.java @@ -8,15 +8,15 @@ import java.io.File; * Created by tdzl2003 on 3/31/16. */ class DownloadTaskParams { - static final int TASK_TYPE_CLEANUP = 0; //Keep hash & originHash + static final int TASK_TYPE_CLEANUP = 0; //Keep hash & originHash - static final int TASK_TYPE_PATCH_FULL = 1; - static final int TASK_TYPE_PATCH_FROM_APK = 2; - static final int TASK_TYPE_PATCH_FROM_PPK = 3; - static final int TASK_TYPE_PLAIN_DOWNLOAD = 4; + static final int TASK_TYPE_PATCH_FULL = 1; + static final int TASK_TYPE_PATCH_FROM_APK = 2; + static final int TASK_TYPE_PATCH_FROM_PPK = 3; + static final int TASK_TYPE_PLAIN_DOWNLOAD = 4; - static final int TASK_TYPE_HPATCH_FROM_APK = 5; - static final int TASK_TYPE_HPATCH_FROM_PPK = 6; + static final int TASK_TYPE_HPATCH_FROM_APK = 5; + static final int TASK_TYPE_HPATCH_FROM_PPK = 6; static boolean isHPatchType(int patchType){ return (patchType==TASK_TYPE_HPATCH_FROM_APK)||(patchType==TASK_TYPE_HPATCH_FROM_PPK); diff --git a/android/src/main/java/cn/reactnative/modules/update/UpdateContext.java b/android/src/main/java/cn/reactnative/modules/update/UpdateContext.java index 0b294f6..ae911cd 100644 --- a/android/src/main/java/cn/reactnative/modules/update/UpdateContext.java +++ b/android/src/main/java/cn/reactnative/modules/update/UpdateContext.java @@ -92,15 +92,15 @@ public class UpdateContext { private String zipExtension(int patchType){ switch (patchType) { - case TASK_TYPE_PATCH_FULL: + case DownloadTaskParams.TASK_TYPE_PATCH_FULL: return ".ppk"; - case TASK_TYPE_PATCH_FROM_APK: + case DownloadTaskParams.TASK_TYPE_PATCH_FROM_APK: return ".apk.patch"; - case TASK_TYPE_PATCH_FROM_PPK: + case DownloadTaskParams.TASK_TYPE_PATCH_FROM_PPK: return ".ppk.patch"; - case TASK_TYPE_HPATCH_FROM_APK: + case DownloadTaskParams.TASK_TYPE_HPATCH_FROM_APK: return ".apk.hpatch"; - case TASK_TYPE_HPATCH_FROM_PPK: + case DownloadTaskParams.TASK_TYPE_HPATCH_FROM_PPK: return ".ppk.hpatch"; default: return "";//unknown type