Merge branch 'kvvservice2'

app/build.gradle

@@ -34,7 +34,7 @@ dependencies {
     })
     implementation 'androidx.preference:preference:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
     implementation 'com.android.volley:volley:1.1.0'
     //noinspection GradleDependency
     implementation 'com.google.android.gms:play-services-auth:15.0.0'

app/src/main/AndroidManifest.xml

@@ -5,6 +5,9 @@
     <uses-permission
         android:name="android.permission.AUTHENTICATE_ACCOUNTS"
         android:maxSdkVersion="22" />
+    <uses-permission
+        android:name="android.permission.GET_ACCOUNTS"
+        android:maxSdkVersion="22" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission
         android:name="android.permission.MANAGE_ACCOUNTS"
@@ -15,9 +18,10 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <!-- To auto-complete the email text field in the login form with the user's emails -->
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
 
     <application
         android:allowBackup="true"
@@ -47,17 +51,36 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths" />
         </provider>
+        <provider
+            android:authorities="de.sebse.fuplanner.contentprovider.kvv.modules"
+            android:name="de.sebse.fuplanner.services.kvv.sync.KVVContentProvider"
+            android:exported="false"
+            android:syncable="true">
+
+        </provider>
 
         <activity
-            android:name=".services.newkvv.FUAuthenticatorActivity"
+            android:name=".services.fulogin.FUAuthenticatorActivity"
             android:label="@string/title_activity_fuauthenticator" />
-        <service android:name=".services.newkvv.FUAuthenticatorService">
+        <service android:name=".services.fulogin.FUAuthenticatorService">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
             <meta-data android:name="android.accounts.AccountAuthenticator"
                 android:resource="@xml/authenticator" />
         </service>
+        <service
+            android:name=".services.kvv.sync.KVVSyncService"
+            android:label="@string/kvv_sync"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter" />
+            </intent-filter>
+            <meta-data
+                android:name="android.content.SyncAdapter"
+                android:resource="@xml/syncadapter_kvv" />
+        </service>
+
 
     </application>
 

app/src/main/java/de/sebse/fuplanner/MainActivity.java

@@ -1,6 +1,8 @@
 package de.sebse.fuplanner;
 
+import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.content.ContentResolver;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
@@ -36,27 +38,24 @@ import de.sebse.fuplanner.fragments.ScheduleFragment;
 import de.sebse.fuplanner.fragments.StartupFragment;
 import de.sebse.fuplanner.fragments.canteen.DaySwitcherFragment;
 import de.sebse.fuplanner.fragments.moddetails.ModDetailFragment;
-import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
+import de.sebse.fuplanner.services.canteen.CanteenBrowser;
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
+import de.sebse.fuplanner.services.canteen.types.Canteen;
-import de.sebse.fuplanner.services.Canteen.types.CanteenListener;
+import de.sebse.fuplanner.services.canteen.types.CanteenListener;
-import de.sebse.fuplanner.services.GoogleAuth.Credentials;
+import de.sebse.fuplanner.services.fulogin.AccountGeneral;
-import de.sebse.fuplanner.services.GoogleAuth.GoogleAuth;
+import de.sebse.fuplanner.services.kvv.KVV;
-import de.sebse.fuplanner.services.KVV.KVV;
+import de.sebse.fuplanner.services.kvv.KVVListener;
-import de.sebse.fuplanner.services.KVV.KVVListener;
+import de.sebse.fuplanner.services.kvv.sync.KVVContentProvider;
-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.services.News.NewsManager;
+import de.sebse.fuplanner.services.news.NewsManager;
-import de.sebse.fuplanner.services.newkvv.AccountGeneral;
 import de.sebse.fuplanner.tools.CustomAccountManager;
+import de.sebse.fuplanner.tools.CustomNotificationManager;
 import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.NewAsyncQueue;
 import de.sebse.fuplanner.tools.Preferences;
 import de.sebse.fuplanner.tools.Regex;
 import de.sebse.fuplanner.tools.RequestPermissionsResultListener;
 import de.sebse.fuplanner.tools.logging.Logger;
-import de.sebse.fuplanner.tools.network.NetworkCallback;
-import de.sebse.fuplanner.tools.network.NetworkError;
-import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 import de.sebse.fuplanner.tools.types.News;
 
 public class MainActivity extends AppCompatActivity
@@ -80,7 +79,6 @@ public class MainActivity extends AppCompatActivity
     private static final int DOUBLE_CLICK_TO_EXIT_MILLIS = 2000;
 
     private FragmentManager mFragmentManager;
-    private GoogleAuth mGoogleAuth;
     private KVV mKVV;
     private NewsManager mNewsManager;
     private CanteenBrowser mCanteenBrowser;
@@ -91,7 +89,6 @@ public class MainActivity extends AppCompatActivity
     @NotNull
     private String mFragmentData = "";
     private final HashMap<String, RequestPermissionsResultListener> permissionListeners = new HashMap<>();
-    private boolean mOfflineBanner;
     private final NewAsyncQueue mQueue = new NewAsyncQueue();
     private long mDoubleBackToExitPressedOnce = 0;
     private CustomAccountManager mAccountManager;
@@ -143,6 +140,12 @@ public class MainActivity extends AppCompatActivity
                     changeFragment(getDefaultFragmentAfterLogout());
             });
         }
+
+        if (!Preferences.getBoolean(this, R.string.pref_set_auto_sync_on_startup)) {
+            registerSync();
+            Preferences.setBoolean(this, R.string.pref_set_auto_sync_on_startup, true);
+        }
+        CustomNotificationManager.createNotificationChannel(this);
     }
 
     @Override
@@ -150,16 +153,13 @@ public class MainActivity extends AppCompatActivity
         super.onPause();
         isPaused = true;
         isLoggedInBeforePause = getKVV().account().isLoggedIn();
-        log.d("onPause", isPaused, isLoggedInBeforePause);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        log.d("onResume", isPaused, isLoggedInBeforePause);
         if (isPaused) {
             getKVV().account().restoreOnlineLogin(isRestored -> {
-                log.d("onResume", isRestored);
                 updateNavigation();
                 if (isRestored && !isLoggedInBeforePause)
                     changeFragment(getDefaultFragmentAfterLogin());
@@ -168,8 +168,11 @@ public class MainActivity extends AppCompatActivity
                     changeFragment(getDefaultFragmentAfterLogout());
                 }
             });
+            getKVV().modules().list().reloadIfOutdated();
         }
         isPaused = false;
+        //log.d("onResume", "send notification!");
+        //CustomNotificationManager.sendNotification(this, "Titel", "Neue Announcements!");
     }
 
     @Override
@@ -272,11 +275,6 @@ public class MainActivity extends AppCompatActivity
             case R.id.nav_logout:
                 getKVV().account().logout(true);
                 getKVV().modules().list().delete();
-                this.getGoogleAuth().getLoginState(credentials -> {
-                    if (credentials != null) {
-                        this.getGoogleAuth().deleteLoginState(credentials.getUsername(), credentials.getPassword());
-                    }
-                });
                 break;
 
         }
@@ -292,12 +290,6 @@ public class MainActivity extends AppCompatActivity
         return true;
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        this.getGoogleAuth().onActivityResult(requestCode, resultCode, data);
-    }
-
     @Override
     protected void onSaveInstanceState(Bundle savedInstanceState) {
         if (mFragmentPage != FRAGMENT_STARTUP && mFragmentPage != FRAGMENT_NONE) {
@@ -325,13 +317,6 @@ public class MainActivity extends AppCompatActivity
     /* --------------------------------------------*/
     /* --------------------------------------------*/
 
-    public GoogleAuth getGoogleAuth() {
-        if (this.mGoogleAuth == null) {
-            this.mGoogleAuth = new GoogleAuth(this);
-        }
-        return this.mGoogleAuth;
-    }
-
     public NewsManager getNewsManager() {
         if (this.mNewsManager == null) {
             this.mNewsManager = new NewsManager(this);
@@ -362,15 +347,13 @@ public class MainActivity extends AppCompatActivity
     }
 
     private void toLogoutState() {
-        setOfflineBanner(false);
         setRefreshFailedBanner(false);
         updateNavigation();
         changeFragment(getDefaultFragmentAfterLogout());
         mAccountManager.getTokenByType(AccountGeneral.ACCOUNT_TYPE, AccountGeneral.AUTHTOKEN_TYPE_KVV, null);
     }
 
-    private void toLoginState(String fullName, String email, int newFragment, boolean onlineMode) {
+    private void toLoginState(String fullName, String email, int newFragment) {
-        setOfflineBanner(!onlineMode);
         updateNavigation();
 
         View header = mNavigationView.getHeaderView(0);
@@ -378,6 +361,20 @@ public class MainActivity extends AppCompatActivity
         ((TextView) header.findViewById(R.id.login_mail)).setText(email);
 
         changeFragment(newFragment);
+        registerSync();
+    }
+
+    private void registerSync() {
+        Account accountByType = mAccountManager.getAccountByType(AccountGeneral.ACCOUNT_TYPE);
+        log.d("registerSync", accountByType);
+        if (accountByType != null) {
+            ContentResolver.setSyncAutomatically(accountByType, KVVContentProvider.PROVIDER_NAME, true);
+            ContentResolver.addPeriodicSync(
+                accountByType,
+                KVVContentProvider.PROVIDER_NAME,
+                Bundle.EMPTY,
+                AccountGeneral.SYNC_INTERVAL);
+        }
     }
 
     private void changeFragment(int newFragment) {
@@ -442,15 +439,9 @@ public class MainActivity extends AppCompatActivity
         invalidateOptionsMenu();
     }
 
-    private void setOfflineBanner(boolean visible) {
-        View offline_header = findViewById(R.id.offline_msg);
-        offline_header.setVisibility(visible ? View.VISIBLE : View.GONE);
-        mOfflineBanner = visible;
-    }
-
     private void setRefreshFailedBanner(boolean refreshFailed) {
         View viewNoConnection = findViewById(R.id.no_connection_msg);
-        if (!mOfflineBanner && refreshFailed)
+        if (refreshFailed)
             viewNoConnection.setVisibility(View.VISIBLE);
         else
             viewNoConnection.setVisibility(View.GONE);
@@ -669,20 +660,10 @@ public class MainActivity extends AppCompatActivity
 
 
 
-    @Override
-    public void getCredentials(NetworkCallback<Credentials> callback, NetworkErrorCallback error) {
-        getGoogleAuth().getLoginState(credentials -> {
-            if (credentials == null || credentials.getUsername() == null || credentials.getPassword() == null) {
-                error.onError(new NetworkError(200100, 403, "No Google Login available!"));
-            } else {
-                callback.onResponse(credentials);
-            }
-        });
-    }
 
     @Override
-    public void onLogin(LoginToken token, boolean enteringOnlineMode) {
+    public void onLogin(LoginToken token) {
-        toLoginState(token.getFullName(), token.getEmail(), getDefaultFragmentAfterLogin(), enteringOnlineMode);
+        toLoginState(token.getFullName(), token.getEmail(), getDefaultFragmentAfterLogin());
     }
 
     @Override

app/src/main/java/de/sebse/fuplanner/fragments/CanteensAdapter.java

@@ -8,8 +8,8 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import de.sebse.fuplanner.R;
 import de.sebse.fuplanner.fragments.CanteensFragment.OnCanteensFragmentInteractionListener;
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
+import de.sebse.fuplanner.services.canteen.types.Canteen;
-import de.sebse.fuplanner.services.Canteen.types.Canteens;
+import de.sebse.fuplanner.services.canteen.types.Canteens;
 import de.sebse.fuplanner.tools.ui.ItemViewHolder;
 
 /**

app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java

@@ -13,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
+import de.sebse.fuplanner.services.canteen.CanteenBrowser;
 import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 

app/src/main/java/de/sebse/fuplanner/fragments/ModulesAdapter.java

@@ -11,9 +11,9 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import de.sebse.fuplanner.R;
 import de.sebse.fuplanner.fragments.ModulesFragment.OnModulesFragmentInteractionListener;
-import de.sebse.fuplanner.services.KVV.types.Lecturer;
+import de.sebse.fuplanner.services.kvv.types.Lecturer;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
-import de.sebse.fuplanner.services.KVV.types.Semester;
+import de.sebse.fuplanner.services.kvv.types.Semester;
 import de.sebse.fuplanner.tools.ui.CustomViewHolder;
 import de.sebse.fuplanner.tools.ui.ItemViewHolder;
 import de.sebse.fuplanner.tools.ui.StringViewHolder;

app/src/main/java/de/sebse/fuplanner/fragments/NewsAdapter.java

@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import de.sebse.fuplanner.R;
 import de.sebse.fuplanner.fragments.ModulesFragment.OnModulesFragmentInteractionListener;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.UtilsDate;
 import de.sebse.fuplanner.tools.types.News;
 import de.sebse.fuplanner.tools.types.NewsList;

app/src/main/java/de/sebse/fuplanner/fragments/NewsFragment.java

@@ -11,22 +11,11 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Locale;
-
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.tools.DateSortedList;
 import de.sebse.fuplanner.tools.MainActivityListener;
-import de.sebse.fuplanner.tools.UtilsDate;
 import de.sebse.fuplanner.tools.logging.Logger;
-import de.sebse.fuplanner.tools.types.News;
 import de.sebse.fuplanner.tools.types.NewsList;
 
 /**

app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java

@@ -16,8 +16,8 @@ import java.util.List;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.types.Event;
+import de.sebse.fuplanner.services.kvv.types.Event;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.UtilsDate;
 import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;

app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherAdapter.java

@@ -4,7 +4,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
+import de.sebse.fuplanner.services.canteen.types.Canteen;
 import de.sebse.fuplanner.tools.UtilsDate;
 
 class DaySwitcherAdapter extends FragmentStatePagerAdapter {

app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherFragment.java

@@ -11,8 +11,8 @@ import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
+import de.sebse.fuplanner.services.canteen.CanteenBrowser;
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
+import de.sebse.fuplanner.services.canteen.types.Canteen;
 import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 import de.sebse.fuplanner.tools.network.NetworkCallback;

app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherListener.java

@@ -1,6 +1,6 @@
 package de.sebse.fuplanner.fragments.canteen;
 
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
+import de.sebse.fuplanner.services.canteen.types.Canteen;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 

app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java

@@ -13,8 +13,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.RecyclerView;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.Canteen.types.Day;
+import de.sebse.fuplanner.services.canteen.types.Day;
-import de.sebse.fuplanner.services.Canteen.types.Meal;
+import de.sebse.fuplanner.services.canteen.types.Meal;
 import de.sebse.fuplanner.tools.Preferences;
 import de.sebse.fuplanner.tools.ui.MealViewHolder;
 import de.sebse.fuplanner.tools.ui.StringViewHolder;

app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java

@@ -13,9 +13,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
+import de.sebse.fuplanner.services.canteen.CanteenBrowser;
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
+import de.sebse.fuplanner.services.canteen.types.Canteen;
-import de.sebse.fuplanner.services.Canteen.types.Day;
+import de.sebse.fuplanner.services.canteen.types.Day;
 import de.sebse.fuplanner.tools.logging.Logger;
 
 /**

app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceAdapter.java

@@ -16,9 +16,9 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.ui.Download;
+import de.sebse.fuplanner.services.kvv.ui.Download;
-import de.sebse.fuplanner.services.KVV.types.Announcement;
+import de.sebse.fuplanner.services.kvv.types.Announcement;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.Regex;
 import de.sebse.fuplanner.tools.UtilsDate;
 import de.sebse.fuplanner.tools.logging.Logger;

app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceFragment.java

@@ -14,8 +14,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
-import de.sebse.fuplanner.services.KVV.ui.Download;
+import de.sebse.fuplanner.services.kvv.ui.Download;
 import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 

app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentAdapter.java

@@ -16,9 +16,9 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.ui.Download;
+import de.sebse.fuplanner.services.kvv.ui.Download;
-import de.sebse.fuplanner.services.KVV.types.Assignment;
+import de.sebse.fuplanner.services.kvv.types.Assignment;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.Regex;
 import de.sebse.fuplanner.tools.UtilsDate;
 import de.sebse.fuplanner.tools.logging.Logger;

app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentFragment.java

@@ -14,8 +14,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.ui.Download;
+import de.sebse.fuplanner.services.kvv.ui.Download;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 

app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailEventAdapter.java

@@ -14,10 +14,10 @@ import java.util.Map;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.types.Event;
+import de.sebse.fuplanner.services.kvv.types.Event;
-import de.sebse.fuplanner.services.KVV.types.EventList;
+import de.sebse.fuplanner.services.kvv.types.EventList;
-import de.sebse.fuplanner.services.KVV.types.GroupedEvents;
+import de.sebse.fuplanner.services.kvv.types.GroupedEvents;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.UtilsDate;
 import de.sebse.fuplanner.tools.logging.Logger;
 import de.sebse.fuplanner.tools.ui.CustomViewHolder;

app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailFragment.java

@@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 

app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailGradebookAdapter.java

@@ -12,8 +12,8 @@ import java.util.ArrayList;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.types.Grade;
+import de.sebse.fuplanner.services.kvv.types.Grade;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.ui.StringViewHolder;
 
 class ModDetailGradebookAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java

@@ -15,11 +15,11 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.types.Announcement;
+import de.sebse.fuplanner.services.kvv.types.Announcement;
-import de.sebse.fuplanner.services.KVV.types.Assignment;
+import de.sebse.fuplanner.services.kvv.types.Assignment;
-import de.sebse.fuplanner.services.KVV.types.Event;
+import de.sebse.fuplanner.services.kvv.types.Event;
-import de.sebse.fuplanner.services.KVV.types.Lecturer;
+import de.sebse.fuplanner.services.kvv.types.Lecturer;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.UtilsDate;
 import de.sebse.fuplanner.tools.logging.Logger;
 import de.sebse.fuplanner.tools.ui.CustomViewHolder;

app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceAdapter.java

@@ -3,8 +3,8 @@ package de.sebse.fuplanner.fragments.moddetails;
 import java.util.ArrayList;
 import java.util.List;
 
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
-import de.sebse.fuplanner.services.KVV.types.Resource;
+import de.sebse.fuplanner.services.kvv.types.Resource;
 import de.sebse.fuplanner.tools.ui.treeview.TreeNode;
 import de.sebse.fuplanner.tools.ui.treeview.TreeViewAdapter;
 import de.sebse.fuplanner.tools.ui.treeview.TreeViewBinder;

app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java

@@ -18,9 +18,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.ui.Download;
+import de.sebse.fuplanner.services.kvv.ui.Download;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
-import de.sebse.fuplanner.services.KVV.types.Resource;
+import de.sebse.fuplanner.services.kvv.types.Resource;
 import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 import de.sebse.fuplanner.tools.ui.treeview.DirectoryNodeBinder;

app/src/main/java/de/sebse/fuplanner/services/GoogleAuth/ConnectedListener.java

@@ -1,9 +0,0 @@
-package de.sebse.fuplanner.services.GoogleAuth;
-
-/**
- * Created by sebastian on 07.11.17.
- */
-
-public interface ConnectedListener {
-    void connected();
-}

app/src/main/java/de/sebse/fuplanner/services/GoogleAuth/Credentials.java

@@ -1,23 +0,0 @@
-package de.sebse.fuplanner.services.GoogleAuth;
-
-/**
- * Created by Sebastian on 06.11.2017.
- */
-
-public class Credentials {
-    private final String username;
-    private final String password;
-
-    public Credentials(String username, String password) {
-        this.username = username;
-        this.password = password;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-}

app/src/main/java/de/sebse/fuplanner/services/GoogleAuth/CredentialsListener.java

@@ -1,9 +0,0 @@
-package de.sebse.fuplanner.services.GoogleAuth;
-
-/**
- * Created by Sebastian on 06.11.2017.
- */
-
-public interface CredentialsListener {
-    void onCredentials(Credentials credentials);
-}

app/src/main/java/de/sebse/fuplanner/services/GoogleAuth/GoogleAuth.java

@@ -1,224 +0,0 @@
-package de.sebse.fuplanner.services.GoogleAuth;
-
-import android.content.Intent;
-import android.content.IntentSender;
-import android.util.Log;
-import android.widget.Toast;
-
-import com.google.android.gms.auth.api.credentials.Credential;
-import com.google.android.gms.auth.api.credentials.CredentialRequest;
-import com.google.android.gms.auth.api.credentials.CredentialsClient;
-import com.google.android.gms.auth.api.credentials.CredentialsOptions;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.common.api.ApiException;
-import com.google.android.gms.common.api.CommonStatusCodes;
-import com.google.android.gms.common.api.ResolvableApiException;
-
-import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentActivity;
-
-import static android.app.Activity.RESULT_OK;
-
-/**
- * Created by Sebastian on 06.11.2017.
- */
-
-public class GoogleAuth {
-    // https://developers.google.com/identity/smartlock-passwords/android/retrieve-credentials
-
-    private static final String TAG = "GoogleAuth";
-    private final FragmentActivity activity;
-    private static final String FU_PLANNER_PROVIDER = "FUPlanner";
-    private CredentialsClient mCredentialsClient;
-    private boolean mIsResolving;
-    @Nullable
-    private CredentialsListener mCredentialsListener;
-    private boolean isConnected = false;
-
-    public GoogleAuth(FragmentActivity activity) {
-        this.activity = activity;
-    }
-
-    private void connect() {
-        if (this.isUnavailable()) {
-            Log.w(TAG, "STATUS: Google auth not available!");
-            return;
-        }
-        this.mCredentialsClient = getClient();
-        this.isConnected = true;
-    }
-
-
-
-
-    public void getLoginState(final CredentialsListener credentialsListener) {
-        if (this.isUnavailable()) {
-            Log.w(TAG, "STATUS: Google auth not available!");
-            credentialsListener.onCredentials(null);
-            return;
-        }
-        if (!this.isConnected)
-            connect();
-        CredentialRequest request = new CredentialRequest.Builder()
-                .setPasswordLoginSupported(true)
-                .setAccountTypes(FU_PLANNER_PROVIDER)
-                .build();
-
-
-        mCredentialsClient.request(request).addOnCompleteListener(task -> {
-            if (task.isSuccessful()) {
-                // Successfully read the credential without any user interaction, this
-                // means there was only a single credential and the user has auto
-                // sign-in enabled.
-                Credential credential = task.getResult().getCredential();
-                credentialsListener.onCredentials(new Credentials(credential.getId(), credential.getPassword()));
-                return;
-            }
-
-            Exception e = task.getException();
-            if (e instanceof ResolvableApiException) {
-                // This is most likely the case where the user has multiple saved
-                // credentials and needs to pick one. This requires showing UI to
-                // resolve the read request.
-                GoogleAuth.this.mCredentialsListener = credentialsListener;
-                ResolvableApiException rae = (ResolvableApiException) e;
-                resolveResult(rae, RequestCode.RC_READ);
-                return;
-            }
-
-            if (e instanceof ApiException) {
-                ApiException ae = (ApiException) e;
-                if (ae.getStatusCode() == CommonStatusCodes.SIGN_IN_REQUIRED) {
-                    // This means only a hint is available, but we are handling that
-                    // elsewhere so no need to act here.
-                } else {
-                    credentialsListener.onCredentials(null);
-                    Log.w(TAG, "Unexpected status code: " + ae.getStatusCode());
-                }
-            }
-        });
-    }
-
-    public void setLoginState(String username, String password) {
-        if (this.isUnavailable()) {
-            Log.w(TAG, "STATUS: Google auth not available!");
-            Toast.makeText(activity, "Google auth not available!", Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if (!this.isConnected)
-            connect();
-        Credential credential = new Credential.Builder(username)
-                .setPassword(password)
-                .build();
-        mCredentialsClient.save(credential).addOnCompleteListener(task -> {
-            if (task.isSuccessful()) {
-                showToast("Credential saved.");
-                return;
-            }
-
-            Exception e = task.getException();
-            if (e instanceof ResolvableApiException) {
-                // The first time a credential is saved, the user is shown UI
-                // to confirm the action. This requires resolution.
-                ResolvableApiException rae = (ResolvableApiException) e;
-                resolveResult(rae, RequestCode.RC_SAVE);
-            } else {
-                // Save failure cannot be resolved.
-                Log.w(TAG, "Save failed.", e);
-                showToast("Credential Save Failed");
-            }
-        });
-    }
-
-    public void deleteLoginState(String username, String password) {
-        if (this.isUnavailable()) {
-            Log.w(TAG, "STATUS: Google auth not available!");
-            return;
-        }
-        if (!this.isConnected)
-            connect();
-        Credential credential = new Credential.Builder(username)
-                .setPassword(password)
-                .build();
-        mCredentialsClient.delete(credential).addOnCompleteListener(task -> {
-            if (task.isSuccessful()) {
-                // Credential was deleted successfully
-            }
-        });
-    }
-
-
-    private boolean isUnavailable() {
-        return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(this.activity) != ConnectionResult.SUCCESS;
-    }
-
-    private CredentialsClient getClient() {
-        CredentialsOptions options = new CredentialsOptions.Builder()
-                .forceEnableSaveDialog()
-                .build();
-        return com.google.android.gms.auth.api.credentials.Credentials.getClient(this.activity, options);
-    }
-
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        Log.w(TAG, "onActivityResult:" + requestCode + ":" + resultCode + ":" + data);
-
-        switch (requestCode) {
-            case RequestCode.RC_HINT:
-                // Drop into handling for RC_READ
-            case RequestCode.RC_READ:
-                if (resultCode == RESULT_OK) {
-                    boolean isHint = (requestCode == RequestCode.RC_HINT);
-                    Credential credential = data.getParcelableExtra(Credential.EXTRA_KEY);
-                    if (mCredentialsListener != null)
-                        this.mCredentialsListener.onCredentials(new Credentials(credential.getId(), credential.getPassword()));
-                    else
-                        Log.w(TAG, "No Credentials Listener");
-                } else {
-                    if (mCredentialsListener != null)
-                        this.mCredentialsListener.onCredentials(null);
-                    else
-                        Log.w(TAG, "No Credentials Listener");
-                    Log.e(TAG, "Credential Read: NOT OK");
-                    showToast("Credential Read Failed");
-                }
-
-                mIsResolving = false;
-                break;
-            case RequestCode.RC_SAVE:
-                if (resultCode == RESULT_OK) {
-                    Log.w(TAG, "Credential Save: OK");
-                    showToast("Credential Save Success");
-                } else {
-                    Log.e(TAG, "Credential Save: NOT OK");
-                    showToast("Credential Save Failed");
-                }
-
-                mIsResolving = false;
-                break;
-        }
-    }
-
-
-    private void resolveResult(ResolvableApiException rae, int requestCode) {
-        // We don't want to fire multiple resolutions at once since that can result
-        // in stacked dialogs after rotation or another similar event.
-        if (mIsResolving) {
-            Log.w(TAG, "resolveResult: already resolving.");
-            return;
-        }
-
-        Log.w(TAG, "Resolving: " + rae);
-        try {
-            rae.startResolutionForResult(this.activity, requestCode);
-            mIsResolving = true;
-        } catch (IntentSender.SendIntentException e) {
-            Log.e(TAG, "STATUS: Failed to send resolution.", e);
-        }
-    }
-
-    /** Display a short Toast message **/
-    private void showToast(String msg) {
-        Toast.makeText(this.activity, msg, Toast.LENGTH_SHORT).show();
-    }
-}

app/src/main/java/de/sebse/fuplanner/services/GoogleAuth/RequestCode.java

@@ -1,11 +0,0 @@
-package de.sebse.fuplanner.services.GoogleAuth;
-
-/**
- * Created by sebastian on 07.11.17.
- */
-
-class RequestCode {
-    public static final int RC_SAVE = 1;
-    public static final int RC_HINT = 2;
-    public static final int RC_READ = 3;
-}

app/src/main/java/de/sebse/fuplanner/services/KVV/KVVListener.java

@@ -1,23 +0,0 @@
-package de.sebse.fuplanner.services.KVV;
-
-import com.android.volley.NetworkResponse;
-
-import de.sebse.fuplanner.services.GoogleAuth.Credentials;
-import de.sebse.fuplanner.services.KVV.types.LoginToken;
-import de.sebse.fuplanner.tools.CustomAccountManager;
-import de.sebse.fuplanner.tools.network.NetworkCallback;
-import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
-
-public interface KVVListener {
-    void getCredentials(NetworkCallback<Credentials> callback, NetworkErrorCallback error);
-
-    void onLogin(LoginToken token, boolean enteringOnlineMode);
-
-    void onLogout();
-
-    void onModuleListChange();
-
-    void onKVVNetworkResponse(NetworkResponse error);
-
-    CustomAccountManager getAccountManager();
-}

app/src/main/java/de/sebse/fuplanner/services/canteen/CanteenBrowser.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen;
+package de.sebse.fuplanner.services.canteen;
 
 import android.content.Context;
 
@@ -8,10 +8,10 @@ import org.json.JSONObject;
 
 import java.io.IOException;
 
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
+import de.sebse.fuplanner.services.canteen.types.Canteen;
-import de.sebse.fuplanner.services.Canteen.types.CanteenListener;
+import de.sebse.fuplanner.services.canteen.types.CanteenListener;
-import de.sebse.fuplanner.services.Canteen.types.Canteens;
+import de.sebse.fuplanner.services.canteen.types.Canteens;
-import de.sebse.fuplanner.services.Canteen.types.Day;
+import de.sebse.fuplanner.services.canteen.types.Day;
 import de.sebse.fuplanner.tools.AsyncQueue;
 import de.sebse.fuplanner.tools.network.HTTPService;
 import de.sebse.fuplanner.tools.network.NetworkCallback;

app/src/main/java/de/sebse/fuplanner/services/canteen/types/Canteen.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 import androidx.annotation.NonNull;
 

app/src/main/java/de/sebse/fuplanner/services/canteen/types/CanteenListener.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 public interface CanteenListener {
     void onCanteenRefreshCompleted(boolean b);

app/src/main/java/de/sebse/fuplanner/services/canteen/types/Canteens.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 import android.content.Context;
 import androidx.annotation.NonNull;

app/src/main/java/de/sebse/fuplanner/services/canteen/types/Day.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 import androidx.annotation.NonNull;
 

app/src/main/java/de/sebse/fuplanner/services/canteen/types/Meal.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 import java.io.Serializable;
 import java.util.ArrayList;

app/src/main/java/de/sebse/fuplanner/services/canteen/types/SortedListCanteen.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 import de.sebse.fuplanner.tools.SortedList;
 

app/src/main/java/de/sebse/fuplanner/services/canteen/types/SortedListDay.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 import java.util.Calendar;
 

app/src/main/java/de/sebse/fuplanner/services/canteen/types/SortedListMeal.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 import de.sebse.fuplanner.tools.SortedList;
 

app/src/main/java/de/sebse/fuplanner/services/fulogin/AccountGeneral.java

@@ -1,7 +1,8 @@
-package de.sebse.fuplanner.services.newkvv;
+package de.sebse.fuplanner.services.fulogin;
 
 public class AccountGeneral {
     public static final String ACCOUNT_TYPE = "de.sebse.fuplanner.fuauth";
     public static final String AUTHTOKEN_TYPE_KVV = "KVV";
     public static final String AUTHTOKEN_TYPE_BLACKBOARD = "Blackboard";
+    public static final long SYNC_INTERVAL = 6 * 60 * 60; // defined in seconds
 }

app/src/main/java/de/sebse/fuplanner/services/fulogin/FUAuthenticator.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.newkvv;
+package de.sebse.fuplanner.services.fulogin;
 
 import android.accounts.AbstractAccountAuthenticator;
 import android.accounts.Account;

app/src/main/java/de/sebse/fuplanner/services/fulogin/FUAuthenticatorActivity.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.newkvv;
+package de.sebse.fuplanner.services.fulogin;
 
 import android.accounts.Account;
 import android.accounts.AccountAuthenticatorActivity;
@@ -27,7 +27,7 @@ import android.widget.EditText;
 import androidx.annotation.NonNull;
 import de.sebse.fuplanner.R;
 
-import static de.sebse.fuplanner.services.newkvv.UserLoginTask.PARAM_USER_PASS;
+import static de.sebse.fuplanner.services.fulogin.UserLoginTask.PARAM_USER_PASS;
 
 /**
  * A login screen that offers login via email/password.
@@ -169,10 +169,6 @@ public class FUAuthenticatorActivity extends AccountAuthenticatorActivity implem
             mEmailView.setError(getString(R.string.error_field_required));
             focusView = mEmailView;
             cancel = true;
-        } else if (!isEmailValid(email)) {
-            mEmailView.setError(getString(R.string.error_invalid_email));
-            focusView = mEmailView;
-            cancel = true;
         }
 
         if (cancel) {
@@ -188,11 +184,6 @@ public class FUAuthenticatorActivity extends AccountAuthenticatorActivity implem
         }
     }
 
-    private boolean isEmailValid(String email) {
-        //TODO: Replace this with your own logic
-        return true;//email.contains("@");
-    }
-
     private boolean isPasswordValid(String password) {
         //TODO: Replace this with your own logic
         return password.length() > 4;

app/src/main/java/de/sebse/fuplanner/services/fulogin/FUAuthenticatorService.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.newkvv;
+package de.sebse.fuplanner.services.fulogin;
 
 import android.app.Service;
 import android.content.Intent;

app/src/main/java/de/sebse/fuplanner/services/fulogin/UserLoginTask.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.newkvv;
+package de.sebse.fuplanner.services.fulogin;
 
 import android.accounts.AccountManager;
 import android.annotation.SuppressLint;
@@ -14,8 +14,8 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import androidx.annotation.Nullable;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.types.LoginToken;
+import de.sebse.fuplanner.services.kvv.types.LoginToken;
-import de.sebse.fuplanner.services.newkvv.network.Login;
+import de.sebse.fuplanner.services.kvv.sync.Login;
 import de.sebse.fuplanner.tools.logging.Logger;
 
 
@@ -62,8 +62,14 @@ public class UserLoginTask extends AsyncTask<Void, Void, String> {
             mVolleyLogin.testLoginToken(success, success1 -> {
                 login.set(success);
                 latch.countDown();
-            }, error -> latch.countDown());
+            }, error -> {
-        }, error -> latch.countDown());
+                log.e(error);
+                latch.countDown();
+            });
+        }, error -> {
+            log.e(error);
+            latch.countDown();
+        });
         try {
             latch.await();
         } catch (InterruptedException e) {

app/src/main/java/de/sebse/fuplanner/services/kvv/KVV.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.kvv;
 
 import android.content.Context;
 

app/src/main/java/de/sebse/fuplanner/services/kvv/KVVListener.java

@@ -0,0 +1,18 @@
+package de.sebse.fuplanner.services.kvv;
+
+import com.android.volley.NetworkResponse;
+
+import de.sebse.fuplanner.services.kvv.types.LoginToken;
+import de.sebse.fuplanner.tools.CustomAccountManager;
+
+public interface KVVListener {
+    default void onLogin(LoginToken token) {}
+
+    default void onLogout() {}
+
+    default void onModuleListChange() {}
+
+    default void onKVVNetworkResponse(NetworkResponse error) {}
+
+    CustomAccountManager getAccountManager();
+}

app/src/main/java/de/sebse/fuplanner/services/kvv/Login.java

@@ -1,14 +1,12 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.kvv;
 
 import android.content.Context;
 
 import org.jetbrains.annotations.NotNull;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 import androidx.annotation.Nullable;
-import de.sebse.fuplanner.services.KVV.types.LoginToken;
+import de.sebse.fuplanner.services.kvv.types.LoginToken;
-import de.sebse.fuplanner.services.newkvv.AccountGeneral;
+import de.sebse.fuplanner.services.fulogin.AccountGeneral;
 import de.sebse.fuplanner.tools.CustomAccountManager;
 import de.sebse.fuplanner.tools.NetworkCallbackCollector;
 import de.sebse.fuplanner.tools.network.HTTPService;
@@ -20,7 +18,6 @@ public class Login extends HTTPService {
     private final KVVListener mListener;
     @Nullable private LoginToken mToken;
     private boolean mLoginPending = false;
-    private boolean mOnlineMode = false;
     private final NetworkCallbackCollector<LoginToken> mRefreshCallbacks = new NetworkCallbackCollector<>();
 
     Login(KVVListener listener, Context context) {
@@ -28,25 +25,6 @@ public class Login extends HTTPService {
         this.mListener = listener;
     }
 
-    @Deprecated
-    public void reset() {
-        mToken = null;
-        mLoginPending = false;
-        mOnlineMode = false;
-    }
-
-    public void doOnlineLogin(@NotNull String username, @NotNull String password, NetworkCallback<LoginToken> callback, NetworkErrorCallback errorCallback) {
-
-    }
-
-    //public boolean restoreOnlineLogin() {
-    //    return restoreLogin(true);
-    //}
-
-    //public boolean doOfflineLogin() {
-    //    return restoreLogin(false);
-    //}
-
     public void restoreOnlineLogin(BooleanInterface callback) {
         if (mLoginPending) {
             callback.run(false);
@@ -54,7 +32,7 @@ public class Login extends HTTPService {
         }
         mLoginPending = true;
         LoginToken.load(mListener.getAccountManager(), token -> {
-            boolean result = setToken(token, true);
+            boolean result = setToken(token);
             mLoginPending = false;
             log.d("loginToken", token != null ? token.toString() : null);
             callback.run(result);
@@ -86,12 +64,8 @@ public class Login extends HTTPService {
         return mToken != null;
     }
 
-    public boolean isInOfflineMode() {
-        return isLoggedIn() && !mOnlineMode;
-    }
-
     public boolean isInOnlineMode() {
-        return isLoggedIn() && mOnlineMode;
+        return isLoggedIn();
     }
 
     void testLoginToken(@NotNull NetworkCallback<LoginToken> callback, @NotNull NetworkErrorCallback errorCallback) {
@@ -103,22 +77,7 @@ public class Login extends HTTPService {
     }
 
     private void testLoginToken(@NotNull LoginToken token, @NotNull NetworkCallback<LoginToken> callback, @NotNull NetworkErrorCallback errorCallback) {
-        get(String.format("https://kvv.imp.fu-berlin.de/direct/profile/%s.json", token.getUsername()), token.getCookies(), response -> {
+        new de.sebse.fuplanner.services.kvv.sync.Login(getContext()).testLoginToken(token, callback, errorCallback);
-            String body = response.getParsed();
-            if (body == null) {
-                errorCallback.onError(new NetworkError(100172, 403, "Testing login failed!"));
-                return;
-            }
-            try {
-                JSONObject json = new JSONObject(body);
-                String displayName = json.getString("displayName");
-                String email = json.getString("email");
-                token.setAdditionals(displayName, email);
-                callback.onResponse(token);
-            } catch (JSONException e) {
-                errorCallback.onError(new NetworkError(100171, 403, "Cannot parse profile!"));
-            }
-        }, error -> errorCallback.onError(new NetworkError(100170, error.networkResponse.statusCode, "Testing login failed!")));
     }
 
     @Nullable public LoginToken getLoginToken() {
@@ -132,9 +91,7 @@ public class Login extends HTTPService {
             return;
         CustomAccountManager manager = mListener.getAccountManager();
         manager.doInvalidateToken(AccountGeneral.ACCOUNT_TYPE, AccountGeneral.AUTHTOKEN_TYPE_KVV, ignored -> {
-            log.d("try restore", ignored);
             restoreOnlineLogin(isRestored -> {
-                log.d("restore", isRestored, mToken);
                 if (isRestored)
                     testLoginToken(mRefreshCallbacks::responseResponse, mRefreshCallbacks::responseError);
                 else {
@@ -143,21 +100,13 @@ public class Login extends HTTPService {
                 }
             });
         });
-       /* mListener.getCredentials(credentials -> {
-            doOnlineLogin(credentials.getUsername(), credentials.getPassword(),
-                    mRefreshCallbacks::responseResponse,
-                    mRefreshCallbacks::responseError);
-        }, e -> {
-            logout(false);
-            mRefreshCallbacks.responseError(e);
-        });*/
     }
 
 
 
     private boolean handleCallbacks() {
         if (mToken != null) {
-            mListener.onLogin(mToken, mOnlineMode);
+            mListener.onLogin(mToken);
             return true;
         } else {
             mListener.onLogout();
@@ -165,12 +114,11 @@ public class Login extends HTTPService {
         }
     }
 
-    private boolean setToken(@Nullable LoginToken token, boolean enteringOnlineMode) {
+    private boolean setToken(@Nullable LoginToken token) {
         if (token == null)
             return false;
         boolean isOnlyRefresh = mToken != null;
         mToken = token;
-        mOnlineMode = enteringOnlineMode;
         return isOnlyRefresh || handleCallbacks();
     }
 

app/src/main/java/de/sebse/fuplanner/services/kvv/Modules.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.kvv;
 
 import android.content.Context;
 

app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesAnnouncements.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.kvv;
 
 import android.content.Context;
 
@@ -8,8 +8,8 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-import de.sebse.fuplanner.services.KVV.types.Announcement;
+import de.sebse.fuplanner.services.kvv.types.Announcement;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkError;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;

app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesAssignments.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.kvv;
 
 import android.content.Context;
 
@@ -8,9 +8,9 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-import de.sebse.fuplanner.services.KVV.types.Assignment;
+import de.sebse.fuplanner.services.kvv.types.Assignment;
-import de.sebse.fuplanner.services.KVV.types.AssignmentList;
+import de.sebse.fuplanner.services.kvv.types.AssignmentList;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkError;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;

app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesDetails.java

@@ -1,11 +1,11 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.kvv;
 
 import android.content.Context;
 import android.util.Pair;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkError;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;

app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesEvents.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.kvv;
 
 import android.content.Context;
 
@@ -6,9 +6,9 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import de.sebse.fuplanner.services.KVV.types.Event;
+import de.sebse.fuplanner.services.kvv.types.Event;
-import de.sebse.fuplanner.services.KVV.types.EventList;
+import de.sebse.fuplanner.services.kvv.types.EventList;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkError;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;

app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesGradebook.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.kvv;
 
 import android.content.Context;
 
@@ -8,8 +8,8 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-import de.sebse.fuplanner.services.KVV.types.Grade;
+import de.sebse.fuplanner.services.kvv.types.Grade;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkError;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;

app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesList.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.kvv;
 
 import android.content.Context;
 
@@ -13,9 +13,9 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.regex.MatchResult;
 
-import de.sebse.fuplanner.services.KVV.types.Lecturer;
+import de.sebse.fuplanner.services.kvv.types.Lecturer;
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
-import de.sebse.fuplanner.services.KVV.types.Semester;
+import de.sebse.fuplanner.services.kvv.types.Semester;
 import de.sebse.fuplanner.tools.NewAsyncQueue;
 import de.sebse.fuplanner.tools.Regex;
 import de.sebse.fuplanner.tools.network.HTTPService;
@@ -23,7 +23,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkError;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 
-import static de.sebse.fuplanner.services.KVV.PartModules.RETRY_COUNT;
+import static de.sebse.fuplanner.services.kvv.PartModules.RETRY_COUNT;
 
 public class ModulesList extends HTTPService {
     private final Login mLogin;
@@ -46,6 +46,16 @@ public class ModulesList extends HTTPService {
         return null;
     }
 
+    public void reloadIfOutdated() {
+        try {
+            if (mModules != null && mModules.isNewerVersionInStorage(getContext())) {
+                restore();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
     public void find(String moduleID, NetworkCallback<Modules.Module> moduleNetworkCallback, NetworkErrorCallback errorCallback) {
         find(moduleID, moduleNetworkCallback, errorCallback, RETRY_COUNT);
     }
@@ -115,10 +125,10 @@ public class ModulesList extends HTTPService {
             this.upgrade(success -> {
                 if (this.mModules == null)
                     this.mModules = success;
-                else
+                else if(this.mModules.updateList(success)) {
-                    this.mModules.updateList(success);
+                    mListener.onModuleListChange();
-                mListener.onModuleListChange();
+                    store();
-                store();
+                }
                 callback.onResponse(this.mModules);
                 mQueue.next();
             }, error -> {
@@ -139,6 +149,7 @@ public class ModulesList extends HTTPService {
     }
 
     private void upgrade(final NetworkCallback<Modules> callback, final NetworkErrorCallback errorCallback) {
+        log.d(mLogin.isInOnlineMode(), mLogin.getLoginToken());
         if (!mLogin.isInOnlineMode() || mLogin.getLoginToken() == null) {
             errorCallback.onError(new NetworkError(101105, 500, "Currently running in offline mode!"));
             return;

app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesResources.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.kvv;
 
 import android.content.Context;
 import android.os.Build;
@@ -15,8 +15,8 @@ import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
-import de.sebse.fuplanner.services.KVV.types.Resource;
+import de.sebse.fuplanner.services.kvv.types.Resource;
 import de.sebse.fuplanner.tools.Regex;
 import de.sebse.fuplanner.tools.UtilsDate;
 import de.sebse.fuplanner.tools.network.NetworkCallback;

app/src/main/java/de/sebse/fuplanner/services/kvv/Part.java

@@ -1,8 +1,8 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.kvv;
 
 import android.content.Context;
 
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.network.HTTPService;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;

app/src/main/java/de/sebse/fuplanner/services/kvv/PartModules.java

@@ -1,11 +1,11 @@
-package de.sebse.fuplanner.services.KVV;
+package de.sebse.fuplanner.services.kvv;
 
 import android.content.Context;
 import android.os.Build;
 import android.text.Html;
 import android.text.Spanned;
 
-import de.sebse.fuplanner.services.KVV.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Modules;
 import de.sebse.fuplanner.tools.NewAsyncQueue;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;

app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVContentProvider.java

@@ -0,0 +1,67 @@
+package de.sebse.fuplanner.services.kvv.sync;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public class KVVContentProvider extends ContentProvider {
+
+    public static final String PROVIDER_NAME = "de.sebse.fuplanner.contentprovider.kvv.modules";
+    private static final Uri CONTENT_URI = Uri.parse("content://" + PROVIDER_NAME + "/modules");
+    private static final int MODULE = 1;
+    private static final int MODULE_ID = 2;
+    private static final UriMatcher uriMatcher = getUriMatcher();
+
+    private static UriMatcher getUriMatcher() {
+        UriMatcher uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+        uriMatcher.addURI(PROVIDER_NAME, "modules", MODULE);
+        uriMatcher.addURI(PROVIDER_NAME, "modules/#", MODULE_ID);
+        return uriMatcher;
+    }
+
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Nullable
+    @Override
+    public Cursor query(@NonNull Uri uri, @Nullable String[] strings, @Nullable String s, @Nullable String[] strings1, @Nullable String s1) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getType(@NonNull Uri uri) {
+        switch (uriMatcher.match(uri)) {
+            case MODULE:
+                return "vnd.android.cursor.dir/vnd.com."+PROVIDER_NAME;
+            case MODULE_ID:
+                return "vnd.android.cursor.item/vnd.com."+PROVIDER_NAME;
+
+        }
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public Uri insert(@NonNull Uri uri, @Nullable ContentValues contentValues) {
+        return null;
+    }
+
+    @Override
+    public int delete(@NonNull Uri uri, @Nullable String s, @Nullable String[] strings) {
+        return 0;
+    }
+
+    @Override
+    public int update(@NonNull Uri uri, @Nullable ContentValues contentValues, @Nullable String s, @Nullable String[] strings) {
+        return 0;
+    }
+}

app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java

@@ -0,0 +1,161 @@
+package de.sebse.fuplanner.services.kvv.sync;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.AbstractThreadedSyncAdapter;
+import android.content.ContentProviderClient;
+import android.content.Context;
+import android.content.SyncResult;
+import android.os.Bundle;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import androidx.annotation.StringRes;
+import de.sebse.fuplanner.R;
+import de.sebse.fuplanner.services.kvv.KVV;
+import de.sebse.fuplanner.services.kvv.KVVListener;
+import de.sebse.fuplanner.services.kvv.types.Announcement;
+import de.sebse.fuplanner.services.kvv.types.Assignment;
+import de.sebse.fuplanner.services.kvv.types.AssignmentList;
+import de.sebse.fuplanner.services.kvv.types.Event;
+import de.sebse.fuplanner.services.kvv.types.EventList;
+import de.sebse.fuplanner.services.kvv.types.Grade;
+import de.sebse.fuplanner.services.kvv.types.Modules;
+import de.sebse.fuplanner.services.kvv.types.Resource;
+import de.sebse.fuplanner.tools.CustomAccountManager;
+import de.sebse.fuplanner.tools.CustomNotificationManager;
+import de.sebse.fuplanner.tools.NewAsyncQueue;
+import de.sebse.fuplanner.tools.UtilsDate;
+import de.sebse.fuplanner.tools.logging.Logger;
+
+public class KVVSyncAdapter extends AbstractThreadedSyncAdapter {
+    private KVV mKVV;
+    private Logger log = new Logger(this);
+    private NewAsyncQueue mQueue = new NewAsyncQueue();
+
+    /**
+     * Set up the sync adapter
+     */
+    public KVVSyncAdapter(Context context, boolean autoInitialize) {
+        super(context, autoInitialize);
+        init(context);
+    }
+    /**
+     * Set up the sync adapter. This form of the
+     * constructor maintains compatibility with Android 3.0
+     * and later platform versions
+     */
+    public KVVSyncAdapter(
+            Context context,
+            boolean autoInitialize,
+            boolean allowParallelSyncs) {
+        super(context, autoInitialize, allowParallelSyncs);
+        init(context);
+    }
+
+    private void init(Context context) {
+        mKVV = new KVV(new KVVListener() {
+            CustomAccountManager accountManager = null;
+            @Override
+            public CustomAccountManager getAccountManager() {
+                if (accountManager == null)
+                    accountManager = new CustomAccountManager(AccountManager.get(context), () -> null);
+                return accountManager;
+            }
+        }, context);
+        mQueue.add(() -> {
+            mKVV.account().restoreOnlineLogin(bool -> {
+                log.d("login restored");
+                mQueue.next();
+            });
+        });
+    }
+
+    /*
+     * Specify the code you want to run in the sync adapter. The entire
+     * sync adapter runs in a background thread, so you don't have to set
+     * up your own background processing.
+     */
+    @Override
+    public void onPerformSync(
+            Account account,
+            Bundle extras,
+            String authority,
+            ContentProviderClient provider,
+            SyncResult syncResult) {
+        log.d("onPerformSync");
+        mQueue.add(() -> {
+            log.d("start syncing");
+            mKVV.modules().list().recv(success -> {
+                Iterator<Modules.Module> iterator = success.latestSemesterIterator();
+                while (iterator.hasNext()) {
+                    Modules.Module module = iterator.next();
+                    log.d("sync module", module.title);
+                    final ArrayList<Announcement> announcements = module.announcements;
+                    final AssignmentList assignments = module.assignments;
+                    final EventList events = module.events;
+                    final ArrayList<Grade> gradebook = module.gradebook;
+                    final ArrayList<Resource> resources = module.resources;
+                    mKVV.modules().details().recv(module, success1 -> {
+                        if (success1.second) {
+                            log.d("Sync Successful for Module '"+module.title+"'!");
+                            sendNotifications(announcements, module.announcements, module.title, Announcement::getTitle, Announcement::getId,
+                                    R.string.announcement_updated, R.string.announcement_added, R.string.announcement_removed);
+                            sendNotifications(assignments, module.assignments, module.title, Assignment::getTitle, Assignment::getId,
+                                    R.string.assignment_updated, R.string.assignment_added, R.string.assignment_removed);
+                            sendNotifications(events, module.events, module.title, evt -> evt.getTitle()+" - "+UtilsDate.getModifiedDate(evt.getStartDate()), Event::getId,
+                                    R.string.event_updated, R.string.event_added, R.string.event_removed);
+                            sendNotifications(gradebook, module.gradebook, module.title, Grade::getItemName, Grade::getItemName,
+                                    R.string.gradebook_updated, R.string.gradebook_added, R.string.gradebook_removed);
+                            sendNotifications(resources, module.resources, module.title, Resource::getTitle, Resource::getUrl,
+                                    R.string.resource_updated, R.string.resource_added, R.string.resource_removed);
+                            mQueue.next();
+                        }
+                    }, msg -> {
+                        log.e(msg);
+                        mQueue.next();
+                    }, true);
+                }
+            }, msg -> {
+                log.e(msg);
+                mQueue.next();
+            }, true);
+            log.d("finished");
+        });
+    }
+
+    private <T> void sendNotifications(Iterable<T> oldList, Iterable<T> newList, String title, StringInterface<T> titleInterface, StringInterface<T> idInterface, @StringRes int updateRes, @StringRes int addRes, @StringRes int removeRes) {
+        if (oldList == null || newList == null) {
+            return;
+        }
+        ArrayList<T> obsoletes = new ArrayList<T>();
+        for (T old: oldList) {
+            obsoletes.add(old);
+        }
+        for (T newEntry: newList) {
+            boolean found = false;
+            for (T oldEntry: oldList) {
+                if (idInterface.get(newEntry).equals(idInterface.get(oldEntry))) {
+                    found = true;
+                    if (newEntry.hashCode() != oldEntry.hashCode()) {
+                        CustomNotificationManager.sendNotification(getContext(), getContext().getString(updateRes, title), titleInterface.get(newEntry));
+                    }
+                    obsoletes.remove(oldEntry);
+                    break;
+                }
+            }
+            if (!found) {
+                CustomNotificationManager.sendNotification(getContext(), getContext().getString(addRes, title), titleInterface.get(newEntry));
+            }
+        }
+        for (T oldEntry: obsoletes) {
+            CustomNotificationManager.sendNotification(getContext(), getContext().getString(removeRes, title), titleInterface.get(oldEntry));
+        }
+    }
+
+    @FunctionalInterface
+    interface StringInterface<T> {
+        String get(T element);
+    }
+}

app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncService.java

@@ -0,0 +1,24 @@
+package de.sebse.fuplanner.services.kvv.sync;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+public class KVVSyncService extends Service {
+
+    private static final Object sSyncAdapterLock = new Object();
+    private static KVVSyncAdapter sSyncAdapter = null;
+
+    @Override
+    public void onCreate() {
+        synchronized (sSyncAdapterLock) {
+            if (sSyncAdapter == null)
+                sSyncAdapter = new KVVSyncAdapter(getApplicationContext(), true);
+        }
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return sSyncAdapter.getSyncAdapterBinder();
+    }
+}

app/src/main/java/de/sebse/fuplanner/services/kvv/sync/Login.java

@@ -0,0 +1,265 @@
+package de.sebse.fuplanner.services.kvv.sync;
+
+import android.content.Context;
+
+import org.jetbrains.annotations.NotNull;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import de.sebse.fuplanner.services.kvv.types.LoginToken;
+import de.sebse.fuplanner.tools.network.HTTPService;
+import de.sebse.fuplanner.tools.network.NetworkCallback;
+import de.sebse.fuplanner.tools.network.NetworkError;
+import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
+
+public class Login extends HTTPService {
+    public Login(Context context) {
+        super(context);
+    }
+
+
+    public void testLoginToken(@NotNull LoginToken token, @NotNull NetworkCallback<LoginToken> callback, @NotNull NetworkErrorCallback errorCallback) {
+        get(String.format("https://kvv.imp.fu-berlin.de/direct/profile/%s.json", token.getUsername()), token.getCookies(), response -> {
+            String body = response.getParsed();
+            if (body == null) {
+                errorCallback.onError(new NetworkError(100172, 403, "Testing login failed!"));
+                return;
+            }
+            try {
+                JSONObject json = new JSONObject(body);
+                String displayName = json.getString("displayName");
+                String email = json.getString("email");
+                token.setAdditionals(displayName, email);
+                callback.onResponse(token);
+            } catch (JSONException e) {
+                errorCallback.onError(new NetworkError(100171, 403, "Cannot parse profile!"));
+            }
+        }, error -> errorCallback.onError(new NetworkError(100170, error.networkResponse.statusCode, "Testing login failed!")));
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public void doLogin(String username, String password, NetworkCallback<LoginToken> callback, NetworkErrorCallback error) {
+        step1(success1 -> {
+            String samlLocation = success1.get("Location");
+            step2(samlLocation, success2 -> {
+                String fuJSESSIONID = success2.get("JSESSIONID");
+                step3(fuJSESSIONID, success3 -> {
+                    step4(username, password, fuJSESSIONID, success4 -> {
+                        String fuSHIBSession = success4.get("shib_idp_session");
+                        String samlResponse = success4.get("SAMLResponse");
+                        step5(samlResponse, success5 -> {
+                            String shibsessionKey = success5.get("shibsessionKey");
+                            String shibsessionName = success5.get("shibsessionName");
+                            step6(shibsessionKey, shibsessionName, success6 -> {
+                                String kvvJSESSIONID = success6.get("JSESSIONID");
+                                LoginToken token = new LoginToken(username, shibsessionKey, shibsessionName, kvvJSESSIONID);
+                                callback.onResponse(token);
+                            }, error);
+                        }, error);
+                    }, error);
+                }, error);
+            }, error);
+        }, error);
+    }
+
+    /*
+     1= GET https://kvv.imp.fu-berlin.de/Shibboleth.sso/Login?entityID=https://identity.fu-berlin.de/idp-fub
+        -> Location-Header: https://identity.fu-berlin.de:9443/idp-fub-qa/profile/SAML2/Redirect/SSO?SAMLResponse=[SAMLResponse]&RelayState=[RelayState]
+     */
+    private void step1(final NetworkCallback<HashMap<String, String>> callback, final NetworkErrorCallback errorCallback) {
+        get("https://kvv.imp.fu-berlin.de/Shibboleth.sso/Login?entityID=https://identity.fu-berlin.de/idp-fub", null, response -> {
+            String location = response.getHeaders().get("Location");
+            if (location==null) {
+                errorCallback.onError(new NetworkError(100111, -1, "Error on getting SAML request!"));
+                return;
+            }
+            HashMap<String, String> object = new HashMap<>();
+            object.put("Location", location);
+            callback.onResponse(object);
+        }, error -> errorCallback.onError(new NetworkError(100110, error.networkResponse.statusCode, "Error on getting SAML request!")));
+    }
+
+    /*
+     2= GET [Location-Header 1]
+        -> Set-Cookie: JSESSIONID=[JSESSION-FU]
+        -> Location: /idp-fub-qa/profile/SAML2/Redirect/SSO?execution=e1s1
+    */
+    private void step2(String url, final NetworkCallback<HashMap<String, String>> callback, final NetworkErrorCallback errorCallback) {
+        get(url, null, response -> {
+            String cookies = response.getHeaders().get("Set-Cookie");
+            if (cookies==null) {
+                errorCallback.onError(new NetworkError(100121, -1, "Error on starting FU session!"));
+                return;
+            }
+            HashMap<String, String> object;
+            try {
+                object = getCookie(cookies, new String[]{"JSESSIONID"});
+            } catch (NoSuchFieldException e) {
+                errorCallback.onError(new NetworkError(100122, -1, "Error on starting FU session!"));
+                return;
+            }
+            callback.onResponse(object);
+        }, error -> errorCallback.onError(new NetworkError(100120, error.networkResponse.statusCode, "Error on starting FU session!")));
+    }
+
+    /*
+     3= GET [Location-Header 2]
+        + Cookie: JSESSIONID=[JSESSION-FU]
+     */
+    private void step3(String JSESSIONID_FU, final NetworkCallback<Boolean> callback, final NetworkErrorCallback errorCallback) {
+        HashMap<String, String> cookies = new HashMap<>();
+        cookies.put("JSESSIONID", JSESSIONID_FU);
+        get("https://identity.fu-berlin.de/idp-fub/profile/SAML2/Redirect/SSO?execution=e1s1", cookies, response -> {
+            callback.onResponse(true);
+        }, error -> errorCallback.onError(new NetworkError(100130, error.networkResponse.statusCode, "Error starting login page!")));
+    }
+
+    /*
+     4= POST [Location-Header 2]
+        + Body: j_username=[USERNAME]&j_password=[PASSWORD]&_eventId_proceed=
+        + Header: Content-Type: application/x-www-form-urlencoded
+        + Header: Referer: [Location-Header 2]
+        + Cookie: JSESSIONID=[JSESSION-FU]
+        -> Set-Cookie: shib_idp_session=[SHIB-IDP-SESSION]
+        -> Body SAMLResponse-Input-value
+     */
+    private void step4(String username, String password, String JSESSIONID_FU, final NetworkCallback<HashMap<String, String>> callback, final NetworkErrorCallback errorCallback) {
+        HashMap<String, String> cookies = new HashMap<>();
+        cookies.put("JSESSIONID", JSESSIONID_FU);
+        HashMap<String, String> body = new HashMap<>();
+        body.put("j_username", username);
+        body.put("j_password", password);
+        body.put("_eventId_proceed", "");
+        post("https://identity.fu-berlin.de/idp-fub/profile/SAML2/Redirect/SSO?execution=e1s1", cookies, body, response -> {
+            String cookies1 = response.getHeaders().get("Set-Cookie");
+            if (cookies1 ==null) {
+                errorCallback.onError(new NetworkError(100141, -1, "Error on logging in to FU Identity Server!"));
+                return;
+            }
+            HashMap<String, String> object;
+            try {
+                object = getCookie(cookies1, new String[]{"shib_idp_session"});
+            } catch (NoSuchFieldException e) {
+                errorCallback.onError(new NetworkError(100142, -1, "Error on logging in to FU Identity Server!"));
+                return;
+            }
+
+            String content = response.getParsed();
+            if (content == null) {
+                errorCallback.onError(new NetworkError(100143, -1, "Error on getting SAML response!"));
+                return;
+            }
+            Pattern pattern = Pattern.compile("name=\"SAMLResponse\" value=\"([0-9a-zA-Z+]+=*)");
+            Matcher matcher = pattern.matcher(content);
+            if (!matcher.find()) {
+                errorCallback.onError(new NetworkError(100144, -1, "Error on getting SAML response!"));
+                return;
+            }
+            object.put("SAMLResponse", matcher.group(1));
+            callback.onResponse(object);
+        }, error -> errorCallback.onError(new NetworkError(100145, error.networkResponse.statusCode, "Error on logging in to FU Identity Server!")));
+    }
+
+    /*
+     5= POST https://kvv.imp.fu-berlin.de/Shibboleth.sso/SAML2/POST
+        + Body: SAMLResponse=[SAML-RESPONSE]
+        + Header: Content-Type: application/x-www-form-urlencoded
+        -> Set-Cookie: _shibsession_[SESS-NR]: [SESS-VALUE]
+    */
+    private void step5(String SAMLResponse, final NetworkCallback<HashMap<String, String>> callback, final NetworkErrorCallback errorCallback) {
+        HashMap<String, String> body = new HashMap<>();
+        body.put("SAMLResponse", SAMLResponse);
+        post("https://kvv.imp.fu-berlin.de/Shibboleth.sso/SAML2/POST", null, body, response -> {
+            String cookies = response.getHeaders().get("Set-Cookie");
+            if (cookies ==null) {
+                errorCallback.onError(new NetworkError(100151, -1, "Error on starting KVV session!"));
+                return;
+            }
+            HashMap<String, String> object = new HashMap<>();
+
+
+            Pattern pattern = Pattern.compile("(_shibsession_[0-9a-f]+)=([^;]+);");
+            Matcher matcher = pattern.matcher(cookies);
+            if (!matcher.find()) {
+                errorCallback.onError(new NetworkError(100152, -1, "Error on starting KVV session!"));
+            }
+            object.put("shibsessionKey", matcher.group(1));
+            object.put("shibsessionName", matcher.group(2));
+
+            callback.onResponse(object);
+        }, error -> errorCallback.onError(new NetworkError(100150, error.networkResponse.statusCode, "Error on starting KVV session!")));
+    }
+
+
+    /*
+     6= https://kvv.imp.fu-berlin.de/sakai-login-tool/container
+        + Cookie: _shibsession_[SESS-NR]: [SESS-VALUE]
+        -> Set-Cookie: JSESSIONID: [JSESSION-KVV]
+	*/
+    private void step6(String shibsessionKey, String shibsessionName, final NetworkCallback<HashMap<String, String>> callback, final NetworkErrorCallback errorCallback) {
+        HashMap<String, String> cookies = new HashMap<>();
+        cookies.put(shibsessionKey, shibsessionName);
+        get("https://kvv.imp.fu-berlin.de/sakai-login-tool/container", cookies, response -> {
+            String cookies1 = response.getHeaders().get("Set-Cookie");
+            if (cookies1 ==null) {
+                errorCallback.onError(new NetworkError(100161, -1, "Cannot finish login process!"));
+                return;
+            }
+            HashMap<String, String> object;
+            try {
+                object = getCookie(cookies1, new String[]{"JSESSIONID"});
+            } catch (NoSuchFieldException e) {
+                errorCallback.onError(new NetworkError(100162, -1, "Cannot finish login process!"));
+                return;
+            }
+            callback.onResponse(object);
+        }, error -> errorCallback.onError(new NetworkError(100160, error.networkResponse.statusCode, "Cannot finish login process!")));
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+    private String getCookie(String cookies, String name) throws NoSuchFieldException {
+        Pattern pattern = Pattern.compile(name+"=([^;]+);");
+        Matcher matcher = pattern.matcher(cookies);
+        if (!matcher.find()) {
+            log.e("GETcookie failed", name);
+            log.e("GETcookie failed", cookies);
+            throw new NoSuchFieldException();
+        }
+        return matcher.group(1);
+    }
+
+    private HashMap<String, String> getCookie(String cookies, String[] names) throws NoSuchFieldException {
+        HashMap<String, String> result = new HashMap<>();
+        for (String name: names) {
+            result.put(name,this.getCookie(cookies, name));
+        }
+        return result;
+    }
+}

app/src/main/java/de/sebse/fuplanner/services/kvv/types/Announcement.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV.types;
+package de.sebse.fuplanner.services.kvv.types;
 
 import com.google.android.gms.common.internal.Objects;
 
@@ -16,7 +16,6 @@ public class Announcement implements Serializable {
     private final ArrayList<String> urls;
 
     public Announcement(String id, String title, String body, String createdBy, long createdOn, ArrayList<String> urls) {
-
         this.id = id;
         this.title = title;
         this.body = body;
@@ -29,7 +28,7 @@ public class Announcement implements Serializable {
         return urls;
     }
 
-    private String getId() {
+    public String getId() {
         return id;
     }
 

app/src/main/java/de/sebse/fuplanner/services/kvv/types/Assignment.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV.types;
+package de.sebse.fuplanner.services.kvv.types;
 
 import com.google.android.gms.common.internal.Objects;
 
@@ -22,7 +22,7 @@ public class Assignment implements Serializable {
         this.instructions = instructions;
     }
 
-    private String getId() {
+    public String getId() {
         return id;
     }
 

app/src/main/java/de/sebse/fuplanner/services/kvv/types/AssignmentList.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV.types;
+package de.sebse.fuplanner.services.kvv.types;
 
 import de.sebse.fuplanner.tools.DateSortedList;
 

app/src/main/java/de/sebse/fuplanner/services/kvv/types/Event.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV.types;
+package de.sebse.fuplanner.services.kvv.types;
 
 import com.google.android.gms.common.internal.Objects;
 

app/src/main/java/de/sebse/fuplanner/services/kvv/types/EventList.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV.types;
+package de.sebse.fuplanner.services.kvv.types;
 
 import de.sebse.fuplanner.tools.DateSortedList;
 

app/src/main/java/de/sebse/fuplanner/services/kvv/types/Grade.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV.types;
+package de.sebse.fuplanner.services.kvv.types;
 
 import com.google.android.gms.common.internal.Objects;
 

app/src/main/java/de/sebse/fuplanner/services/kvv/types/GroupedEvents.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV.types;
+package de.sebse.fuplanner.services.kvv.types;
 
 
 import android.annotation.SuppressLint;

app/src/main/java/de/sebse/fuplanner/services/kvv/types/Lecturer.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV.types;
+package de.sebse.fuplanner.services.kvv.types;
 
 import java.io.Serializable;
 import java.util.regex.Matcher;

app/src/main/java/de/sebse/fuplanner/services/kvv/types/LoginToken.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV.types;
+package de.sebse.fuplanner.services.kvv.types;
 
 import android.content.Context;
 
@@ -11,7 +11,7 @@ import java.util.HashMap;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import de.sebse.fuplanner.services.newkvv.AccountGeneral;
+import de.sebse.fuplanner.services.fulogin.AccountGeneral;
 import de.sebse.fuplanner.tools.CustomAccountManager;
 import de.sebse.fuplanner.tools.logging.Logger;
 
@@ -39,32 +39,19 @@ public class LoginToken implements Serializable {
 
     @Nullable
     public static void load(CustomAccountManager manager, LoginTokenInterface callback) {
-        log.d("try to login");
         if (!manager.hasAccounts(AccountGeneral.ACCOUNT_TYPE)) {
             callback.run(null);
             return;
         }
-        log.d("has accounts");
         manager.getTokenByType(AccountGeneral.ACCOUNT_TYPE, AccountGeneral.AUTHTOKEN_TYPE_KVV, tokenString -> {
-            //manager.getTokenByTypeSync(AccountGeneral.ACCOUNT_TYPE, AccountGeneral.AUTHTOKEN_TYPE_KVV);
             if (tokenString == null) {
                 callback.run(null);
                 return;
             }
-            log.d("got token string", tokenString);
             callback.run(LoginToken.fromJsonString(tokenString));
-            //return LoginToken.fromJsonString(tokenString);
         });
     }
 
-    public void save(Context context) throws IOException {
-        /*FileOutputStream fos = context.openFileOutput(FILE_NAME, Context.MODE_PRIVATE);
-        ObjectOutputStream os = new ObjectOutputStream(fos);
-        os.writeObject(this);
-        os.close();
-        fos.close();*/
-    }
-
     public void delete(CustomAccountManager manager) {
         manager.deleteAccount(AccountGeneral.ACCOUNT_TYPE);
     }

app/src/main/java/de/sebse/fuplanner/services/kvv/types/Modules.java

@@ -1,7 +1,9 @@
-package de.sebse.fuplanner.services.KVV.types;
+package de.sebse.fuplanner.services.kvv.types;
 
 import android.content.Context;
 
+import com.google.android.gms.common.internal.Objects;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.io.FileInputStream;
@@ -25,8 +27,10 @@ import androidx.annotation.Nullable;
 public class Modules implements Iterable<Modules.Module>, Serializable {
     private SortedListModule list;
     private final String mUsername;
+    private transient long mLastTimestamp = 0;
     //private transient Logger log = new Logger(this);
     private static final String FILE_NAME = "ModuleListSaving";
+    private static final String FILE_NAME_TIMESTAMP = "ModuleListSavingTimestamp";
 
     public Modules(String username) {
         this.mUsername = username;
@@ -75,15 +79,38 @@ public class Modules implements Iterable<Modules.Module>, Serializable {
         Modules modules = (Modules) readObject;
         is.close();
         fis.close();
+
+        fis = context.openFileInput(FILE_NAME_TIMESTAMP);
+        is = new ObjectInputStream(fis);
+        modules.mLastTimestamp = is.readLong();
+        is.close();
+        fis.close();
+
         return modules;
     }
 
+    public boolean isNewerVersionInStorage(Context context) throws IOException {
+        FileInputStream fis = context.openFileInput(FILE_NAME_TIMESTAMP);
+        ObjectInputStream is = new ObjectInputStream(fis);
+        boolean result = this.mLastTimestamp < is.readLong();
+        is.close();
+        fis.close();
+        return result;
+    }
+
     public void save(Context context) throws IOException {
         FileOutputStream fos = context.openFileOutput(FILE_NAME, Context.MODE_PRIVATE);
         ObjectOutputStream os = new ObjectOutputStream(fos);
         os.writeObject(this);
         os.close();
         fos.close();
+
+        fos = context.openFileOutput(FILE_NAME_TIMESTAMP, Context.MODE_PRIVATE);
+        os = new ObjectOutputStream(fos);
+        this.mLastTimestamp = System.currentTimeMillis();
+        os.writeLong(this.mLastTimestamp);
+        os.close();
+        fos.close();
     }
 
     public void delete(Context context) {
@@ -94,19 +121,36 @@ public class Modules implements Iterable<Modules.Module>, Serializable {
         return mUsername;
     }
 
-    public void updateList(Modules modules) {
+    public boolean updateList(Modules modules) {
         SortedListModule old = this.list;
         this.list = modules.list;
+        boolean isChanged = false;
         for (Module oldModule : old) {
             Module newModule = this.list.getById(oldModule.getID());
             if (newModule != null) {
+                if (!isChanged && !hashEquals(oldModule, newModule))
+                    isChanged = true;
                 newModule.announcements = oldModule.announcements;
                 newModule.assignments = oldModule.assignments;
                 newModule.events = oldModule.events;
                 newModule.gradebook = oldModule.gradebook;
                 newModule.resources = oldModule.resources;
+            } else {
+                isChanged = true;
             }
         }
+        if (this.list.size() != old.size())
+            isChanged = true;
+        return isChanged;
+    }
+
+    private boolean hashEquals(Module o1, Module o2) {
+        if (o1 == null && o2 == null)
+            return true;
+        else if (o1 == null || o2 == null)
+            return false;
+        else
+            return o1.hashCode() == o2.hashCode();
     }
 
     public class Module implements Serializable {
@@ -166,5 +210,10 @@ public class Modules implements Iterable<Modules.Module>, Serializable {
                     "\ntype: "+type+
                     "\nID: "+ID;
         }
+
+        @Override
+        public int hashCode() {
+            return Objects.hashCode(semester, lvNumber, title, lecturer, type, description, ID);
+        }
     }
 }

app/src/main/java/de/sebse/fuplanner/services/kvv/types/Resource.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV.types;
+package de.sebse.fuplanner.services.kvv.types;
 
 import com.google.android.gms.common.internal.Objects;
 

app/src/main/java/de/sebse/fuplanner/services/kvv/types/Semester.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV.types;
+package de.sebse.fuplanner.services.kvv.types;
 
 import java.io.Serializable;
 

app/src/main/java/de/sebse/fuplanner/services/kvv/types/SortedListModule.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV.types;
+package de.sebse.fuplanner.services.kvv.types;
 
 import androidx.annotation.Nullable;
 import de.sebse.fuplanner.tools.SortedList;

app/src/main/java/de/sebse/fuplanner/services/kvv/ui/Download.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.KVV.ui;
+package de.sebse.fuplanner.services.kvv.ui;
 
 import android.Manifest;
 import android.app.AlertDialog;
@@ -18,7 +18,7 @@ import androidx.core.app.ActivityCompat;
 import androidx.core.content.FileProvider;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.types.Resource;
+import de.sebse.fuplanner.services.kvv.types.Resource;
 import de.sebse.fuplanner.tools.Regex;
 import de.sebse.fuplanner.tools.RequestPermissionsResultListener;
 import de.sebse.fuplanner.tools.UtilsDate;

app/src/main/java/de/sebse/fuplanner/services/newkvv/network/Login.java

@@ -1,297 +0,0 @@
-package de.sebse.fuplanner.services.newkvv.network;
-
-import android.content.Context;
-
-import org.jetbrains.annotations.NotNull;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import de.sebse.fuplanner.services.KVV.types.LoginToken;
-import de.sebse.fuplanner.tools.network.HTTPService;
-import de.sebse.fuplanner.tools.network.NetworkCallback;
-import de.sebse.fuplanner.tools.network.NetworkError;
-import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
-
-public class Login extends HTTPService {
-    public Login(Context context) {
-        super(context);
-    }
-
-
-    public void testLoginToken(@NotNull LoginToken token, @NotNull NetworkCallback<LoginToken> callback, @NotNull NetworkErrorCallback errorCallback) {
-        get(String.format("https://kvv.imp.fu-berlin.de/direct/profile/%s.json", token.getUsername()), token.getCookies(), response -> {
-            String body = response.getParsed();
-            if (body == null) {
-                errorCallback.onError(new NetworkError(100172, 403, "Testing login failed!"));
-                return;
-            }
-            try {
-                JSONObject json = new JSONObject(body);
-                String displayName = json.getString("displayName");
-                String email = json.getString("email");
-                token.setAdditionals(displayName, email);
-                callback.onResponse(token);
-            } catch (JSONException e) {
-                errorCallback.onError(new NetworkError(100171, 403, "Cannot parse profile!"));
-            }
-        }, error -> errorCallback.onError(new NetworkError(100170, error.networkResponse.statusCode, "Testing login failed!")));
-    }
-
-
-
-
-
-
-    public void doLogin(String username, String password, NetworkCallback<LoginToken> callback, NetworkErrorCallback error) {
-        startKVVSession(success -> {
-            String kvvJSESSIONID = success.get("JSESSIONID");
-            getSAMLRequest(kvvJSESSIONID, success1 -> startIdentSession(success1.get("Location"), success11 -> {
-                String identJSESSIONID = success11.get("JSESSIONID");
-                String ident_idp_authn_lc_key = success11.get("_idp_authn_lc_key");
-                String identROUTEID = success11.get("ROUTEID");
-                loginIdent(true, username, password, identJSESSIONID, ident_idp_authn_lc_key, identROUTEID, success111 -> loginIdent(false, username, password, identJSESSIONID, ident_idp_authn_lc_key, identROUTEID, success11112 -> {
-                    String ident_idp_session = success11112.get("_idp_session");
-                    getSAMLResponse(identJSESSIONID, ident_idp_authn_lc_key, identROUTEID, ident_idp_session, success1111 -> loginKVV(success1111.get("RelayState"), success1111.get("SAMLResponse"), kvvJSESSIONID, success111112 -> {
-                        LoginToken token = new LoginToken(username, success111112.get("shibsessionKey"), success111112.get("shibsessionName"), kvvJSESSIONID);
-                        finishKVVlogin(token, success11111 -> callback.onResponse(token), error);
-                    }, error), error);
-                }, error), error);
-            }, error), error);
-        }, error);
-    }
-
-    /*
-    GET https://kvv.imp.fu-berlin.de/portal/login
-    -> JSESSIONID 5c10406f-588c-4c16-96e9-c80d115417de.tomcat1
-     */
-    private void startKVVSession(final NetworkCallback<HashMap<String, String>> callback, final NetworkErrorCallback errorCallback) {
-        get("https://kvv.imp.fu-berlin.de/portal/login", null, response -> {
-            String cookies = response.getHeaders().get("Set-Cookie");
-            if (cookies==null) {
-                errorCallback.onError(new NetworkError(100101, -1, "Error on starting KVV session!"));
-                return;
-            }
-            HashMap<String, String> object;
-            try {
-                object = getCookie(cookies, new String[]{"JSESSIONID"});
-            } catch (NoSuchFieldException e) {
-                errorCallback.onError(new NetworkError(100102, -1, "Error on starting KVV session!"));
-                return;
-            }
-            callback.onResponse(object);
-        }, error -> errorCallback.onError(new NetworkError(100100, error.networkResponse.statusCode, "Error on starting KVV session!")));
-    }
-
-    /*
-    GET https://kvv.imp.fu-berlin.de/sakai-login-tool/container
-    <- JSESSIONID
-    -> (Location-Header) https://identity.fu-berlin.de/idp-fub/profile/SAML2/Redirect/SSO
-    ?SAMLRequest=fZLLb.....Q8yre3X1IHwkJKE0Mnpy/V9TH4A
-    &RelayState=ss:mem:7ea01e29157b8bd906f7002176.....0d1a505f2c8bf
-     */
-    private void getSAMLRequest(String JSESSIONID, final NetworkCallback<HashMap<String, String>> callback, final NetworkErrorCallback errorCallback) {
-        HashMap<String, String> cookies = new HashMap<>();
-        cookies.put("JSESSIONID", JSESSIONID);
-        get("https://kvv.imp.fu-berlin.de/sakai-login-tool/container", cookies, response -> {
-            String location = response.getHeaders().get("Location");
-            if (location==null) {
-                errorCallback.onError(new NetworkError(100111, -1, "Error on getting SAML request!"));
-                return;
-            }
-            HashMap<String, String> object = new HashMap<>();
-            object.put("Location", location);
-            callback.onResponse(object);
-        }, error -> errorCallback.onError(new NetworkError(100110, error.networkResponse.statusCode, "Error on getting SAML request!")));
-    }
-
-    /*
-    GET https://identity.fu-berlin.de/idp-fub/profile/SAML2/Redirect/SSO
-    ?SAMLRequest=fZLLbsIwEEV/JfI+cWJAUIsgpbAoEi2IpF10UznxUKw6dupxaPn7hkdb2LD29bkzRzNGUeuGZ63fmjV8toA++K61QX58SEnrDLcCFXIjakDuK55njwvOopg3znpbWU2CDBGcV9ZMrcG2BpeD26kKnteLlGy9b5BT+rHbRapuok0bluC0MpEEmm9VWVoNfhshWnpgM7pa5gUJZt0wyogD9h+iJBiv/P6aomQTbtqSdhNtlIYzZg1SOag8zfMlCeazlLyNqpHsy1gO2V1fVsNBMuqJoUyAJaxXDUaiiyG2MDfohfEpYXEyDJM4ZKxgCe/FPI5fSbA6L36vjFTm/bal8hRC/lAUq/C02gs4PK7VBchkfHDNj8Xuwv5trPhVTiY3BeOf4DG96DmVNvypA89nK6tVtQ8yre3X1IHwkJKE0Mnpy/V9TH4A
-    &RelayState=ss:mem:7ea01e29157b8bd906f7002176213b6db5e1f45ebb88716a9820d1a505f2c8bf
-    -> JSESSIONID			C4B6A428BA1F50746235D03F5D107A57
-    -> _idp_authn_lc_key	57a6ae26067f374cc3d0ccfc47e27b04b47752d2a3d4eb2782af0d3994535395
-    -> ROUTEID				.1
-    */
-    private void startIdentSession(String url, final NetworkCallback<HashMap<String, String>> callback, final NetworkErrorCallback errorCallback) {
-        get(url, null, response -> {
-            String cookies = response.getHeaders().get("Set-Cookie");
-            if (cookies==null) {
-                errorCallback.onError(new NetworkError(100121, -1, "Error on starting Ident session!"));
-                return;
-            }
-            HashMap<String, String> object;
-            try {
-                object = getCookie(cookies, new String[]{"JSESSIONID", "_idp_authn_lc_key", "ROUTEID"});
-            } catch (NoSuchFieldException e) {
-                errorCallback.onError(new NetworkError(100122, -1, "Error on starting Ident session!"));
-                return;
-            }
-            callback.onResponse(object);
-        }, error -> errorCallback.onError(new NetworkError(100120, error.networkResponse.statusCode, "Error on starting Ident session!")));
-    }
-
-    /*
-    POST https://identity.fu-berlin.de/idp-fub/Authn/UserPassword
-    <- j_username			seedorf96
-    <- j_password			neinhieristpatrick
-    <- (Header-"Content-Type") application/x-www-form-urlencoded
-    <- JSESSIONID
-    <- _idp_authn_lc_key
-    <- ROUTEID
-    -> _idp_session			OTMuMTkzLjg1LjMz|LQ==|OGYxOWI4MjA2NTQ4YWUwYzJkOWM4Mjk4YzcwZDMwZmJiZjBmMTdmMzkyZGU2OWIwY2JkNmZlNjlmNTRmNzBlMQ==|wLlzQal7VqyntmG2vLNn06wt8wQ=
-     */
-    private void loginIdent(final boolean first, String username, String password, String JSESSIONID, String _idp_authn_lc_key, String ROUTEID, final NetworkCallback<HashMap<String, String>> callback, final NetworkErrorCallback errorCallback) {
-        HashMap<String, String> cookies = new HashMap<>();
-        cookies.put("JSESSIONID", JSESSIONID);
-        cookies.put("_idp_authn_lc_key", _idp_authn_lc_key);
-        cookies.put("ROUTEID", ROUTEID);
-        HashMap<String, String> body = new HashMap<>();
-        body.put("j_username", username);
-        body.put("j_password", password);
-        post("https://identity.fu-berlin.de/idp-fub/Authn/UserPassword", cookies, body, response -> {
-            if (first) {
-                callback.onResponse(new HashMap<>());
-                return;
-            }
-
-            String cookies1 = response.getHeaders().get("Set-Cookie");
-            if (cookies1 ==null) {
-                errorCallback.onError(new NetworkError(100131, -1, "Error on logging in to Identity Server!"));
-                return;
-            }
-            HashMap<String, String> object;
-            try {
-                object = getCookie(cookies1, new String[]{"_idp_session"});
-            } catch (NoSuchFieldException e) {
-                errorCallback.onError(new NetworkError(100132, -1, "Error on logging in to Identity Server!"));
-                return;
-            }
-            callback.onResponse(object);
-        }, error -> errorCallback.onError(new NetworkError(100130, error.networkResponse.statusCode, "Error on logging in to Identity Server!")));
-    }
-
-    /*
-    GET https://identity.fu-berlin.de/idp-fub/profile/SAML2/Redirect/SSO
-    <- JSESSIONID
-    <- _idp_authn_lc_key
-    <- ROUTEID
-    <- _idp_session
-    -> (BODY) RelayState	7ea01e29157b8bd906f7002176213b6db5e1f45ebb88716a9820d1a505f2c8bf
-    -> (BODY) SAMLResponse	PD94bWwgdmVyc2lvbj0...........wvc2FtbDJwOlJlc3BvbnNlPg==
-    */
-    private void getSAMLResponse(String JSESSIONID, String _idp_authn_lc_key, String ROUTEID, String _idp_session, final NetworkCallback<HashMap<String, String>> callback, final NetworkErrorCallback errorCallback) {
-        HashMap<String, String> cookies = new HashMap<>();
-        cookies.put("JSESSIONID", JSESSIONID);
-        cookies.put("_idp_authn_lc_key", _idp_authn_lc_key);
-        cookies.put("ROUTEID", ROUTEID);
-        cookies.put("_idp_session", _idp_session);
-        get("https://identity.fu-berlin.de/idp-fub/profile/SAML2/Redirect/SSO", cookies, response -> {
-            String body = response.getParsed();
-            if (body == null) {
-                errorCallback.onError(new NetworkError(100143, -1, "Error on getting SAML response!"));
-                return;
-            }
-
-            HashMap<String, String> object = new HashMap<>();
-
-            Pattern pattern = Pattern.compile("ss&#x3a;mem&#x3a;([0-9a-f]+)");
-            Matcher matcher = pattern.matcher(body);
-            if (!matcher.find()) {
-                errorCallback.onError(new NetworkError(100142, -1, "Error on getting SAML response!"));
-                return;
-            }
-            object.put("RelayState", "ss:mem:"+matcher.group(1));
-
-            pattern = Pattern.compile("name=\"SAMLResponse\" value=\"([0-9a-zA-Z+]+=*)");
-            matcher = pattern.matcher(body);
-            if (!matcher.find()) {
-                errorCallback.onError(new NetworkError(100141, -1, "Error on getting SAML response!"));
-                return;
-            }
-            object.put("SAMLResponse", matcher.group(1));
-
-            callback.onResponse(object);
-        }, error -> errorCallback.onError(new NetworkError(100140, error.networkResponse.statusCode, "Error on getting SAML response!")));
-    }
-
-
-    /*
-    POST https://kvv.imp.fu-berlin.de/Shibboleth.sso/SAML2/POST
-    <- RelayState			7ea01e29157b8bd906f7002176213b6db5e1f45ebb88716a9820d1a505f2c8bf
-    <- SAMLResponse			PD94bWwgdmVyc2lvbj0...........wvc2FtbDJwOlJlc3BvbnNlPg==
-    <- JSESSIONID
-    -> _shibsession_64656661756c7468747470733a2f2f6b76762e696d702e66752d6265726c696e2e64652f73686962626f6c657468
-			_b1912c5a03d733a80bd3fee772bf68d4
-	*/
-    private void loginKVV(String RelayState, String SAMLResponse, String JSESSIONID, final NetworkCallback<HashMap<String, String>> callback, final NetworkErrorCallback errorCallback) {
-        HashMap<String, String> cookies = new HashMap<>();
-        cookies.put("JSESSIONID", JSESSIONID);
-        HashMap<String, String> body = new HashMap<>();
-        body.put("RelayState", RelayState);
-        body.put("SAMLResponse", SAMLResponse);
-        post("https://kvv.imp.fu-berlin.de/Shibboleth.sso/SAML2/POST", cookies, body, response -> {
-            String cookies1 = response.getHeaders().get("Set-Cookie");
-            if (cookies1 ==null) {
-                errorCallback.onError(new NetworkError(100151, -1, "Error on starting KVV session!"));
-                return;
-            }
-            HashMap<String, String> object = new HashMap<>();
-
-
-            Pattern pattern = Pattern.compile("(_shibsession_[0-9a-f]+)=([^;]+);");
-            Matcher matcher = pattern.matcher(cookies1);
-            if (!matcher.find()) {
-                errorCallback.onError(new NetworkError(100152, -1, "Error on starting Ident session!"));
-            }
-            object.put("shibsessionKey", matcher.group(1));
-            object.put("shibsessionName", matcher.group(2));
-
-            callback.onResponse(object);
-        }, error -> errorCallback.onError(new NetworkError(100150, error.networkResponse.statusCode, "Error on starting Ident session!")));
-    }
-
-
-    /*
-    GET https://kvv.imp.fu-berlin.de/sakai-login-tool/container
-    <- JSESSIONID
-    <- _shibsession_64656661756c7468747470733a2f2f6b76762e696d702e66752d6265726c696e2e64652f73686962626f6c657468
-			_b1912c5a03d733a80bd3fee772bf68d4
-	*/
-    private void finishKVVlogin(LoginToken loginToken, final NetworkCallback<HashMap<String, String>> callback, final NetworkErrorCallback errorCallback) {
-        get("https://kvv.imp.fu-berlin.de/sakai-login-tool/container", loginToken.getCookies(), response -> callback.onResponse(new HashMap<>()), error -> errorCallback.onError(new NetworkError(100160, error.networkResponse.statusCode, "Cannot finish login process!")));
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-    private String getCookie(String cookies, String name) throws NoSuchFieldException {
-        Pattern pattern = Pattern.compile(name+"=([^;]+);");
-        Matcher matcher = pattern.matcher(cookies);
-        if (!matcher.find()) {
-            log.e("GETcookie failed", name);
-            log.e("GETcookie failed", cookies);
-            throw new NoSuchFieldException();
-        }
-        return matcher.group(1);
-    }
-
-    private HashMap<String, String> getCookie(String cookies, String[] names) throws NoSuchFieldException {
-        HashMap<String, String> result = new HashMap<>();
-        for (String name: names) {
-            result.put(name,this.getCookie(cookies, name));
-        }
-        return result;
-    }
-}

app/src/main/java/de/sebse/fuplanner/services/news/NewsManager.java

@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.News;
+package de.sebse.fuplanner.services.news;
 
 import android.content.Context;
 

app/src/main/java/de/sebse/fuplanner/tools/CustomAccountManager.java

@@ -2,16 +2,17 @@ package de.sebse.fuplanner.tools;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.accounts.AccountManagerCallback;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
+import android.app.Activity;
 import android.os.Build;
 import android.os.Bundle;
 
 import java.io.IOException;
 
 import androidx.annotation.Nullable;
-import de.sebse.fuplanner.MainActivity;
+import de.sebse.fuplanner.services.kvv.Login;
-import de.sebse.fuplanner.services.KVV.Login;
 import de.sebse.fuplanner.tools.logging.Logger;
 
 public class CustomAccountManager {
@@ -77,8 +78,8 @@ public class CustomAccountManager {
     }
 
     public void getTokenByType(String accountType, String authTokenType, @Nullable StringInterface callback) {
-        //Account account = mAccountManager.getAccountsByType(accountType)[0];
+        Activity activity = mActivityInterface.get();
-        mAccountManager.getAuthTokenByFeatures(accountType, authTokenType, null, mActivityInterface.get(), null, null, accountManagerFuture -> {
+        AccountManagerCallback<Bundle> cb = (accountManagerFuture -> {
             try {
                 Bundle bnd = accountManagerFuture.getResult();
                 final String authtoken = bnd.getString(AccountManager.KEY_AUTHTOKEN);
@@ -94,22 +95,25 @@ public class CustomAccountManager {
             }
             if (callback != null)
                 callback.run(null);
-        }, null);
+        });
+        if (activity != null) {
+            mAccountManager.getAuthTokenByFeatures(accountType, authTokenType, null, mActivityInterface.get(), null, null, cb, null);
+        } else {
+            Account account = mAccountManager.getAccountsByType(accountType)[0];
+            mAccountManager.getAuthToken(account, authTokenType, null, true, cb, null);
+        }
     }
 
     public String getTokenByTypeSync(String accountType, String authTokenType) {
         Account account = mAccountManager.getAccountsByType(accountType)[0];
-        MainActivity activity = this.mActivityInterface.get();
+        try {
-        if (activity != null) {
+            return  mAccountManager.blockingGetAuthToken(account, authTokenType, true);
-            try {
+        } catch (AuthenticatorException e) {
-                return  mAccountManager.blockingGetAuthToken(account, authTokenType, true);
+            e.printStackTrace();
-            } catch (AuthenticatorException e) {
+        } catch (IOException e) {
-                e.printStackTrace();
+            e.printStackTrace();
-            } catch (IOException e) {
+        } catch (OperationCanceledException e) {
-                e.printStackTrace();
+            e.printStackTrace();
-            } catch (OperationCanceledException e) {
-                e.printStackTrace();
-            }
         }
         return null;
     }
@@ -118,10 +122,17 @@ public class CustomAccountManager {
         return mAccountManager.getAccountsByType(accountType).length != 0;
     }
 
+    public Account getAccountByType(String accountType) {
+        Account[] accountsByType = mAccountManager.getAccountsByType(accountType);
+        if (accountsByType.length > 0)
+            return accountsByType[0];
+        return null;
+    }
+
     @FunctionalInterface
     public interface ActivityInterface {
         @Nullable
-        MainActivity get();
+        Activity get();
     }
 
     public interface StringInterface {

app/src/main/java/de/sebse/fuplanner/tools/CustomNotificationManager.java

@@ -0,0 +1,57 @@
+package de.sebse.fuplanner.tools;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+
+import org.jetbrains.annotations.NotNull;
+
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import de.sebse.fuplanner.MainActivity;
+import de.sebse.fuplanner.R;
+
+public class CustomNotificationManager {
+    private static final String CHANNEL_ID = "fuplanner-default";
+    //public static ArrayList<Integer> passedNotifications = new ArrayList<>();
+
+    public static void sendNotification(Context context, String textTitle, String textContent) {
+        Intent intent = new Intent(context, MainActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
+
+
+        NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(context, CHANNEL_ID)
+                .setSmallIcon(R.drawable.ic_notification)
+                .setContentTitle(textTitle)
+                .setContentText(textContent)
+                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+                .setContentIntent(pendingIntent)
+                .setAutoCancel(true);
+
+        NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
+        int notificationId = (int) (System.currentTimeMillis() % Integer.MAX_VALUE);
+        notificationManager.notify(notificationId, mBuilder.build());
+    }
+
+    public static void createNotificationChannel(@NotNull Context context) {
+        // Create the NotificationChannel, but only on API 26+ because
+        // the NotificationChannel class is new and not in the support library
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            CharSequence name = context.getString(R.string.channel_name);
+            String description = context.getString(R.string.channel_description);
+            int importance = NotificationManager.IMPORTANCE_DEFAULT;
+            NotificationChannel channel = new NotificationChannel(CHANNEL_ID, name, importance);
+            channel.setDescription(description);
+            // Register the channel with the system; you can't change the importance
+            // or other notification behaviors after this
+            NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+            if (notificationManager != null) {
+                notificationManager.createNotificationChannel(channel);
+            }
+        }
+    }
+}

app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java

@@ -2,10 +2,9 @@ package de.sebse.fuplanner.tools;
 
 import androidx.annotation.StringRes;
 
-import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
+import de.sebse.fuplanner.services.canteen.CanteenBrowser;
-import de.sebse.fuplanner.services.GoogleAuth.GoogleAuth;
+import de.sebse.fuplanner.services.kvv.KVV;
-import de.sebse.fuplanner.services.KVV.KVV;
+import de.sebse.fuplanner.services.news.NewsManager;
-import de.sebse.fuplanner.services.News.NewsManager;
 
 public interface MainActivityListener {
     void onTitleTextChange(String newTitle);
@@ -18,8 +17,6 @@ public interface MainActivityListener {
 
     KVV getKVV();
 
-    GoogleAuth getGoogleAuth();
-
     CanteenBrowser getCanteenBrowser();
 
     NewsManager getNewsManager();

app/src/main/java/de/sebse/fuplanner/tools/Preferences.java

@@ -1,6 +1,7 @@
 package de.sebse.fuplanner.tools;
 
 import android.content.Context;
+
 import androidx.annotation.ArrayRes;
 import androidx.annotation.StringRes;
 import androidx.preference.PreferenceManager;
@@ -20,4 +21,14 @@ public class Preferences {
         String string = context.getResources().getString(key);
         PreferenceManager.getDefaultSharedPreferences(context).edit().putLong(string, value).apply();
     }
+
+    public static boolean getBoolean(Context context, @StringRes int key) {
+        String string = context.getResources().getString(key);
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(string, false);
+    }
+
+    public static void setBoolean(Context context, @StringRes int key, boolean value) {
+        String string = context.getResources().getString(key);
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(string, value).apply();
+    }
 }

app/src/main/java/de/sebse/fuplanner/tools/types/News.java

@@ -1,7 +1,5 @@
 package de.sebse.fuplanner.tools.types;
 
-import androidx.annotation.NonNull;
-
 public class News {
     public static final int CATEGORY_TRICKS = 0;
     public static final int CATEGORY_UPDATE = 1;

app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/DirectoryNodeBinder.java

@@ -5,7 +5,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.types.Resource;
+import de.sebse.fuplanner.services.kvv.types.Resource;
 
 /**
  * Created by tlh on 2016/10/1 :)

app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/FileNodeBinder.java

@@ -4,7 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.KVV.types.Resource;
+import de.sebse.fuplanner.services.kvv.types.Resource;
 
 /**
  * Created by tlh on 2016/10/1 :)

app/src/main/res/layout/activity_fu_authenticator.xml

@@ -9,7 +9,7 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context=".services.newkvv.FUAuthenticatorActivity">
+    tools:context=".services.fulogin.FUAuthenticatorActivity">
 
     <!-- Login progress -->
     <ProgressBar
@@ -24,7 +24,7 @@
         android:layout_height="match_parent"
         android:fitsSystemWindows="true"
         android:id="@+id/login_form"
-        tools:context="de.sebse.fuplanner.services.newkvv.FUAuthenticatorActivity">
+        tools:context="de.sebse.fuplanner.services.fulogin.FUAuthenticatorActivity">
 
         <LinearLayout
             android:orientation="vertical"

app/src/main/res/layout/app_bar_main.xml

@@ -18,17 +18,6 @@
             android:background="@color/colorFUGreen"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-        <TextView
-            android:id="@+id/offline_msg"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/colorFURed"
-            android:textColor="@color/colorFUWhite"
-            android:gravity="center"
-            android:textStyle="bold"
-            android:visibility="gone"
-            android:text="@string/offline_mode" />
-
         <TextView
             android:id="@+id/no_connection_msg"
             android:layout_width="match_parent"

app/src/main/res/layout/fragment_login.xml

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="de.sebse.fuplanner.services.newkvv.FUAuthenticatorActivity">
+    tools:context="de.sebse.fuplanner.services.fulogin.FUAuthenticatorActivity">
 
     <LinearLayout
         android:orientation="vertical"

app/src/main/res/values-de/strings.xml

@@ -82,4 +82,31 @@
     <string name="update_news">Update-News</string>
     <string name="tricks">Tipps/Tricks</string>
     <string name="back_to_exit">Klicke ZURÜCK erneut zum Beenden!</string>
+    <string name="title_activity_fuauthenticator">Sign in</string>
+    <!-- Strings related to login -->
+    <string name="prompt_email">Benutzername</string>
+    <string name="prompt_password">Passwort (optional)</string>
+    <string name="action_sign_in">Log in</string>
+    <string name="action_sign_in_short">Log in</string>
+    <string name="error_invalid_password">Das Passwort ist zu kurz.</string>
+    <string name="error_incorrect_password">Das Passwort ist nicht korrekt.</string>
+    <string name="error_field_required">Pflichtfeld</string>
+    <string name="kvv_sync">KVV-Synchronisation</string>
+    <string name="channel_name">Neue Daten verfügbar</string>
+    <string name="channel_description">Benachrichtigen, wenn neue Ankündigungen, Aufgaben, Noten oder Resourcen verfügbar sind</string>
+    <string name="announcement_updated">Ankündigung aktualisiert: %1$s</string>
+    <string name="assignment_updated">Aufgabe aktualisiert: %1$s</string>
+    <string name="event_updated">Event aktualisiert: %1$s</string>
+    <string name="gradebook_updated">Noteneintrag aktualisiert: %1$s</string>
+    <string name="resource_updated">Ressource aktualisiert: %1$s</string>
+    <string name="announcement_added">Neue Ankündigung: %1$s</string>
+    <string name="assignment_added">Neue Aufgabe: %1$</string>
+    <string name="event_added">Neues Event: %1$</string>
+    <string name="gradebook_added">Neuer Noteneintrag: %1$</string>
+    <string name="resource_added">Neue Ressource: %1$</string>
+    <string name="announcement_removed">Ankündigung entfernt: %1$s</string>
+    <string name="assignment_removed">Aufgabe entfernt: %1$s</string>
+    <string name="event_removed">Event entfernt: %1$s</string>
+    <string name="gradebook_removed">Noteneintrag entfernt: %1$s</string>
+    <string name="resource_removed">Ressource entfernt: %1$s</string>
 </resources>

app/src/main/res/values/preferences.xml

@@ -8,4 +8,6 @@
     <string name="pref_price_group_default" translatable="false">all</string>
 
     <string name="pref_last_visited_news" translatable="false">pref_last_visited_news</string>
+
+    <string name="pref_set_auto_sync_on_startup" translatable="false">pref_set_auto_sync_on_startup</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -92,15 +92,29 @@
     <string name="back_to_exit">Please click BACK again to exit!</string>
     <string name="title_activity_fuauthenticator">Sign in</string>
     <!-- Strings related to login -->
-    <string name="prompt_email">Email</string>
+    <string name="prompt_email">Username</string>
     <string name="prompt_password">Password (optional)</string>
     <string name="action_sign_in">Sign in or register</string>
     <string name="action_sign_in_short">Sign in</string>
-    <string name="error_invalid_email">This email address is invalid</string>
     <string name="error_invalid_password">This password is too short</string>
     <string name="error_incorrect_password">This password is incorrect</string>
     <string name="error_field_required">This field is required</string>
-    <string name="permission_rationale">"Contacts permissions are needed for providing email
+    <string name="kvv_sync">KVV Synchronization</string>
-        completions."
+    <string name="channel_name">New data available</string>
-    </string>
+    <string name="channel_description">Notify when new announcements, assignments, grades or resources are available</string>
+    <string name="announcement_updated">Announcement updated: %1$s</string>
+    <string name="announcement_added">New announcement: %1$s</string>
+    <string name="announcement_removed">Announcement removed: %1$s</string>
+    <string name="assignment_updated">Assignment updated: %1$s</string>
+    <string name="assignment_added">New assignment: %1$s</string>
+    <string name="assignment_removed">Assignment removed: %1$s</string>
+    <string name="event_updated">Event updated: %1$s</string>
+    <string name="event_added">New event: %1$s</string>
+    <string name="event_removed">Event removed: %1$s</string>
+    <string name="gradebook_updated">Gradebook entry updated: %1$s</string>
+    <string name="gradebook_added">New gradebook entry: %1$s</string>
+    <string name="gradebook_removed">Gradebook entry removed: %1$s</string>
+    <string name="resource_updated">Resource updated: %1$s</string>
+    <string name="resource_added">New resource: %1$s</string>
+    <string name="resource_removed">Resource removed: %1$s</string>
 </resources>

app/src/main/res/xml/syncadapter_kvv.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
+    android:contentAuthority="de.sebse.fuplanner.contentprovider.kvv.modules"
+    android:accountType="de.sebse.fuplanner.fuauth"
+    android:userVisible="true"
+    android:allowParallelSyncs="false"
+    android:isAlwaysSyncable="true"
+    android:supportsUploading="false"/>