diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java index d65bb69..dcd70b0 100644 --- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java +++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java @@ -376,7 +376,7 @@ public class MainActivity extends AppCompatActivity } // switch to login else if ( (fragmentPage == FRAGMENT_STARTUP || fragmentPage == FRAGMENT_LOGIN || fragmentPage == FRAGMENT_NONE) && - ((newFragment != FRAGMENT_STARTUP && newFragment != FRAGMENT_LOGIN) || (getKVV().easyLogin() != null)) + (newFragment != FRAGMENT_STARTUP && newFragment != FRAGMENT_LOGIN && getKVV().isLoggedIn()) ) { View header = mNavigationView.getHeaderView(0); //header.findViewById(R.id.imageView).setVisibility(View.VISIBLE); diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java index 9ff3895..f815c5b 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java @@ -11,6 +11,7 @@ import java.util.HashMap; import de.sebse.fuplanner.services.KVV.types.LoginToken; import de.sebse.fuplanner.services.KVV.types.Modules; import de.sebse.fuplanner.tools.MainAcitivityListener; +import de.sebse.fuplanner.tools.logging.Logger; import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; @@ -25,6 +26,7 @@ public class KVV { private final ArrayList updatingList; private final HashMap addons = new HashMap<>(); private final MainAcitivityListener mListener; + private Logger log = new Logger(this); public KVV(Context context) { mListener = (MainAcitivityListener) context; @@ -32,6 +34,11 @@ public class KVV { this.updatingList = new ArrayList<>(); } + public boolean isLoggedIn() { + log.d(this.lastToken, new KVVLogin(this.context).easyLogin()); + return this.lastToken != null; + } + public LoginToken easyLogin() { KVVLogin login = new KVVLogin(this.context); lastToken = login.easyLogin();