From 9cf5e4c41cdf38e1e9c7e447eb7dfeaee4f5dd89 Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Sat, 19 Jan 2019 17:45:58 +0100 Subject: [PATCH] Don't show login, if credentails are missing --- .../main/java/ctbrec/ui/sites/jasmin/LiveJasminTab.java | 8 ++++++-- .../ctbrec/ui/sites/jasmin/LiveJasminUpdateService.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTab.java b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTab.java index 5957be34..9e1f996e 100644 --- a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTab.java +++ b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTab.java @@ -71,8 +71,12 @@ public class LiveJasminTab extends ThumbOverviewTab { @Override protected void onFail(WorkerStateEvent event) { - status.setText("Login failed"); - super.onFail(event); + if(Config.getInstance().getSettings().livejasminBetaAcknowledged) { + status.setText("Login failed"); + grid.getChildren().remove(acknowledge); + grid.getChildren().remove(createAccount); + super.onFail(event); + } } @Override diff --git a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminUpdateService.java b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminUpdateService.java index 69017169..884bdb76 100644 --- a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminUpdateService.java @@ -42,7 +42,7 @@ public class LiveJasminUpdateService extends PaginatedScheduledService { @Override public List call() throws IOException, NotLoggedInExcetion { //String _url = url + ((page-1) * 36); // TODO find out how to switch pages - if(!SiteUiFactory.getUi(liveJasmin).login()) { + if(!liveJasmin.credentialsAvailable() || !SiteUiFactory.getUi(liveJasmin).login()) { throw new NotLoggedInExcetion(); }