From bea09b691debcd901a05a5d324b7b86e0ddab5d7 Mon Sep 17 00:00:00 2001 From: Marlon Date: Tue, 22 Sep 2026 12:43:08 -0500 Subject: [PATCH 1/2] remove: proxy apk at mediamtx --- .../twentyfoulabs/data/ptt/PttAudioClient.kt | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/app/src/main/kotlin/com/bodycamera/twentyfoulabs/data/ptt/PttAudioClient.kt b/app/src/main/kotlin/com/bodycamera/twentyfoulabs/data/ptt/PttAudioClient.kt index dc16712..7a7cabf 100644 --- a/app/src/main/kotlin/com/bodycamera/twentyfoulabs/data/ptt/PttAudioClient.kt +++ b/app/src/main/kotlin/com/bodycamera/twentyfoulabs/data/ptt/PttAudioClient.kt @@ -858,22 +858,27 @@ class PttAudioClient @Inject constructor( suppliedUrl: String?, fallbackPath: String ): String { - if (suppliedUrl.isNullOrBlank()) { return "$MEDIA_BASE_URL/$fallbackPath" } - return when { - suppliedUrl.startsWith( - "http://" - ) || - suppliedUrl.startsWith( - "https://" - ) -> suppliedUrl + // Rails (BROWSER_PROXY) envía "/media-mtx/ptt/u/:id/whip". + // MediaMTX espera "http://host:8889/ptt/u/:id/whip" (sin prefijo media-mtx). + val raw = suppliedUrl.trim() - else -> - "$MEDIA_BASE_URL/" + - suppliedUrl.trimStart('/') + return when { + raw.startsWith("http://") || raw.startsWith("https://") -> { + if (raw.contains("/media-mtx/")) { + "$MEDIA_BASE_URL/" + raw.substringAfter("/media-mtx/").trimStart('/') + } else { + raw + } + } + + else -> { + val path = raw.trimStart('/').removePrefix("media-mtx/") + "$MEDIA_BASE_URL/$path" + } } } From 01681a33d44df9ad334940ddbee1f77a6b8afb01 Mon Sep 17 00:00:00 2001 From: Marlon Date: Fri, 25 Sep 2026 09:02:14 -0500 Subject: [PATCH 2/2] revert: remove proxy apk at mediamtx --- .../twentyfoulabs/data/ptt/PttAudioClient.kt | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/app/src/main/kotlin/com/bodycamera/twentyfoulabs/data/ptt/PttAudioClient.kt b/app/src/main/kotlin/com/bodycamera/twentyfoulabs/data/ptt/PttAudioClient.kt index 7a7cabf..dc16712 100644 --- a/app/src/main/kotlin/com/bodycamera/twentyfoulabs/data/ptt/PttAudioClient.kt +++ b/app/src/main/kotlin/com/bodycamera/twentyfoulabs/data/ptt/PttAudioClient.kt @@ -858,27 +858,22 @@ class PttAudioClient @Inject constructor( suppliedUrl: String?, fallbackPath: String ): String { + if (suppliedUrl.isNullOrBlank()) { return "$MEDIA_BASE_URL/$fallbackPath" } - // Rails (BROWSER_PROXY) envía "/media-mtx/ptt/u/:id/whip". - // MediaMTX espera "http://host:8889/ptt/u/:id/whip" (sin prefijo media-mtx). - val raw = suppliedUrl.trim() - return when { - raw.startsWith("http://") || raw.startsWith("https://") -> { - if (raw.contains("/media-mtx/")) { - "$MEDIA_BASE_URL/" + raw.substringAfter("/media-mtx/").trimStart('/') - } else { - raw - } - } + suppliedUrl.startsWith( + "http://" + ) || + suppliedUrl.startsWith( + "https://" + ) -> suppliedUrl - else -> { - val path = raw.trimStart('/').removePrefix("media-mtx/") - "$MEDIA_BASE_URL/$path" - } + else -> + "$MEDIA_BASE_URL/" + + suppliedUrl.trimStart('/') } }