diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.java b/app/src/main/java/com/hippo/ehviewer/Settings.java
index eebabced5..4ec3eed7a 100644
--- a/app/src/main/java/com/hippo/ehviewer/Settings.java
+++ b/app/src/main/java/com/hippo/ehviewer/Settings.java
@@ -198,6 +198,17 @@ public class Settings {
return sEhConfig;
}
+ private static final String KEY_NEED_SIGN_IN = "need_sign_in";
+ private static final boolean DEFAULT_NEED_SIGN_IN = true;
+
+ public static boolean getNeedSignIn() {
+ return getBoolean(KEY_NEED_SIGN_IN, DEFAULT_NEED_SIGN_IN);
+ }
+
+ public static void putNeedSignIn(boolean value) {
+ putBoolean(KEY_NEED_SIGN_IN, value);
+ }
+
/********************
****** Eh
********************/
diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhUtils.java b/app/src/main/java/com/hippo/ehviewer/client/EhUtils.java
index e64b23abf..ce71be294 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhUtils.java
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhUtils.java
@@ -119,10 +119,11 @@ public class EhUtils {
EhApplication.getEhCookieStore(context).signOut();
Settings.putAvatar(null);
Settings.putDisplayName(null);
+ Settings.putNeedSignIn(true);
}
- public static boolean hasSignedIn(Context context) {
- return EhApplication.getEhCookieStore(context).hasSignedIn();
+ public static boolean needSignedIn(Context context) {
+ return Settings.getNeedSignIn() && !EhApplication.getEhCookieStore(context).hasSignedIn();
}
public static String getSuitableTitle(GalleryInfo gi) {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
index 0c2078466..7ca617b8d 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
@@ -136,7 +136,7 @@ public final class MainActivity extends StageActivity
break;
}
case CHECK_STEP_CRASH:
- if (!EhUtils.hasSignedIn(this)) {
+ if (EhUtils.needSignedIn(this)) {
startScene(new Announcer(SignInScene.class).setArgs(args));
break;
}
@@ -182,7 +182,7 @@ public final class MainActivity extends StageActivity
return new Announcer(AnalyticsScene.class);
} else if (Crash.hasCrashFile()) {
return new Announcer(CrashScene.class);
- } else if (!EhUtils.hasSignedIn(this)) {
+ } else if (EhUtils.needSignedIn(this)) {
return new Announcer(SignInScene.class);
} else {
Bundle args = new Bundle();
@@ -209,7 +209,7 @@ public final class MainActivity extends StageActivity
newArgs.putString(KEY_TARGET_SCENE, announcer.getClazz().getName());
newArgs.putBundle(KEY_TARGET_ARGS, announcer.getArgs());
return new Announcer(CrashScene.class).setArgs(newArgs);
- } else if (!EhUtils.hasSignedIn(this)) {
+ } else if (EhUtils.needSignedIn(this)) {
Bundle newArgs = new Bundle();
newArgs.putString(KEY_TARGET_SCENE, announcer.getClazz().getName());
newArgs.putBundle(KEY_TARGET_ARGS, announcer.getArgs());
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java
index 0cba5f2f1..f3200447c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java
@@ -224,6 +224,8 @@ public final class SignInScene extends BaseScene implements EditText.OnEditorAct
} else if (mSignInViaCookies == v) {
startScene(new Announcer(CookieSignInScene.class).setRequestCode(this, REQUEST_CODE_COOKIE));
} else if (mSkipSigningIn == v) {
+ // Set gallery size SITE_G if skip sign in
+ Settings.putGallerySite(EhUrl.SITE_G);
redirectTo();
}
}
@@ -293,6 +295,7 @@ public final class SignInScene extends BaseScene implements EditText.OnEditorAct
}
private void redirectTo() {
+ Settings.putNeedSignIn(false);
((MainActivity) getActivity()).startSceneForCheckStep(
MainActivity.CHECK_STEP_SIGN_IN, getArguments());
finish();
@@ -300,8 +303,8 @@ public final class SignInScene extends BaseScene implements EditText.OnEditorAct
private void whetherToSkip() {
new AlertDialog.Builder(getContext())
- .setTitle(R.string.skip_signing_in)
- .setMessage(R.string.skip_signing_in_plain)
+ .setTitle(R.string.sign_in_failed)
+ .setMessage(R.string.sign_in_failed_plain)
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(R.string.get_it, null)
.show();
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d00e64aca..787983368 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -75,7 +75,8 @@
用户名不可为空
密码不可为空
跳过登陆
- 登陆失败。这可能是网站更新导致的，也有可能是发生了奇怪的事情。您可以选择在登陆按钮下方通过网页登陆或者输入 cookie，或者跳过登陆。跳过登陆可能导致无法正常使用应用。
+ 登陆失败
+ 这可能是网站更新导致的，也有可能是发生了奇怪的事情。您可以选择在登陆按钮下方通过网页登陆或者输入 cookie，或者跳过登陆。跳过登陆可能导致无法正常使用应用。
再按一次退出
点击重试
EhViewer 将申请设备存储空间访问权限以便下载画廊。您愿意授权吗？
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index d899a4967..c31681eb9 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -75,7 +75,8 @@
用户名不可為空
密碼不可為空
跳過登陸
- 登陸失敗。這可能是網站更新導致的，也有可能是發生了奇怪的事情。您可以選擇在登陸按鈕下方通過網頁登陸或者輸入 cookie，或者跳過登陸。跳過登陸可能導致無法正常使用應用。
+ 登陸失敗
+ 這可能是網站更新導致的，也有可能是發生了奇怪的事情。您可以選擇在登陸按鈕下方通過網頁登陸或者輸入 cookie，或者跳過登陸。跳過登陸可能導致無法正常使用應用。
再按一次退出
點擊重試
EhViewer 將申請設備存儲空間訪問權限以便下載畫廊。您願意授權嗎？
@@ -287,6 +288,7 @@
天哪，我的老夥計，你要退出登錄嗎？我是説，你真的要退出登錄嗎？
是的，我是説，真的
已退出登陸，重啟應用以便再次登陸
+ 畫廊站點
列表模式
詳情
縮略圖
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 425b63539..67fd43e9e 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -75,7 +75,8 @@
使用者名稱不可為空
密碼不可為空
跳過登陸
- 登陸失敗。這可能是網站更新導致的，也有可能是發生了奇怪的事情。您可以選擇在登陸按鈕下方通過網頁登陸或者輸入 cookie，或者跳過登陸。跳過登陸可能導致無法正常使用應用。
+ 登陸失敗
+ 這可能是網站更新導致的，也有可能是發生了奇怪的事情。您可以選擇在登陸按鈕下方通過網頁登陸或者輸入 cookie，或者跳過登陸。跳過登陸可能導致無法正常使用應用。
再按一次退出
點選重試
EhViewer 將申請裝置儲存空間訪問許可權以便下載畫廊。您願意授權嗎？
@@ -287,6 +288,7 @@
天哪，我的老夥計，你要退出登入嗎？我是說，你真的要退出登入嗎？
是的，我是說，真的
已退出登陸，重啟應用以便再次登陸
+ 畫廊站點
列表模式
詳情
縮圖
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 721cdd597..92b04e254 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -114,7 +114,8 @@
Username cannot be an empty string
Password cannot be an empty string
Skip signing in
- Sign in failed. But perhaps it is a mistake due to website update or something wrong happened. You may try sign in via WebView or enter cookie or skip signing in under sign in button. But you may be a "Sad Panda" after skipping signing in.
+ Sign in failed
+ Perhaps it is a mistake due to website update or something wrong happened. You may try sign in via WebView or enter cookie or skip signing in under sign in button. But you may be a "Sad Panda" after skipping signing in.
Press twice to exit
Click to retry
EhViewer will request WRITE_EXTERNAL_STORAGE permission for downloading gallery. Do you want to grant the permission?