sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Canteen Plan Fixed 2

Browse Source
This commit is contained in:
Caesar2011
2018-10-15 13:52:07 +02:00
parent f97e293ef3
commit 1130b57022
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/de/sebse/fuplanner/MainActivity.java
View File

@@ -376,7 +376,7 @@ public class MainActivity extends AppCompatActivity
} // switch to login } // switch to login
else if ( else if (
(fragmentPage == FRAGMENT_STARTUP || fragmentPage == FRAGMENT_LOGIN || fragmentPage == FRAGMENT_NONE) && (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); View header = mNavigationView.getHeaderView(0);
//header.findViewById(R.id.imageView).setVisibility(View.VISIBLE); //header.findViewById(R.id.imageView).setVisibility(View.VISIBLE);

7
app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java
View File

@@ -11,6 +11,7 @@ import java.util.HashMap;
import de.sebse.fuplanner.services.KVV.types.LoginToken; import de.sebse.fuplanner.services.KVV.types.LoginToken;
import de.sebse.fuplanner.services.KVV.types.Modules; import de.sebse.fuplanner.services.KVV.types.Modules;
import de.sebse.fuplanner.tools.MainAcitivityListener; 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.NetworkCallback;
import de.sebse.fuplanner.tools.network.NetworkErrorCallback; import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
@@ -25,6 +26,7 @@ public class KVV {
private final ArrayList<LastTokenCallback> updatingList; private final ArrayList<LastTokenCallback> updatingList;
private final HashMap<String, Object> addons = new HashMap<>(); private final HashMap<String, Object> addons = new HashMap<>();
private final MainAcitivityListener mListener; private final MainAcitivityListener mListener;
private Logger log = new Logger(this);
public KVV(Context context) { public KVV(Context context) {
mListener = (MainAcitivityListener) context; mListener = (MainAcitivityListener) context;
@@ -32,6 +34,11 @@ public class KVV {
this.updatingList = new ArrayList<>(); this.updatingList = new ArrayList<>();
} }
public boolean isLoggedIn() {
log.d(this.lastToken, new KVVLogin(this.context).easyLogin());
return this.lastToken != null;
}
public LoginToken easyLogin() { public LoginToken easyLogin() {
KVVLogin login = new KVVLogin(this.context); KVVLogin login = new KVVLogin(this.context);
lastToken = login.easyLogin(); lastToken = login.easyLogin();