From 104bab71fad7a8902a7766386e97cc73d3432138 Mon Sep 17 00:00:00 2001 From: grakovne Date: Fri, 19 Dec 2025 00:41:15 +0300 Subject: [PATCH] Fix issue https://acrarium.grakovne.org/app/1/bug/2617/report/d43fd076-2a4c-410b-afa0-4b2de2b45785 --- app/build.gradle.kts | 4 ++-- .../org/grakovne/lissen/channel/common/ApiClient.kt | 3 ++- .../kotlin/org/grakovne/lissen/lib/domain/FixScheme.kt | 6 ++++++ .../org/grakovne/lissen/lib/domain/connection/LocalUrl.kt | 8 ++------ 4 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 lib/src/main/kotlin/org/grakovne/lissen/lib/domain/FixScheme.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 82d3829a..4a054f5d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -53,8 +53,8 @@ android { applicationId = "org.grakovne.lissen" minSdk = 28 targetSdk = 36 - versionCode = 10714 - versionName = "1.7.14-$commitHash" + versionCode = 10800 + versionName = "1.8.0-$commitHash" buildConfigField("String", "GIT_HASH", "\"$commitHash\"") diff --git a/app/src/main/kotlin/org/grakovne/lissen/channel/common/ApiClient.kt b/app/src/main/kotlin/org/grakovne/lissen/channel/common/ApiClient.kt index b0253ce3..660e9052 100644 --- a/app/src/main/kotlin/org/grakovne/lissen/channel/common/ApiClient.kt +++ b/app/src/main/kotlin/org/grakovne/lissen/channel/common/ApiClient.kt @@ -3,6 +3,7 @@ package org.grakovne.lissen.channel.common import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import org.grakovne.lissen.lib.domain.connection.ServerRequestHeader +import org.grakovne.lissen.lib.domain.fixUriScheme import org.grakovne.lissen.persistence.preferences.LissenSharedPreferences import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory @@ -17,7 +18,7 @@ class ApiClient( val retrofit: Retrofit = Retrofit .Builder() - .baseUrl(host) + .baseUrl(host.fixUriScheme()) .client(httpClient) .addConverterFactory(MoshiConverterFactory.create(moshi)) .build() diff --git a/lib/src/main/kotlin/org/grakovne/lissen/lib/domain/FixScheme.kt b/lib/src/main/kotlin/org/grakovne/lissen/lib/domain/FixScheme.kt new file mode 100644 index 00000000..a8968914 --- /dev/null +++ b/lib/src/main/kotlin/org/grakovne/lissen/lib/domain/FixScheme.kt @@ -0,0 +1,6 @@ +package org.grakovne.lissen.lib.domain + +fun String.fixUriScheme() = when (this.startsWith("http://") || this.startsWith("https://")) { + true -> this + false -> "http://$this" +} \ No newline at end of file diff --git a/lib/src/main/kotlin/org/grakovne/lissen/lib/domain/connection/LocalUrl.kt b/lib/src/main/kotlin/org/grakovne/lissen/lib/domain/connection/LocalUrl.kt index 6e726301..9a4e6e07 100644 --- a/lib/src/main/kotlin/org/grakovne/lissen/lib/domain/connection/LocalUrl.kt +++ b/lib/src/main/kotlin/org/grakovne/lissen/lib/domain/connection/LocalUrl.kt @@ -2,6 +2,7 @@ package org.grakovne.lissen.lib.domain.connection import androidx.annotation.Keep import com.squareup.moshi.JsonClass +import org.grakovne.lissen.lib.domain.fixUriScheme import java.net.URI import java.util.UUID @@ -34,12 +35,7 @@ data class LocalUrl( return this .filter { validCharacters.matches(it.toString()) } .trim() - .let { - when (it.startsWith("http://") || it.startsWith("https://")) { - true -> it - false -> "http://$it" - } - } + .fixUriScheme() } } }