Skip to content

fix: validate highlightColor before passing to SystemUI #248

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
Wangtaotaoo wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −4
Open

fix: validate highlightColor before passing to SystemUI #248

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 19 additions & 4 deletions app/src/main/java/com/d4viddf/hyperbridge/service/translators/BaseTranslator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,25 +75,40 @@ abstract class BaseTranslator(
// A. Specific Color Override
val overrideColor = override?.highlightColor
if (!overrideColor.isNullOrEmpty()) {
return overrideColor
return overrideColor.toSafeColorHex(defaultHex)
}

// B. App-Specific "Use App Colors"
// If explicit true -> extract. If explicit false -> skip extraction (fall to global).
if (override?.useAppColors == true) {
return getAppBrandColor(pkg) ?: theme.global.highlightColor ?: defaultHex
return (getAppBrandColor(pkg) ?: theme.global.highlightColor ?: defaultHex).toSafeColorHex(defaultHex)
}
}

// 2. Global "Use App Colors" -> Extract from Icon
// Only run if app override didn't explicitly disable it (useAppColors != false)
val appOverrideDisabled = theme.apps[pkg]?.useAppColors == false
if (theme.global.useAppColors && !appOverrideDisabled && pkg != null) {
return getAppBrandColor(pkg) ?: theme.global.highlightColor ?: defaultHex
return (getAppBrandColor(pkg) ?: theme.global.highlightColor ?: defaultHex).toSafeColorHex(defaultHex)
}

// 3. Global Theme Highlight -> Default Fallback
return theme.global.highlightColor ?: defaultHex
return (theme.global.highlightColor ?: defaultHex).toSafeColorHex(defaultHex)
}

/**
* Validates that a color string can be parsed by [android.graphics.Color.parseColor].
* Returns the original string if valid, or [fallback] if parsing fails.
* This prevents SystemUI crashes caused by invalid color values in theme configs.
*/
private fun String.toSafeColorHex(fallback: String): String {
return try {
Color.parseColor(this)
this
} catch (_: IllegalArgumentException) {
Log.w("BaseTranslator", "Invalid highlight color \"$this\", falling back to \"$fallback\"")
fallback
}
}

private fun getAppBrandColor(pkg: String): String? {
Expand Down