From 0d3b1b1c5ac19bb5e0bf94d14ffae88f1692886a Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Fri, 5 Apr 2024 12:01:54 +0200 Subject: [PATCH] show rules of the correct instance on the auth screen (#4358) closes #4357 --- .../tusky/components/login/LoginWebViewViewModel.kt | 2 +- .../main/java/com/keylesspalace/tusky/network/MastodonApi.kt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/login/LoginWebViewViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/login/LoginWebViewViewModel.kt index 231d1c0be..2e9198d16 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/login/LoginWebViewViewModel.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/login/LoginWebViewViewModel.kt @@ -39,7 +39,7 @@ class LoginWebViewViewModel @Inject constructor( if (this.domain == null) { this.domain = domain viewModelScope.launch { - api.getInstance().fold( + api.getInstance(domain).fold( { instance -> _instanceRules.value = instance.rules.map { rule -> rule.text } }, diff --git a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt index 2c462a58a..91c5fca2e 100644 --- a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt +++ b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt @@ -89,7 +89,9 @@ interface MastodonApi { ): NetworkResult @GET("api/v2/instance") - suspend fun getInstance(): NetworkResult + suspend fun getInstance( + @Header(DOMAIN_HEADER) domain: String? = null + ): NetworkResult @GET("api/v1/filters") suspend fun getFiltersV1(): NetworkResult>