Skip to content

fix: Handle Nullable Map and Enum Mismatch in MarkTextOptions.kt #247

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: Handle Nullable Map and Enum Mismatch in MarkTextOptions.kt #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b58bcba
Update ErrorCode.kt
anggaprytn Jul 30, 2025
2f8c4fb
Update ErrorCode.kt
anggaprytn Jul 30, 2025
b88a0e7
Update MarkTextOptions.kt
anggaprytn Jul 30, 2025
d3f63da
Refactor handleDynamicToString for null safety
anggaprytn Sep 16, 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
3 changes: 2 additions & 1 deletion android/src/main/java/com/jimmydaddy/imagemarker/base/ErrorCode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ enum class ErrorCode(val value: String) {
INVALID_PARAMS("INVALID_PARAMS"),
LOAD_IMAGE_FAILED("LOAD_IMAGE_FAILED"),
GET_RESOURCE_FAILED("GET_RESOURCE_FAILED"),
PARAMS_REQUIRED("PARAMS_REQUIRED");
PARAMS_REQUIRED("PARAMS_REQUIRED"),
NULL_MAP("NULL_MAP");
}
10 changes: 7 additions & 3 deletions android/src/main/java/com/jimmydaddy/imagemarker/base/MarkTextOptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@ class MarkTextOptions(options: ReadableMap) : Options(options) {
val waterMarkTextsMap = options.getArray("watermarkTexts")
if (waterMarkTextsMap!!.size() > 0) {
watermarkTexts = arrayOfNulls(waterMarkTextsMap.size())
for (i in 0 until waterMarkTextsMap.size()) {
val textMap = waterMarkTextsMap.getMap(i)
watermarkTexts[i] = TextOptions(textMap)
for (i in 0 until waterMarkTextsMap.size()) {
val textMap = waterMarkTextsMap.getMap(i)
textMap?.let {
watermarkTexts[i] = TextOptions(it)
} ?: run {
throw MarkerError(ErrorCode.NULL_MAP, "watermarkTexts[$i] is null")
}
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions android/src/main/java/com/jimmydaddy/imagemarker/base/Utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,15 @@ class Utils {
}

fun handleDynamicToString(d: Dynamic?): String {
return if (d == null) "0"
else
when (d.type) {
ReadableType.String -> d.asString()
ReadableType.Number -> d.asDouble().toString()
else -> {
"0"
return if (d == null) {
"0"
} else {
when (d.type) {
ReadableType.String -> d.asString() ?: "0"
ReadableType.Number -> d.asDouble().toString()
else -> "0"
}
}
}
}
}

Expand Down