yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missing content warning cookie in guest mode

Browse Source
This commit is contained in:
FooIbar committed 2023-12-19 11:17:58 +08:00
1 parent f86dec9b2e
commit 347ce6854d
15 files changed
+37 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/kotlin/com/hippo/ehviewer/client/EhCookieStore.kt
+10 -8
View File
@@ -65,16 +65,18 @@ object EhCookieStore : CookiesStorage {
override fun close() = Unit
fun load(url: Url): List<Cookie> {
val cookies = manager.getCookie(url.toString()) ?: return emptyList()
val cookies = manager.getCookie(url.toString())
val checkTips = EhUrl.DOMAIN_E in url.host
return parseClientCookiesHeader(cookies)
.map { Cookie(it.key, it.value, maxAge = Int.MAX_VALUE) }
.filterTo(mutableListOf()) { it.name != KEY_UTMP_NAME }.apply {
if (checkTips) {
removeAll { it.name == KEY_CONTENT_WARNING }
add(sTipsCookie)
return cookies?.let {
parseClientCookiesHeader(cookies)
.map { Cookie(it.key, it.value, maxAge = Int.MAX_VALUE) }
.filterTo(mutableListOf()) { it.name != KEY_UTMP_NAME }.apply {
if (checkTips) {
removeAll { it.name == KEY_CONTENT_WARNING }
add(sTipsCookie)
}
}
}
} ?: if (checkTips) listOf(sTipsCookie) else emptyList()
}
override suspend fun get(requestUrl: Url) = load(requestUrl)
app/src/main/kotlin/com/hippo/ehviewer/ui/login/SignInScreen.kt
+2 -2
View File
@@ -259,7 +259,7 @@ fun SignInScreen(navigator: DestinationsNavigator) {
withStyle(
style = SpanStyle(textDecoration = TextDecoration.Underline),
) {
append(stringResource(id = R.string.tourist_mode))
append(stringResource(id = R.string.guest_mode))
}
},
)
@@ -356,7 +356,7 @@ fun SignInScreen(navigator: DestinationsNavigator) {
withStyle(
style = SpanStyle(textDecoration = TextDecoration.Underline),
) {
append(stringResource(id = R.string.tourist_mode))
append(stringResource(id = R.string.guest_mode))
}
},
)
app/src/main/kotlin/com/hippo/ehviewer/ui/settings/EhScreen.kt
+3 -3
View File
@@ -84,12 +84,12 @@ fun EhScreen(navigator: DestinationsNavigator) {
},
snackbarHost = { SnackbarHost(snackbarHostState) },
) { paddingValues ->
val touristMode = stringResource(id = R.string.settings_eh_identity_cookies_tourist)
val guestMode = stringResource(id = R.string.settings_eh_identity_cookies_guest)
val copiedToClipboard = stringResource(id = R.string.copied_to_clipboard)
Column(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection).verticalScroll(rememberScrollState()).padding(paddingValues)) {
Preference(
title = stringResource(id = R.string.account_name),
summary = Settings.displayName ?: touristMode,
summary = Settings.displayName ?: guestMode,
) {
val eCookies = EhCookieStore.load(Url(EhUrl.HOST_E))
val exCookies = EhCookieStore.load(Url(EhUrl.HOST_EX))
@@ -114,7 +114,7 @@ fun EhScreen(navigator: DestinationsNavigator) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) launchSnackBar(copiedToClipboard)
}
} else {
setMessage(touristMode)
setMessage(guestMode)
}
setPositiveButton(R.string.settings_eh_sign_out) { _, _ ->
EhUtils.signOut()
app/src/main/res/values-de/strings.xml
+2 -2
View File
@@ -305,7 +305,7 @@
<string name="app_waring">Inhalt dieser App kommt aus dem Internet, von dem einige dir körperlichen oder emotionalen Schaden zufügen kann. Du hast es wirklich erfahrt und möchtest immer noch fortsetzen.</string>
<string name="error_username_cannot_empty">Gibt den Nutzername ein</string>
<string name="error_password_cannot_empty">Gibt das Passwort ein</string>
<string name="tourist_mode">Anmeldung überspringen</string>
<string name="guest_mode">Anmeldung überspringen</string>
<string name="sign_in_failed">Anmeldung fehlgeschlagen</string>
<string name="clipboard_gallery_url_snack_message">Ein Link von einen Galerie wurde in Zwischenablage erkennt.</string>
<string name="clipboard_gallery_url_snack_action">Gehen</string>
@@ -330,7 +330,7 @@
<string name="download_reset_reading_progress">Lesefortschritte zurücksetzen</string>
<string name="reset_reading_progress_message">Lesefortschritte aus allen heruntergeladenen Galerie zurücksetzen?</string>
<string name="settings_eh_identity_cookies_signed">Wenn jemand die folgenden Informationen hat, kann er sich als du anmelden. &lt;br&gt;&lt;b&gt;ALSO GEHEIM HALTEN!&lt;/b&gt;&lt;br&gt;&lt;br&gt;%s</string>
<string name="settings_eh_identity_cookies_tourist">Du hast dich noch nicht angemeldet.</string>
<string name="settings_eh_identity_cookies_guest">Du hast dich noch nicht angemeldet.</string>
<string name="settings_eh_identity_cookies_copy">Kopieren</string>
<string name="settings_eh_show_gallery_pages">Galerieseitenzahl anzeigen</string>
<string name="settings_eh_show_gallery_pages_summary">Die Galerieseitenzahle in der Galerieliste anzeigen</string>
app/src/main/res/values-es/strings.xml
+1 -1
View File
@@ -63,7 +63,7 @@
<string name="app_waring">El contenido de esta aplicación es de Internet. Algunas de ellas pueden causarle daño psicológico. Ahora sabes los riesgos anteriormente mencionado y te gustaría asumirlos</string>
<string name="error_username_cannot_empty">El usuario no puede estar vacío</string>
<string name="tourist_mode">Saltar inicio de sesión</string>
<string name="guest_mode">Saltar inicio de sesión</string>
<string name="sign_in_failed">Inicio de sesión fallido</string>
<string name="get_it">Entendido</string>
app/src/main/res/values-fr/strings.xml
+2 -2
View File
@@ -64,7 +64,7 @@
<string name="app_waring">Le contenu de l\'application provient de l\'Internet, dont quelque chose peut vous causer le dommage physique ou mentale. Vous l\'avez bien compris et voulez continuer quand même.</string>
<string name="error_username_cannot_empty">Nom d\'ultilisateur ne doit pas être une chaîne vide</string>
<string name="error_password_cannot_empty">Mot de passe ne doit pas être une chaîne vide</string>
<string name="tourist_mode">Continuer sans se connecter</string>
<string name="guest_mode">Continuer sans se connecter</string>
<string name="sign_in_failed">Impossible de se connecter</string>
<string name="get_it">Compris</string>
@@ -436,7 +436,7 @@
<string name="settings_advanced_app_language_title">Langue de l\'app (Language)</string>
<string name="app_language_system">Langue du système (défaut)</string>
<string name="settings_eh_identity_cookies_signed">Tout le monde peut utiliser les cookies de ce compte pour s\'y connecter.&lt;br&gt;&lt;b&gt;GARDEZ-LES BIEN !&lt;/b&gt;&lt;br&gt;&lt;br&gt;%s</string>
<string name="settings_eh_identity_cookies_tourist">Vous ne vous êtes pas connecté.</string>
<string name="settings_eh_identity_cookies_guest">Vous ne vous êtes pas connecté.</string>
<string name="settings_eh_identity_cookies_copy">Copier</string>
<string name="settings_eh_show_gallery_pages">Montrer les nombres des pages des galeries</string>
<string name="settings_eh_show_gallery_pages_summary">Montrer le nombre des pages des galerie dans la liste des galeries</string>
app/src/main/res/values-ja/strings.xml
+2 -2
View File
@@ -62,7 +62,7 @@
<string name="app_waring">このアプリの内容はインターネットから取得したものです。その内容の一部は使用者のお体や心理に傷つける恐れがあります。それでも続行しますか？</string>
<string name="error_username_cannot_empty">ユーザー名を入力してください。</string>
<string name="error_password_cannot_empty">パスワードを入力してください。</string>
<string name="tourist_mode">ログインをスキップ</string>
<string name="guest_mode">ログインをスキップ</string>
<string name="sign_in_failed">ログインに失敗しました。</string>
<string name="get_it">了解</string>
@@ -434,7 +434,7 @@
<string name="download_service">ダウンロードサービス</string>
<string name="settings_eh_identity_cookies_signed">下記の情報を持つ誰でもこのアカウントにログインできますので&lt;br&gt;&lt;b&gt;絶対に他人に渡さないように！&lt;/b&gt;&lt;br&gt;&lt;br&gt;%s</string>
<string name="settings_eh_identity_cookies_tourist">まだログインしていません</string>
<string name="settings_eh_identity_cookies_guest">まだログインしていません</string>
<string name="settings_eh_identity_cookies_copy">コピー</string>
<string name="settings_eh_show_gallery_pages">ギャラリーページ数を表示</string>
<string name="settings_eh_show_gallery_pages_summary">リストにギャラリーのページの数量を表示します</string>
app/src/main/res/values-ko/strings.xml
+2 -2
View File
@@ -66,7 +66,7 @@
<string name="app_waring">이 앱의 내용은 인터넷에서 받아옵니다. 이 앱을 사용하기 위해서는 받아온 내용 중 일부가 사용자에게 가할 수 있는 신체적 또는 정신적 피해를 감수해야 합니다.</string>
<string name="error_username_cannot_empty">사용자 이름은 비워둘 수 없습니다.</string>
<string name="error_password_cannot_empty">비밀번호는 비워둘 수 없습니다.</string>
<string name="tourist_mode">로그인 없이 사용</string>
<string name="guest_mode">로그인 없이 사용</string>
<string name="sign_in_failed">로그인 실패</string>
<string name="get_it">알겠습니다</string>
@@ -264,7 +264,7 @@
<string name="settings_eh">EH</string>
<string name="settings_eh_sign_out">로그아웃</string>
<string name="settings_eh_identity_cookies_signed">식별용 쿠키를 사용하여 이 계정으로 로그인할 수 있습니다.&lt;br&gt;&lt;b&gt;안전하게 보관하세요.&lt;/b&gt;&lt;br&gt;&lt;br&gt;%s</string>
<string name="settings_eh_identity_cookies_tourist">로그인 상태가 아닙니다.</string>
<string name="settings_eh_identity_cookies_guest">로그인 상태가 아닙니다.</string>
<string name="settings_eh_identity_cookies_copy">복사</string>
<string name="settings_u_config">E-Hentai 설정</string>
<string name="settings_u_config_summary">E-Hentai 사이트의 설정 페이지를 엽니다.</string>
app/src/main/res/values-nb-rNO/strings.xml
+2 -2
View File
@@ -30,7 +30,7 @@
<string name="no_torrents">Ingen torrenter</string>
<string name="search_sfl">Språk</string>
<string name="search_osc">Kun søk i omslag</string>
<string name="tourist_mode">Fortsett uten å logge inn</string>
<string name="guest_mode">Fortsett uten å logge inn</string>
<string name="select_scene">Hvilken galleriside vil du besøke\?</string>
<string name="favored_times">♥ %d</string>
<string name="torrent_count">Torrent (%d)</string>
@@ -90,7 +90,7 @@
<string name="key_pages">Sider</string>
<string name="share_image">Del bilde</string>
<string name="settings_eh_sign_out">Logg ut</string>
<string name="settings_eh_identity_cookies_tourist">Turistmodus</string>
<string name="settings_eh_identity_cookies_guest">Turistmodus</string>
<string name="settings_eh_identity_cookies_copy">Kopier informasjonskapsler</string>
<string name="settings_about_version">Byggversjon</string>
<string name="settings_my_tags">Mine etiketter</string>
app/src/main/res/values-th/strings.xml
+2 -2
View File
@@ -66,7 +66,7 @@
<string name="app_waring">เนื้อหาภายในแอปพลิเคชั่นนี้มาจากอินเทอร์เน็ตทั้งหมด อาจมีเนื้อหาบางอย่างที่มีผลต่อร่างกายหรือจิตใจของคุณ คุณจะต้องยอมรับความเสี่ยงที่ดังกล่าว และดำเนินการต่อไป</string>
<string name="error_username_cannot_empty">ชื่อผู้ใช้ห้ามเว้นว่างไว้</string>
<string name="error_password_cannot_empty">รหัสผ่านห้ามเว้นว่างไว้</string>
<string name="tourist_mode">ดำเนินการต่อโดยไม่ต้องลงชื่อเข้าระบบ</string>
<string name="guest_mode">ดำเนินการต่อโดยไม่ต้องลงชื่อเข้าระบบ</string>
<string name="sign_in_failed">การลงชื่อเข้าใช้ล้มเหลว</string>
<string name="get_it">เข้าใจแล้ว ไม่ต้องแสดงอีก</string>
@@ -279,7 +279,7 @@
<string name="settings_eh">EH</string>
<string name="settings_eh_sign_out">ออกจากระบบ</string>
<string name="settings_eh_identity_cookies_signed">คุกกี๊ยืนยันตัวตนสามารถใช้ลงชื่อเข้าสู่ระบบสำหรับบัญชีนี้เท่านั้น&lt;br&gt;&lt;b&gt;เก็บ รักษา ให้ ปลอดภัย&lt;/b&gt;&lt;br&gt;&lt;br&gt;%s</string>
<string name="settings_eh_identity_cookies_tourist">ยังไม่ลงชื่อเข้าสู่ระบบ</string>
<string name="settings_eh_identity_cookies_guest">ยังไม่ลงชื่อเข้าสู่ระบบ</string>
<string name="settings_eh_identity_cookies_copy">คัดลอก</string>
<string name="settings_u_config">การตั้งค่า EHentai</string>
<string name="settings_u_config_summary">การตั้งค่าบนเว็บไซต์ EHentai</string>
app/src/main/res/values-tr/strings.xml
+1 -1
View File
@@ -42,7 +42,7 @@
<string name="error_invalid_number">Geçersiz numara</string>
<string name="error_username_cannot_empty">Kullanıcı adı boş bir metin olamaz</string>
<string name="error_password_cannot_empty">Şifre boş bir metin olamaz</string>
<string name="tourist_mode">Giriş yapmaksızın devam et</string>
<string name="guest_mode">Giriş yapmaksızın devam et</string>
<string name="sign_in_failed">Giriş başarısız</string>
<string name="get_it">Anladım</string>
<string name="gallery_list_empty_hit">Dünya büyük olmasına rağmen pandacık yalnız oturuyor</string>
app/src/main/res/values-zh-rCN/strings.xml
+2 -2
View File
@@ -58,7 +58,7 @@
<string name="app_waring_2">继续使用即代表您同意上述条款。</string>
<string name="error_username_cannot_empty">用户名不可为空</string>
<string name="error_password_cannot_empty">密码不可为空</string>
<string name="tourist_mode">游客模式</string>
<string name="guest_mode">游客模式</string>
<string name="sign_in_failed">登录失败</string>
<string name="sign_in_failed_tip">若持续出错，请尝试“通过网页登录”或“通过 Cookie 登录”。</string>
<string name="get_it">知道了</string>
@@ -295,7 +295,7 @@
<string name="settings_eh">EH</string>
<string name="settings_eh_sign_out">退出登录</string>
<string name="settings_eh_identity_cookies_signed">身份 Cookie 可用于登录该账号。&lt;br&gt;&lt;b&gt;注意数据安全&lt;/b&gt;&lt;br&gt;&lt;br&gt;%s</string>
<string name="settings_eh_identity_cookies_tourist">游客模式</string>
<string name="settings_eh_identity_cookies_guest">游客模式</string>
<string name="settings_eh_identity_cookies_copy">复制 Cookies</string>
<string name="settings_u_config">EHentai 设置</string>
<string name="settings_u_config_summary">EHentai 网站上的设置</string>
app/src/main/res/values-zh-rHK/strings.xml
+2 -2
View File
@@ -67,7 +67,7 @@
<string name="app_waring">本應用中內容來自互聯網，部分內容可能對您的生理及心理造成難以恢復的傷害。本應用作者不會對由本應用造成的任何後果負責。\n\n未成年人應在監護人指導下使用本應用。</string>
<string name="error_username_cannot_empty">用户名不可為空</string>
<string name="error_password_cannot_empty">密碼不可為空</string>
<string name="tourist_mode">跳過登錄</string>
<string name="guest_mode">跳過登錄</string>
<string name="sign_in_failed">登錄失敗</string>
<string name="sign_in_failed_tip">若持續出錯，請嘗試“通過網頁登錄”或“通過 Cookie 登錄”。</string>
<string name="get_it">知道了</string>
@@ -307,7 +307,7 @@
<string name="settings_eh">EH</string>
<string name="settings_eh_sign_out">退出登錄</string>
<string name="settings_eh_identity_cookies_signed">身份 Cookie 可用於登錄該賬號。&lt;br&gt;&lt;b&gt;注意數據安全&lt;/b&gt;&lt;br&gt;&lt;br&gt;%s</string>
<string name="settings_eh_identity_cookies_tourist">未登錄</string>
<string name="settings_eh_identity_cookies_guest">未登錄</string>
<string name="settings_eh_identity_cookies_copy">複製</string>
<string name="settings_u_config">EHentai 設置</string>
<string name="settings_u_config_summary">EHentai 網站上的設置</string>
app/src/main/res/values-zh-rTW/strings.xml
+2 -2
View File
@@ -58,7 +58,7 @@
<string name="app_waring_2">繼續使用即表示您同意上述條款。</string>
<string name="error_username_cannot_empty">使用者名稱欄位不能為空</string>
<string name="error_password_cannot_empty">密碼欄位不能為空</string>
<string name="tourist_mode">略過登入</string>
<string name="guest_mode">略過登入</string>
<string name="sign_in_failed">登入失敗</string>
<string name="sign_in_failed_tip">若持續出錯，請嘗試“通過網頁登入”或“通過 Cookie 登入”。</string>
<string name="get_it">知道了</string>
@@ -295,7 +295,7 @@
<string name="settings_eh">EH</string>
<string name="settings_eh_sign_out">登出</string>
<string name="settings_eh_identity_cookies_signed">身份 Cookie 可用於登入該帳號。&lt;br&gt;&lt;b&gt;請注意資料安全&lt;/b&gt;&lt;br&gt;&lt;br&gt;%s</string>
<string name="settings_eh_identity_cookies_tourist">訪客模式</string>
<string name="settings_eh_identity_cookies_guest">訪客模式</string>
<string name="settings_eh_identity_cookies_copy">複製 Cookies</string>
<string name="settings_u_config">EHentai 設定</string>
<string name="settings_u_config_summary">EHentai 網站上的設定</string>
app/src/main/res/values/strings.xml
+2 -2
View File
@@ -96,7 +96,7 @@
<string name="app_waring_2">By continuing to use it, you agree to the above terms.</string>
<string name="error_username_cannot_empty">Username cannot be an empty string</string>
<string name="error_password_cannot_empty">Password cannot be an empty string</string>
<string name="tourist_mode">Continue without signing in</string>
<string name="guest_mode">Continue without signing in</string>
<string name="sign_in_failed">Sign in failed</string>
<string name="sign_in_failed_tip">If this issue continues, try \"Sign in via WebView\" or \"Sign in via cookies\".</string>
<string name="get_it">Got it</string>
@@ -336,7 +336,7 @@
<string name="settings_eh">EH</string>
<string name="settings_eh_sign_out">Sign out</string>
<string name="settings_eh_identity_cookies_signed">Identity cookies can be used to sign in to this account.&lt;br&gt;&lt;b&gt;KEEP IT SAFE&lt;/b&gt;&lt;br&gt;&lt;br&gt;%s</string>
<string name="settings_eh_identity_cookies_tourist">Tourist mode</string>
<string name="settings_eh_identity_cookies_guest">Guest mode</string>
<string name="settings_eh_identity_cookies_copy">Copy Cookies</string>
<string name="settings_u_config">EHentai settings</string>
<string name="settings_u_config_summary">Settings on EHentai website</string>