Skip to content

fix: android build after changes to FileSystemScriptLoader #1203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbroma merged 2 commits into from
Jul 2, 2025
Merged

fix: android build after changes to FileSystemScriptLoader #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfc096e
fix: kotlin types
jbroma Jul 2, 2025
4406738
chore: changeset
jbroma Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/salty-rockets-kiss.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@callstack/repack": patch
---

Fix type mismatch in FileSystemScriptLoader on Android
6 changes: 3 additions & 3 deletions packages/repack/android/src/main/java/com/callstack/repack/FileSystemScriptLoader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import java.io.FileInputStream

class FileSystemScriptLoader(private val reactContext: ReactContext, private val nativeLoader: NativeScriptLoader) {
fun verifyBundle(code: ByteArray, config: ScriptConfig): ByteArray {
val (bundle, token) = code?.let {
val (bundle, token) = code.let {
CodeSigningUtils.extractBundleAndToken(code)
} ?: Pair(null, null)
}

if (config.verifyScriptSignature == "strict" || (config.verifyScriptSignature == "lax" && token != null)) {
CodeSigningUtils.verifyBundle(reactContext, token, bundle)
Expand All @@ -31,7 +31,7 @@ class FileSystemScriptLoader(private val reactContext: ReactContext, private val
val inputStream = reactContext.assets.open(assetName)
code = inputStream.use { it.readBytes() }
}
val bundle: ByteArray = verifyBundle(code, config)
val bundle = verifyBundle(code, config)
nativeLoader.evaluate(bundle, config.sourceUrl, promise)
} catch (error: Exception) {
promise.reject(
Expand Down