393 changed files with 8278 additions and 4992 deletions
--- a/app/proguard/app.pro
+++ b/app/proguard/app.pro
@ -22,13 +22,13 @@
 -keep class android.support.v7.widget.** { *; }

 -keep class pl.szczodrzynski.edziennik.utils.models.** { *; }
-keep class pl.szczodrzynski.edziennik.data.db.entity.Event { *; }
-keep class pl.szczodrzynski.edziennik.data.db.full.EventFull { *; }
+-keep class pl.szczodrzynski.edziennik.data.db.modules.events.Event { *; }
+-keep class pl.szczodrzynski.edziennik.data.db.modules.events.EventFull { *; }
 -keep class pl.szczodrzynski.edziennik.ui.modules.home.HomeCardModel { *; }
-keepclassmembers class pl.szczodrzynski.edziennik.ui.widgets.WidgetConfig { public *; }
-keepnames class pl.szczodrzynski.edziennik.ui.widgets.timetable.WidgetTimetableProvider
-keepnames class pl.szczodrzynski.edziennik.ui.widgets.notifications.WidgetNotificationsProvider
-keepnames class pl.szczodrzynski.edziennik.widgets.luckynumber.WidgetLuckyNumber
+-keepclassmembers class pl.szczodrzynski.edziennik.widgets.WidgetConfig { public *; }
+-keepnames class pl.szczodrzynski.edziennik.WidgetTimetable
+-keepnames class pl.szczodrzynski.edziennik.notifications.WidgetNotifications
+-keepnames class pl.szczodrzynski.edziennik.luckynumber.WidgetLuckyNumber

 -keep class .R
 -keep class **.R$* {
--- a/app/proguard/zxing.pro
+++ b/app/proguard/zxing.pro
@ -1,5 +0,0 @@
-# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
-keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -3,17 +3,6 @@
    xmlns:tools="http://schemas.android.com/tools"
    package="pl.szczodrzynski.edziennik">

-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-
    <application
        android:name=".App"
        android:allowBackup="true"
@ -26,16 +15,12 @@
        android:theme="@style/AppTheme.Dark"
        android:usesCleartextTraffic="true"
        tools:ignore="UnusedAttribute">
-
-        <!--  __  __       _                      _   _       _ _
-             |  \/  |     (_)           /\       | | (_)     (_) |
-             | \  / | __ _ _ _ __      /  \   ___| |_ ___   ___| |_ _   _
-             | |\/| |/ _` | | '_ \    / /\ \ / __| __| \ \ / / | __| | | |
-             | |  | | (_| | | | | |  / ____ \ (__| |_| |\ V /| | |_| |_| |
-             |_|  |_|\__,_|_|_| |_| /_/    \_\___|\__|_| \_/ |_|\__|\__, |
-                                                                     __/ |
-                                                                    |___/ -->
-        <activity android:name=".MainActivity"
+        <activity
+            android:name=".ui.modules.login.LoginLibrusCaptchaActivity"
+            android:theme="@android:style/Theme.Dialog"
+            android:excludeFromRecents="true"/>
+        <activity
+            android:name=".MainActivity"
            android:configChanges="orientation|screenSize"
            android:label="@string/app_name"
            android:launchMode="singleTop"
@ -47,18 +32,50 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
-
+        <activity
+            android:name=".ui.modules.feedback.FeedbackActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name=".ui.modules.login.LoginActivity"
+            android:configChanges="orientation|screenSize"
+            android:launchMode="singleTop"
+            android:theme="@style/AppTheme.Light" />
+        <activity
+            android:name=".ui.modules.intro.ChangelogIntroActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Intro" />
        <!--
-             __          ___     _            _
-             \ \        / (_)   | |          | |
-              \ \  /\  / / _  __| | __ _  ___| |_  ___
-               \ \/  \/ / | |/ _` |/ _` |/ _ \ __|/ __|
-                \  /\  /  | | (_| | (_| |  __/ |_ \__ \
-                 \/  \/   |_|\__,_|\__, |\___|\__||___/
+              ______ _          _
+             |  ____(_)        | |
+             | |__   _ _ __ ___| |__   __ _ ___  ___
+             |  __| | | '__/ _ \ '_ \ / _` / __|/ _ \
+             | |    | | | |  __/ |_) | (_| \__ \  __/
+             |_|    |_|_|  \___|_.__/ \__,_|___/\___/
+        -->
+        <activity
+            android:name=".ui.modules.base.CrashActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:process=":error_activity"
+            android:theme="@style/DeadTheme" />
+        <!--
+               _____               _                  _   _       _ _
+              / ____|             | |                | | (_)     (_) |
+             | |     _ __ __ _ ___| |__     __ _  ___| |_ ___   ___| |_ _   _
+             | |    | '__/ _` / __| '_ \   / _` |/ __| __| \ \ / / | __| | | |
+             | |____| | | (_| \__ \ | | | | (_| | (__| |_| |\ V /| | |_| |_| |
+              \_____|_|  \__,_|___/_| |_|  \__,_|\___|\__|_| \_/ |_|\__|\__, |
                                                                         __/ |
                                                                        |___/
        -->
-        <activity android:name=".ui.widgets.WidgetConfigActivity"
+        <activity
+            android:name=".ui.modules.base.CrashGtfoActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:theme="@style/DeadTheme" />
+        <activity
+            android:name=".widgets.WidgetConfigActivity"
            android:configChanges="orientation|keyboardHidden"
            android:excludeFromRecents="true"
            android:noHistory="true"
@ -67,25 +84,79 @@
                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
            </intent-filter>
        </activity>
-        <!-- TIMETABLE -->
-        <receiver android:name=".ui.widgets.timetable.WidgetTimetableProvider"
-            android:label="@string/widget_timetable_title">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_timetable_info" />
-        </receiver>
-        <service android:name=".ui.widgets.timetable.WidgetTimetableService"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
-        <activity android:name=".ui.widgets.LessonDialogActivity"
+        <!--
+             __          ___     _            _
+             \ \        / (_)   | |          | |
+              \ \  /\  / / _  __| | __ _  ___| |_  ___
+               \ \/  \/ / | |/ _` |/ _` |/ _ \ __|/ __|
+                \  /\  /  | | (_| | (_| |  __/ |_ \__ \
+                 \/  \/   |_|\__,_|\__, |\___|\__||___/
+                                    __/ |
+                                   |_
+        -->
+        <activity android:name=".widgets.timetable.LessonDialogActivity"
            android:configChanges="orientation|keyboardHidden"
            android:excludeFromRecents="true"
            android:noHistory="true"
            android:theme="@style/AppTheme.NoDisplay" />
-        <!-- NOTIFICATIONS -->
-        <receiver android:name=".ui.widgets.notifications.WidgetNotificationsProvider"
+        <activity
+            android:name=".ui.modules.settings.SettingsLicenseActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:theme="@style/Base.Theme.AppCompat" />
+        <activity
+            android:name=".ui.modules.webpush.WebPushConfigActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:theme="@style/AppTheme.Dark" />
+        <activity
+            android:name=".ui.modules.home.CounterActivityOld"
+            android:theme="@style/AppTheme.Black" />
+        <activity
+            android:name=".ui.modules.home.CounterActivity"
+            android:theme="@style/AppTheme.Black" />
+        <activity android:name=".ui.modules.webpush.QrScannerActivity" />
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
+        <!--
+              _____                _     _
+             |  __ \              (_)   | |
+             | |__) | __ _____   ___  __| | ___ _ __ ___
+             |  ___/ '__/ _ \ \ / / |/ _` |/ _ \ '__/ __|
+             | |   | | | (_) \ V /| | (_| |  __/ |  \__ \
+             |_|   |_|  \___/ \_/ |_|\__,_|\___|_|  |___/
+        -->
+        <receiver
+            android:name=".WidgetTimetable"
+            android:label="@string/widget_timetable_title">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_timetable_info" />
+        </receiver>
+        <!--
+              ____              _                       _
+             |  _ \            | |                     (_)
+             | |_) | ___   ___ | |_   _ __ ___  ___ ___ ___   _____ _ __
+             |  _ < / _ \ / _ \| __| | '__/ _ \/ __/ _ \ \ \ / / _ \ '__|
+             | |_) | (_) | (_) | |_  | | |  __/ (_|  __/ |\ V /  __/ |
+             |____/ \___/ \___/ \__| |_|  \___|\___\___|_| \_/ \_____|
+        -->
+        <receiver
+            android:name=".widgets.notifications.WidgetNotifications"
            android:label="@string/widget_notifications_title">
            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@ -95,10 +166,8 @@
                android:name="android.appwidget.provider"
                android:resource="@xml/widget_notifications_info" />
        </receiver>
-        <service android:name=".ui.widgets.notifications.WidgetNotificationsService"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
-        <!-- LUCKY NUMBER -->
-        <receiver android:name=".widgets.luckynumber.WidgetLuckyNumber"
+        <receiver
+            android:name=".widgets.luckynumber.WidgetLuckyNumber"
            android:label="@string/widget_lucky_number_title">
            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@ -108,58 +177,8 @@
                android:name="android.appwidget.provider"
                android:resource="@xml/widget_lucky_number_info" />
        </receiver>
-
-        <!--               _   _       _ _   _
-                 /\       | | (_)     (_) | (_)
-                /  \   ___| |_ ___   ___| |_ _  ___  ___
-               / /\ \ / __| __| \ \ / / | __| |/ _ \/ __|
-              / ____ \ (__| |_| |\ V /| | |_| |  __/\__ \
-             /_/    \_\___|\__|_| \_/ |_|\__|_|\___||___/
-        -->
-        <activity android:name=".ui.modules.base.CrashActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:process=":error_activity"
-            android:theme="@style/DeadTheme" />
-        <activity android:name=".ui.modules.base.CrashGtfoActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:theme="@style/DeadTheme" />
-        <activity android:name=".ui.modules.intro.ChangelogIntroActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Intro" />
-        <activity android:name=".ui.modules.login.LoginActivity"
-            android:configChanges="orientation|screenSize"
-            android:launchMode="singleTop"
-            android:theme="@style/AppTheme.Light" />
-        <activity android:name=".ui.modules.login.LoginLibrusCaptchaActivity"
-            android:theme="@android:style/Theme.Dialog"
-            android:excludeFromRecents="true"/>
-        <activity android:name=".ui.modules.home.CounterActivity"
-            android:theme="@style/AppTheme.Black" />
-        <activity android:name=".ui.modules.feedback.FeedbackActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme" />
-        <activity android:name=".ui.modules.settings.SettingsLicenseActivity"
-
-            android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/AppTheme" />
-        <activity android:name=".ui.modules.webpush.WebPushConfigActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/AppTheme.Dark" />
-        <activity android:name=".ui.modules.webpush.QrScannerActivity" />
-        <activity android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/Base.Theme.AppCompat" />
-
-        <!--  _____               _
-             |  __ \             (_)
-             | |__) |___  ___ ___ ___   _____ _ __ ___
-             |  _  // _ \/ __/ _ \ \ \ / / _ \ '__/ __|
-             | | \ \  __/ (_|  __/ |\ V /  __/ |  \__ \
-             |_|  \_\___|\___\___|_| \_/ \___|_|  |___/
-        -->
-        <receiver android:name=".receivers.UserPresentReceiver"
+        <receiver
+            android:name=".receivers.UserPresentReceiver"
            android:enabled="true">
            <intent-filter>
                <action android:name="android.intent.action.USER_PRESENT" />
@ -172,53 +191,54 @@
                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
            </intent-filter>
        </receiver>
-        <receiver android:name=".sync.FirebaseBroadcastReceiver"
+
+        <receiver
+            android:name=".sync.FirebaseBroadcastReceiver"
            android:exported="true"
            android:permission="com.google.android.c2dm.permission.SEND">
            <intent-filter>
                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
            </intent-filter>
        </receiver>
-        <receiver android:name=".receivers.SzkolnyReceiver"
+
+        <receiver
+            android:name=".receivers.SzkolnyReceiver"
            android:exported="true">
            <intent-filter>
                <action android:name="pl.szczodrzynski.edziennik.SZKOLNY_MAIN" />
            </intent-filter>
        </receiver>

-        <!--   _____                 _
-              / ____|               (_)
-             | (___   ___ _ ____   ___  ___ ___  ___
-              \___ \ / _ \ '__\ \ / / |/ __/ _ \/ __|
-              ____) |  __/ |   \ V /| | (_|  __/\__ \
-             |_____/ \___|_|    \_/ |_|\___\___||___/
-        -->
-        <service android:name=".sync.MyFirebaseMessagingService"
+        <service
+            android:name=".sync.MyFirebaseMessagingService"
            android:exported="false">
            <intent-filter>
                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
                <action android:name="com.google.firebase.MESSAGING_EVENT" />
            </intent-filter>
        </service>
+        <service
+            android:name=".widgets.timetable.WidgetTimetableService"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+        <service
+            android:name=".widgets.notifications.WidgetNotificationsService"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
        <service android:name=".receivers.BootReceiver$NotificationActionService" />
-        <service android:name=".Notifier$GetDataRetryService" />
-        <service android:name=".data.api.ApiService" />

-        <!--
-              _____                _     _
-             |  __ \              (_)   | |
-             | |__) | __ _____   ___  __| | ___ _ __ ___
-             |  ___/ '__/ _ \ \ / / |/ _` |/ _ \ '__/ __|
-             | |   | | | (_) \ V /| | (_| |  __/ |  \__ \
-             |_|   |_|  \___/ \_/ |_|\__,_|\___|_|  |___/
-        -->
-        <provider android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
+        <service android:name=".Notifier$GetDataRetryService" />
+
+        <service android:name="pl.szczodrzynski.edziennik.data.api.ApiService" />
    </application>
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
 </manifest>
--- a/app/src/main/assets/pl-changelog.html
+++ b/app/src/main/assets/pl-changelog.html
@ -1,4 +1,4 @@
-<h3>Wersja 4.0-beta.2, 2020-01-06</h3>
+<h3>Wersja 4.0-beta.1, 2020-01-02</h3>
 <ul>
    <li><b>Przebudowaliśmy cały moduł synchronizacji</b>, co oznacza większą stabilność aplikacji, szybkosć oraz poprawność pobieranych danych.</li>
    <li><b><u>Wysyłanie wiadomości</u></b> - funkcja, na którą czekał każdy. Od teraz w Szkolnym można wysyłać oraz odpowiadać na wiadomości do nauczycieli &#x1F44F;</li>
@ -10,7 +10,6 @@
    <li>Dużo poprawek w widoku <b>Wiadomości</b> oraz <b>Ogłoszeń</b></li>
    <li>Częściowa <b>Obsługa dziennika EduDziennik</b></li>
    <li>Librus: opcja logowania w dziennikach <b>Jednostek Samorządu Terytorialnego</b> oraz <b>Oświata w Radomiu</b></li>
-    <li>Librus: <b>poprawione obliczanie frekwencji</b></li>
    <li>Librus: obsługa Zadań domowych bez posiadania Mobilnych dodatków (przez system Synergia)</li>
    <li>Lepsze <b>przekazywanie powiadomień na komputer</b> oraz łatwiejsze parowanie</li>
    <li>Poprawiliśmy synchronizację w tle na niektórych telefonach</li>
@ -23,8 +22,9 @@
 Staramy się usuwać takie przypadki, jednak na chwilę obecną mogą występować błędy w:
 <ul>
    <li>Wysyłanie wiadomości może czasami nie działać - proszę o zgłaszanie wszystkich błędów na naszym serwerze Discord</li>
-    <li>Widget szczęśliwego numerka</li>
+    <li>Widget powiadomień</li>
    <li>Terminarz - brak informacji o odwołanych lekcjach w dialogu</li>
+    <li>Brak generowania blokowego planu lekcji</li>
 </ul>
 <br>
 <br>
--- a/app/src/main/cpp/szkolny-signing.cpp
+++ b/app/src/main/cpp/szkolny-signing.cpp
@ -9,7 +9,7 @@

 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0xf5, 0xbe, 0x91, 0x89, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0x6c, 0x53, 0xa9, 0x71, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };

 unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);

--- a/app/src/main/java/pl/szczodrzynski/edziennik/App.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.java
@ -71,8 +71,9 @@ import pl.szczodrzynski.edziennik.config.Config;
 import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing;
 import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask;
 import pl.szczodrzynski.edziennik.data.db.AppDb;
-import pl.szczodrzynski.edziennik.data.db.entity.DebugLog;
-import pl.szczodrzynski.edziennik.data.db.entity.Profile;
+import pl.szczodrzynski.edziennik.data.db.modules.debuglog.DebugLog;
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
 import pl.szczodrzynski.edziennik.network.NetworkUtils;
 import pl.szczodrzynski.edziennik.network.TLSSocketFactory;
 import pl.szczodrzynski.edziennik.sync.SyncWorker;
@ -83,7 +84,7 @@ import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.edziennik.utils.Utils;
 import pl.szczodrzynski.edziennik.utils.models.AppConfig;

-import static pl.szczodrzynski.edziennik.data.db.entity.LoginStore.LOGIN_TYPE_MOBIDZIENNIK;
+import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_MOBIDZIENNIK;

 public class App extends androidx.multidex.MultiDexApplication implements Configuration.Provider {
    private static final String TAG = "App";
@ -138,10 +139,11 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
    public SharedPreferences appSharedPrefs; // sharedPreferences for APPCONFIG + JOBS STORE
    public AppConfig appConfig; // APPCONFIG: common for all profiles
    //public AppProfile profile; // current profile
+    public JsonObject loginStore = null;
    public SharedPreferences registerStore; // sharedPreferences for REGISTER
    //public Register register; // REGISTER for current profile, read from registerStore

-    public Profile profile;
+    public ProfileFull profile;
    public Config config;
    private static Config mConfig;
    public static Config getConfig() {
@ -614,6 +616,15 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
            db.profileDao().add(profile);
        });
    }
+    public void profileSaveFullAsync(ProfileFull profile) {
+        AsyncTask.execute(() -> {
+            profileSaveFull(profile);
+        });
+    }
+    public void profileSaveFull(ProfileFull profileFull) {
+        db.profileDao().add(profileFull);
+        db.loginStoreDao().add(profileFull);
+    }

    public void profileLoadById(int id) {
        profileLoadById(id, false);
@ -627,7 +638,7 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
            return;
        }*/
        if (profile == null || profile.getId() != id) {
-            profile = db.profileDao().getByIdNow(id);
+            profile = db.profileDao().getFullByIdNow(id);
            /*if (profile == null) {
                profileLoadById(id);
                return;
@ -647,6 +658,12 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
        }
    }

+    public void profileLoad(ProfileFull profile) {
+        MainActivity.Companion.setUseOldMessages(profile.getLoginStoreType() == LOGIN_TYPE_MOBIDZIENNIK && appConfig.mobidziennikOldMessages == 1);
+        this.profile = profile;
+        profileId = profile.getId();
+    }
+
    /*public void profileRemove(int id)
    {
        Profile profile = db.profileDao().getFullByIdNow(id);
@ -686,13 +703,11 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
    }*/

    public int profileFirstId() {
-        Integer id = db.profileDao().getFirstId();
-        return id == null ? 1 : id;
+        return db.profileDao().getFirstId();
    }

    public int profileLastId() {
-        Integer id = db.profileDao().getLastId();
-        return id == null ? 1 : id;
+        return db.profileDao().getLastId();
    }


--- a/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
@ -6,7 +6,6 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.content.res.ColorStateList
 import android.content.res.Resources
-import android.database.Cursor
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.graphics.Typeface
@ -17,19 +16,17 @@ import android.text.*
 import android.text.style.ForegroundColorSpan
 import android.text.style.StrikethroughSpan
 import android.text.style.StyleSpan
-import android.util.*
 import android.util.Base64
 import android.util.Base64.NO_WRAP
 import android.util.Base64.encodeToString
+import android.util.LongSparseArray
+import android.util.SparseArray
+import android.util.TypedValue
 import android.view.View
-import android.widget.CheckBox
 import android.widget.CompoundButton
 import android.widget.TextView
 import androidx.annotation.*
 import androidx.core.app.ActivityCompat
-import androidx.core.database.getIntOrNull
-import androidx.core.database.getLongOrNull
-import androidx.core.database.getStringOrNull
 import androidx.core.util.forEach
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
@ -43,10 +40,9 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import okhttp3.RequestBody
 import okio.Buffer
-import pl.szczodrzynski.edziennik.data.db.entity.Notification
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
-import pl.szczodrzynski.edziennik.data.db.entity.Team
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
 import pl.szczodrzynski.edziennik.utils.models.Time
 import java.io.PrintWriter
 import java.io.StringWriter
@ -58,7 +54,6 @@ import java.util.*
 import java.util.zip.CRC32
 import javax.crypto.Mac
 import javax.crypto.spec.SecretKeySpec
-import kotlin.Pair


 fun List<Teacher>.byId(id: Long) = firstOrNull { it.id == id }
@ -74,7 +69,6 @@ fun JsonObject?.getString(key: String): String? = get(key)?.let { if (it.isJsonN
 fun JsonObject?.getInt(key: String): Int? = get(key)?.let { if (it.isJsonNull) null else it.asInt }
 fun JsonObject?.getLong(key: String): Long? = get(key)?.let { if (it.isJsonNull) null else it.asLong }
 fun JsonObject?.getFloat(key: String): Float? = get(key)?.let { if(it.isJsonNull) null else it.asFloat }
-fun JsonObject?.getChar(key: String): Char? = get(key)?.let { if(it.isJsonNull) null else it.asCharacter }
 fun JsonObject?.getJsonObject(key: String): JsonObject? = get(key)?.let { if (it.isJsonNull) null else it.asJsonObject }
 fun JsonObject?.getJsonArray(key: String): JsonArray? = get(key)?.let { if (it.isJsonNull) null else it.asJsonArray }

@ -83,23 +77,10 @@ fun JsonObject?.getString(key: String, defaultValue: String): String = get(key)?
 fun JsonObject?.getInt(key: String, defaultValue: Int): Int = get(key)?.let { if (it.isJsonNull) defaultValue else it.asInt } ?: defaultValue
 fun JsonObject?.getLong(key: String, defaultValue: Long): Long = get(key)?.let { if (it.isJsonNull) defaultValue else it.asLong } ?: defaultValue
 fun JsonObject?.getFloat(key: String, defaultValue: Float): Float = get(key)?.let { if(it.isJsonNull) defaultValue else it.asFloat } ?: defaultValue
-fun JsonObject?.getChar(key: String, defaultValue: Char): Char = get(key)?.let { if(it.isJsonNull) defaultValue else it.asCharacter } ?: defaultValue
 fun JsonObject?.getJsonObject(key: String, defaultValue: JsonObject): JsonObject = get(key)?.let { if (it.isJsonNull) defaultValue else it.asJsonObject } ?: defaultValue
 fun JsonObject?.getJsonArray(key: String, defaultValue: JsonArray): JsonArray = get(key)?.let { if (it.isJsonNull) defaultValue else it.asJsonArray } ?: defaultValue

-operator fun JsonObject.set(key: String, value: JsonElement) = this.add(key, value)
-operator fun JsonObject.set(key: String, value: Boolean) = this.addProperty(key, value)
-operator fun JsonObject.set(key: String, value: String?) = this.addProperty(key, value)
-operator fun JsonObject.set(key: String, value: Number) = this.addProperty(key, value)
-operator fun JsonObject.set(key: String, value: Char) = this.addProperty(key, value)
-
-operator fun Profile.set(key: String, value: JsonElement) = this.studentData.add(key, value)
-operator fun Profile.set(key: String, value: Boolean) = this.studentData.addProperty(key, value)
-operator fun Profile.set(key: String, value: String?) = this.studentData.addProperty(key, value)
-operator fun Profile.set(key: String, value: Number) = this.studentData.addProperty(key, value)
-operator fun Profile.set(key: String, value: Char) = this.studentData.addProperty(key, value)
-
-fun JsonArray.asJsonObjectList() = this.mapNotNull { it.asJsonObject }
+fun JsonArray?.asJsonObjectList() = this?.map { it.asJsonObject }

 fun CharSequence?.isNotNullNorEmpty(): Boolean {
    return this != null && this.isNotEmpty()
@ -215,23 +196,25 @@ fun List<String>.join(delimiter: String): String {
 }

 fun colorFromName(name: String?): Int {
-    val i = (name ?: "").crc32()
-    return when ((i / 10 % 16 + 1).toInt()) {
+    var crc = (name ?: "").crc16()
+    crc = (crc and 0xff) or (crc shr 8)
+    crc %= 16
+    return when (crc) {
        13 -> 0xffF44336
        4  -> 0xffF50057
        2  -> 0xffD500F9
        9  -> 0xff6200EA
-        5  -> 0xffFFAB00
+        5  -> 0xff3F51B5
        1  -> 0xff304FFE
-        6  -> 0xff40C4FF
+        6  -> 0xff18FFFF
        14 -> 0xff26A69A
-        15 -> 0xff00C853
+        15 -> 0xff4CAF50
        7  -> 0xffFFD600
        3  -> 0xffFF3D00
        8  -> 0xffDD2C00
        10 -> 0xff795548
-        12 -> 0xff2979FF
-        11 -> 0xffFF6D00
+        12 -> 0xffBDBDBD
+        11 -> 0xff78909C
        else -> 0xff64DD17
    }.toInt()
 }
@ -250,7 +233,10 @@ fun colorFromCssName(name: String): Int {
    }.toInt()
 }

-fun List<Profile>.filterOutArchived() = this.filter { !it.archived }
+fun MutableList<Profile>.filterOutArchived(): MutableList<Profile> {
+    this.removeAll { it.archived }
+    return this
+}

 fun Activity.isStoragePermissionGranted(): Boolean {
    return if (Build.VERSION.SDK_INT >= 23) {
@ -288,13 +274,6 @@ fun <T> LongSparseArray<T>.values(): List<T> {
    return result
 }

-fun SparseArray<*>.keys(): List<Int> {
-    val result = mutableListOf<Int>()
-    forEach { key, _ ->
-        result += key
-    }
-    return result
-}
 fun <T> SparseArray<T>.values(): List<T> {
    val result = mutableListOf<T>()
    forEach { _, value ->
@ -303,21 +282,6 @@ fun <T> SparseArray<T>.values(): List<T> {
    return result
 }

-fun SparseIntArray.keys(): List<Int> {
-    val result = mutableListOf<Int>()
-    forEach { key, _ ->
-        result += key
-    }
-    return result
-}
-fun SparseIntArray.values(): List<Int> {
-    val result = mutableListOf<Int>()
-    forEach { _, value ->
-        result += value
-    }
-    return result
-}
-
 fun <K, V> List<Pair<K, V>>.keys(): List<K> {
    val result = mutableListOf<K>()
    forEach { pair ->
@ -533,7 +497,7 @@ fun CharSequence.asSpannable(vararg spans: Any, substring: String? = null, ignor
            spans.forEach {
                spannable.setSpan(it, index, index + substring.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
            }
-            index = indexOf(substring, startIndex = index + 1, ignoreCase = ignoreCase)
+            index = indexOf(substring, startIndex = index + 1, ignoreCase = ignoreCase);
        }
    }
    return spannable
@ -868,7 +832,7 @@ fun Int.toColorStateList(): ColorStateList {
            this
    )

-    return ColorStateList(states, colors)
+    return ColorStateList(states, colors);
 }

 fun SpannableStringBuilder.appendText(text: CharSequence): SpannableStringBuilder {
@ -915,34 +879,3 @@ fun String.base64Decode(): ByteArray {
 fun String.base64DecodeToString(): String {
    return Base64.decode(this, Base64.DEFAULT).toString(Charset.defaultCharset())
 }
-
-fun CheckBox.trigger() { isChecked = !isChecked }
-
-fun Context.plural(@PluralsRes resId: Int, value: Int): String = resources.getQuantityString(resId, value, value)
-
-fun Context.getNotificationTitle(type: Int): String {
-    return getString(when (type) {
-        Notification.TYPE_UPDATE -> R.string.notification_type_update
-        Notification.TYPE_ERROR -> R.string.notification_type_error
-        Notification.TYPE_TIMETABLE_CHANGED -> R.string.notification_type_timetable_change
-        Notification.TYPE_TIMETABLE_LESSON_CHANGE -> R.string.notification_type_timetable_lesson_change
-        Notification.TYPE_NEW_GRADE -> R.string.notification_type_new_grade
-        Notification.TYPE_NEW_EVENT -> R.string.notification_type_new_event
-        Notification.TYPE_NEW_HOMEWORK -> R.string.notification_type_new_homework
-        Notification.TYPE_NEW_SHARED_EVENT -> R.string.notification_type_new_shared_event
-        Notification.TYPE_NEW_MESSAGE -> R.string.notification_type_new_message
-        Notification.TYPE_NEW_NOTICE -> R.string.notification_type_notice
-        Notification.TYPE_NEW_ATTENDANCE -> R.string.notification_type_attendance
-        Notification.TYPE_SERVER_MESSAGE -> R.string.notification_type_server_message
-        Notification.TYPE_LUCKY_NUMBER -> R.string.notification_type_lucky_number
-        Notification.TYPE_FEEDBACK_MESSAGE -> R.string.notification_type_feedback_message
-        Notification.TYPE_NEW_ANNOUNCEMENT -> R.string.notification_type_new_announcement
-        Notification.TYPE_AUTO_ARCHIVING -> R.string.notification_type_auto_archiving
-        Notification.TYPE_GENERAL -> R.string.notification_type_general
-        else -> R.string.notification_type_general
-    })
-}
-
-fun Cursor?.getString(columnName: String) = this?.getStringOrNull(getColumnIndex(columnName))
-fun Cursor?.getInt(columnName: String) = this?.getIntOrNull(getColumnIndex(columnName))
-fun Cursor?.getLong(columnName: String) = this?.getLongOrNull(getColumnIndex(columnName))
--- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@ -41,10 +41,9 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import pl.droidsonroids.gif.GifDrawable
 import pl.szczodrzynski.edziennik.data.api.events.*
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing
 import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata.*
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.*
 import pl.szczodrzynski.edziennik.databinding.ActivitySzkolnyBinding
 import pl.szczodrzynski.edziennik.sync.AppManagerDetectedEvent
 import pl.szczodrzynski.edziennik.sync.SyncWorker
@ -72,7 +71,7 @@ import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesListFragment
 import pl.szczodrzynski.edziennik.ui.modules.notifications.NotificationsFragment
 import pl.szczodrzynski.edziennik.ui.modules.settings.ProfileManagerFragment
 import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsNewFragment
-import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment
+import pl.szczodrzynski.edziennik.ui.modules.timetable.v2.TimetableFragment
 import pl.szczodrzynski.edziennik.ui.modules.webpush.WebPushFragment
 import pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch
 import pl.szczodrzynski.edziennik.utils.Themes
@ -322,10 +321,6 @@ class MainActivity : AppCompatActivity() {
                removeAllItems()
                toggleGroupEnabled = false
                textInputEnabled = false
-                onCloseListener = {
-                    if (!app.config.ui.bottomSheetOpened)
-                        app.config.ui.bottomSheetOpened = true
-                }
            }

            drawer.apply {
@ -333,6 +328,7 @@ class MainActivity : AppCompatActivity() {

                drawerProfileListEmptyListener = {
                    app.config.loginFinished = false
+                    app.saveConfig("loginFinished")
                    profileListEmptyListener()
                }
                drawerItemSelectedListener = { id, position, drawerItem ->
@ -372,8 +368,10 @@ class MainActivity : AppCompatActivity() {
        if (!profileListEmpty) {
            handleIntent(intent?.extras)
        }
-        app.db.profileDao().all.observe(this, Observer { profiles ->
-            drawer.setProfileList(profiles.filter { it.id >= 0 }.toMutableList())
+        app.db.profileDao().allFull.observe(this, Observer { profiles ->
+            // TODO fix weird -1 profiles ???
+            profiles.removeAll { it.id < 0 }
+            drawer.setProfileList(profiles)
            if (profileListEmpty) {
                profileListEmpty = false
                handleIntent(intent?.extras)
@ -507,6 +505,13 @@ class MainActivity : AppCompatActivity() {
                    .withIcon(CommunityMaterial.Icon.cmd_android_studio)
                    .withOnClickListener(View.OnClickListener { loadTarget(DRAWER_ITEM_DEBUG) })
        }
+
+        EventBus.getDefault().register(this)
+    }
+
+    override fun onDestroy() {
+        EventBus.getDefault().unregister(this)
+        super.onDestroy()
    }

    var profileListEmptyListener = {
@ -515,6 +520,9 @@ class MainActivity : AppCompatActivity() {
    private var profileSettingClickListener = { id: Int, view: View? ->
        when (id) {
            DRAWER_PROFILE_ADD_NEW -> {
+                LoginActivity.privacyPolicyAccepted = true
+                // else it would try to navigateUp onBackPressed, which it can't do. There is no parent fragment
+                LoginActivity.firstCompleted = false
                profileListEmptyListener()
            }
            DRAWER_PROFILE_SYNC_ALL -> {
@ -593,7 +601,6 @@ class MainActivity : AppCompatActivity() {
    }
    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
    fun onApiTaskErrorEvent(event: ApiTaskErrorEvent) {
-        EventBus.getDefault().removeStickyEvent(event)
        navView.toolbar.apply {
            subtitleFormat = R.string.toolbar_subtitle
            subtitleFormatWithUnread = R.plurals.toolbar_subtitle_with_unread
@ -747,12 +754,10 @@ class MainActivity : AppCompatActivity() {
        val filter = IntentFilter()
        filter.addAction(Intent.ACTION_MAIN)
        registerReceiver(intentReceiver, filter)
-        EventBus.getDefault().register(this)
        super.onResume()
    }
    override fun onPause() {
        unregisterReceiver(intentReceiver)
-        EventBus.getDefault().unregister(this)
        super.onPause()
    }

@ -812,6 +817,7 @@ class MainActivity : AppCompatActivity() {

            this.runOnUiThread {
                if (app.profile == null) {
+                    LoginActivity.firstCompleted = false
                    if (app.config.loginFinished) {
                        // this shouldn't run
                        profileListEmptyListener()
@ -1095,7 +1101,6 @@ class MainActivity : AppCompatActivity() {
        }
    }

-    fun error(error: ApiError) = errorSnackbar.addError(error).show()
    fun snackbar(text: String, actionText: String? = null, onClick: (() -> Unit)? = null) = mainSnackbar.snackbar(text, actionText, onClick)
    fun snackbarDismiss() = mainSnackbar.dismiss()
 }
--- a/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java
@ -17,6 +17,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

+import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
 import pl.szczodrzynski.edziennik.receivers.BootReceiver;
 import pl.szczodrzynski.edziennik.utils.models.Date;
 import pl.szczodrzynski.edziennik.utils.models.Time;
@ -220,8 +221,10 @@ public class Notifier {
        app.appConfig.notifications.add(notification);
    }

-    public void postAll() {
+    public void postAll(ProfileFull profile) {
        Collections.sort(app.appConfig.notifications, (o1, o2) -> (o2.addedDate - o1.addedDate > 0) ? 1 : (o2.addedDate - o1.addedDate < 0) ? -1 : 0);
+        if (profile != null && !profile.getSyncNotifications())
+            return;

        if (app.appConfig.notifications.size() > 40) {
            app.appConfig.notifications.subList(40, app.appConfig.notifications.size() - 1).clear();
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt
@ -1,8 +1,4 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-1-6.
- */
-
-package pl.szczodrzynski.edziennik.ui.widgets.timetable
+package pl.szczodrzynski.edziennik

 import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
@ -25,50 +21,20 @@ import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import com.mikepenz.iconics.utils.colorInt
 import com.mikepenz.iconics.utils.sizeDp
-import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
-import pl.szczodrzynski.edziennik.data.db.entity.Event.TYPE_HOMEWORK
-import pl.szczodrzynski.edziennik.data.db.entity.Lesson
-import pl.szczodrzynski.edziennik.ui.widgets.LessonDialogActivity
-import pl.szczodrzynski.edziennik.ui.widgets.WidgetConfig
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_HOMEWORK
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.ItemWidgetTimetableModel
 import pl.szczodrzynski.edziennik.utils.models.Time
 import pl.szczodrzynski.edziennik.utils.models.Week
+import pl.szczodrzynski.edziennik.widgets.WidgetConfig
+import pl.szczodrzynski.edziennik.widgets.timetable.LessonDialogActivity
+import pl.szczodrzynski.edziennik.widgets.timetable.WidgetTimetableService
 import java.lang.reflect.InvocationTargetException


-class WidgetTimetableProvider : AppWidgetProvider() {
-    companion object {
-        const val ACTION_SYNC_DATA = "ACTION_SYNC_DATA"
-        private const val TAG = "WidgetTimetable"
-
-        var timetables: SparseArray<List<ItemWidgetTimetableModel>>? = null
-
-        fun getPendingSelfIntent(context: Context, action: String): PendingIntent {
-            val intent = Intent(context, WidgetTimetableProvider::class.java)
-            intent.action = action
-            return getPendingSelfIntent(context, intent)
-        }
-
-        fun getPendingSelfIntent(context: Context, intent: Intent): PendingIntent {
-            return PendingIntent.getBroadcast(context, 0, intent, 0)
-        }
-
-        fun drawableToBitmap(drawable: Drawable): Bitmap {
-
-            if (drawable is BitmapDrawable) {
-                return drawable.bitmap
-            }
-
-            val bitmap = Bitmap.createBitmap(drawable.intrinsicWidth, drawable.intrinsicHeight, Bitmap.Config.ARGB_8888)
-            val canvas = Canvas(bitmap)
-            drawable.setBounds(0, 0, canvas.width, canvas.height)
-            drawable.draw(canvas)
-
-            return bitmap
-        }
-    }
+class WidgetTimetable : AppWidgetProvider() {

    override fun onReceive(context: Context, intent: Intent) {
        if (ACTION_SYNC_DATA == intent.action) {
@ -80,12 +46,12 @@ class WidgetTimetableProvider : AppWidgetProvider() {
    private val ignoreCancelled = true

    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
-        val thisWidget = ComponentName(context, WidgetTimetableProvider::class.java)
+        val thisWidget = ComponentName(context, WidgetTimetable::class.java)

        timetables = SparseArray()
+        //timetables.clear();

        val app = context.applicationContext as App
-        val widgetConfigs = app.config.widgetConfigs

        var bellSyncDiffMillis: Long = 0
        app.config.timetable.bellSyncDiff?.let {
@ -97,32 +63,37 @@ class WidgetTimetableProvider : AppWidgetProvider() {
        val allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)

        allWidgetIds?.forEach { appWidgetId ->
-            val config = widgetConfigs.getJsonObject(appWidgetId.toString())?.let { app.gson.fromJson(it, WidgetConfig::class.java) } ?: return@forEach
-
-            val views = if (config.bigStyle) {
-                RemoteViews(context.packageName, if (config.darkTheme) R.layout.widget_timetable_dark_big else R.layout.widget_timetable_big)
-            } else {
-                RemoteViews(context.packageName, if (config.darkTheme) R.layout.widget_timetable_dark else R.layout.widget_timetable)
+            var widgetConfig = app.appConfig.widgetTimetableConfigs[appWidgetId]
+            if (widgetConfig == null) {
+                widgetConfig = WidgetConfig(app.profileFirstId())
+                app.appConfig.widgetTimetableConfigs[appWidgetId] = widgetConfig
+                app.appConfig.savePending = true
            }

-            val refreshIntent = Intent(app, WidgetTimetableProvider::class.java)
+            val views = if (widgetConfig.bigStyle) {
+                RemoteViews(context.packageName, if (widgetConfig.darkTheme) R.layout.widget_timetable_dark_big else R.layout.widget_timetable_big)
+            } else {
+                RemoteViews(context.packageName, if (widgetConfig.darkTheme) R.layout.widget_timetable_dark else R.layout.widget_timetable)
+            }
+
+            val refreshIntent = Intent(app, WidgetTimetable::class.java)
            refreshIntent.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
            refreshIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds)
-            val refreshPendingIntent = PendingIntent.getBroadcast(context,
+            val pendingRefreshIntent = PendingIntent.getBroadcast(context,
                    0, refreshIntent, PendingIntent.FLAG_UPDATE_CURRENT)
-            views.setOnClickPendingIntent(R.id.widgetTimetableRefresh, refreshPendingIntent)
+            views.setOnClickPendingIntent(R.id.widgetTimetableRefresh, pendingRefreshIntent)

            views.setOnClickPendingIntent(R.id.widgetTimetableSync, getPendingSelfIntent(context, ACTION_SYNC_DATA))

            views.setImageViewBitmap(R.id.widgetTimetableRefresh, IconicsDrawable(context, CommunityMaterial.Icon2.cmd_refresh)
                    .colorInt(Color.WHITE)
-                    .sizeDp(if (config.bigStyle) 24 else 16).toBitmap())
+                    .sizeDp(if (widgetConfig.bigStyle) 24 else 16).toBitmap())

            views.setImageViewBitmap(R.id.widgetTimetableSync, IconicsDrawable(context, CommunityMaterial.Icon.cmd_download_outline)
                    .colorInt(Color.WHITE)
-                    .sizeDp(if (config.bigStyle) 24 else 16).toBitmap())
+                    .sizeDp(if (widgetConfig.bigStyle) 24 else 16).toBitmap())

-            prepareAppWidget(app, appWidgetId, views, config, bellSyncDiffMillis)
+            prepareAppWidget(app, appWidgetId, views, widgetConfig, bellSyncDiffMillis)

            appWidgetManager.updateAppWidget(appWidgetId, views)
            appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.widgetTimetableListView)
@ -358,20 +329,20 @@ class WidgetTimetableProvider : AppWidgetProvider() {
        }

        // intent running when the header is clicked
-        val headerIntent = Intent(app, MainActivity::class.java)
-        headerIntent.action = "android.intent.action.MAIN"
+        val openIntent = Intent(app, MainActivity::class.java)
+        openIntent.action = "android.intent.action.MAIN"
        if (!unified) {
            // per-profile widget should redirect to it + correct day
            profileId?.let {
-                headerIntent.putExtra("profileId", it)
+                openIntent.putExtra("profileId", it)
            }
            displayingDate?.let {
-                headerIntent.putExtra("timetableDate", it.value)
+                openIntent.putExtra("timetableDate", it.value)
            }
        }
-        headerIntent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE)
-        val headerPendingIntent = PendingIntent.getActivity(app, appWidgetId, headerIntent, 0)
-        views.setOnClickPendingIntent(R.id.widgetTimetableHeader, headerPendingIntent)
+        openIntent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE)
+        val pendingOpenIntent = PendingIntent.getActivity(app, appWidgetId, openIntent, 0)
+        views.setOnClickPendingIntent(R.id.widgetTimetableHeader, pendingOpenIntent)

        timetables!!.put(appWidgetId, models)

@ -382,21 +353,55 @@ class WidgetTimetableProvider : AppWidgetProvider() {
        views.setRemoteAdapter(R.id.widgetTimetableListView, listIntent)

        // create an intent used to display the lesson details dialog
-        val itemIntent = Intent(app, LessonDialogActivity::class.java)
-        itemIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK /*or Intent.FLAG_ACTIVITY_CLEAR_TASK*/)
-        val itemPendingIntent = PendingIntent.getActivity(app, appWidgetId, itemIntent, 0)
-        views.setPendingIntentTemplate(R.id.widgetTimetableListView, itemPendingIntent)
+        val intentTemplate = Intent(app, LessonDialogActivity::class.java)
+        intentTemplate.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK /*or Intent.FLAG_ACTIVITY_CLEAR_TASK*/)
+        val pendingIntentTimetable = PendingIntent.getActivity(app, appWidgetId, intentTemplate, 0)
+        views.setPendingIntentTemplate(R.id.widgetTimetableListView, pendingIntentTimetable)

        if (!unified)
            views.setScrollPosition(R.id.widgetTimetableListView, scrollPos)
    }

+    override fun onEnabled(context: Context) {
+        // Enter relevant functionality for when the first widget is created
+    }
+
    override fun onDeleted(context: Context, appWidgetIds: IntArray) {
        val app = context.applicationContext as App
-        val widgetConfigs = app.config.widgetConfigs
-        appWidgetIds.forEach {
-            widgetConfigs.remove(it.toString())
+        for (appWidgetId in appWidgetIds) {
+            app.appConfig.widgetTimetableConfigs.remove(appWidgetId)
+        }
+        app.saveConfig("widgetTimetableConfigs")
+    }
+
+    companion object {
+        const val ACTION_SYNC_DATA = "ACTION_SYNC_DATA"
+        private const val TAG = "WidgetTimetable"
+
+        var timetables: SparseArray<List<ItemWidgetTimetableModel>>? = null
+
+        fun getPendingSelfIntent(context: Context, action: String): PendingIntent {
+            val intent = Intent(context, WidgetTimetable::class.java)
+            intent.action = action
+            return getPendingSelfIntent(context, intent)
+        }
+
+        fun getPendingSelfIntent(context: Context, intent: Intent): PendingIntent {
+            return PendingIntent.getBroadcast(context, 0, intent, 0)
+        }
+
+        fun drawableToBitmap(drawable: Drawable): Bitmap {
+
+            if (drawable is BitmapDrawable) {
+                return drawable.bitmap
+            }
+
+            val bitmap = Bitmap.createBitmap(drawable.intrinsicWidth, drawable.intrinsicHeight, Bitmap.Config.ARGB_8888)
+            val canvas = Canvas(bitmap)
+            drawable.setBounds(0, 0, canvas.width, canvas.height)
+            drawable.draw(canvas)
+
+            return bitmap
        }
-        app.config.widgetConfigs = widgetConfigs
    }
 }
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt
@ -4,7 +4,6 @@

 package pl.szczodrzynski.edziennik.config

-import com.google.gson.JsonObject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@ -50,11 +49,6 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
        get() { mLoginFinished = mLoginFinished ?: values.get("loginFinished", false); return mLoginFinished ?: false }
        set(value) { set("loginFinished", value); mLoginFinished = value }

-    private var mPrivacyPolicyAccepted: Boolean? = null
-    var privacyPolicyAccepted: Boolean
-        get() { mPrivacyPolicyAccepted = mPrivacyPolicyAccepted ?: values.get("privacyPolicyAccepted", false); return mPrivacyPolicyAccepted ?: false }
-        set(value) { set("privacyPolicyAccepted", value); mPrivacyPolicyAccepted = value }
-
    private var mDevModePassword: String? = null
    var devModePassword: String?
        get() { mDevModePassword = mDevModePassword ?: values.get("devModePassword", null as String?); return mDevModePassword }
@ -75,11 +69,6 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
        get() { mRunSync = mRunSync ?: values.get("runSync", false); return mRunSync ?: false }
        set(value) { set("runSync", value); mRunSync = value }

-    private var mWidgetConfigs: JsonObject? = null
-    var widgetConfigs: JsonObject
-        get() { mWidgetConfigs = mWidgetConfigs ?: values.get("widgetConfigs", JsonObject()); return mWidgetConfigs ?: JsonObject() }
-        set(value) { set("widgetConfigs", value); mWidgetConfigs = value }
-
    private var rawEntries: List<ConfigEntry> = db.configDao().getAllNow()
    private val profileConfigs: HashMap<Int, ProfileConfig> = hashMapOf()
    init {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigGrades.kt
@ -6,8 +6,8 @@ package pl.szczodrzynski.edziennik.config

 import pl.szczodrzynski.edziennik.config.utils.get
 import pl.szczodrzynski.edziennik.config.utils.set
-import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.COLOR_MODE_WEIGHTED
-import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.YEAR_ALL_GRADES
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.Companion.COLOR_MODE_WEIGHTED
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.Companion.YEAR_ALL_GRADES

 class ProfileConfigGrades(private val config: ProfileConfig) {
    private var mColorMode: Int? = null
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/ApiService.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/ApiService.kt
@ -18,7 +18,7 @@ import pl.szczodrzynski.edziennik.data.api.events.requests.TaskCancelRequest
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.task.*
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import kotlin.math.min
 import kotlin.math.roundToInt
@ -38,7 +38,7 @@ class ApiService : Service() {

    private val app by lazy { applicationContext as App }

-    private val syncingProfiles = mutableListOf<Profile>()
+    private val syncingProfiles = mutableListOf<ProfileFull>()

    private val finishingTaskQueue = mutableListOf(
            SzkolnyTask.sync(syncingProfiles),
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt
@ -14,11 +14,11 @@ val SYSTEM_USER_AGENT = System.getProperty("http.agent") ?: "Dalvik/2.1.0 Androi

 val SERVER_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME} $SYSTEM_USER_AGENT"

-const val FAKE_LIBRUS_API = "https://librus.szkolny.eu/api"
-const val FAKE_LIBRUS_PORTAL = "https://librus.szkolny.eu"
-const val FAKE_LIBRUS_AUTHORIZE = "https://librus.szkolny.eu/authorize.php"
-const val FAKE_LIBRUS_LOGIN = "https://librus.szkolny.eu/login_action.php"
-const val FAKE_LIBRUS_TOKEN = "https://librus.szkolny.eu/access_token.php"
+const val FAKE_LIBRUS_API = "http://librus.szkolny.eu/api"
+const val FAKE_LIBRUS_PORTAL = "http://librus.szkolny.eu"
+const val FAKE_LIBRUS_AUTHORIZE = "http://librus.szkolny.eu/authorize.php"
+const val FAKE_LIBRUS_LOGIN = "http://librus.szkolny.eu/login_action.php"
+const val FAKE_LIBRUS_TOKEN = "http://librus.szkolny.eu/access_token.php"
 const val FAKE_LIBRUS_ACCOUNT = "/synergia_accounts_fresh.php?login="
 const val FAKE_LIBRUS_ACCOUNTS = "/synergia_accounts.php"

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/DataNotifications.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/DataNotifications.kt
@ -11,22 +11,22 @@ import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_TIMETABLE
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.models.Data
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance
-import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.*
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Notice
-import pl.szczodrzynski.edziennik.data.db.entity.Notification
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_LUCKY_NUMBER
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_ANNOUNCEMENT
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_ATTENDANCE
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_EVENT
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_GRADE
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_HOMEWORK
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_MESSAGE
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_NOTICE
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_TIMETABLE_LESSON_CHANGE
-import pl.szczodrzynski.edziennik.getNotificationTitle
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.*
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_LUCKY_NUMBER
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_ANNOUNCEMENT
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_ATTENDANCE
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_EVENT
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_GRADE
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_HOMEWORK
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_MESSAGE
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_NOTICE
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_TIMETABLE_LESSON_CHANGE
+import pl.szczodrzynski.edziennik.data.db.modules.notification.getNotificationTitle
 import pl.szczodrzynski.edziennik.utils.models.Date

 class DataNotifications(val data: Data) {
@ -47,6 +47,7 @@ class DataNotifications(val data: Data) {

        val today = Date.getToday()
        val todayValue = today.value
+        profile.currentSemester = profile.dateToSemester(today)

        for (lesson in app.db.timetableDao().getNotNotifiedNow(profileId)) {
            val text = app.getString(R.string.notification_lesson_change_format, lesson.getDisplayChangeType(app), if (lesson.displayDate == null) "" else lesson.displayDate!!.formattedString, lesson.changeSubjectName)
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/EndpointChooser.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/EndpointChooser.kt
@ -3,9 +3,9 @@ package pl.szczodrzynski.edziennik.data.api
 import pl.szczodrzynski.edziennik.data.api.models.Data
 import pl.szczodrzynski.edziennik.data.api.models.Feature
 import pl.szczodrzynski.edziennik.data.api.models.LoginMethod
-import pl.szczodrzynski.edziennik.data.db.entity.EndpointTimer
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_NEVER
+import pl.szczodrzynski.edziennik.data.db.modules.api.EndpointTimer
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_NEVER

 fun Data.prepare(loginMethods: List<LoginMethod>, features: List<Feature>, featureIds: List<Int>, viewId: Int?) {
    val data = this
@ -47,8 +47,7 @@ fun Data.prepare(loginMethods: List<LoginMethod>, features: List<Feature>, featu
            .onEach { feature ->
                feature.endpointIds.forEach { endpoint ->
                    (data.endpointTimers
-                            .singleOrNull { it.endpointId == endpoint.first } ?: EndpointTimer(data.profile?.id
-                            ?: -1, endpoint.first))
+                            .singleOrNull { it.endpointId == endpoint.first } ?: EndpointTimer(data.profile?.id ?: -1, endpoint.first))
                            .let { timer ->
                                if (timer.nextSync == SYNC_ALWAYS ||
                                        (viewId != null && timer.viewId == viewId) ||
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt
@ -164,11 +164,11 @@ const val ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA               = 441
 const val ERROR_IDZIENNIK_API_ACCESS_DENIED                 = 450
 const val ERROR_IDZIENNIK_API_OTHER                         = 451
 const val ERROR_IDZIENNIK_API_NO_REGISTER                   = 452
-const val ERROR_IDZIENNIK_WEB_RECIPIENT_LIST_NO_PERMISSION  = 453

 const val ERROR_LOGIN_EDUDZIENNIK_WEB_INVALID_LOGIN         = 501
 const val ERROR_LOGIN_EDUDZIENNIK_WEB_OTHER                 = 510
 const val ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID         = 511
+const val ERROR_EDUDZIENNIK_WEB_TIMETABLE_NOT_PUBLIC        = 520
 const val ERROR_EDUDZIENNIK_WEB_LIMITED_ACCESS              = 521
 const val ERROR_EDUDZIENNIK_WEB_SESSION_EXPIRED             = 522
 const val ERROR_EDUDZIENNIK_WEB_TEAM_MISSING                = 530
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Features.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Features.kt
@ -13,8 +13,8 @@ import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOME
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOMEWORK
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_TIMETABLE
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT

 internal const val FEATURE_TIMETABLE = 1
 internal const val FEATURE_AGENDA = 2
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/LoginMethods.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/LoginMethods.kt
@ -23,7 +23,7 @@ import pl.szczodrzynski.edziennik.data.api.models.LoginMethod
 // vulcan
 // mobireg

-const val SYNERGIA_API_ENABLED = false
+const val SYNERGIA_API_ENABLED = true



--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt
@ -74,7 +74,7 @@ object Regexes {
        """id="ctl00_CzyRodzic" value="([01])" />""".toRegex()
    }
    val IDZIENNIK_LOGIN_FIRST_SCHOOL_YEAR by lazy {
-        """name="ctl00\\${'$'}dxComboRokSzkolny".+?selected="selected".*?value="([0-9]+)">([0-9]+)/([0-9]+)<""".toRegex(DOT_MATCHES_ALL)
+        """name="ctl00\${"$"}dxComboRokSzkolny".+?selected="selected".*?value="([0-9]+)">([0-9/]+)<""".toRegex(DOT_MATCHES_ALL)
    }
    val IDZIENNIK_LOGIN_FIRST_STUDENT_SELECT by lazy {
        """<select.*?name="ctl00\${"$"}dxComboUczniowie".*?</select>""".toRegex(DOT_MATCHES_ALL)
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/DataEdudziennik.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/DataEdudziennik.kt
@ -7,11 +7,11 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_EDUDZIENNIK_WEB
 import pl.szczodrzynski.edziennik.data.api.models.Data
-import pl.szczodrzynski.edziennik.data.db.entity.EventType
-import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.data.db.entity.Subject
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.modules.events.EventType
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher

 /**
 * Use http://patorjk.com/software/taag/#p=display&f=Big for the ascii art
@ -29,8 +29,6 @@ class DataEdudziennik(app: App, profile: Profile?, loginStore: LoginStore) : Dat
        }
    }

-    override fun generateUserCode() = "$schoolName:$loginEmail:${studentId?.crc32()}"
-
    private var mLoginEmail: String? = null
    var loginEmail: String?
        get() { mLoginEmail = mLoginEmail ?: loginStore.getLoginData("email", null); return mLoginEmail }
@ -78,16 +76,16 @@ class DataEdudziennik(app: App, profile: Profile?, loginStore: LoginStore) : Dat
         | |  | | __| '_ \ / _ \ '__|
         | |__| | |_| | | |  __/ |
          \____/ \__|_| |_|\___|*/
-    private var mCurrentSemester: Int? = null
-    var currentSemester: Int
-        get() { mCurrentSemester = mCurrentSemester ?: profile?.getStudentData("currentSemester", 1); return mCurrentSemester ?: 1 }
-        set(value) { profile?.putStudentData("currentSemester", value) ?: return; mCurrentSemester = value }
-
    private var mSchoolName: String? = null
    var schoolName: String?
        get() { mSchoolName = mSchoolName ?: profile?.getStudentData("schoolName", null); return mSchoolName }
        set(value) { profile?.putStudentData("schoolName", value) ?: return; mSchoolName = value }

+    private var mTimetableNotPublic: Boolean? = null
+    var timetableNotPublic: Boolean
+        get() { mTimetableNotPublic = mTimetableNotPublic ?: profile?.getStudentData("timetableNotPublic", false); return mTimetableNotPublic ?: false }
+        set(value) { profile?.putStudentData("timetableNotPublic", value) ?: return; mTimetableNotPublic = value }
+
    val studentEndpoint: String
        get() = "Students/$studentId/"

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/Edudziennik.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/Edudziennik.kt
@ -15,12 +15,12 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.Edudzienn
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
-import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.utils.Utils.d

 class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
@ -124,7 +124,8 @@ class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStor
                    ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID -> {
                        login()
                    }
-                    ERROR_EDUDZIENNIK_WEB_LIMITED_ACCESS -> {
+                    ERROR_EDUDZIENNIK_WEB_TIMETABLE_NOT_PUBLIC -> {
+                        data.timetableNotPublic = true
                        data()
                    }
                    else -> callback.onError(apiError)
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikWeb.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikWeb.kt
@ -70,7 +70,7 @@ open class EdudziennikWeb(open val data: DataEdudziennik) {
                        .secure().httpOnly().build(),
                Cookie.Builder()
                        .name("semester")
-                        .value((data.currentSemester).toString())
+                        .value((profile?.currentSemester ?: 1).toString())
                        .domain("dziennikel.appspot.com")
                        .secure().httpOnly().build()
        ))
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAnnouncements.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAnnouncements.kt
@ -10,10 +10,11 @@ import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ANNOUNCEMENT_ID
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
-import pl.szczodrzynski.edziennik.data.db.entity.Announcement
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.splitName
 import pl.szczodrzynski.edziennik.utils.models.Date

 class EdudziennikWebAnnouncements(override val data: DataEdudziennik,
@ -36,7 +37,9 @@ class EdudziennikWebAnnouncements(override val data: DataEdudziennik,
                    val subject = titleElement.text()

                    val teacherName = announcementElement.child(1).text()
-                    val teacher = data.getTeacherByFirstLast(teacherName)
+                    val teacher = teacherName.splitName()?.let { (teacherFirstName, teacherLastName) ->
+                        data.getTeacher(teacherFirstName, teacherLastName)
+                    } ?: return@forEach

                    val dateString = announcementElement.getElementsByClass("datetime").first().text()
                    val startDate = Date.fromY_m_d(dateString)
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt
@ -11,9 +11,9 @@ import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ATTENDANCE_TYPES
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.get
 import pl.szczodrzynski.edziennik.singleOrNull
 import pl.szczodrzynski.edziennik.utils.models.Date
@ -69,7 +69,7 @@ class EdudziennikWebAttendance(override val data: DataEdudziennik,
                        id,
                        lesson?.displayTeacherId ?: -1,
                        lesson?.displaySubjectId ?: -1,
-                        data.currentSemester,
+                        profile.currentSemester,
                        name,
                        date,
                        lesson?.displayStartTime ?: startTime,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebEvents.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebEvents.kt
@ -11,9 +11,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_EVENTS
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.get
 import pl.szczodrzynski.edziennik.utils.models.Date

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt
@ -13,9 +13,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_EXAMS
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.get
 import pl.szczodrzynski.edziennik.utils.models.Date

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetAnnouncement.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetAnnouncement.kt
@ -9,7 +9,7 @@ import pl.szczodrzynski.edziennik.data.api.Regexes
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
 import pl.szczodrzynski.edziennik.data.api.events.AnnouncementGetEvent
-import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementFull
 import pl.szczodrzynski.edziennik.get

 class EdudziennikWebGetAnnouncement(
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGrades.kt
@ -13,10 +13,10 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_GRADES
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Grade
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.*
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.*
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.get
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date
@ -54,10 +54,10 @@ class EdudziennikWebGrades(override val data: DataEdudziennik,
                    subjects.select(".avg-$subjectId .grade-tip > p").first()
                            .text().split('+').map {
                                val split = it.split('*')
-                                val value = split[1].trim().toFloatOrNull()
-                                val weight = value?.let { split[0].trim().toFloatOrNull() } ?: 0f
+                                val weight = split[0].trim().toFloat()
+                                val value = split[1].trim().toFloat()

-                                Pair(value ?: 0f, weight)
+                                Pair(value, weight)
                            }
                } else emptyList()

@ -82,8 +82,8 @@ class EdudziennikWebGrades(override val data: DataEdudziennik,

                    val description = columnName + if (comment.isNotBlank()) " - $comment" else ""

-                    val teacherName = info.child(1).text()
-                    val teacher = data.getTeacherByLastFirst(teacherName)
+                    val (teacherLastName, teacherFirstName) = info.child(1).text().split(' ')
+                    val teacher = data.getTeacher(teacherFirstName, teacherLastName)

                    val addedDate = info.child(2).text().split(' ').let {
                        val day = it[0].toInt()
@ -107,7 +107,7 @@ class EdudziennikWebGrades(override val data: DataEdudziennik,
                            name,
                            value,
                            if (gradeCountToAverage) weight else 0f,
-                            data.currentSemester,
+                            profile.currentSemester,
                            teacher.id,
                            subject.id
                    ).apply {
@ -137,7 +137,7 @@ class EdudziennikWebGrades(override val data: DataEdudziennik,
                            proposed,
                            proposed.toFloatOrNull() ?: 0f,
                            0f,
-                            data.currentSemester,
+                            profile.currentSemester,
                            -1,
                            subject.id
                    ).apply {
@ -170,7 +170,7 @@ class EdudziennikWebGrades(override val data: DataEdudziennik,
                            final,
                            final.toFloatOrNull() ?: 0f,
                            0f,
-                            data.currentSemester,
+                            profile.currentSemester,
                            -1,
                            subject.id
                    ).apply {
@ -201,7 +201,7 @@ class EdudziennikWebGrades(override val data: DataEdudziennik,
                        TYPE_SEMESTER1_FINAL,
                        TYPE_SEMESTER2_FINAL
                ).map {
-                    DataRemoveModel.Grades.semesterWithType(data.currentSemester, it)
+                    DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it)
                })
            }

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebHomework.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebHomework.kt
@ -12,10 +12,11 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.splitName
 import pl.szczodrzynski.edziennik.utils.models.Date

 class EdudziennikWebHomework(override val data: DataEdudziennik,
@ -45,7 +46,9 @@ class EdudziennikWebHomework(override val data: DataEdudziennik,
                    val startTime = lessons.firstOrNull { it.subjectId == subject.id }?.displayStartTime

                    val teacherName = homeworkElement.child(2).text()
-                    val teacher = data.getTeacherByFirstLast(teacherName)
+                    val teacher = teacherName.splitName()?.let { (teacherFirstName, teacherLastName) ->
+                        data.getTeacher(teacherFirstName, teacherLastName)
+                    } ?: return@forEach

                    val topic = homeworkElement.child(4).text()

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebLuckyNumber.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebLuckyNumber.kt
@ -7,9 +7,9 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.models.Date

 class EdudziennikWebLuckyNumber(override val data: DataEdudziennik,
@ -32,7 +32,7 @@ class EdudziennikWebLuckyNumber(override val data: DataEdudziennik,
                        profileId,
                        Metadata.TYPE_LUCKY_NUMBER,
                        luckyNumberObject.date.value.toLong(),
-                        true,
+                        profile.empty,
                        profile.empty,
                        System.currentTimeMillis()
                ))
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebNotes.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebNotes.kt
@ -10,9 +10,9 @@ import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_NOTE_ID
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_NOTES
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Notice
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice
 import pl.szczodrzynski.edziennik.get
 import pl.szczodrzynski.edziennik.utils.models.Date

@ -42,7 +42,7 @@ class EdudziennikWebNotes(override val data: DataEdudziennik,
                        profileId,
                        id,
                        description,
-                        data.currentSemester,
+                        profile.currentSemester,
                        Notice.TYPE_NEUTRAL,
                        teacher.id
                )
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebStart.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebStart.kt
@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_START
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.Team
+import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
 import pl.szczodrzynski.edziennik.firstLettersName
 import pl.szczodrzynski.edziennik.get

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTimetable.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTimetable.kt
@ -5,19 +5,22 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web

 import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.data.api.ERROR_EDUDZIENNIK_WEB_TIMETABLE_NOT_PUBLIC
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_TEACHER_ID
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.LessonRange
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Lesson
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
 import pl.szczodrzynski.edziennik.get
 import pl.szczodrzynski.edziennik.getString
 import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.splitName
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
@ -54,7 +57,17 @@ class EdudziennikWebTimetable(override val data: DataEdudziennik,

            val table = doc.select("#Schedule tbody").first()

-            if (!table.text().contains("Brak planu lekcji.")) {
+            if (table.text().trim() == "Brak planu lekcji.") {
+                val today = Date.getToday()
+                val schoolYearStart = if (today.month >= 9) today.year else today.year - 1
+
+                if (weekStart >= Date(schoolYearStart, 9, 1)) {
+                    data.error(ApiError(TAG, ERROR_EDUDZIENNIK_WEB_TIMETABLE_NOT_PUBLIC)
+                            .withApiResponse(text))
+                    onSuccess()
+                    return@webGet
+                }
+            } else {
                table.children().forEach { row ->
                    val rowElements = row.children()

@ -95,8 +108,10 @@ class EdudziennikWebTimetable(override val data: DataEdudziennik,
                            val teacherElement = info[1].child(0)
                            val teacherLongId = EDUDZIENNIK_TEACHER_ID.find(teacherElement.attr("href"))?.get(1)
                            val teacherName = teacherElement.text().trim()
-                            data.getTeacherByLastFirst(teacherName, teacherLongId).id
-                        } else null
+                            teacherName.splitName()?.let { (teacherLastName, teacherFirstName) ->
+                                data.getTeacher(teacherFirstName, teacherLastName, teacherLongId)
+                            }?.id ?: -1
+                        } else -1

                        val lessonObject = Lesson(profileId, -1).also {
                            it.type = type
@ -106,12 +121,11 @@ class EdudziennikWebTimetable(override val data: DataEdudziennik,
                            it.endTime = endTime
                            it.subjectId = subject.id
                            it.teacherId = teacherId
-                            it.teamId = data.teamClass?.id

                            it.id = it.buildId()
                        }

-                        data.lessonList.add(lessonObject)
+                        data.lessonNewList.add(lessonObject)
                        dataDays.remove(lessonObject.date!!.value)

                        if (type != Lesson.TYPE_NORMAL) {
@ -132,7 +146,7 @@ class EdudziennikWebTimetable(override val data: DataEdudziennik,

            for (day in dataDays) {
                val lessonDate = Date.fromValue(day)
-                data.lessonList += Lesson(profileId, lessonDate.value.toLong()).apply {
+                data.lessonNewList += Lesson(profileId, lessonDate.value.toLong()).apply {
                    type = Lesson.TYPE_NO_LESSONS
                    date = lessonDate
                }
@ -140,6 +154,8 @@ class EdudziennikWebTimetable(override val data: DataEdudziennik,

            d(TAG, "Clearing lessons between ${weekStart.stringY_m_d} and ${weekEnd.stringY_m_d} - timetable downloaded for $getDate")

+            if (data.timetableNotPublic) data.timetableNotPublic = false
+
            data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd))
            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE, SYNC_ALWAYS)
            onSuccess()
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/firstlogin/EdudziennikFirstLogin.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/firstlogin/EdudziennikFirstLogin.kt
@ -5,18 +5,17 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.firstlogin

 import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_EDUDZIENNIK
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ACCOUNT_NAME_START
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_STUDENTS_START
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLoginWeb
 import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
 import pl.szczodrzynski.edziennik.fixName
 import pl.szczodrzynski.edziennik.get
 import pl.szczodrzynski.edziennik.getShortName
-import pl.szczodrzynski.edziennik.set
+import pl.szczodrzynski.edziennik.utils.Utils

 class EdudziennikFirstLogin(val data: DataEdudziennik, val onSuccess: () -> Unit) {
    companion object {
@ -27,35 +26,25 @@ class EdudziennikFirstLogin(val data: DataEdudziennik, val onSuccess: () -> Unit
    private val profileList = mutableListOf<Profile>()

    init {
-        val loginStoreId = data.loginStore.id
-        val loginStoreType = LOGIN_TYPE_EDUDZIENNIK
-        var firstProfileId = loginStoreId
-
        EdudziennikLoginWeb(data) {
            web.webGet(TAG, "") { text ->
-                val accountNameLong = EDUDZIENNIK_ACCOUNT_NAME_START.find(text)?.get(1)?.fixName()
+                val accountName = EDUDZIENNIK_ACCOUNT_NAME_START.find(text)?.get(1)?.fixName()

                EDUDZIENNIK_STUDENTS_START.findAll(text).forEach {
                    val studentId = it[1]
-                    val studentNameLong = it[2].fixName()
+                    val studentName = it[2].fixName()

-                    if (studentId.isBlank() || studentNameLong.isBlank()) return@forEach
+                    if (studentId.isBlank() || studentName.isBlank()) return@forEach

-                    val studentNameShort = studentNameLong.getShortName()
-                    val accountName = if (accountNameLong == studentNameLong) null else accountNameLong
-
-                    val profile = Profile(
-                            firstProfileId++,
-                            loginStoreId,
-                            loginStoreType,
-                            studentNameLong,
-                            data.loginEmail,
-                            studentNameLong,
-                            studentNameShort,
-                            accountName
-                    ).apply {
-                        studentData["studentId"] = studentId
-                    }
+                    val profile = Profile()
+                    profile.studentNameLong = studentName
+                    profile.studentNameShort = studentName.getShortName()
+                    profile.accountNameLong = if (studentName == accountName) null else accountName
+                    profile.studentSchoolYear = Utils.getCurrentSchoolYear()
+                    profile.name = studentName
+                    profile.subname = data.loginEmail
+                    profile.empty = true
+                    profile.putStudentData("studentId", studentId)
                    profileList.add(profile)
                }

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/login/EdudziennikLoginWeb.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/login/EdudziennikLoginWeb.kt
@ -13,7 +13,6 @@ import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.getUnixDate
 import pl.szczodrzynski.edziennik.isNotNullNorEmpty
 import pl.szczodrzynski.edziennik.utils.Utils.d
-import pl.szczodrzynski.edziennik.utils.models.Date

 class EdudziennikLoginWeb(val data: DataEdudziennik, val onSuccess: () -> Unit) {
    companion object {
@ -62,7 +61,6 @@ class EdudziennikLoginWeb(val data: DataEdudziennik, val onSuccess: () -> Unit)

                val cookies = data.app.cookieJar.getForDomain("dziennikel.appspot.com")
                val sessionId = cookies.firstOrNull { it.name() == "sessionid" }?.value()
-                val semester = cookies.firstOrNull { it.name() == "semester" }?.value()?.toIntOrNull()

                if (sessionId == null) {
                    data.error(ApiError(TAG, ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID)
@ -72,14 +70,6 @@ class EdudziennikLoginWeb(val data: DataEdudziennik, val onSuccess: () -> Unit)
                }

                data.webSessionId = sessionId
-
-                if (data.profile != null && semester != null) {
-                    data.currentSemester = semester
-
-                    if (semester == 2 && data.profile.dateSemester2Start > Date.getToday())
-                        data.profile.dateSemester2Start = Date.getToday().stepForward(0, 0, -1)
-                }
-
                data.webSessionIdExpiryTime = response.getUnixDate() + 45 * 60 /* 45 min */
                onSuccess()
            }
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/DataIdziennik.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/DataIdziennik.kt
@ -10,10 +10,10 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_API
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_WEB
 import pl.szczodrzynski.edziennik.data.api.models.Data
-import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.data.db.entity.Subject
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher

 class DataIdziennik(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {

@ -41,8 +41,6 @@ class DataIdziennik(app: App, profile: Profile?, loginStore: LoginStore) : Data(
            loginMethods += LOGIN_METHOD_IDZIENNIK_API
    }

-    override fun generateUserCode() = "$webSchoolName:$webUsername:$registerId"
-
    private var mLoginExpiryTime: Long? = null
    var loginExpiryTime: Long
        get() { mLoginExpiryTime = mLoginExpiryTime ?: loginStore.getLoginData("loginExpiryTime", 0L); return mLoginExpiryTime ?: 0L }
@ -130,8 +128,7 @@ class DataIdziennik(app: App, profile: Profile?, loginStore: LoginStore) : Data(
            subjectList.singleOrNull { it.id == id }

        if (subject == null) {
-            subject = Subject(profileId, id
-                    ?: name.crc16().toLong(), name, shortName)
+            subject = Subject(profileId, id ?: name.crc16().toLong(), name, shortName)
            subjectList[subject.id] = subject
        }
        return subject
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/Idziennik.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/Idziennik.kt
@ -17,12 +17,12 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLo
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
-import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.utils.Utils.d

 class Idziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikWeb.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikWeb.kt
@ -41,13 +41,6 @@ open class IdziennikWeb(open val data: DataIdziennik) {
                    return
                }

-                if (response?.code() == HTTP_INTERNAL_ERROR && endpoint == IDZIENNIK_WEB_GET_RECIPIENT_LIST) {
-                    data.error(ApiError(tag, ERROR_IDZIENNIK_WEB_RECIPIENT_LIST_NO_PERMISSION)
-                            .withResponse(response)
-                            .withApiResponse(json))
-                    return
-                }
-
                when {
                    response?.code() == HTTP_UNAUTHORIZED -> ERROR_IDZIENNIK_WEB_ACCESS_DENIED
                    response?.code() == HTTP_INTERNAL_ERROR -> ERROR_IDZIENNIK_WEB_SERVER_ERROR
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiCurrentRegister.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiCurrentRegister.kt
@ -10,8 +10,8 @@ import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_CURRENT_REGISTER
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi
-import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.getInt
 import pl.szczodrzynski.edziennik.getJsonObject
 import pl.szczodrzynski.edziennik.getString
@ -25,6 +25,9 @@ class IdziennikApiCurrentRegister(override val data: DataIdziennik,
    }

    init {
+        data.profile?.luckyNumber = -1
+        data.profile?.luckyNumberDate = null
+
        apiGet(TAG, IDZIENNIK_API_CURRENT_REGISTER) { json ->
            if (json !is JsonObject) {
                onSuccess()
@ -34,9 +37,9 @@ class IdziennikApiCurrentRegister(override val data: DataIdziennik,
            var nextSync = System.currentTimeMillis() + 14*DAY*1000

            val settings = json.getJsonObject("ustawienia")?.apply {
-                getString("poczatekSemestru1")?.let { profile?.dateSemester1Start = Date.fromY_m_d(it) }
-                getString("koniecSemestru1")?.let { profile?.dateSemester2Start = Date.fromY_m_d(it).stepForward(0, 0, 1) }
-                getString("koniecSemestru2")?.let { profile?.dateYearEnd = Date.fromY_m_d(it) }
+                profile?.dateSemester1Start = getString("poczatekSemestru1")?.let { Date.fromY_m_d(it) }
+                profile?.dateSemester2Start = getString("koniecSemestru1")?.let { Date.fromY_m_d(it).stepForward(0, 0, 1) }
+                profile?.dateYearEnd = getString("koniecSemestru2")?.let { Date.fromY_m_d(it) }
            }

            json.getInt("szczesliwyNumerek")?.let { luckyNumber ->
@ -77,7 +80,7 @@ class IdziennikApiCurrentRegister(override val data: DataIdziennik,
                                profileId,
                                Metadata.TYPE_LUCKY_NUMBER,
                                luckyNumberObject.date.value.toLong(),
-                                true,
+                                data.profile?.empty ?: false,
                                data.profile?.empty ?: false,
                                System.currentTimeMillis()
                        ))
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesInbox.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesInbox.kt
@ -10,13 +10,13 @@ import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_MESSAGES_INBOX
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_DELETED
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_DELETED
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.getBoolean
 import pl.szczodrzynski.edziennik.getString
 import pl.szczodrzynski.edziennik.utils.Utils.crc32
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesSent.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesSent.kt
@ -12,10 +12,10 @@ import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_MESSAGES_SENT
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_SENT
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_SENT
-import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.Utils.crc32
 import pl.szczodrzynski.edziennik.utils.models.Date

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAnnouncements.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAnnouncements.kt
@ -12,9 +12,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.Announcement
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.getJsonObject
 import pl.szczodrzynski.edziennik.utils.models.Date

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAttendance.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAttendance.kt
@ -11,10 +11,10 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNI
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.crc16
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.*
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.*
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.getJsonObject
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebExams.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebExams.kt
@ -13,9 +13,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNI
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.models.Date

 class IdziennikWebExams(override val data: DataIdziennik,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetAttachment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetAttachment.kt
@ -9,7 +9,7 @@ import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_ATTACHMENT
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Message
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.get
 import pl.szczodrzynski.edziennik.utils.Utils
 import java.io.File
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetMessage.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetMessage.kt
@ -10,11 +10,11 @@ import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_MESSAGE
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_SENT
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
-import pl.szczodrzynski.edziennik.data.db.full.MessageRecipientFull
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipientFull
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.models.Date

 class IdziennikWebGetMessage(
@ -57,7 +57,7 @@ class IdziennikWebGetMessage(
                        recipientObject.readDate = if (readDateString.isNullOrBlank()) System.currentTimeMillis()
                        else Date.fromIso(readDateString)

-                        recipientObject.fullName = profile.accountName ?: profile.studentNameLong
+                        recipientObject.fullName = profile.accountNameLong ?: profile.studentNameLong

                        data.messageRecipientList.add(recipientObject)
                        message.addRecipient(recipientObject)
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetRecipientList.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetRecipientList.kt
@ -14,7 +14,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.events.RecipientListGetEvent
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher

 class IdziennikWebGetRecipientList(
        override val data: DataIdziennik, val onSuccess: () -> Unit) : IdziennikWeb(data) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGrades.kt
@ -13,9 +13,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNI
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Grade
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.models.Date

 class IdziennikWebGrades(override val data: DataIdziennik,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebHomework.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebHomework.kt
@ -13,9 +13,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNI
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.models.Date

 class IdziennikWebHomework(override val data: DataIdziennik,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebNotices.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebNotices.kt
@ -11,10 +11,10 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNI
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.crc16
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Notice
-import pl.szczodrzynski.edziennik.data.db.entity.Notice.*
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice
+import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice.*
 import pl.szczodrzynski.edziennik.getJsonObject
 import pl.szczodrzynski.edziennik.utils.models.Date

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebProposedGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebProposedGrades.kt
@ -12,11 +12,11 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNI
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Grade
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.TYPE_SEMESTER1_PROPOSED
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.TYPE_YEAR_PROPOSED
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER1_PROPOSED
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_YEAR_PROPOSED
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.getJsonArray
 import pl.szczodrzynski.edziennik.getJsonObject
 import pl.szczodrzynski.edziennik.getString
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebSendMessage.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebSendMessage.kt
@ -13,9 +13,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api.IdziennikApiMessagesSent
 import pl.szczodrzynski.edziennik.data.api.events.MessageSentEvent
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import java.util.*

 class IdziennikWebSendMessage(
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebTimetable.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebTimetable.kt
@ -13,10 +13,10 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNI
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.LessonRange
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Lesson
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
@ -51,13 +51,12 @@ class IdziennikWebTimetable(override val data: DataIdziennik,
                return@webApiGet
            }

-            json.getJsonArray("GodzinyLekcyjne")?.asJsonObjectList()?.forEachIndexed { index, range ->
+            json.getJsonArray("GodzinyLekcyjne")?.asJsonObjectList()?.forEach { range ->
                val lessonRange = LessonRange(
                        profileId,
-                        index + 1,
-                        range.getString("Poczatek")?.let { Time.fromH_m(it) }
-                                ?: return@forEachIndexed,
-                        range.getString("Koniec")?.let { Time.fromH_m(it) } ?: return@forEachIndexed
+                        range.getInt("LiczbaP") ?: return@forEach,
+                        range.getString("Poczatek")?.let { Time.fromH_m(it) } ?: return@forEach,
+                        range.getString("Koniec")?.let { Time.fromH_m(it) } ?: return@forEach
                )
                data.lessonRanges[lessonRange.lessonNumber] = lessonRange
            }
@ -183,7 +182,7 @@ class IdziennikWebTimetable(override val data: DataIdziennik,

            d(TAG, "Clearing lessons between ${weekStart.stringY_m_d} and ${weekEnd.stringY_m_d} - timetable downloaded for $getDate")

-            data.lessonList.addAll(lessons)
+            data.lessonNewList.addAll(lessons)
            data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd))

            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_TIMETABLE, SYNC_ALWAYS)
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/firstlogin/IdziennikFirstLogin.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/firstlogin/IdziennikFirstLogin.kt
@ -7,17 +7,15 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.firstlogin
 import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.data.api.ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR
 import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_SETTINGS
-import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_IDZIENNIK
 import pl.szczodrzynski.edziennik.data.api.Regexes
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLoginWeb
 import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
 import pl.szczodrzynski.edziennik.fixName
 import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.set
 import pl.szczodrzynski.edziennik.swapFirstLastName

 class IdziennikFirstLogin(val data: DataIdziennik, val onSuccess: () -> Unit) {
@ -29,10 +27,6 @@ class IdziennikFirstLogin(val data: DataIdziennik, val onSuccess: () -> Unit) {
    private val profileList = mutableListOf<Profile>()

    init {
-        val loginStoreId = data.loginStore.id
-        val loginStoreType = LOGIN_TYPE_IDZIENNIK
-        var firstProfileId = loginStoreId
-
        IdziennikLoginWeb(data) {
            web.webGet(TAG, IDZIENNIK_WEB_SETTINGS) { text ->
                //val accounts = json.getJsonArray("accounts")
@ -40,15 +34,12 @@ class IdziennikFirstLogin(val data: DataIdziennik, val onSuccess: () -> Unit) {
                val isParent = Regexes.IDZIENNIK_LOGIN_FIRST_IS_PARENT.find(text)?.get(1) != "0"
                val accountNameLong = if (isParent)
                    Regexes.IDZIENNIK_LOGIN_FIRST_ACCOUNT_NAME.find(text)?.get(1)?.swapFirstLastName()?.fixName()
-                else null
+                else
+                    null

-                var schoolYearStart: Int? = null
-                var schoolYearEnd: Int? = null
                var schoolYearName: String? = null
-                val schoolYearId = Regexes.IDZIENNIK_LOGIN_FIRST_SCHOOL_YEAR.find(text)?.let {
-                    schoolYearName = it[2]+"/"+it[3]
-                    schoolYearStart = it[2].toIntOrNull()
-                    schoolYearEnd = it[3].toIntOrNull()
+                val schoolYear = Regexes.IDZIENNIK_LOGIN_FIRST_SCHOOL_YEAR.find(text)?.let {
+                    schoolYearName = it[2]
                    it[1].toIntOrNull()
                } ?: run {
                    data.error(ApiError(TAG, ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR)
@ -66,26 +57,18 @@ class IdziennikFirstLogin(val data: DataIdziennik, val onSuccess: () -> Unit) {
                            val lastName = match[4]
                            val className = match[5] + " " + match[6]

-                            val studentNameLong = "$firstName $lastName".fixName()
-                            val studentNameShort = "$firstName ${lastName[0]}.".fixName()
-                            val accountName = if (accountNameLong == studentNameLong) null else accountNameLong
-
-                            val profile = Profile(
-                                    firstProfileId++,
-                                    loginStoreId,
-                                    loginStoreType,
-                                    studentNameLong,
-                                    data.webUsername,
-                                    studentNameLong,
-                                    studentNameShort,
-                                    accountName
-                            ).apply {
-                                schoolYearStart?.let { studentSchoolYearStart = it }
-                                studentClassName = className
-                                studentData["studentId"] = studentId
-                                studentData["registerId"] = registerId
-                                studentData["schoolYearId"] = schoolYearId
-                            }
+                            val profile = Profile()
+                            profile.studentNameLong = "$firstName $lastName".fixName()
+                            profile.studentNameShort = "$firstName ${lastName[0]}.".fixName()
+                            profile.accountNameLong = accountNameLong
+                            profile.studentClassName = className
+                            profile.studentSchoolYear = schoolYearName
+                            profile.name = profile.studentNameLong
+                            profile.subname = data.webUsername
+                            profile.empty = true
+                            profile.putStudentData("studentId", studentId)
+                            profile.putStudentData("registerId", registerId)
+                            profile.putStudentData("schoolYearId", schoolYear)
                            profileList.add(profile)
                        }

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/DataLibrus.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/DataLibrus.kt
@ -12,8 +12,8 @@ import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_MESSAGES
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_PORTAL
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_SYNERGIA
 import pl.szczodrzynski.edziennik.data.api.models.Data
-import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
 import pl.szczodrzynski.edziennik.isNotNullNorEmpty

 class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
@ -51,8 +51,6 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
        }
    }

-    override fun generateUserCode() = "$schoolName:$apiLogin"
-
    fun getColor(id: Int?): Int {
        return when (id) {
             1 -> 0xFFF0E68C
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/Librus.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/Librus.kt
@ -19,12 +19,12 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLogin
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
-import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.utils.Utils.d

 class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusFeatures.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusFeatures.kt
@ -15,7 +15,6 @@ const val ENDPOINT_LIBRUS_API_UNITS                                    = 1005
 const val ENDPOINT_LIBRUS_API_USERS                                    = 1006
 const val ENDPOINT_LIBRUS_API_SUBJECTS                                 = 1007
 const val ENDPOINT_LIBRUS_API_CLASSROOMS                               = 1008
-const val ENDPOINT_LIBRUS_API_LESSONS                                  = 1009
 const val ENDPOINT_LIBRUS_API_PUSH_CONFIG                              = 1010
 const val ENDPOINT_LIBRUS_API_TIMETABLES                               = 1015
 const val ENDPOINT_LIBRUS_API_SUBSTITUTIONS                            = 1016
@ -58,10 +57,6 @@ const val ENDPOINT_LIBRUS_MESSAGES_GET                                 = 3040

 val LibrusFeatures = listOf(

-        Feature(LOGIN_TYPE_LIBRUS, FEATURE_ALWAYS_NEEDED, listOf(
-                ENDPOINT_LIBRUS_API_LESSONS to LOGIN_METHOD_LIBRUS_API
-        ), listOf(LOGIN_METHOD_LIBRUS_API)),
-
        // push config
        Feature(LOGIN_TYPE_LIBRUS, FEATURE_PUSH_CONFIG, listOf(
                ENDPOINT_LIBRUS_API_PUSH_CONFIG to LOGIN_METHOD_LIBRUS_API
@ -101,8 +96,7 @@ val LibrusFeatures = listOf(
                ENDPOINT_LIBRUS_API_NORMAL_GRADE_CATEGORIES to LOGIN_METHOD_LIBRUS_API,
                ENDPOINT_LIBRUS_API_POINT_GRADE_CATEGORIES to LOGIN_METHOD_LIBRUS_API,
                ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADE_CATEGORIES to LOGIN_METHOD_LIBRUS_API,
-                // Commented out, because TextGrades/Categories is the same as Grades/Categories
-                /* ENDPOINT_LIBRUS_API_TEXT_GRADE_CATEGORIES to LOGIN_METHOD_LIBRUS_API, */
+                ENDPOINT_LIBRUS_API_TEXT_GRADE_CATEGORIES to LOGIN_METHOD_LIBRUS_API,
                ENDPOINT_LIBRUS_API_DESCRIPTIVE_TEXT_GRADE_CATEGORIES to LOGIN_METHOD_LIBRUS_API,
                ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_CATEGORIES to LOGIN_METHOD_LIBRUS_API,
                ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS to LOGIN_METHOD_LIBRUS_API,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusApi.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusApi.kt
@ -26,7 +26,7 @@ open class LibrusApi(open val data: DataLibrus) {
    val profile
        get() = data.profile

-    fun apiGet(tag: String, endpoint: String, method: Int = GET, payload: JsonObject? = null, ignoreErrors: List<Int> = emptyList(), onSuccess: (json: JsonObject) -> Unit) {
+    fun apiGet(tag: String, endpoint: String, method: Int = GET, payload: JsonObject? = null, onSuccess: (json: JsonObject) -> Unit) {

        d(tag, "Request: Librus/Api - ${if (data.fakeLogin) FAKE_LIBRUS_API else LIBRUS_API_URL}/$endpoint")

@ -65,14 +65,12 @@ open class LibrusApi(open val data: DataLibrus) {
                        "Nieprawidłowy węzeł." -> ERROR_LIBRUS_API_INCORRECT_ENDPOINT
                        else -> ERROR_LIBRUS_API_OTHER
                    }.let { errorCode ->
-                        if (errorCode !in ignoreErrors) {
                        data.error(ApiError(tag, errorCode)
                                .withApiResponse(json)
                                .withResponse(response))
                        return
                    }
                }
-                }

                if (json == null) {
                    data.error(ApiError(tag, ERROR_RESPONSE_EMPTY)
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusData.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusData.kt
@ -10,7 +10,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesGetList
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaHomework
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaInfo
-import pl.szczodrzynski.edziennik.data.db.entity.Message
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.utils.Utils

 class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
@ -75,10 +75,6 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
                data.startProgress(R.string.edziennik_progress_endpoint_classrooms)
                LibrusApiClassrooms(data, onSuccess)
            }
-            ENDPOINT_LIBRUS_API_LESSONS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_lessons)
-                LibrusApiLessons(data, onSuccess)
-            }
            // TODO push config
            ENDPOINT_LIBRUS_API_TIMETABLES -> {
                data.startProgress(R.string.edziennik_progress_endpoint_timetable)
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAnnouncementMarkAsRead.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAnnouncementMarkAsRead.kt
@ -5,13 +5,12 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.data.api.ERROR_LIBRUS_API_INVALID_REQUEST_PARAMS
 import pl.szczodrzynski.edziennik.data.api.POST
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.api.events.AnnouncementGetEvent
-import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata

 class LibrusApiAnnouncementMarkAsRead(
        override val data: DataLibrus,
@ -23,8 +22,7 @@ class LibrusApiAnnouncementMarkAsRead(
    }

    init {
-        apiGet(TAG, "SchoolNotices/MarkAsRead/${announcement.idString}", method = POST,
-                ignoreErrors = listOf(ERROR_LIBRUS_API_INVALID_REQUEST_PARAMS)) {
+        apiGet(TAG, "SchoolNotices/MarkAsRead/${announcement.idString}", method = POST) {
            announcement.seen = true

            EventBus.getDefault().postSticky(AnnouncementGetEvent(announcement))
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAnnouncements.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAnnouncements.kt
@ -8,9 +8,9 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_ANNOUNCEMENTS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.Announcement
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.models.Date

 class LibrusApiAnnouncements(override val data: DataLibrus,
@ -21,7 +21,7 @@ class LibrusApiAnnouncements(override val data: DataLibrus,

    init { data.profile?.also { profile ->
        apiGet(TAG, "SchoolNotices") { json ->
-            val announcements = json.getJsonArray("SchoolNotices")?.asJsonObjectList()
+            val announcements = json.getJsonArray("SchoolNotices").asJsonObjectList()

            announcements?.forEach { announcement ->
                val longId = announcement.getString("Id") ?: return@forEach
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendanceTypes.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendanceTypes.kt
@ -9,8 +9,8 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance
-import pl.szczodrzynski.edziennik.data.db.entity.AttendanceType
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceType

 class LibrusApiAttendanceTypes(override val data: DataLibrus,
                               val onSuccess: () -> Unit) : LibrusApi(data) {
@ -20,7 +20,7 @@ class LibrusApiAttendanceTypes(override val data: DataLibrus,

    init {
        apiGet(TAG, "Attendances/Types") { json ->
-            val attendanceTypes = json.getJsonArray("Types")?.asJsonObjectList()
+            val attendanceTypes = json.getJsonArray("Types").asJsonObjectList()

            attendanceTypes?.forEach { attendanceType ->
                val id = attendanceType.getLong("Id") ?: return@forEach
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendances.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendances.kt
@ -9,9 +9,9 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_ATTENDANCES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date

@ -25,35 +25,30 @@ class LibrusApiAttendances(override val data: DataLibrus,
        if (data.attendanceTypes.isEmpty()) {
            data.db.attendanceTypeDao().getAllNow(profileId).toSparseArray(data.attendanceTypes) { it.id }
        }
-        if (data.librusLessons.isEmpty()) {
-            data.db.librusLessonDao().getAllNow(profileId).toSparseArray(data.librusLessons) { it.lessonId }
-        }

        apiGet(TAG, "Attendances") { json ->
-            val attendances = json.getJsonArray("Attendances")?.asJsonObjectList()
+            val attendances = json.getJsonArray("Attendances").asJsonObjectList()

            attendances?.forEach { attendance ->
                val id = Utils.strToInt((attendance.getString("Id") ?: return@forEach)
                        .replace("[^\\d.]".toRegex(), "")).toLong()
-                val lessonId = attendance.getJsonObject("Lesson")?.getLong("Id") ?: -1
+                val teacherId = attendance.getJsonObject("AddedBy")?.getLong("Id") ?: -1
                val lessonNo = attendance.getInt("LessonNo") ?: return@forEach
+                val startTime = data.lessonRanges.get(lessonNo).startTime
                val lessonDate = Date.fromY_m_d(attendance.getString("Date"))
                val semester = attendance.getInt("Semester") ?: return@forEach
                val type = attendance.getJsonObject("Type")?.getLong("Id") ?: return@forEach
                val typeObject = data.attendanceTypes.get(type)
                val topic = typeObject?.name ?: ""

-                val startTime = data.lessonRanges.get(lessonNo).startTime
-
-                val lesson = if (lessonId != -1L)
-                    data.librusLessons.singleOrNull { it.lessonId == lessonId }
-                else null
+                val lessonList = data.db.timetableDao().getForDateNow(profileId, lessonDate)
+                val subjectId = lessonList.firstOrNull { it.startTime == startTime }?.subjectId ?: -1

                val attendanceObject = Attendance(
                        profileId,
                        id,
-                        lesson?.teacherId ?: -1,
-                        lesson?.subjectId ?: -1,
+                        teacherId,
+                        subjectId,
                        semester,
                        topic,
                        lessonDate,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeCategories.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeCategories.kt
@ -9,7 +9,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_CATEGORIES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory

 class LibrusApiBehaviourGradeCategories(override val data: DataLibrus,
                                        val onSuccess: () -> Unit) : LibrusApi(data) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeComments.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeComments.kt
@ -8,8 +8,8 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_COMMENTS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory

 class LibrusApiBehaviourGradeComments(override val data: DataLibrus,
                                      val onSuccess: () -> Unit) : LibrusApi(data) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGrades.kt
@ -9,10 +9,10 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Grade
-import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.models.Date
 import java.text.DecimalFormat

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClasses.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClasses.kt
@ -8,7 +8,7 @@ import pl.szczodrzynski.edziennik.DAY
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_CLASSES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.Team
+import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
 import pl.szczodrzynski.edziennik.getJsonObject
 import pl.szczodrzynski.edziennik.getLong
 import pl.szczodrzynski.edziennik.getString
@ -38,8 +38,6 @@ class LibrusApiClasses(override val data: DataLibrus,
                        teacherId
                )

-                data.profile?.studentClassName = name
-
                data.teamList.put(id, teamObject)

                data.unitId = studentClass.getJsonObject("Unit").getLong("Id") ?: 0L
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClassrooms.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClassrooms.kt
@ -8,7 +8,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_CLASSROOMS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.Classroom
+import pl.szczodrzynski.edziennik.data.db.modules.classrooms.Classroom
 import java.util.*

 class LibrusApiClassrooms(override val data: DataLibrus,
@ -19,7 +19,7 @@ class LibrusApiClassrooms(override val data: DataLibrus,

    init {
        apiGet(TAG, "Classrooms") { json ->
-            val classrooms = json.getJsonArray("Classrooms")?.asJsonObjectList()
+            val classrooms = json.getJsonArray("Classrooms").asJsonObjectList()

            classrooms?.forEach { classroom ->
                val id = classroom.getLong("Id") ?: return@forEach
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiDescriptiveGradeCategories.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiDescriptiveGradeCategories.kt
@ -9,7 +9,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADE_CATEGORIES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory

 class LibrusApiDescriptiveGradeCategories(override val data: DataLibrus,
                                          val onSuccess: () -> Unit) : LibrusApi(data) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiDescriptiveGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiDescriptiveGrades.kt
@ -9,12 +9,12 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Grade
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.TYPE_DESCRIPTIVE_TEXT
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.TYPE_TEXT
-import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_DESCRIPTIVE_TEXT
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_TEXT
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.models.Date

 class LibrusApiDescriptiveGrades(override val data: DataLibrus,
@ -44,7 +44,7 @@ class LibrusApiDescriptiveGrades(override val data: DataLibrus,
                val category = data.gradeCategories.singleOrNull {
                    it.categoryId == categoryId && it.type == when (type) {
                        TYPE_DESCRIPTIVE_TEXT -> GradeCategory.TYPE_DESCRIPTIVE
-                        else -> GradeCategory.TYPE_NORMAL
+                        else -> GradeCategory.TYPE_TEXT
                    }
                }

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEventTypes.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEventTypes.kt
@ -8,7 +8,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_EVENT_TYPES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.EventType
+import pl.szczodrzynski.edziennik.data.db.modules.events.EventType

 class LibrusApiEventTypes(override val data: DataLibrus,
                           val onSuccess: () -> Unit) : LibrusApi(data) {
@ -18,7 +18,7 @@ class LibrusApiEventTypes(override val data: DataLibrus,

    init {
        apiGet(TAG, "HomeWorks/Categories") { json ->
-            val eventTypes = json.getJsonArray("Categories")?.asJsonObjectList()
+            val eventTypes = json.getJsonArray("Categories").asJsonObjectList()

            eventTypes?.forEach { eventType ->
                val id = eventType.getLong("Id") ?: return@forEach
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEvents.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEvents.kt
@ -10,9 +10,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_EVENTS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time

@ -28,7 +28,7 @@ class LibrusApiEvents(override val data: DataLibrus,
        }

        apiGet(TAG, "HomeWorks") { json ->
-            val events = json.getJsonArray("HomeWorks")?.asJsonObjectList()
+            val events = json.getJsonArray("HomeWorks").asJsonObjectList()

            events?.forEach { event ->
                val id = event.getLong("Id") ?: return@forEach
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeCategories.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeCategories.kt
@ -9,8 +9,8 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADE_CATEGORIES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory

 class LibrusApiGradeCategories(override val data: DataLibrus,
                               val onSuccess: () -> Unit) : LibrusApi(data) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeComments.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeComments.kt
@ -8,8 +8,8 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory

 class LibrusApiGradeComments(override val data: DataLibrus,
                             val onSuccess: () -> Unit) : LibrusApi(data) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGrades.kt
@ -5,11 +5,11 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Grade
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.*
-import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.*
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date

@ -21,7 +21,7 @@ class LibrusApiGrades(override val data: DataLibrus,

    init { data.profile?.also { profile ->
        apiGet(TAG, "Grades") { json ->
-            val grades = json.getJsonArray("Grades")?.asJsonObjectList()
+            val grades = json.getJsonArray("Grades").asJsonObjectList()

            grades?.forEach { grade ->
                val id = grade.getLong("Id") ?: return@forEach
@ -32,15 +32,18 @@ class LibrusApiGrades(override val data: DataLibrus,
                val subjectId = grade.getJsonObject("Subject")?.getLong("Id") ?: -1
                val addedDate = Date.fromIso(grade.getString("AddDate"))

-                val category = data.gradeCategories.singleOrNull {
-                    it.categoryId == categoryId && it.type == GradeCategory.TYPE_NORMAL
-                }
-
+                val category = data.gradeCategories.singleOrNull { it.categoryId == categoryId }
+                val categoryName = category?.text ?: ""
+                val color = category?.color ?: -1
+                var weight = category?.weight ?: 0f
                val value = Utils.getGradeValue(name)
-                val weight = if (name == "-" || name == "+"
+
+
+                if (name == "-" || name == "+"
                        || name.equals("np", ignoreCase = true)
-                        || name.equals("bz", ignoreCase = true)) 0f
-                else category?.weight ?: 0f
+                        || name.equals("bz", ignoreCase = true)) {
+                    weight = 0f
+                }

                val description = grade.getJsonArray("Comments")?.asJsonObjectList()?.let { comments ->
                    if (comments.isNotEmpty()) {
@ -54,8 +57,8 @@ class LibrusApiGrades(override val data: DataLibrus,
                val gradeObject = Grade(
                        profileId,
                        id,
-                        category?.text ?: "",
-                        category?.color ?: -1,
+                        categoryName,
+                        color,
                        description,
                        name,
                        value,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiHomework.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiHomework.kt
@ -9,9 +9,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_HOMEWORK
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.models.Date

 class LibrusApiHomework(override val data: DataLibrus,
@ -22,7 +22,7 @@ class LibrusApiHomework(override val data: DataLibrus,

    init {
        apiGet(TAG, "HomeWorkAssignments") { json ->
-            val homeworkList = json.getJsonArray("HomeWorkAssignments")?.asJsonObjectList()
+            val homeworkList = json.getJsonArray("HomeWorkAssignments").asJsonObjectList()

            homeworkList?.forEach { homework ->
                val id = homework.getLong("Id") ?: return@forEach
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLessons.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLessons.kt
@ -1,44 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-1-6.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api
-
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_LESSONS
-import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.LibrusLesson
-
-class LibrusApiLessons(override val data: DataLibrus,
-                     val onSuccess: () -> Unit) : LibrusApi(data) {
-    companion object {
-        const val TAG = "LibrusApiLessons"
-    }
-
-    init {
-        apiGet(TAG, "Lessons") { json ->
-            val lessons = json.getJsonArray("Lessons")?.asJsonObjectList()
-
-            lessons?.forEach { lesson ->
-                val id = lesson.getLong("Id") ?: return@forEach
-                val teacherId = lesson.getJsonObject("Teacher")?.getLong("Id") ?: return@forEach
-                val subjectId = lesson.getJsonObject("Subject")?.getLong("Id") ?: return@forEach
-                val teamId = lesson.getJsonObject("Class")?.getLong("Id")
-
-                val librusLesson = LibrusLesson(
-                        profileId,
-                        id,
-                        teacherId,
-                        subjectId,
-                        teamId
-                )
-
-                data.librusLessons.put(id, librusLesson)
-            }
-
-            data.setSyncNext(ENDPOINT_LIBRUS_API_LESSONS, 4*DAY)
-            onSuccess()
-        }
-    }
-}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLuckyNumber.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLuckyNumber.kt
@ -8,8 +8,8 @@ import pl.szczodrzynski.edziennik.DAY
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_LUCKY_NUMBER
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.getInt
 import pl.szczodrzynski.edziennik.getJsonObject
 import pl.szczodrzynski.edziennik.getString
@ -23,6 +23,9 @@ class LibrusApiLuckyNumber(override val data: DataLibrus,
    }

    init {
+        data.profile?.luckyNumber = -1
+        data.profile?.luckyNumberDate = null
+
        var nextSync = System.currentTimeMillis() + 2*DAY*1000

        apiGet(TAG, "LuckyNumbers") { json ->
@ -49,7 +52,7 @@ class LibrusApiLuckyNumber(override val data: DataLibrus,
                                    profileId,
                                    Metadata.TYPE_LUCKY_NUMBER,
                                    luckyNumberObject.date.value.toLong(),
-                                    true,
+                                    profile?.empty ?: false,
                                    profile?.empty ?: false,
                                    System.currentTimeMillis()
                            ))
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiMe.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiMe.kt
@ -24,7 +24,7 @@ class LibrusApiMe(override val data: DataLibrus,
            data.isPremium = account?.getBoolean("IsPremium") == true || account?.getBoolean("IsPremiumDemo") == true

            val isParent = account?.getInt("GroupId") == 5
-            data.profile?.accountName =
+            data.profile?.accountNameLong =
                    if (isParent)
                        buildFullName(account?.getString("FirstName"), account?.getString("LastName"))
                    else null
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNoticeTypes.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNoticeTypes.kt
@ -8,7 +8,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NOTICE_TYPES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.NoticeType
+import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeType

 class LibrusApiNoticeTypes(override val data: DataLibrus,
                               val onSuccess: () -> Unit) : LibrusApi(data) {
@ -18,7 +18,7 @@ class LibrusApiNoticeTypes(override val data: DataLibrus,

    init {
        apiGet(TAG, "Notes/Categories") { json ->
-            val noticeTypes = json.getJsonArray("Categories")?.asJsonObjectList()
+            val noticeTypes = json.getJsonArray("Categories").asJsonObjectList()

            noticeTypes?.forEach { noticeType ->
                val id = noticeType.getLong("Id") ?: return@forEach
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNotices.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNotices.kt
@ -9,9 +9,9 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NOTICES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Notice
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice
 import pl.szczodrzynski.edziennik.utils.models.Date

 class LibrusApiNotices(override val data: DataLibrus,
@ -26,7 +26,7 @@ class LibrusApiNotices(override val data: DataLibrus,
        }

        apiGet(TAG, "Notes") { json ->
-            val notes = json.getJsonArray("Notes")?.asJsonObjectList()
+            val notes = json.getJsonArray("Notes").asJsonObjectList()

            notes?.forEach { note ->
                val id = note.getLong("Id") ?: return@forEach
@ -46,7 +46,7 @@ class LibrusApiNotices(override val data: DataLibrus,
                val noticeObject = Notice(
                        profileId,
                        id,
-                        categoryText + "\n" + text,
+                        categoryText+"\n"+text,
                        semester,
                        type,
                        teacherId
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPointGradeCategories.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPointGradeCategories.kt
@ -9,7 +9,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_POINT_GRADE_CATEGORIES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory

 class LibrusApiPointGradeCategories(override val data: DataLibrus,
                                    val onSuccess: () -> Unit) : LibrusApi(data) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPointGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPointGrades.kt
@ -9,11 +9,11 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_POINT_GRADES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Grade
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.TYPE_POINT_AVG
-import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_POINT_AVG
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.models.Date

 class LibrusApiPointGrades(override val data: DataLibrus,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPtMeetings.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPtMeetings.kt
@ -9,8 +9,8 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_PT_MEETINGS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time

@ -22,7 +22,7 @@ class LibrusApiPtMeetings(override val data: DataLibrus,

    init {
        apiGet(TAG, "ParentTeacherConferences") { json ->
-            val ptMeetings = json.getJsonArray("ParentTeacherConferences")?.asJsonObjectList()
+            val ptMeetings = json.getJsonArray("ParentTeacherConferences").asJsonObjectList()

            ptMeetings?.forEach { meeting ->
                val id = meeting.getLong("Id") ?: return@forEach
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSchools.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSchools.kt
@ -8,7 +8,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_SCHOOLS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.LessonRange
+import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange
 import pl.szczodrzynski.edziennik.utils.models.Time
 import java.util.*

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSubjects.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSubjects.kt
@ -8,7 +8,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_SUBJECTS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.Subject
+import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject

 class LibrusApiSubjects(override val data: DataLibrus,
                              val onSuccess: () -> Unit) : LibrusApi(data) {
@ -18,7 +18,7 @@ class LibrusApiSubjects(override val data: DataLibrus,

    init {
        apiGet(TAG, "Subjects") { json ->
-            val subjects = json.getJsonArray("Subjects")?.asJsonObjectList()
+            val subjects = json.getJsonArray("Subjects").asJsonObjectList()

            subjects?.forEach { subject ->
                val id = subject.getLong("Id") ?: return@forEach
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDayTypes.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDayTypes.kt
@ -8,7 +8,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.TeacherAbsenceType
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceType

 class LibrusApiTeacherFreeDayTypes(override val data: DataLibrus,
                                   val onSuccess: () -> Unit) : LibrusApi(data) {
@ -18,7 +18,7 @@ class LibrusApiTeacherFreeDayTypes(override val data: DataLibrus,

    init {
        apiGet(TAG, "TeacherFreeDays/Types") { json ->
-            val teacherAbsenceTypes = json.getJsonArray("Types")?.asJsonObjectList()
+            val teacherAbsenceTypes = json.getJsonArray("Types").asJsonObjectList()

            teacherAbsenceTypes?.forEach { teacherAbsenceType ->
                val id = teacherAbsenceType.getLong("Id") ?: return@forEach
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDays.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDays.kt
@ -10,8 +10,8 @@ import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.TeacherAbsence
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsence
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time

@ -27,7 +27,7 @@ class LibrusApiTeacherFreeDays(override val data: DataLibrus,
        }

        apiGet(TAG, "TeacherFreeDays") { json ->
-            val teacherAbsences = json.getJsonArray("TeacherFreeDays")?.asJsonObjectList()
+            val teacherAbsences = json.getJsonArray("TeacherFreeDays").asJsonObjectList()

            teacherAbsences?.forEach { teacherAbsence ->
                val id = teacherAbsence.getLong("Id") ?: return@forEach
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTextGradeCategories.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTextGradeCategories.kt
@ -9,7 +9,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_TEXT_GRADE_CATEGORIES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory

 class LibrusApiTextGradeCategories(override val data: DataLibrus,
                                   val onSuccess: () -> Unit) : LibrusApi(data) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTextGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTextGrades.kt
@ -9,11 +9,11 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_TEXT_GRADES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Grade
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.TYPE_DESCRIPTIVE
-import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_DESCRIPTIVE
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.models.Date

 class LibrusApiTextGrades(override val data: DataLibrus,
@ -30,12 +30,7 @@ class LibrusApiTextGrades(override val data: DataLibrus,
                val teacherId = grade.getJsonObject("AddedBy")?.getLong("Id") ?: return@forEach
                val semester = grade.getInt("Semester") ?: return@forEach
                val subjectId = grade.getJsonObject("Subject")?.getLong("Id") ?: return@forEach
-
-                val map = grade.getString("Map")
-                val realValue = grade.getString("RealGradeValue")
-
-                val name = map ?: realValue ?: return@forEach
-                val description = if (map != null && map != realValue) realValue ?: "" else ""
+                val description = grade.getString("RealGradeValue") ?: grade.getString("Map") ?: ""

                val categoryId = grade.getJsonObject("Skill")?.getLong("Id") ?: return@forEach

@ -50,8 +45,8 @@ class LibrusApiTextGrades(override val data: DataLibrus,
                        id,
                        category?.text ?: "",
                        category?.color ?: -1,
+                        "",
                        description,
-                        name,
                        0f,
                        0f,
                        semester,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTimetables.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTimetables.kt
@ -11,9 +11,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_TIMETABLES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Lesson
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
@ -60,7 +60,7 @@ class LibrusApiTimetables(override val data: DataLibrus,
                }

                if (day.isNullOrEmpty() || !lessonsFound) {
-                    data.lessonList.add(Lesson(profileId, lessonDate.value.toLong()).apply {
+                    data.lessonNewList.add(Lesson(profileId, lessonDate.value.toLong()).apply {
                        type = Lesson.TYPE_NO_LESSONS
                        date = lessonDate
                    })
@ -200,6 +200,6 @@ class LibrusApiTimetables(override val data: DataLibrus,
                            System.currentTimeMillis()
                    ))
        }
-        data.lessonList.add(lessonObject)
+        data.lessonNewList.add(lessonObject)
    }}
 }
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUnits.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUnits.kt
@ -23,7 +23,7 @@ class LibrusApiUnits(override val data: DataLibrus,
        }

        apiGet(TAG, "Units") { json ->
-            val units = json.getJsonArray("Units")?.asJsonObjectList()
+            val units = json.getJsonArray("Units").asJsonObjectList()

            units?.singleOrNull { it.getLong("Id") == data.unitId }?.also { unit ->
                val startPoints = unit.getJsonObject("BehaviourGradesSettings")?.getJsonObject("StartPoints")
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUsers.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUsers.kt
@ -8,7 +8,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_USERS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher

 class LibrusApiUsers(override val data: DataLibrus,
                        val onSuccess: () -> Unit) : LibrusApi(data) {
@ -18,7 +18,7 @@ class LibrusApiUsers(override val data: DataLibrus,

    init {
        apiGet(TAG, "Users") { json ->
-            val users = json.getJsonArray("Users")?.asJsonObjectList()
+            val users = json.getJsonArray("Users").asJsonObjectList()

            users?.forEach { user ->
                val id = user.getLong("Id") ?: return@forEach
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiVirtualClasses.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiVirtualClasses.kt
@ -8,7 +8,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.Team
+import pl.szczodrzynski.edziennik.data.db.modules.teams.Team

 class LibrusApiVirtualClasses(override val data: DataLibrus,
                       val onSuccess: () -> Unit) : LibrusApi(data) {
@ -18,7 +18,7 @@ class LibrusApiVirtualClasses(override val data: DataLibrus,

    init {
        apiGet(TAG, "VirtualClasses") { json ->
-            val virtualClasses = json.getJsonArray("VirtualClasses")?.asJsonObjectList()
+            val virtualClasses = json.getJsonArray("VirtualClasses").asJsonObjectList()

            virtualClasses?.forEach { virtualClass ->
                val id = virtualClass.getLong("Id") ?: return@forEach
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetAttachment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetAttachment.kt
@ -15,7 +15,7 @@ import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
 import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent.Companion.TYPE_FINISHED
 import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent.Companion.TYPE_PROGRESS
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.Message
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.get
 import pl.szczodrzynski.edziennik.getString
 import pl.szczodrzynski.edziennik.utils.Utils
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetList.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetList.kt
@ -11,12 +11,12 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_MESSAGES_RECEIVED
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_MESSAGES_SENT
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.fixName
 import pl.szczodrzynski.edziennik.singleOrNull
 import pl.szczodrzynski.edziennik.utils.Utils
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetMessage.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetMessage.kt
@ -9,12 +9,12 @@ import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
 import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_SENT
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
-import pl.szczodrzynski.edziennik.data.db.full.MessageRecipientFull
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipientFull
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.fixName
 import pl.szczodrzynski.edziennik.isNotNullNorEmpty
 import pl.szczodrzynski.edziennik.notEmptyOrNull
@ -110,7 +110,7 @@ class LibrusMessagesGetMessage(
                            messageObject.id
                    )

-                    messageRecipientObject.fullName = profile.accountName ?: profile.studentNameLong ?: ""
+                    messageRecipientObject.fullName = profile.accountNameLong ?: profile.studentNameLong ?: ""

                    messageRecipientList.add(messageRecipientObject)
                }
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetRecipientList.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetRecipientList.kt
@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
 import pl.szczodrzynski.edziennik.data.api.events.RecipientListGetEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher

 class LibrusMessagesGetRecipientList(
        override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusMessages(data) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesSendMessage.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesSendMessage.kt
@ -9,9 +9,9 @@ import pl.szczodrzynski.edziennik.base64Encode
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
 import pl.szczodrzynski.edziennik.data.api.events.MessageSentEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.getJsonObject
 import pl.szczodrzynski.edziennik.getLong
 import pl.szczodrzynski.edziennik.getString
--- a/Show more
+++ b/Show more