Notifications added

New KVV login working
New KVV login preparation (works only via VPN or internal)
2019-01-09 15:52:09 +01:00 · 2019-01-09 14:58:08 +01:00 · 2019-01-09 01:22:13 +01:00 · 2019-01-07 23:34:48 +01:00 · 2019-01-07 21:14:59 +01:00 · 2019-01-07 14:59:48 +01:00
31 changed files with 436 additions and 585 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
        applicationId "de.sebse.fuplanner"
        minSdkVersion 15
        targetSdkVersion 28
-        versionCode 16
-        versionName "1.3.5"
+        versionCode 19
+        versionName "1.4"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
@@ -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'
--- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java
+++ b/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;
@@ -39,13 +41,15 @@ import de.sebse.fuplanner.fragments.moddetails.ModDetailFragment;
 import de.sebse.fuplanner.services.canteen.CanteenBrowser;
 import de.sebse.fuplanner.services.canteen.types.Canteen;
 import de.sebse.fuplanner.services.canteen.types.CanteenListener;
+import de.sebse.fuplanner.services.fulogin.AccountGeneral;
 import de.sebse.fuplanner.services.kvv.KVV;
 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.Modules;
 import de.sebse.fuplanner.services.news.NewsManager;
-import de.sebse.fuplanner.services.fulogin.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;
@@ -136,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
@@ -158,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
@@ -348,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) {
--- a/app/src/main/java/de/sebse/fuplanner/services/fulogin/AccountGeneral.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/fulogin/AccountGeneral.java
@@ -4,4 +4,5 @@ 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
 }
--- a/app/src/main/java/de/sebse/fuplanner/services/fulogin/UserLoginTask.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/fulogin/UserLoginTask.java
@@ -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 -> latch.countDown());
+            }, error -> {
+                log.e(error);
+                latch.countDown();
+            });
+        }, error -> {
+            log.e(error);
+            latch.countDown();
+        });
        try {
            latch.await();
        } catch (InterruptedException e) {
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesList.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesList.java
@@ -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);
    }
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVContentProvider.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVContentProvider.java
@@ -11,7 +11,7 @@ import androidx.annotation.Nullable;

 public class KVVContentProvider extends ContentProvider {

-    private static final String PROVIDER_NAME = "de.sebse.fuplanner.contentprovider.kvv.modules";
+    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;
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java
@@ -8,20 +8,31 @@ import android.content.Context;
 import android.content.SyncResult;
 import android.os.Bundle;

-import com.android.volley.NetworkResponse;
-
+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.LoginToken;
+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
@@ -53,7 +64,12 @@ public class KVVSyncAdapter extends AbstractThreadedSyncAdapter {
                return accountManager;
            }
        }, context);
-        mKVV.account().restoreOnlineLogin(bool -> {});
+        mQueue.add(() -> {
+            mKVV.account().restoreOnlineLogin(bool -> {
+                log.d("login restored");
+                mQueue.next();
+            });
+        });
    }

    /*
@@ -68,20 +84,78 @@ public class KVVSyncAdapter extends AbstractThreadedSyncAdapter {
            String authority,
            ContentProviderClient provider,
            SyncResult syncResult) {
+        log.d("onPerformSync");
+        mQueue.add(() -> {
            log.d("start syncing");
-        /*
-         * Put the data transfer code here.
-         */
            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)
+                        if (success1.second) {
                            log.d("Sync Successful for Module '"+module.title+"'!");
-                }, log::e, true);
+                            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();
                        }
-        }, log::e, true);
+                    }, 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);
    }
 }
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/Login.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/Login.java
@@ -56,56 +56,35 @@ public class Login extends HTTPService {


    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);
+        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);
    }

    /*
-    GET https://kvv.imp.fu-berlin.de/portal/login
-    -> JSESSIONID 5c10406f-588c-4c16-96e9-c80d115417de.tomcat1
+     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 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 -> {
+    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!"));
@@ -118,133 +97,98 @@ public class Login extends HTTPService {
    }

    /*
-    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
+     2= GET [Location-Header 1]
+        -> Set-Cookie: JSESSIONID=[JSESSION-FU]
+        -> Location: /idp-fub-qa/profile/SAML2/Redirect/SSO?execution=e1s1
    */
-    private void startIdentSession(String url, final NetworkCallback<HashMap<String, String>> callback, final NetworkErrorCallback errorCallback) {
+    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 Ident session!"));
+                errorCallback.onError(new NetworkError(100121, -1, "Error on starting FU session!"));
                return;
            }
            HashMap<String, String> object;
            try {
-                object = getCookie(cookies, new String[]{"JSESSIONID", "_idp_authn_lc_key", "ROUTEID"});
+                object = getCookie(cookies, new String[]{"JSESSIONID"});
            } catch (NoSuchFieldException e) {
-                errorCallback.onError(new NetworkError(100122, -1, "Error on starting Ident session!"));
+                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 Ident session!")));
+        }, error -> errorCallback.onError(new NetworkError(100120, error.networkResponse.statusCode, "Error on starting FU 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=
+     3= GET [Location-Header 2]
+        + Cookie: JSESSIONID=[JSESSION-FU]
     */
-    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) {
+    private void step3(String JSESSIONID_FU, final NetworkCallback<Boolean> 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("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);
-        post("https://identity.fu-berlin.de/idp-fub/Authn/UserPassword", cookies, body, response -> {
-            if (first) {
-                callback.onResponse(new HashMap<>());
-                return;
-            }
-
+        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(100131, -1, "Error on logging in to Identity Server!"));
+                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[]{"_idp_session"});
+                object = getCookie(cookies1, new String[]{"shib_idp_session"});
            } catch (NoSuchFieldException e) {
-                errorCallback.onError(new NetworkError(100132, -1, "Error on logging in to Identity Server!"));
+                errorCallback.onError(new NetworkError(100142, -1, "Error on logging in to FU 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) {
+            String content = response.getParsed();
+            if (content == 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);
+            Pattern pattern = Pattern.compile("name=\"SAMLResponse\" value=\"([0-9a-zA-Z+]+=*)");
+            Matcher matcher = pattern.matcher(content);
            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!"));
+                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(100140, error.networkResponse.statusCode, "Error on getting SAML response!")));
+        }, error -> errorCallback.onError(new NetworkError(100145, error.networkResponse.statusCode, "Error on logging in to FU Identity Server!")));
    }

-
    /*
-    POST https://kvv.imp.fu-berlin.de/Shibboleth.sso/SAML2/POST
-    <- RelayState			7ea01e29157b8bd906f7002176213b6db5e1f45ebb88716a9820d1a505f2c8bf
-    <- SAMLResponse			PD94bWwgdmVyc2lvbj0...........wvc2FtbDJwOlJlc3BvbnNlPg==
-    <- JSESSIONID
-    -> _shibsession_64656661756c7468747470733a2f2f6b76762e696d702e66752d6265726c696e2e64652f73686962626f6c657468
-			_b1912c5a03d733a80bd3fee772bf68d4
+     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 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);
+    private void step5(String SAMLResponse, final NetworkCallback<HashMap<String, String>> callback, final NetworkErrorCallback errorCallback) {
        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) {
+        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;
            }
@@ -252,26 +196,41 @@ public class Login extends HTTPService {


            Pattern pattern = Pattern.compile("(_shibsession_[0-9a-f]+)=([^;]+);");
-            Matcher matcher = pattern.matcher(cookies1);
+            Matcher matcher = pattern.matcher(cookies);
            if (!matcher.find()) {
-                errorCallback.onError(new NetworkError(100152, -1, "Error on starting Ident session!"));
+                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 Ident session!")));
+        }, error -> errorCallback.onError(new NetworkError(100150, error.networkResponse.statusCode, "Error on starting KVV session!")));
    }


    /*
-    GET https://kvv.imp.fu-berlin.de/sakai-login-tool/container
-    <- JSESSIONID
-    <- _shibsession_64656661756c7468747470733a2f2f6b76762e696d702e66752d6265726c696e2e64652f73686962626f6c657468
-			_b1912c5a03d733a80bd3fee772bf68d4
+     6= https://kvv.imp.fu-berlin.de/sakai-login-tool/container
+        + Cookie: _shibsession_[SESS-NR]: [SESS-VALUE]
+        -> Set-Cookie: JSESSIONID: [JSESSION-KVV]
 	*/
-    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 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!")));
    }


--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Announcement.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Announcement.java
@@ -2,16 +2,12 @@ package de.sebse.fuplanner.services.kvv.types;

 import com.google.android.gms.common.internal.Objects;

-import org.json.JSONException;
-import org.json.JSONObject;
-
+import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.HashSet;

 import androidx.annotation.NonNull;
-import de.sebse.fuplanner.tools.UtilsJson;

-public class Announcement implements UtilsJson.JsonConvertible {
+public class Announcement implements Serializable {
    private final String id;
    private final String title;
    private final String body;
@@ -28,24 +24,11 @@ public class Announcement implements UtilsJson.JsonConvertible {
        this.urls = urls;
    }

-    public Announcement(JSONObject json) throws JSONException {
-        this.id = json.getString("id");
-        this.title = json.getString("title");
-        this.body = json.getString("body");
-        this.createdBy = json.getString("createdBy");
-        this.createdOn = json.getLong("createdOn");
-        ArrayList<String> urls = new ArrayList<>();
-        for (String url: UtilsJson.jsonArrayToIterableString(json.getJSONArray("urls"))) {
-            urls.add(url);
-        }
-        this.urls = urls;
-    }
-
    public ArrayList<String> getUrls() {
        return urls;
    }

-    private String getId() {
+    public String getId() {
        return id;
    }

@@ -80,16 +63,4 @@ public class Announcement implements UtilsJson.JsonConvertible {
    public int hashCode() {
        return Objects.hashCode(getId(), getBody(), getCreatedBy(), getCreatedOn(), getTitle(), getUrls());
    }
-
-    @Override
-    public JSONObject toJSONObject() throws JSONException {
-        JSONObject json = new JSONObject();
-        json.put("id", id);
-        json.put("title", title);
-        json.put("body", body);
-        json.put("createdBy", createdBy);
-        json.put("createdOn", createdOn);
-        json.put("urls", UtilsJson.collectionToJson(urls));
-        return json;
-    }
 }
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Assignment.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Assignment.java
@@ -2,15 +2,12 @@ package de.sebse.fuplanner.services.kvv.types;

 import com.google.android.gms.common.internal.Objects;

-import org.json.JSONException;
-import org.json.JSONObject;
-
+import java.io.Serializable;
 import java.util.ArrayList;

 import androidx.annotation.NonNull;
-import de.sebse.fuplanner.tools.UtilsJson;

-public class Assignment implements UtilsJson.JsonConvertible {
+public class Assignment implements Serializable {
    private final String id;
    private final String title;
    private final long dueTime;
@@ -25,7 +22,7 @@ public class Assignment implements UtilsJson.JsonConvertible {
        this.instructions = instructions;
    }

-    private String getId() {
+    public String getId() {
        return id;
    }

@@ -62,15 +59,4 @@ public class Assignment implements UtilsJson.JsonConvertible {
    public int hashCode() {
        return Objects.hashCode(getId(), getDueDate(), getInstructions(), getTitle(), getUrls());
    }
-
-    @Override
-    public JSONObject toJSONObject() throws JSONException {
-        JSONObject json = new JSONObject();
-        json.put("id", id);
-        json.put("title", title);
-        json.put("dueTime", dueTime);
-        json.put("createdBy", UtilsJson.collectionToJson(urls));
-        json.put("instructions", instructions);
-        return json;
-    }
 }
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Event.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Event.java
@@ -2,18 +2,15 @@ package de.sebse.fuplanner.services.kvv.types;

 import com.google.android.gms.common.internal.Objects;

-import org.json.JSONException;
-import org.json.JSONObject;
-
+import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

 import androidx.annotation.NonNull;
 import de.sebse.fuplanner.tools.ColorRGB;
-import de.sebse.fuplanner.tools.UtilsJson;

-public class Event implements UtilsJson.JsonConvertible {
+public class Event implements Serializable {
    private final String siteId;
    private final String id;
    private final String type;
@@ -123,17 +120,4 @@ public class Event implements UtilsJson.JsonConvertible {
    public int hashCode() {
        return Objects.hashCode(getId(), getType(), getStartDate(), getEndDate(), getTitle(), getLocation());
    }
-
-    @Override
-    public JSONObject toJSONObject() throws JSONException {
-        JSONObject json = new JSONObject();
-        json.put("siteId", siteId);
-        json.put("id", id);
-        json.put("type", type);
-        json.put("title", title);
-        json.put("duration", duration);
-        json.put("firstTime", firstTime);
-        json.put("location", location);
-        return json;
-    }
 }
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Grade.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Grade.java
@@ -2,13 +2,11 @@ package de.sebse.fuplanner.services.kvv.types;

 import com.google.android.gms.common.internal.Objects;

-import org.json.JSONException;
-import org.json.JSONObject;
+import java.io.Serializable;

 import androidx.annotation.NonNull;
-import de.sebse.fuplanner.tools.UtilsJson;

-public class Grade implements UtilsJson.JsonConvertible {
+public class Grade implements Serializable {
    private final String itemName;
    private final double grade;
    private final double maxPoints;
@@ -43,13 +41,4 @@ public class Grade implements UtilsJson.JsonConvertible {
    public int hashCode() {
        return Objects.hashCode(getItemName(), getPoints(), getMaxPoints());
    }
-
-    @Override
-    public JSONObject toJSONObject() throws JSONException {
-        JSONObject json = new JSONObject();
-        json.put("itemName", itemName);
-        json.put("grade", grade);
-        json.put("maxPoints", maxPoints);
-        return json;
-    }
 }
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Lecturer.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Lecturer.java
@@ -1,17 +1,12 @@
 package de.sebse.fuplanner.services.kvv.types;

-import com.google.android.gms.common.internal.Objects;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
+import java.io.Serializable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

 import androidx.annotation.NonNull;
-import de.sebse.fuplanner.tools.UtilsJson;

-public class Lecturer implements UtilsJson.JsonConvertible {
+public class Lecturer implements Serializable {
    private final String firstName;
    private final String surname;
    private final String mail;
@@ -29,13 +24,6 @@ public class Lecturer implements UtilsJson.JsonConvertible {
        this.isResponsible = matcher.group(4).equals("true");
    }

-    public Lecturer(JSONObject json) throws JSONException {
-        this.firstName = json.getString("firstName");
-        this.surname = json.getString("surname");
-        this.mail = json.getString("mail");
-        this.isResponsible = json.getBoolean("isResponsible");
-    }
-
    public String getFirstName() {
        return firstName;
    }
@@ -67,19 +55,4 @@ public class Lecturer implements UtilsJson.JsonConvertible {
                "\nSurname: "+getSurname()+
                "\nMail: "+getMail();
    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(getFirstName(), getSurname(), getMail(), isResponsible());
-    }
-
-    @Override
-    public JSONObject toJSONObject() throws JSONException {
-        JSONObject json = new JSONObject();
-        json.put("firstName", firstName);
-        json.put("surname", surname);
-        json.put("mail", mail);
-        json.put("isResponsible", isResponsible);
-        return json;
-    }
 }
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/types/LoginToken.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/types/LoginToken.java
@@ -19,7 +19,10 @@ import de.sebse.fuplanner.tools.logging.Logger;
 * Created by sebastian on 29.10.17.
 */

-public class LoginToken {
+public class LoginToken implements Serializable {
+    static Logger log = new Logger("LoginToken");
+    private static final String FILE_NAME = "LoginTokenSaving";
+
    private final String username;
    private final String shibsessionKey;
    private final String shibsessionName;
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Modules.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Modules.java
@@ -5,20 +5,13 @@ import android.content.Context;
 import com.google.android.gms.common.internal.Objects;

 import org.jetbrains.annotations.NotNull;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;

-import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.OutputStreamWriter;
-import java.lang.reflect.Array;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -26,19 +19,15 @@ import java.util.LinkedHashSet;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import de.sebse.fuplanner.tools.UtilsJson;
-
-import static de.sebse.fuplanner.tools.UtilsJson.collectionToJson;
-import static de.sebse.fuplanner.tools.UtilsJson.jsonArrayToIterableObject;

 /**
 * Created by sebastian on 29.10.17.
 */

-public class Modules implements Iterable<Modules.Module> {
+public class Modules implements Iterable<Modules.Module>, Serializable {
    private SortedListModule list;
    private final String mUsername;
-    private long mLoadTime;
+    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";
@@ -81,54 +70,47 @@ public class Modules implements Iterable<Modules.Module> {
        return this.list.get(index);
    }

-    public static Modules load(Context context) throws IOException {
-        String ret = "";
-        InputStream inputStream = context.openFileInput(FILE_NAME);
-        if (inputStream != null) {
-            InputStreamReader inputStreamReader = new InputStreamReader(inputStream);
-            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
-            String receiveString;
-            StringBuilder stringBuilder = new StringBuilder();
-            while ((receiveString = bufferedReader.readLine()) != null) {
-                stringBuilder.append(receiveString);
-            }
-            inputStream.close();
-            ret = stringBuilder.toString();
+    public static Modules load(Context context) throws IOException, ClassNotFoundException {
+        FileInputStream fis = context.openFileInput(FILE_NAME);
+        ObjectInputStream is = new ObjectInputStream(fis);
+        Object readObject = is.readObject();
+        if (!(readObject instanceof Modules))
+            return null;
+        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;
    }

-        try {
-            JSONObject json = new JSONObject(ret);
-            Modules mod = new Modules(json.getString("username"));
-            JSONArray arr = json.getJSONArray("modules");
-            for (JSONObject jsonObject: jsonArrayToIterableObject(arr)) {
-                mod.list.add(new Module(jsonObject));
-            }
-            FileInputStream ofi = context.openFileInput(FILE_NAME_TIMESTAMP);
-            ObjectInputStream inputStream1 = new ObjectInputStream(ofi);
-            mod.mLoadTime = inputStream1.readLong();
-            return mod;
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        return null;
+    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 {
-        JSONObject json = new JSONObject();
-        try {
-            json.put("username", mUsername);
-            json.put("modules", UtilsJson.collectionToJson(list));
-            OutputStreamWriter osw = new OutputStreamWriter(context.openFileOutput(FILE_NAME, Context.MODE_PRIVATE));
-            osw.write(json.toString());
-            osw.close();
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
+        FileOutputStream fos = context.openFileOutput(FILE_NAME, Context.MODE_PRIVATE);
+        ObjectOutputStream os = new ObjectOutputStream(fos);
+        os.writeObject(this);
+        os.close();
+        fos.close();

-        mLoadTime = System.currentTimeMillis();
-        FileOutputStream ofo = context.openFileOutput(FILE_NAME_TIMESTAMP, Context.MODE_PRIVATE);
-        ObjectOutputStream outputStream = new ObjectOutputStream(ofo);
-        outputStream.writeLong(mLoadTime);
+        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) {
@@ -157,6 +139,8 @@ public class Modules implements Iterable<Modules.Module> {
                isChanged = true;
            }
        }
+        if (this.list.size() != old.size())
+            isChanged = true;
        return isChanged;
    }

@@ -169,11 +153,12 @@ public class Modules implements Iterable<Modules.Module> {
            return o1.hashCode() == o2.hashCode();
    }

-    public static class Module implements UtilsJson.JsonConvertible {
+    public class Module implements Serializable {
        @Nullable public final Semester semester;
        @NotNull final HashSet<String> lvNumber;
        @NotNull public final String title;
-        @NotNull public final ArrayList<Lecturer> lecturer;
+        @NotNull
+        public final ArrayList<Lecturer> lecturer;
        @Nullable public final String type;
        @Nullable public final String description;
        @NotNull private final String ID;
@@ -183,29 +168,6 @@ public class Modules implements Iterable<Modules.Module> {
        @Nullable public ArrayList<Grade> gradebook;
        @Nullable public ArrayList<Resource> resources;

-        @Override
-        public int hashCode() {
-            return Objects.hashCode(semester, lvNumber, title, lecturer, type, description, ID);
-        }
-
-        @Override
-        public JSONObject toJSONObject() throws JSONException {
-            JSONObject json = new JSONObject();
-            json.put("semester", semester != null ? semester.toJSONObject() : null);
-            json.put("lvNumber", collectionToJson(lvNumber));
-            json.put("title", title);
-            json.put("lecturer", collectionToJson(lecturer));
-            json.put("type", type);
-            json.put("description", description);
-            json.put("ID", ID);
-            json.put("announcements", collectionToJson(announcements));
-            json.put("assignments", collectionToJson(assignments));
-            json.put("events", collectionToJson(events));
-            json.put("gradebook", collectionToJson(gradebook));
-            json.put("resources", collectionToJson(resources));
-            return json;
-        }
-
        public float getGradebookPercent(){
            float maxPoint = 0;
            float userPoint = 0;
@@ -233,71 +195,6 @@ public class Modules implements Iterable<Modules.Module> {
            this.ID = ID;
        }

-        private Module(@NotNull JSONObject json) throws JSONException {
-            HashSet<String> lv = new HashSet<>();
-            for (String number: UtilsJson.jsonArrayToIterableString(json.getJSONArray("lvNumber"))) {
-                lv.add(number);
-            }
-            LinkedHashSet<Lecturer> lecturer = new LinkedHashSet<>();
-            for (JSONObject l: UtilsJson.jsonArrayToIterableObject(json.getJSONArray("lecturer"))) {
-                lecturer.add(new Lecturer(l));
-            }
-            JSONObject obj = json.optJSONObject("semester");
-
-            this.semester = obj != null ? new Semester(obj) : null;
-            this.lvNumber = lv;
-            this.title = json.getString("title");
-            this.lecturer = new ArrayList<>(lecturer);
-            this.type = json.getString("type");
-            this.description = json.getString("description");
-            this.ID = json.getString("ID");
-
-            JSONArray arr = json.optJSONArray("announcements");
-            if (obj != null) {
-                ArrayList<Announcement> announce = new ArrayList<>();
-                for (JSONObject l: UtilsJson.jsonArrayToIterableObject(arr)) {
-                    announce.add(new Announcement(l));
-                }
-                this.announcements = announce;
-            }
-            arr = json.optJSONArray("assignments");
-            if (obj != null) {
-                AssignmentList assign = new AssignmentList();
-                for (JSONObject l: UtilsJson.jsonArrayToIterableObject(arr)) {
-                    assign.add(new Assignment(l));
-                }
-                this.assignments = assign;
-            }
-
-            arr = json.optJSONArray("events");
-            if (obj != null) {
-                EventList events = new EventList();
-                for (JSONObject l: UtilsJson.jsonArrayToIterableObject(arr)) {
-                    events.add(new Event(l));
-                }
-                this.events = events;
-            }
-            arr = json.optJSONArray("gradebook");
-            if (obj != null) {
-                ArrayList<Grade> grades = new ArrayList<>();
-                for (JSONObject l: UtilsJson.jsonArrayToIterableObject(arr)) {
-                    grades.add(new Grade(l));
-                }
-                this.gradebook = grades;
-            }
-            arr = json.optJSONArray("resources");
-            if (obj != null) {
-                ArrayList<Resource> res = new ArrayList<>();
-                for (JSONObject l: UtilsJson.jsonArrayToIterableObject(arr)) {
-                    if (l.getString("restype").equals("file"))
-                        res.add(new Resource.File(l));
-                    else
-                        res.add(new Resource.Folder(l));
-                }
-                this.resources = res;
-            }
-        }
-
        @NonNull
        public String getID() {
            return ID;
@@ -313,5 +210,10 @@ public class Modules implements Iterable<Modules.Module> {
                    "\ntype: "+type+
                    "\nID: "+ID;
        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hashCode(semester, lvNumber, title, lecturer, type, description, ID);
+        }
    }
 }
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Resource.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Resource.java
@@ -2,20 +2,17 @@ package de.sebse.fuplanner.services.kvv.types;

 import com.google.android.gms.common.internal.Objects;

-import org.json.JSONException;
-import org.json.JSONObject;
-
+import java.io.Serializable;
 import java.util.ArrayList;

 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.tools.UtilsJson;
 import de.sebse.fuplanner.tools.ui.treeview.LayoutItemType;
 import de.sebse.fuplanner.tools.ui.treeview.TreeNode;


-public abstract class Resource implements UtilsJson.JsonConvertible {
+public abstract class Resource implements Serializable {

    final String author;
    final long modifiedDate;
@@ -65,19 +62,6 @@ public abstract class Resource implements UtilsJson.JsonConvertible {
        return Objects.hashCode(getAuthor(), getContainer(), getModifiedDate(), getTitle(), getUrl());
    }

-    @Override
-    public JSONObject toJSONObject() throws JSONException {
-        JSONObject json = new JSONObject();
-        json.put("author", author);
-        json.put("modifiedDate", modifiedDate);
-        json.put("title", title);
-        json.put("url", url);
-        json.put("visible", visible);
-        json.put("container", container);
-        json.put("restype", "");
-        return json;
-    }
-
    public static class File extends Resource implements LayoutItemType {
        private final String type;

@@ -107,14 +91,6 @@ public abstract class Resource implements UtilsJson.JsonConvertible {
        public @LayoutRes int getLayoutId() {
            return R.layout.item_file;
        }
-
-        @Override
-        public JSONObject toJSONObject() throws JSONException {
-            JSONObject json = super.toJSONObject();
-            json.put("type", type);
-            json.put("restype", "file");
-            return json;
-        }
    }

    public static class Folder extends Resource implements LayoutItemType {
@@ -162,14 +138,6 @@ public abstract class Resource implements UtilsJson.JsonConvertible {
        public @LayoutRes int getLayoutId() {
            return R.layout.item_dir;
        }
-
-        @Override
-        public JSONObject toJSONObject() throws JSONException {
-            JSONObject json = super.toJSONObject();
-            json.put("children", UtilsJson.collectionToJson(children));
-            json.put("restype", "dir");
-            return json;
-        }
    }
 }

--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Semester.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Semester.java
@@ -1,13 +1,11 @@
 package de.sebse.fuplanner.services.kvv.types;

-import org.json.JSONException;
-import org.json.JSONObject;
+import java.io.Serializable;

 import androidx.annotation.Nullable;
 import de.sebse.fuplanner.tools.Regex;
-import de.sebse.fuplanner.tools.UtilsJson;

-public class Semester implements UtilsJson.JsonConvertible {
+public class Semester implements Serializable {
    public static final int SEM_WS = 1;
    public static final int SEM_SS = 2;
    private int type;
@@ -19,17 +17,25 @@ public class Semester implements UtilsJson.JsonConvertible {
    }

    public Semester(String semester_string) throws NoSuchFieldException {
+        /*Semester sem = null;
+            if (semester != null) {
+                sem = new Semester(semester)
+                semester = semester.replace("SS", "S");
+                semester = semester.replaceAll("[0-9]{2}([0-9]{2})", "$1");
+            }*/
+
+
+        /*String s1type = Regex.regex("^(S|WS) ", a);
+        int s1year = Integer.parseInt(Regex.regex("^(S|WS) ([0-9]{2})", a, 2));
+        String s2type = Regex.regex("^(S|WS) ", b);
+        int s2year = Integer.parseInt(Regex.regex("^(S|WS) ([0-9]{2})", b, 2));*/
+
        String type = Regex.regex("^(SS|WS) ", semester_string);
        String year = Regex.regex("^(SS|WS) ([0-9]{2})", semester_string, 2);
        this.type = type.equals("SS") ? SEM_SS : SEM_WS;
        this.year = Integer.parseInt(year);
    }

-    public Semester(JSONObject json) throws JSONException {
-        this.type = json.getInt("type");
-        this.year = json.getInt("year");
-    }
-
    public int getType() {
        return type;
    }
@@ -46,12 +52,4 @@ public class Semester implements UtilsJson.JsonConvertible {
        }
        return false;
    }
-
-    @Override
-    public JSONObject toJSONObject() throws JSONException {
-        JSONObject json = new JSONObject();
-        json.put("type", type);
-        json.put("year", year);
-        return json;
-    }
 }
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/types/SortedListModule.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/types/SortedListModule.java
@@ -1,8 +1,5 @@
 package de.sebse.fuplanner.services.kvv.types;

-import org.json.JSONException;
-import org.json.JSONObject;
-
 import androidx.annotation.Nullable;
 import de.sebse.fuplanner.tools.SortedList;

--- a/app/src/main/java/de/sebse/fuplanner/tools/CustomAccountManager.java
+++ b/app/src/main/java/de/sebse/fuplanner/tools/CustomAccountManager.java
@@ -122,6 +122,13 @@ 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
--- a/app/src/main/java/de/sebse/fuplanner/tools/CustomNotificationManager.java
+++ b/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);
+            }
+        }
+    }
+}
--- a/app/src/main/java/de/sebse/fuplanner/tools/Preferences.java
+++ b/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();
+    }
 }
--- a/app/src/main/java/de/sebse/fuplanner/tools/SortedList.java
+++ b/app/src/main/java/de/sebse/fuplanner/tools/SortedList.java
@@ -3,11 +3,12 @@ package de.sebse.fuplanner.tools;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;

-public abstract class SortedList<T, I, F> implements Iterable<T> {
+public abstract class SortedList<T, I, F> implements Iterable<T>, Serializable {

    private final ArrayList<T> internalList = new ArrayList<>();

--- a/app/src/main/java/de/sebse/fuplanner/tools/UtilsJson.java
+++ b/app/src/main/java/de/sebse/fuplanner/tools/UtilsJson.java
@@ -1,109 +0,0 @@
-package de.sebse.fuplanner.tools;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-public class UtilsJson {
-    public static JSONArray collectionToJson(@Nullable HashSet<String> coll) {
-        if (coll == null)
-            return null;
-        JSONArray arr = new JSONArray();
-        for (String e: coll) {
-            arr.put(e);
-        }
-        return arr;
-    }
-
-    public static <E extends JsonConvertible> JSONArray collectionToJson(@Nullable Collection<E> coll) throws JSONException {
-        if (coll == null)
-            return null;
-        JSONArray arr = new JSONArray();
-        for (E e: coll) {
-            arr.put(e.toJSONObject());
-        }
-        return arr;
-    }
-
-    public static JSONArray collectionToJson(@Nullable ArrayList<String> coll) throws JSONException {
-        if (coll == null)
-            return null;
-        JSONArray arr = new JSONArray();
-        for (String e: coll) {
-            arr.put(e);
-        }
-        return arr;
-    }
-
-    public static <A extends JsonConvertible> JSONArray collectionToJson(@Nullable SortedList<A, ?, ?> coll) throws JSONException {
-        if (coll == null)
-            return null;
-        JSONArray arr = new JSONArray();
-        for (A e: coll) {
-            arr.put(e.toJSONObject());
-        }
-        return arr;
-    }
-
-    public static <T> Iterator<T> jsonArrayToIterator(JSONArray array, GetInterface<T> func) {
-        return new Iterator<T>() {
-            int size = array == null ? 0 : array.length();
-            int pos = 0;
-            @Override
-            public boolean hasNext() {
-                return pos < size;
-            }
-
-            @Override
-            public T next() {
-                try {
-                    return func.get(array, pos++);
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                    return null;
-                }
-            }
-        };
-    }
-
-    @FunctionalInterface
-    private interface GetInterface<T> {
-        T get(JSONArray array, int index) throws JSONException;
-    }
-
-    public static JsonIterable<JSONObject> jsonArrayToIterableObject(JSONArray array) {
-        return new JsonIterable<>(array, JSONArray::getJSONObject);
-    }
-
-    public static JsonIterable<String> jsonArrayToIterableString(JSONArray array) {
-        return new JsonIterable<>(array, JSONArray::getString);
-    }
-
-    public static class JsonIterable<T> implements Iterable<T> {
-        private JSONArray array;
-        private GetInterface<T> getInterface;
-
-        JsonIterable(JSONArray array, GetInterface<T> getInterface) {
-            this.array = array;
-            this.getInterface = getInterface;
-        }
-        @NonNull
-        @Override
-        public Iterator<T> iterator() {
-            return UtilsJson.jsonArrayToIterator(array, getInterface);
-        }
-    }
-
-    public interface JsonConvertible {
-        JSONObject toJSONObject() throws JSONException;
-    }
-
-}
--- a/app/src/main/res/drawable-hdpi/ic_notification.png
+++ b/app/src/main/res/drawable-hdpi/ic_notification.png
--- a/app/src/main/res/drawable-mdpi/ic_notification.png
+++ b/app/src/main/res/drawable-mdpi/ic_notification.png
--- a/app/src/main/res/drawable-xhdpi/ic_notification.png
+++ b/app/src/main/res/drawable-xhdpi/ic_notification.png
--- a/app/src/main/res/drawable-xxhdpi/ic_notification.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_notification.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_notification.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_notification.png
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -92,4 +92,21 @@
    <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>
--- a/app/src/main/res/values/preferences.xml
+++ b/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>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -100,4 +100,21 @@
    <string name="error_incorrect_password">This password is incorrect</string>
    <string name="error_field_required">This field is required</string>
    <string name="kvv_sync">KVV Synchronization</string>
+    <string name="channel_name">New data available</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>
Author	SHA1	Message	Date
Caesar2011	7d803777f8	Notifications added	2019-01-09 15:52:09 +01:00
Caesar2011	7cc0709133	New KVV login working	2019-01-09 14:58:08 +01:00
Caesar2011	21d247052d	New KVV login preparation (works only via VPN or internal)	2019-01-09 01:22:13 +01:00
Caesar2011	57853eccf1	Sync notifications for announcements	2019-01-07 23:34:48 +01:00
Caesar2011	ceccd77f18	Periodic sync, reload from memory if outdated	2019-01-07 21:14:59 +01:00
Caesar2011	ae53e94108	Periodic sync, reload from memory if outdated	2019-01-07 14:59:48 +01:00
Caesar2011	786c001bbd	unfinished code	2019-01-07 13:28:59 +01:00