From f4a16b3edd51597dfc48881f0c53e3db487fcfcd Mon Sep 17 00:00:00 2001 From: seven332 Date: Mon, 4 Apr 2016 22:20:58 +0800 Subject: [PATCH] Only show error when no cookie saved --- .../hippo/ehviewer/ui/scene/SignInScene.java | 39 +++---------------- 1 file changed, 6 insertions(+), 33 deletions(-) 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 b862657a2..d5d053214 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 @@ -29,7 +29,6 @@ import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; import android.widget.EditText; import android.widget.TextView; -import android.widget.Toast; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.R; @@ -43,7 +42,6 @@ import com.hippo.ehviewer.client.parser.ProfileParser; import com.hippo.ehviewer.ui.MainActivity; import com.hippo.scene.Announcer; import com.hippo.scene.SceneFragment; -import com.hippo.util.ExceptionUtils; import com.hippo.yorozuya.AssertUtils; import com.hippo.yorozuya.ViewUtils; @@ -333,7 +331,7 @@ public final class SignInScene extends BaseScene implements EditText.OnEditorAct .show(); } - public void onSignInSuccess() { + public void onSignInEnd() { Context context = getContext2(); if (null == context) { return; @@ -348,37 +346,12 @@ public final class SignInScene extends BaseScene implements EditText.OnEditorAct } } - public void onSignInFailure(Exception e) { - Context context = getContext2(); - if (null == context) { - return; - } - - mSigningIn = false; - Toast.makeText(context, ExceptionUtils.getReadableString(context, e), - Toast.LENGTH_SHORT).show(); - hideProgress(); - whetherToSkip(); - } - - public void onGetProfileSuccess() { + public void onGetProfileEnd() { mSigningIn = false; updateAvatar(); redirectTo(); } - public void onGetProfileFailure(Exception e) { - Context context = getContext2(); - if (null == context) { - return; - } - - mSigningIn = false; - Toast.makeText(context, ExceptionUtils.getReadableString(context, e), - Toast.LENGTH_SHORT).show(); - redirectTo(); - } - private class SignInListener extends EhCallback { public SignInListener(Context context, int stageId, String sceneTag) { @@ -392,7 +365,7 @@ public final class SignInScene extends BaseScene implements EditText.OnEditorAct SignInScene scene = getScene(); if (scene != null) { - scene.onSignInSuccess(); + scene.onSignInEnd(); } } @@ -403,7 +376,7 @@ public final class SignInScene extends BaseScene implements EditText.OnEditorAct SignInScene scene = getScene(); if (scene != null) { - scene.onSignInFailure(e); + scene.onSignInEnd(); } } @@ -432,7 +405,7 @@ public final class SignInScene extends BaseScene implements EditText.OnEditorAct SignInScene scene = getScene(); if (scene != null) { - scene.onGetProfileSuccess(); + scene.onGetProfileEnd(); } } @@ -443,7 +416,7 @@ public final class SignInScene extends BaseScene implements EditText.OnEditorAct SignInScene scene = getScene(); if (scene != null) { - scene.onGetProfileFailure(e); + scene.onGetProfileEnd(); } }