Improve signing in

This commit is contained in:
seven332 committed 2016-03-09 20:05:03 +08:00
1 parent 7ec5cf7ca1
commit 0f9bcf31ed
9 files changed
+84 -49

No files matched your search

@@ -49,7 +49,7 @@ import com.hippo.ehviewer.ui.scene.GalleryDetailScene;
import com.hippo.ehviewer.ui.scene.GalleryInfoScene;
import com.hippo.ehviewer.ui.scene.GalleryListScene;
import com.hippo.ehviewer.ui.scene.GalleryPreviewsScene;
import com.hippo.ehviewer.ui.scene.LoginScene;
import com.hippo.ehviewer.ui.scene.SignInScene;
import com.hippo.ehviewer.ui.scene.ProgressScene;
import com.hippo.ehviewer.ui.scene.QuickSearchScene;
import com.hippo.ehviewer.ui.scene.WarningScene;
@@ -90,7 +90,7 @@ public final class MainActivity extends StageActivity
static {
registerLaunchMode(WarningScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
registerLaunchMode(AnalyticsScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
registerLaunchMode(LoginScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
registerLaunchMode(SignInScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
registerLaunchMode(GalleryListScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TOP);
registerLaunchMode(QuickSearchScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
registerLaunchMode(GalleryDetailScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
@@ -112,7 +112,7 @@ public final class MainActivity extends StageActivity
}
case CHECK_STEP_ANALYTICS:
if (!EhUtils.hasSignedIn(this)) {
startScene(new Announcer(LoginScene.class).setArgs(args));
startScene(new Announcer(SignInScene.class).setArgs(args));
break;
}
case CHECK_STEP_SIGN_IN:
@@ -156,7 +156,7 @@ public final class MainActivity extends StageActivity
} else if (Settings.getAskAnalytics()) {
return new Announcer(AnalyticsScene.class);
} else if (!EhUtils.hasSignedIn(this)) {
return new Announcer(LoginScene.class);
return new Announcer(SignInScene.class);
} else {
Bundle args = new Bundle();
args.putString(GalleryListScene.KEY_ACTION, GalleryListScene.ACTION_HOMEPAGE);
@@ -181,7 +181,7 @@ public final class MainActivity extends StageActivity
Bundle newArgs = new Bundle();
newArgs.putString(KEY_TARGET_SCENE, announcer.getClazz().getName());
newArgs.putBundle(KEY_TARGET_ARGS, announcer.getArgs());
return new Announcer(LoginScene.class).setArgs(newArgs);
return new Announcer(SignInScene.class).setArgs(newArgs);
}
}
return announcer;