Skip to content
Open
Changes from all commits
Commits
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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with Greptile that we should not use !! since null is allowed and this can cause runtime crashes.

Original file line number Diff line number Diff line change
@@ -1,55 +1,66 @@
package com.youversion.reactnativesdk.views

import android.content.Context
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import com.youversion.platform.core.bibles.domain.BibleReference
import com.youversion.platform.reader.BibleReader
import expo.modules.kotlin.AppContext
import expo.modules.kotlin.views.ComposeProps
import expo.modules.kotlin.views.ExpoComposeView

const val DEFAULT_BEREAN_STANDARD_BIBLE_VERSION = 3034

data class BibleReaderViewProps(
// Bible reference
val versionId: MutableState<Int?> = mutableStateOf(null),
val bookUSFM: MutableState<String?> = mutableStateOf(null),
val chapter: MutableState<Int?> = mutableStateOf(null),
val verse: MutableState<Int?> = mutableStateOf(null),
val verseStart: MutableState<Int?> = mutableStateOf(null),
val verseEnd: MutableState<Int?> = mutableStateOf(null),

val appName: MutableState<String?> = mutableStateOf(null),
val signInMessage: MutableState<String?> = mutableStateOf(null),
val hasReference: MutableState<Boolean?> = mutableStateOf(false),
val hasReference: MutableState<Boolean?> = mutableStateOf(null)
) : ComposeProps

class YVPBibleReaderView(context: Context, appContext: AppContext) :
ExpoComposeView<BibleReaderViewProps>(context, appContext, withHostingView = true) {

override val props = BibleReaderViewProps()

@Composable
override fun Content(modifier: Modifier) {
// TODO: Replace with actual BibleReaderView composable when Kotlin SDK is ready
Box(
modifier = modifier
.fillMaxSize()
.padding(16.dp),
contentAlignment = Alignment.Center
) {
Text(
text = "BibleReaderView placeholder\n" +
"App: ${props.appName.value}\n" +
"Reference: ${props.bookUSFM.value} ${props.chapter.value}",
color = Color.Gray
BibleReader(
appName = props.appName.value ?: "",
appSignInMessage = props.signInMessage.value ?: "",
bibleReference = bibleReference(),
)
}

fun bibleReference(): BibleReference? {
val start = props.verseStart.value
val end = props.verseEnd.value

if (start != null && end != null) {
return BibleReference(
versionId = props.versionId.value ?: DEFAULT_BEREAN_STANDARD_BIBLE_VERSION,
bookUSFM = props.bookUSFM.value ?: "JHN",
chapter = props.chapter.value ?: 1,
verseStart = start,
verseEnd = end
)
}
Comment on lines 45 to 53
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Force-unwraps on versionId, bookUSFM, and chapter risk NullPointerException

Similar to the Content() method, the !! operators on lines 49-51 will crash if these props haven't been set yet. Since bibleReference() is called from Content() during composition, the same timing issue applies — props may still be null on the first composition pass.

Consider using null-safe access and returning null if required fields are missing:

Suggested change
if (start != null && end != null) {
return BibleReference(
versionId = props.versionId.value!!,
bookUSFM = props.bookUSFM.value!!,
chapter = props.chapter.value!!,
verseStart = start,
verseEnd = end
)
}
if (start != null && end != null) {
val versionId = props.versionId.value ?: return null
val bookUSFM = props.bookUSFM.value ?: return null
val chapter = props.chapter.value ?: return null
return BibleReference(
versionId = versionId,
bookUSFM = bookUSFM,
chapter = chapter,
verseStart = start,
verseEnd = end
)
}

Context Used: Rule from dashboard - Avoid unnecessary negations and else blocks to reduce nesting and improve code readability. Use earl... (source)


if (props.hasReference.value == true) {
return BibleReference(
versionId = props.versionId.value ?: DEFAULT_BEREAN_STANDARD_BIBLE_VERSION,
bookUSFM = props.bookUSFM.value ?: "JHN",
chapter = props.chapter.value ?: 1,
verse = props.verse.value
)
}

return null
}
}
Loading