From 15179a82e301c59ff3ae80ebab0965c0890558cc Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Wed, 31 Dec 2025 17:32:25 +0800
Subject: [PATCH] Fix sad panda check

---
 app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt       | 2 +-
 .../kotlin/com/hippo/ehviewer/ui/login/WebViewSignInScreen.kt   | 1 +
 app/src/main/rust/src/ffi/jvm.rs                                | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt b/app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt
index 980563466..62ee1ecaf 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt
@@ -124,7 +124,7 @@ private fun rethrowExactly(response: HttpResponse, body: Either<String, ByteBuff
         { !it.hasRemaining() },
     )
     if (empty) {
-        val message = if (EhUtils.isExHentai) {
+        val message = if (response.request.url.host == EhUrl.DOMAIN_EX) {
             "Sad Panda\n(without panda)"
         } else {
             appCtx.getString(R.string.error_ip_banned)
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/login/WebViewSignInScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/login/WebViewSignInScreen.kt
index d92238427..8bbb4885a 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/login/WebViewSignInScreen.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/login/WebViewSignInScreen.kt
@@ -31,6 +31,7 @@ fun AnimatedVisibilityScope.WebViewSignInScreen(navigator: DestinationsNavigator
                     Settings.desktopSite.value = false
                 }
                 if (EhCookieStore.hasSignedIn()) {
+                    EhCookieStore.flush()
                     postLogin()
                     state.webView?.destroy()
                     bgWork { awaitCancellation() }
diff --git a/app/src/main/rust/src/ffi/jvm.rs b/app/src/main/rust/src/ffi/jvm.rs
index 91d912cac..4298951cd 100644
--- a/app/src/main/rust/src/ffi/jvm.rs
+++ b/app/src/main/rust/src/ffi/jvm.rs
@@ -256,6 +256,7 @@ where
     R: Serialize,
 {
     jni_throwing(env, |env| {
+        ensure!(limit > 0, "Empty response");
         let buffer = deref_mut_direct_bytebuffer(env, str)?;
 
         // SAFETY: ktor client ensure html content is valid utf-8.