From 037f5c1770db7fcc699f3fc05421e0737b13512f Mon Sep 17 00:00:00 2001 From: Dixit Sabharwal Date: Sat, 7 Nov 2026 14:09:19 +0100 Subject: [PATCH] android: decode password-login payload leniently The non-2FA branch decoded the LoginResponse with the strict default Json, so any field the DTO does not model (e.g. user.created_at) failed the sign-in. Reuse the ApiClient decoder, which ignores unknown keys. --- .../app/src/main/java/org/cloudreve/android/api/ApiClient.kt | 3 ++- .../main/java/org/cloudreve/android/ui/login/LoginViewModel.kt | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/src/main/java/org/cloudreve/android/api/ApiClient.kt b/android/app/src/main/java/org/cloudreve/android/api/ApiClient.kt index dcb22c4e84..352952c705 100644 --- a/android/app/src/main/java/org/cloudreve/android/api/ApiClient.kt +++ b/android/app/src/main/java/org/cloudreve/android/api/ApiClient.kt @@ -21,7 +21,8 @@ import java.util.concurrent.TimeUnit */ class ApiClient(private val session: SessionManager) { - private val json = Json { + /** Lenient decoder shared with callers that unwrap `JsonElement` payloads by hand. */ + val json = Json { ignoreUnknownKeys = true coerceInputValues = true } diff --git a/android/app/src/main/java/org/cloudreve/android/ui/login/LoginViewModel.kt b/android/app/src/main/java/org/cloudreve/android/ui/login/LoginViewModel.kt index c7edf73aba..4f698c13a9 100644 --- a/android/app/src/main/java/org/cloudreve/android/ui/login/LoginViewModel.kt +++ b/android/app/src/main/java/org/cloudreve/android/ui/login/LoginViewModel.kt @@ -5,7 +5,6 @@ import androidx.lifecycle.viewModelScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch -import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonPrimitive import org.cloudreve.android.api.ApiClient import org.cloudreve.android.api.LoginResponse @@ -67,7 +66,7 @@ class LoginViewModel( ?: throw Exception("Server requested 2FA without a session id") _state.value = _state.value.copy(loading = false, twoFactorSessionId = sessionId, otp = "") } - 0 -> completeLogin(Json.decodeFromJsonElement(LoginResponse.serializer(), body.data)) + 0 -> completeLogin(api.json.decodeFromJsonElement(LoginResponse.serializer(), body.data)) else -> throw Exception(body.msg.ifBlank { "Login failed" }) } } catch (e: Exception) {