react-native-update 10.55.1 → 10.56.1

package/README-CN.md

@@ -16,6 +16,41 @@
 
 请查看[文档](https://pushy.reactnative.cn/docs/getting-started.html)
 
+### 配置项速查
+
+下表中的每一项都声明在包根导出的 `ClientOptions` 上，完整说明见
+<https://pushy.reactnative.cn/docs/api>。运行时修改统一走 `client.setOptions(...)`。
+
+| 配置项 | 默认值 | 作用 |
+| --- | --- | --- |
+| `appKey` | 必填 | 应用在热更新平台上的身份 |
+| `server` | Pushy/Cresc 预设 | `main` 检查端点与 `queryUrls` 远程端点发现（仅接受 https） |
+| `updateStrategy` | `alertUpdateAndIgnoreError`（开发环境 `alwaysAlert`） | `alwaysAlert` / `alertUpdateAndIgnoreError` / `silentAndNow` / `silentAndLater` / `null` |
+| `checkStrategy` | `both` | `onAppStart` / `onAppResume` / `both` / `null`（不自动检查；原生冷启动检测仍会下载但不会自行激活） |
+| `autoMarkSuccess` | `true` | 由 Provider 自动标记当前热更版本健康 |
+| `autoMarkSuccessDelayMs` | `1000` | 自动标记前的延迟；关键模块加载较晚时应调大 |
+| `healthCheck` | – | 自动标记计时器触发时调用，返回 `false` 则保持崩溃保护 |
+| `beforeCheckUpdate` / `afterCheckUpdate` | – | 否决一次检查 / 观察检查的最终状态 |
+| `beforeDownloadUpdate` / `afterDownloadUpdate` | – | 否决下载 / 否决下载后的激活 |
+| `beforeReload` | – | 否决 `switchVersion` / `restartApp` 的重载 |
+| `onPackageExpired` | – | 否决"原生包过旧"流程（`downloadUrl`） |
+| `maxRetries` | `3` | 下载重试次数（带抖动退避） |
+| `overridePackageVersion` | – | 向服务端上报另一个原生包版本 |
+| `dismissErrorAfter` | – | N 毫秒后自动清除 `lastError` |
+| `locale` | `zh`（Pushy）/ `en`（Cresc） | 弹窗与提示语言 |
+| `debug` | `false` | 允许在开发构建中执行更新操作，并开启 SDK 详细日志 |
+| `throwError` | `false` | 把流程错误抛给调用方（错误总会到达 `onError`） |
+| `disableTelemetry` | `false` | 不向服务端上报生命周期事件（下载/补丁失败、回滚、标记成功） |
+| `disableErrorReporting` | `false` | 关闭 JS 错误上报（见下节） |
+| `disableNativeCheck` | `false` | 关闭原生冷启动检测（救砖通道） |
+| `testChannel` | `true` | 是否响应 `__rnPushyVersionHash` 深链/二维码；生产构建建议设为 `false` |
+| `logger` | – | 接收 SDK 全部事件（`type`、`data`）用于自定义日志 |
+
+除 Provider 钩子外，client 还提供 `onError(listener)`、
+`captureException(error, context)`、`resetToPackagedBundle({ restart })`、
+面向崩溃上报的 `getUpdateMetadata()` / `attachToSentry()` / `attachToCrashlytics()`，
+以及供进度条单独订阅、避免整棵树重渲染的 `useUpdateProgress()`。
+
 ### JS 错误上报
 
 SDK 可以把未捕获错误和手动捕获的 JavaScript 错误关联到当前实际运行的热更版本。

package/README.md

@@ -14,6 +14,43 @@ See the docs:
 
 - English docs: <https://cresc.dev/docs/getting-started>
 
+## Options reference
+
+Every option below is declared on `ClientOptions` (exported from the package
+root) and documented in full at <https://cresc.dev/docs/api>. Runtime changes go
+through `client.setOptions(...)`.
+
+| Option | Default | What it controls |
+| --- | --- | --- |
+| `appKey` | required | App identity on the update platform |
+| `server` | Pushy/Cresc preset | `main` endpoints and `queryUrls` for remote endpoint discovery (https only) |
+| `updateStrategy` | `alertUpdateAndIgnoreError` (`alwaysAlert` in dev) | `alwaysAlert` / `alertUpdateAndIgnoreError` / `silentAndNow` / `silentAndLater` / `null` |
+| `checkStrategy` | `both` | `onAppStart` / `onAppResume` / `both` / `null` (no automatic check; the native cold-start check still downloads but never activates) |
+| `autoMarkSuccess` | `true` | Mark the running update healthy from the Provider |
+| `autoMarkSuccessDelayMs` | `1000` | Delay before the automatic mark; raise it when critical modules load late |
+| `healthCheck` | – | Consulted when the auto-mark timer fires; return `false` to keep crash protection armed |
+| `beforeCheckUpdate` / `afterCheckUpdate` | – | Veto a check / observe its final state |
+| `beforeDownloadUpdate` / `afterDownloadUpdate` | – | Veto a download / veto the activation after it |
+| `beforeReload` | – | Veto a `switchVersion` / `restartApp` reload |
+| `onPackageExpired` | – | Veto the "binary too old" flow (`downloadUrl`) |
+| `maxRetries` | `3` | Download retries with jittered backoff |
+| `overridePackageVersion` | – | Report a different binary version to the server |
+| `dismissErrorAfter` | – | Auto-clear `lastError` after N ms |
+| `locale` | `zh` (Pushy) / `en` (Cresc) | Language of alerts and messages |
+| `debug` | `false` | Enable update operations in development builds and verbose SDK logging |
+| `throwError` | `false` | Rethrow pipeline errors to the caller (they always reach `onError`) |
+| `disableTelemetry` | `false` | Stop lifecycle events (download/patch failure, rollback, mark success) reaching the server |
+| `disableErrorReporting` | `false` | Stop JS exception reporting (see below) |
+| `disableNativeCheck` | `false` | Turn off the native cold-start check that rescues bricked devices |
+| `testChannel` | `true` | Honour `__rnPushyVersionHash` deep links / QR codes; set `false` in production builds |
+| `logger` | – | Receives every SDK event (`type`, `data`) for your own logging |
+
+Beyond the Provider hooks, the client exposes `onError(listener)`,
+`captureException(error, context)`, `resetToPackagedBundle({ restart })`,
+`getUpdateMetadata()` / `attachToSentry()` / `attachToCrashlytics()` for crash
+reporters, and `useUpdateProgress()` for progress bars that must not re-render
+the whole tree.
+
 ## JS error reporting
 
 The SDK reports uncaught and manually captured JavaScript errors against the

package/android/build.gradle

@@ -57,6 +57,26 @@ def resolveInstalledExpoMajorVersion(File projectDir) {
     }
 }
 
+// Reads node_modules/expo/package.json the way Node would resolve it (walking
+// up from the app directory, so hoisted monorepo installs work) — a file read
+// instead of a `node` process at configuration time.
+def readInstalledExpoMajorVersion(File startDir) {
+    File dir = startDir
+    while (dir != null) {
+        File expoPackageJson = new File(dir, 'node_modules/expo/package.json')
+        if (expoPackageJson.isFile()) {
+            try {
+                return parseMajorVersion(
+                    new groovy.json.JsonSlurper().parseText(expoPackageJson.text).version)
+            } catch (Exception ignored) {
+                return null
+            }
+        }
+        dir = dir.parentFile
+    }
+    return null
+}
+
 def checkProjectInfo() {
     def hasExpoModulesCore = rootProject.subprojects.any { it.name == 'expo-modules-core' }
     def packageJsonFile = new File(rootProject.projectDir.parentFile, 'package.json')
@@ -68,20 +88,21 @@ def checkProjectInfo() {
         def packageJson = new groovy.json.JsonSlurper().parseText(packageJsonFile.text)
         projectVersion = packageJson.version ?: '1.0.0' // Get project version
 
-        // Check for expo dependency and version >= 50.
-        // For pnpm catalogs (e.g. "catalog:native"), the version string in package.json
-        // is not numeric, so we resolve the installed expo package version as fallback.
+        // Check for expo dependency and version >= 50. Only resolved when
+        // expo-modules-core is part of the build and expo is declared; every
+        // other project pays nothing beyond this package.json read.
         String expoVersionString = packageJson.dependencies?.expo ?: packageJson.devDependencies?.expo
-        Integer declaredExpoMajorVersion = parseMajorVersion(expoVersionString)
-        Integer installedExpoMajorVersion = expoVersionString ?
-            resolveInstalledExpoMajorVersion(packageJsonFile.parentFile) :
-            null
-        Integer expoMajorVersion = installedExpoMajorVersion ?: declaredExpoMajorVersion
-
-        boolean expoVersionIsHighEnough =
-            expoMajorVersion != null && expoMajorVersion >= 50
+        Integer expoMajorVersion = null
+        if (hasExpoModulesCore && expoVersionString) {
+            // For pnpm catalogs (e.g. "catalog:native") the declared version is
+            // not numeric: prefer the installed package, then the declaration,
+            // and spawn `node` only as the last resort.
+            expoMajorVersion = readInstalledExpoMajorVersion(packageJsonFile.parentFile)
+                ?: parseMajorVersion(expoVersionString)
+                ?: resolveInstalledExpoMajorVersion(packageJsonFile.parentFile)
+        }
 
-        hasExpoDependency = expoVersionIsHighEnough // Update based on version check
+        hasExpoDependency = expoMajorVersion != null && expoMajorVersion >= 50
     }
     
     def isExpo = hasExpoModulesCore && hasExpoDependency
@@ -125,13 +146,11 @@ android {
             }
         }
     }
-    compileSdkVersion safeExtGet('compileSdkVersion', 31)
-    buildToolsVersion safeExtGet('buildToolsVersion', '31.0.0')
+    compileSdkVersion safeExtGet('compileSdkVersion', 34)
+    buildToolsVersion safeExtGet('buildToolsVersion', '34.0.0')
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 21)
-        targetSdkVersion safeExtGet('targetSdkVersion', 27)
-        versionCode 1
-        versionName "1.81.4"
+        targetSdkVersion safeExtGet('targetSdkVersion', 34)
         consumerProguardFiles "proguard.pro"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     }
@@ -146,9 +165,9 @@ android {
                 java.srcDirs += ['src/oldarch']
             }
             
-            if (expoProject) {
-                java.srcDirs += ['java/expo/modules/pushy']
-            } else {
+            // The Expo module lives in the default src/main/java tree and is
+            // only compiled when the host is an Expo (SDK 50+) project.
+            if (!expoProject) {
                 java.exclude 'expo/modules/pushy/**'
             }
         }
@@ -172,20 +191,27 @@ android {
             resValue("string", "pushy_build_time", "0")
         }
     }
-    lintOptions {
-        abortOnError false
+    if (agpMajor >= 7) {
+        lint {
+            abortOnError false
+        }
+    } else {
+        lintOptions {
+            abortOnError false
+        }
     }
-}
 
-repositories {
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url "$rootDir/../node_modules/react-native/android"
+    testOptions {
+        // Pure-JVM unit tests (android/src/test): android.* calls return
+        // defaults instead of throwing, org.json comes from the real library.
+        unitTests.returnDefaultValues = true
     }
 }
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.json:json:20240303'
 }
 if (isNewArchitectureEnabled()) {
     react {

package/android/jni/Application.mk

@@ -3,7 +3,12 @@ APP_CFLAGS += -Wno-error=format-security
 APP_CFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
 APP_CFLAGS += -ffunction-sections -fdata-sections
 APP_CFLAGS += -Oz -fno-unwind-tables -fno-asynchronous-unwind-tables
-APP_CPPFLAGS += -std=c++17 -Oz -fno-exceptions -fno-rtti -fno-unwind-tables -fno-asynchronous-unwind-tables
+# -fexceptions (ndk-build defaults to -fno-exceptions): the cpp/ cores allocate
+# proportionally to untrusted input, and without exceptions a bad_alloc /
+# length_error would std::terminate the process instead of surfacing as a Java
+# exception (every JNI entry point catches and rethrows). Unwind tables are
+# still emitted for throwing frames.
+APP_CPPFLAGS += -std=c++17 -Oz -fexceptions -fno-rtti -fno-unwind-tables -fno-asynchronous-unwind-tables
 APP_LDFLAGS += -Wl,--gc-sections -Wl,--exclude-libs,ALL
 APP_LDFLAGS += -Wl,--icf=all
 APP_BUILD_SCRIPT := Android.mk

package/android/jni/hpatch.c

@@ -15,9 +15,64 @@
 
 #define kMaxLoadMemOldSize ((1<<20)*8)
 
+// LZMA/LZMA2 declare their dictionary size inside the compressed stream, i.e.
+// in attacker-controlled patch bytes, and LzmaDec_Allocate() allocates it
+// verbatim — up to 4 GB. The plugins live in the HDiffPatch submodule, so the
+// cap is applied here by wrapping open(): decode the declared dictionary the
+// way the decoder does and refuse anything above kMaxLzmaDictSize before any
+// allocation happens. hdiffz defaults to an 8 MB dictionary and reduces it to
+// the input size (compress_plugin_demo.h reduceSize), so real patches sit far
+// below the cap; a refused stream fails the patch cleanly (kHPatch_error_patch)
+// and the caller falls back to the full package.
+#define kMaxLzmaDictSize ((hpatch_uint32_t)((1<<20)*128))
+
 #define  _check(v,errorType) do{ \
     if (!(v)){ if (result==kHPatch_ok) result=errorType; if (!_isInClear){ goto _clear; }; } }while(0)
 
+#ifdef  _CompressPlugin_lzma
+static hpatch_decompressHandle _capped_lzma_open(hpatch_TDecompress* decompressPlugin,
+                                                 hpatch_StreamPos_t dataSize,
+                                                 const hpatch_TStreamInput* codeStream,
+                                                 hpatch_StreamPos_t code_begin,
+                                                 hpatch_StreamPos_t code_end){
+    // stream layout (see _lzma_open): propsSize byte, then propsSize bytes of
+    // LZMA props whose bytes 1..4 hold the little-endian dictionary size.
+    unsigned char propsSize=0;
+    unsigned char props[LZMA_PROPS_SIZE];
+    hpatch_uint32_t dicSize;
+    if (code_end-code_begin<1) return 0;
+    if (!codeStream->read(codeStream,code_begin,&propsSize,&propsSize+1)) return 0;
+    if ((propsSize<LZMA_PROPS_SIZE)||(propsSize>code_end-code_begin-1)) return 0;
+    if (!codeStream->read(codeStream,code_begin+1,props,props+LZMA_PROPS_SIZE)) return 0;
+    dicSize=((hpatch_uint32_t)props[1])|(((hpatch_uint32_t)props[2])<<8)
+           |(((hpatch_uint32_t)props[3])<<16)|(((hpatch_uint32_t)props[4])<<24);
+    if (dicSize>kMaxLzmaDictSize) return 0;
+    return lzmaDecompressPlugin.open(decompressPlugin,dataSize,codeStream,code_begin,code_end);
+}
+static hpatch_TDecompress cappedLzmaDecompressPlugin={_lzma_is_can_open,_capped_lzma_open,
+                                                      _lzma_close,_lzma_decompress_part};
+#endif
+#ifdef  _CompressPlugin_lzma2
+static hpatch_decompressHandle _capped_lzma2_open(hpatch_TDecompress* decompressPlugin,
+                                                  hpatch_StreamPos_t dataSize,
+                                                  const hpatch_TStreamInput* codeStream,
+                                                  hpatch_StreamPos_t code_begin,
+                                                  hpatch_StreamPos_t code_end){
+    // stream layout (see _lzma2_open): a single LZMA2 property byte encodes
+    // the dictionary size (Lzma2Dec_GetOldProps): 40 means 4 GB - 1.
+    unsigned char prop=0;
+    hpatch_uint32_t dicSize;
+    if (code_end-code_begin<1) return 0;
+    if (!codeStream->read(codeStream,code_begin,&prop,&prop+1)) return 0;
+    if (prop>40) return 0;
+    dicSize=(prop==40)?0xFFFFFFFF:(((hpatch_uint32_t)2|(prop&1))<<(prop/2+11));
+    if (dicSize>kMaxLzmaDictSize) return 0;
+    return lzma2DecompressPlugin.open(decompressPlugin,dataSize,codeStream,code_begin,code_end);
+}
+static hpatch_TDecompress cappedLzma2DecompressPlugin={_lzma2_is_can_open,_capped_lzma2_open,
+                                                       _lzma2_close,_lzma2_decompress_part};
+#endif
+
 static hpatch_TDecompress* getDecompressPlugin(const char* compressType){
 #ifdef  _CompressPlugin_zlib
     if (zlibDecompressPlugin.is_can_open(compressType))
@@ -28,12 +83,12 @@ static hpatch_TDecompress* getDecompressPlugin(const char* compressType){
         return &bz2DecompressPlugin;
 #endif
 #ifdef  _CompressPlugin_lzma
-    if (lzmaDecompressPlugin.is_can_open(compressType))
-        return &lzmaDecompressPlugin;
+    if (cappedLzmaDecompressPlugin.is_can_open(compressType))
+        return &cappedLzmaDecompressPlugin;
 #endif
 #ifdef  _CompressPlugin_lzma2
-    if (lzma2DecompressPlugin.is_can_open(compressType))
-        return &lzma2DecompressPlugin;
+    if (cappedLzma2DecompressPlugin.is_can_open(compressType))
+        return &cappedLzma2DecompressPlugin;
 #endif
     return 0;
 }

package/android/proguard.pro

@@ -1,18 +1,74 @@
-# Keep our update module classes
--keepnames class cn.reactnative.modules.update.DownloadTask { *; }
--keepnames class cn.reactnative.modules.update.UpdateModuleImpl { *; }
--keepnames class cn.reactnative.modules.update.** { *; }
+# JNI-constructed result classes: cpp/patch_core/update_core_android.cpp
+# resolves them by FindClass + GetMethodID("<init>") + GetFieldID, so the
+# no-arg constructor and every field must survive shrinking with their names
+# (a -keepnames rule alone lets R8 strip the unreferenced constructor/fields).
+-keep class cn.reactnative.modules.update.StateCoreResult { <init>(); <fields>; }
+-keep class cn.reactnative.modules.update.ArchivePatchPlanResult { <init>(); <fields>; }
+-keep class cn.reactnative.modules.update.CopyGroupResult { <init>(); <fields>; }
 
-# Keep React Native classes
--keepnames class com.facebook.react.ReactInstanceManager { *; }
--keepnames class com.facebook.react.** { *; }
--keepnames class com.facebook.react.bridge.** { *; }
--keepnames class com.facebook.react.devsupport.** { *; }
+# JNI entry points are bound by their mangled Java names.
+-keepclasseswithmembernames class cn.reactnative.modules.update.** {
+    native <methods>;
+}
 
-# Keep fields used in reflection
--keepclassmembers class com.facebook.react.ReactActivity { *; }
--keepclassmembers class com.facebook.react.ReactInstanceManager { *; }
--keepclassmembers class com.facebook.react.ReactDelegate { *; }
--keepclassmembers class com.facebook.react.ReactHost { *; }
+# Instantiated by React Native / Expo / the system by name.
+-keep class cn.reactnative.modules.update.UpdateModule { *; }
+-keep class cn.reactnative.modules.update.UpdatePackage { *; }
+-keep class cn.reactnative.modules.update.PackageInstallerStatusReceiver { *; }
+-keep class expo.modules.pushy.** { *; }
+
+# Reflection targets of ReactReloadManager / UpdateEventEmitter. Only the
+# members looked up by name are pinned; React Native's own consumer rules
+# decide what else of com.facebook.react.** survives.
+-keepclassmembers class com.facebook.react.ReactInstanceManager {
+    *** mBundleLoader;
+    *** bundleLoader;
+    *** mJSBundleFile;
+    *** jsBundleFile;
+}
+-keepclassmembers class com.facebook.react.ReactActivity {
+    *** getReactDelegate();
+}
+-keepclassmembers class com.facebook.react.ReactDelegate {
+    *** mReactHost;
+    *** reactHost;
+}
+-keepclassmembers class com.facebook.react.ReactNativeHost {
+    *** getBundleAssetName();
+    *** isNewArchEnabled();
+}
+-keepclassmembers class * extends com.facebook.react.ReactNativeHost {
+    *** getBundleAssetName();
+    *** isNewArchEnabled();
+}
+-keepclassmembers class com.facebook.react.runtime.ReactHostImpl {
+    *** mUseDevSupport;
+    *** useDevSupport;
+    *** mReactHostDelegate;
+    *** reactHostDelegate;
+    *** reload(java.lang.String);
+}
+# reload(String) returns TaskInterface<Void> (not void) and is looked up on
+# the runtime class of whatever ReactHost the app provides; the `***` return
+# type is what makes the rule match — verified against an R8-minified
+# RN 0.85 build, where `void reload(...)` silently kept nothing.
+-keepclassmembers class * implements com.facebook.react.ReactHost {
+    *** reload(java.lang.String);
+}
+-keepclassmembers class * implements com.facebook.react.runtime.ReactHostDelegate {
+    *** jsBundleLoader;
+    *** _jsBundleLoader;
+}
+-keepclassmembers class * implements com.facebook.react.ReactApplication {
+    *** getReactHost();
+}
+-keepclassmembers class com.facebook.react.bridge.ReactContext {
+    *** hasActiveReactInstance();
+}
+# The host app's BuildConfig is located by name (Class.forName) and its
+# new-architecture flag read by reflection.
+-keep class **.BuildConfig {
+    public static boolean IS_NEW_ARCHITECTURE_ENABLED;
+}
 
 -keepnames class expo.modules.ExpoReactHostFactory$ExpoReactHostDelegate { *; }

package/android/src/main/java/cn/reactnative/modules/update/ApkInstaller.java

@@ -55,14 +55,6 @@ final class ApkInstaller {
         ReactApplicationContext reactContext,
         Promise promise
     ) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            promise.reject(
-                ErrorCodes.UNSUPPORTED_PLATFORM,
-                "APK installation requires Android 5.0 or newer"
-            );
-            return false;
-        }
-
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
             return true;
         }
@@ -129,12 +121,23 @@ final class ApkInstaller {
         return false;
     }
 
+    /**
+     * Stages the downloaded APK in a PackageInstaller session and commits it;
+     * the status receiver settles the promise. The APK file is deleted once
+     * the session has the bytes or the attempt failed, so a leftover can
+     * never be installed by a later call (CODE_AUDIT 2.6).
+     */
     static void install(
         ReactApplicationContext reactContext,
         File apkFile,
         String sourceUrl,
         Promise promise
     ) {
+        // TODO(CODE_AUDIT 2.6): verify a server-provided sha256 of the APK
+        // before staging it. The `hash` JS passes to downloadAndInstallApk is
+        // the progress-event key ("downloadingApk"), not a digest, so there
+        // is nothing to check against yet; until the server sends one, the
+        // https-only rule in UpdateModuleImpl is the integrity boundary.
         PackageInstaller packageInstaller = null;
         int sessionId = -1;
         boolean committed = false;
@@ -216,6 +219,10 @@ final class ApkInstaller {
                 }
             }
             promise.reject(ErrorCodes.APK_INSTALL_FAILED, "Unable to stage APK installation", error);
+        } finally {
+            if (apkFile.exists() && !apkFile.delete()) {
+                Log.w(UpdateContext.TAG, "Unable to delete staged APK " + apkFile);
+            }
         }
     }
 

package/android/src/main/java/cn/reactnative/modules/update/ArchiveLimits.java

@@ -13,6 +13,7 @@ final class ArchiveLimits {
     static final long RATIO_CHECK_MIN_BYTES = 1L * 1024 * 1024;
     static final long MAX_MANIFEST_BYTES = 16L * 1024 * 1024;
     static final long FREE_DISK_MARGIN_BYTES = 64L * 1024 * 1024;
+    static final long UNKNOWN_LENGTH_FREE_SPACE_PROBE_BYTES = 8L * 1024 * 1024;
 
     private ArchiveLimits() {
     }

package/android/src/main/java/cn/reactnative/modules/update/BundledResourceCopier.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
-import android.os.Build;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
@@ -362,7 +361,7 @@ final class BundledResourceCopier {
         try {
             ApplicationInfo appInfo =
                 context.getPackageManager().getApplicationInfo(context.getPackageName(), 0);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && appInfo.splitSourceDirs != null) {
+            if (appInfo.splitSourceDirs != null) {
                 for (String splitPath : appInfo.splitSourceDirs) {
                     apkPaths.add(splitPath);
                 }

package/android/src/main/java/cn/reactnative/modules/update/CleanupKeepNames.java

@@ -0,0 +1,25 @@
+package cn.reactnative.modules.update;
+
+/** Selects the at-most-two distinct version names supported by cleanup JNI. */
+final class CleanupKeepNames {
+    private CleanupKeepNames() {
+    }
+
+    static String[] select(String current, String previous, String running) {
+        String[] keep = new String[2];
+        for (String candidate : new String[] {current, previous, running}) {
+            if (candidate == null || candidate.isEmpty()
+                || candidate.equals(keep[0]) || candidate.equals(keep[1])) {
+                continue;
+            }
+            if (keep[0] == null) {
+                keep[0] = candidate;
+            } else if (keep[1] == null) {
+                keep[1] = candidate;
+            } else {
+                return null;
+            }
+        }
+        return keep;
+    }
+}