bvandeusen/minstrel
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 40 Wiki Activity

Discover artwork + Library icon + notification tap routing #73

Merged
bvandeusen merged 5 commits from dev into main 2026-06-02 09:58:10 -04:00
Conversation 0 Commits 5 Files Changed 7
+11 -7
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4cd38aa62f - Show all commits
android/app/src/main/java/com/fabledsword/minstrel/api/BaseUrlInterceptor.kt
+11 -7
View File
@@ -38,14 +38,18 @@ class BaseUrlInterceptor @Inject constructor(
override fun intercept(chain: Interceptor.Chain): Response { override fun intercept(chain: Interceptor.Chain): Response {
val original = chain.request() val original = chain.request()
// Early-bail keeps the no-op path for external URLs cheap
// (no AuthStore read, no URL parse).
if (original.url.host != PLACEHOLDER_HOST) return chain.proceed(original) if (original.url.host != PLACEHOLDER_HOST) return chain.proceed(original)
val baseUrl = authStore.baseUrl.value.toHttpUrlOrNull() // Unparseable baseUrl folds into the same proceed path — keeps
?: return chain.proceed(original) // detekt's ReturnCount happy by avoiding a second early return.
val rewritten: HttpUrl = original.url.newBuilder() val rewritten: HttpUrl = authStore.baseUrl.value.toHttpUrlOrNull()?.let { baseUrl ->
.scheme(baseUrl.scheme) original.url.newBuilder()
.host(baseUrl.host) .scheme(baseUrl.scheme)
.port(baseUrl.port) .host(baseUrl.host)
.build() .port(baseUrl.port)
.build()
} ?: original.url
return chain.proceed(original.newBuilder().url(rewritten).build()) return chain.proceed(original.newBuilder().url(rewritten).build())
} }