diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java index c5c1070..0eade76 100644 --- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java +++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java @@ -359,7 +359,6 @@ public class MainActivity extends AppCompatActivity ((TextView) header.findViewById(R.id.login_mail)).setText(email); changeFragment(newFragment); - registerSync(); } private void registerSync() { @@ -659,8 +658,11 @@ public class MainActivity extends AppCompatActivity @Override - public void onLogin(LoginToken token) { + public void onLogin(LoginToken token, boolean isOnlyRefresh) { toLoginState(token.getFullName(), token.getEmail(), getDefaultFragmentAfterLogin()); + if (!isOnlyRefresh) { + registerSync(); + } } @Override diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/KVVListener.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/KVVListener.java index 2699364..523e066 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/kvv/KVVListener.java +++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/KVVListener.java @@ -6,7 +6,7 @@ import de.sebse.fuplanner.services.kvv.types.LoginToken; import de.sebse.fuplanner.tools.CustomAccountManager; public interface KVVListener { - default void onLogin(LoginToken token) {} + default void onLogin(LoginToken token, boolean isOnlyRefresh) {} default void onLogout() {} diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/Login.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/Login.java index 905c9a5..d8f5d1b 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/kvv/Login.java +++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/Login.java @@ -52,7 +52,7 @@ public class Login extends HTTPService { if (delete) mToken.delete(mListener.getAccountManager()); mToken = null; - return handleCallbacks(); + return handleCallbacks(false); } public boolean isLoginPending() { @@ -103,9 +103,9 @@ public class Login extends HTTPService { - private boolean handleCallbacks() { + private boolean handleCallbacks(boolean isOnlyRefresh) { if (mToken != null) { - mListener.onLogin(mToken); + mListener.onLogin(mToken, isOnlyRefresh); return true; } else { mListener.onLogout(); @@ -118,7 +118,7 @@ public class Login extends HTTPService { return false; boolean isOnlyRefresh = mToken != null; mToken = token; - return isOnlyRefresh || handleCallbacks(); + return isOnlyRefresh || handleCallbacks(isOnlyRefresh); } public interface BooleanInterface { diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 80b187f..64f53fa 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -93,7 +93,7 @@ Pflichtfeld KVV-Synchronisation Neue Daten verfügbar - Benachrichtigen, wenn neue Ankündigungen, Aufgaben, Noten oder Resourcen verfügbar sind + Benachrichtigen, wenn neue Ankündigungen, Aufgaben, Noten oder Ressourcen verfügbar sind Ankündigung aktualisiert: %1$s Aufgabe aktualisiert: %1$s Event aktualisiert: %1$s