Skip to content
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.

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

Safely parse color string #1079

Merged
merged 1 commit into from
Apr 23, 2024
Merged
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
17 changes: 10 additions & 7 deletions aztec/src/main/kotlin/org/wordpress/aztec/spans/MarkSpan.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,22 @@ class MarkSpan : CharacterStyle, IAztecInlineSpan {

val color = CssStyleFormatter.getStyleAttribute(attributes,
CssStyleFormatter.CSS_COLOR_ATTRIBUTE)
textColorValue = if (color.isNotEmpty()) {
Color.parseColor(color)
} else {
null
}
textColorValue = safelyParseColor(color)
}

constructor(attributes: AztecAttributes = AztecAttributes(), colorString: String?) : super() {
this.attributes = attributes
textColorValue = safelyParseColor(colorString)
}

textColorValue = if (colorString != null) {
private fun safelyParseColor(colorString: String?): Int? {
if (colorString == null) {
return null
}
return try {
Color.parseColor(colorString)
} else {
} catch (e: IllegalArgumentException) {
// Unknown color
null
}
}
Expand Down
Loading