Skip to content

settings: more permissive close url interceptor for non-compliant URLs #56

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
crc-32 merged 2 commits into from
Jan 2, 2026
+9 −3
Merged

settings: more permissive close url interceptor for non-compliant URLs #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b141388
settings: more permissive close url interceptor for non-compliant URLs
KonradIT Dec 7, 2025
afc330d
Merge branch 'coredevices:master' into pebblejs-close
KonradIT Dec 17, 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
12 changes: 9 additions & 3 deletions pebble/src/commonMain/kotlin/coredevices/pebble/ui/WatchappSettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ private class SettingsRequestInterceptor(
private val onError: suspend () -> Unit,
private val onSuccess: suspend (String) -> Unit,
) : RequestInterceptor {
private val PREFIX = "pebblejs://close#"
private val PREFIX = "pebblejs://close" // non-compliant intercept for close, because some apps just use "close"
private val scope = CoroutineScope(Dispatchers.Default)

override fun onInterceptUrlRequest(
Expand All @@ -155,8 +155,14 @@ private class SettingsRequestInterceptor(
if (!request.url.startsWith(PREFIX)) {
return WebRequestInterceptResult.Allow
}
val data = request.url.removePrefix(PREFIX).decodeURLPart()
if (data.isNotEmpty()) {

// Matches PREFIX followed by #, /, or /?
// Ideally all apps would send pebblejs://close#param1=value1&param2=value2 but it's not the case.
// The original Pebble Technology Corp App did deviate from the official spec and handled these wrong cases too.
val closeUrlRegex = Regex("""^pebblejs://close(?:#|/\?|/)(.*)$""")

val data = closeUrlRegex.find(request.url)?.groupValues?.get(1)?.decodeURLPart()
if (data?.isNotEmpty() == true) {
scope.launch {
delay(10)
onSuccess(data)
Expand Down