diff --git a/.gitignore b/.gitignore
index 047ad745..ef057948 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ captures/
 .idea/modules.xml
 # Comment next line if keeping position of elements in Navigation Editor is relevant for you
 .idea/navEditor.xml
+.idea/copyright/profiles_settings.xml
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.
@@ -80,3 +81,5 @@ lint/generated/
 lint/outputs/
 lint/tmp/
 # lint/reports/
+
+app/schemas/
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index 61f16974..00000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="kubasz" />
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f834a4ed..e4b2b0ee 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,6 +5,12 @@
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
     </configurations>
   </component>
+  <component name="EntryPointsManager">
+    <list size="2">
+      <item index="0" class="java.lang.String" itemvalue="androidx.databinding.BindingAdapter" />
+      <item index="1" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
+    </list>
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
     <option name="myDefaultNotNull" value="androidx.annotation.RecentlyNonNull" />
diff --git a/agendacalendarview/build.gradle b/agendacalendarview/build.gradle
index 28cbb26d..824ce517 100644
--- a/agendacalendarview/build.gradle
+++ b/agendacalendarview/build.gradle
@@ -49,6 +49,6 @@ dependencies {
 
     // other libraries
     //implementation 'se.emilsjolander:stickylistheaders:2.7.0'
-    implementation 'com.github.edisonw:StickyListHeaders:master-SNAPSHOT'
+    implementation 'com.github.edisonw:StickyListHeaders:master-SNAPSHOT@aar'
     implementation 'io.reactivex:rxjava:1.1.1'
 }
diff --git a/app/build.gradle b/app/build.gradle
index 3abf1031..11c43b78 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -131,7 +131,7 @@ dependencies {
     implementation("com.github.ozodrukh:CircularReveal:2.0.1@aar") {transitive = true}
     implementation "com.heinrichreimersoftware:material-intro:1.5.8" // do not update
     implementation "com.jaredrummler:colorpicker:1.0.2"
-    implementation "com.squareup.okhttp3:okhttp:3.12.0"
+    implementation "com.squareup.okhttp3:okhttp:3.12.2"
     implementation "com.theartofdev.edmodo:android-image-cropper:2.8.0" // do not update
     implementation "com.wdullaer:materialdatetimepicker:4.1.2"
     implementation "com.yuyh.json:jsonviewer:1.0.6"
@@ -142,7 +142,7 @@ dependencies {
     implementation "org.jsoup:jsoup:1.10.1"
     implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.15"
     //implementation "se.emilsjolander:stickylistheaders:2.7.0"
-    implementation 'com.github.edisonw:StickyListHeaders:master-SNAPSHOT'
+    implementation 'com.github.edisonw:StickyListHeaders:master-SNAPSHOT@aar'
     implementation "uk.co.samuelwall:material-tap-target-prompt:2.14.0"
 
     implementation project(":agendacalendarview")
@@ -152,6 +152,24 @@ dependencies {
     implementation project(":nachos")
     //implementation project(":Navigation")
     implementation project(":szkolny-font")
+
+    debugImplementation "com.github.ChuckerTeam.Chucker:library:3.0.1"
+    releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:3.0.1"
+
+    //implementation 'com.github.wulkanowy:uonet-request-signer:master-SNAPSHOT'
+    //implementation 'com.github.kuba2k2.uonet-request-signer:android:master-63f094b14a-1'
+
+    //implementation "org.redundent:kotlin-xml-builder:1.5.3"
+
+    implementation "io.github.wulkanowy:signer-android:0.1.1"
+
+    implementation "androidx.work:work-runtime-ktx:${versions.work}"
+
+    implementation 'com.hypertrack:hyperlog:0.0.10'
+
+    implementation 'com.github.kuba2k2:RecyclerTabLayout:700f980584'
+
+    implementation 'com.github.kuba2k2:Tachyon:551943a6b5'
 }
 repositories {
     mavenCentral()
diff --git a/app/proguard/app.pro b/app/proguard/app.pro
index 162b8fa9..aeecf18d 100644
--- a/app/proguard/app.pro
+++ b/app/proguard/app.pro
@@ -39,4 +39,13 @@
 
 -keep class okhttp3.** { *; }
 
--keep class com.google.android.material.tabs.** {*;}
\ No newline at end of file
+-keep class com.google.android.material.tabs.** {*;}
+
+# ServiceLoader support
+        -keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
+-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+
+# Most of volatile fields are updated with AFU and should not be mangled
+-keepclassmembernames class kotlinx.** {
+    volatile <fields>;
+}
\ No newline at end of file
diff --git a/app/sampledata/check/ic_check.xml b/app/sampledata/check/ic_check.xml
new file mode 100644
index 00000000..f621023c
--- /dev/null
+++ b/app/sampledata/check/ic_check.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF4caf50"
+      android:pathData="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z"/>
+</vector>
diff --git a/app/sampledata/settings/ic_settings.xml b/app/sampledata/settings/ic_settings.xml
new file mode 100644
index 00000000..efaaa4ee
--- /dev/null
+++ b/app/sampledata/settings/ic_settings.xml
@@ -0,0 +1,13 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-25.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,8A4,4 0,0 1,16 12A4,4 0,0 1,12 16A4,4 0,0 1,8 12A4,4 0,0 1,12 8M12,10A2,2 0,0 0,10 12A2,2 0,0 0,12 14A2,2 0,0 0,14 12A2,2 0,0 0,12 10M10,22C9.75,22 9.54,21.82 9.5,21.58L9.13,18.93C8.5,18.68 7.96,18.34 7.44,17.94L4.95,18.95C4.73,19.03 4.46,18.95 4.34,18.73L2.34,15.27C2.21,15.05 2.27,14.78 2.46,14.63L4.57,12.97L4.5,12L4.57,11L2.46,9.37C2.27,9.22 2.21,8.95 2.34,8.73L4.34,5.27C4.46,5.05 4.73,4.96 4.95,5.05L7.44,6.05C7.96,5.66 8.5,5.32 9.13,5.07L9.5,2.42C9.54,2.18 9.75,2 10,2H14C14.25,2 14.46,2.18 14.5,2.42L14.87,5.07C15.5,5.32 16.04,5.66 16.56,6.05L19.05,5.05C19.27,4.96 19.54,5.05 19.66,5.27L21.66,8.73C21.79,8.95 21.73,9.22 21.54,9.37L19.43,11L19.5,12L19.43,13L21.54,14.63C21.73,14.78 21.79,15.05 21.66,15.27L19.66,18.73C19.54,18.95 19.27,19.04 19.05,18.95L16.56,17.95C16.04,18.34 15.5,18.68 14.87,18.93L14.5,21.58C14.46,21.82 14.25,22 14,22H10M11.25,4L10.88,6.61C9.68,6.86 8.62,7.5 7.85,8.39L5.44,7.35L4.69,8.65L6.8,10.2C6.4,11.37 6.4,12.64 6.8,13.8L4.68,15.36L5.43,16.66L7.86,15.62C8.63,16.5 9.68,17.14 10.87,17.38L11.24,20H12.76L13.13,17.39C14.32,17.14 15.37,16.5 16.14,15.62L18.57,16.66L19.32,15.36L17.2,13.81C17.6,12.64 17.6,11.37 17.2,10.2L19.31,8.65L18.56,7.35L16.15,8.39C15.38,7.5 14.32,6.86 13.12,6.62L12.75,4H11.25Z"/>
+</vector>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 991589de..d842cb6d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,10 +15,14 @@
         android:theme="@style/SplashTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="UnusedAttribute">
+        <activity
+            android:name=".ui.modules.login.LoginLibrusCaptchaActivity"
+            android:theme="@android:style/Theme.Dialog"
+            android:excludeFromRecents="true"/>
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name"
             android:configChanges="orientation|screenSize"
+            android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/SplashTheme">
             <intent-filter>
@@ -29,7 +33,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeActivity"
+            android:name=".ui.modules.messages.MessagesComposeActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/messages_compose_title"
             android:theme="@style/AppTheme.Black" />
@@ -39,7 +43,7 @@
             android:label="@string/app_name"
             android:theme="@style/AppTheme" />
         <activity
-            android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity"
+            android:name=".ui.modules.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.Light" />
@@ -101,22 +105,23 @@
             android:excludeFromRecents="true"
             android:noHistory="true"
             android:theme="@style/AppTheme.NoDisplay" />
-
+        <activity android:name=".widgets.timetable.LessonDialogActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:theme="@style/AppTheme.NoDisplay" />
         <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.CounterActivity"
             android:theme="@style/AppTheme.Black" />
@@ -169,7 +174,6 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_notifications_info" />
         </receiver>
-
         <receiver
             android:name=".widgets.luckynumber.WidgetLuckyNumber"
             android:label="@string/widget_lucky_number_title">
@@ -188,7 +192,6 @@
                 <action android:name="android.intent.action.USER_PRESENT" />
             </intent-filter>
         </receiver>
-
         <receiver android:name=".receivers.BootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -196,6 +199,24 @@
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
+
+        <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"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="pl.szczodrzynski.edziennik.SZKOLNY_MAIN" />
+            </intent-filter>
+        </receiver>
+
         <service
             android:name=".sync.MyFirebaseMessagingService"
             android:exported="false">
@@ -214,10 +235,7 @@
 
         <service android:name=".Notifier$GetDataRetryService" />
 
-        <service
-            android:name=".sync.SyncService"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/sync_service" />
+        <service android:name=".api.v2.ApiService" />
     </application>
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -231,4 +249,4 @@
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/assets/pl-changelog.html b/app/src/main/assets/pl-changelog.html
index eab231b6..d44c0246 100644
--- a/app/src/main/assets/pl-changelog.html
+++ b/app/src/main/assets/pl-changelog.html
@@ -31,57 +31,11 @@
 </head>
 <body>
 
-<h3>Wersja 3.1.1, 2019-10-09</h3>
+<h3>Wersja 4.0, 2019-jeszcze-nie-wiem-kiedy</h3>
 <ul>
-    <li>Librus: poprawiona synchronizacja kategorii i kolorów ocen.</li>
-    <li>Zmieniony kolor dolnego paska w ciemnym motywie.</li>
-    <li>Zaktualizowany licznik czasu lekcji.</li>
-</ul>
-
-<h3>Wersja 3.1, 2019-09-29</h3>
-<ul>
-    <li>Poprawiony interfejs zadań domowych.</li>
-    <li>Librus: wyświetlanie komentarzy ocen.</li>
-    <li>Librus: wyświetlanie nieobecności nauczycieli w Terminarzu.</li>
-    <li>Librus: usprawniona synchronizacja ocen.</li>
-    <li>Poprawki angielskiego tłumaczenia.</li>
-</ul>
-
-<h3>Wersja 3.0.3, 2019-09-26</h3>
-<ul>
-    <li>Librus: poprawka kilku błędów synchronizacji.</li>
-    <li>Vulcan: prawidłowe oznaczanie wiadomości jako przeczytana.</li>
-    <li>Vulcan: poprawiona synchronizacja wiadomości i frekwencji.</li>
-    <li>Vulcan: poprawka błędów logowania.</li>
-</ul>
-
-<h3>Wersja 3.0.2, 2019-09-24</h3>
-<ul>
-    <li>Librus: pobieranie Bieżących ocen opisowych.</li>
-    <li>Poprawki UI: kolor ikon paska statusu w jasnym motywie.</li>
-    <li>Poprawka braku skanera QR do przekazywania powiadomień.</li>
-    <li>Poprawka wyboru koloru i daty własnego wydarzenia, które crashowały aplikację.</li>
-</ul>
-
-<h3>Wersja 3.0.1, 2019-09-19</h3>
-<ul>
-    <li>Librus: Poprawa błędu synchronizacji.</li>
-    <li>Poprawki UI związane z paskiem nawigacji.</li>
-    <li>Mobidziennik: Pobieranie ocen w niektórych przedmiotach.</li>
-</ul>
-
-<h3>Wersja 3.0, 2019-09-13</h3>
-<ul>
-    <li><b>Nowy wygląd i sposób nawigacji</b> w całej aplikacji.</li>
-    <li>Menu nawigacji można teraz otworzyć przyciskiem na <b>dolnym pasku</b>. Pociągnięcie w górę tego paska wyświetla <b>menu kontekstowe</b> dotyczące danego widoku.</li>
-    <li>Założyliśmy serwer Discord! <a href="https://discord.gg/n9e8pWr">https://discord.gg/n9e8pWr</a></li>
-    <br>
-    <li>Librus: poprawka powielonych ogłoszeń szkolnych.</li>
-    <li>Naprawiłem błąd nieskończonej synchronizacji w Vulcanie.</li>
-    <li>Naprawiłem crash launchera przy dodaniu widgetu.</li>
-    <li>Naprawiłem częste crashe związane z widokiem kalendarza.</li>
-    <li>Nowe, ładniejsze (choć trochę) motywy kolorów.</li>
-    <li>Dużo drobnych poprawek UI i działania aplikacji.</li>
+    <li>UWAGA. To jest wersja in-development. Wiele funkcji może nie działać prawidłowo (lub wcale), co oznacza tylko że nie zostały jeszcze przeniesione
+    z wersji 3.x. Proszę o cierpliwość oraz <b>nie udostępnianie</b> tej wersji <u>nikomu</u>.</li>
+    <li>Bardzo dużo zmian</li>
 </ul>
 
 <!--<i>
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/App.java b/app/src/main/java/pl/szczodrzynski/edziennik/App.java
index afb44fda..b975aff9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/App.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.java
@@ -20,7 +20,13 @@ import android.util.Base64;
 import android.util.Log;
 import android.util.Pair;
 
-import com.evernote.android.job.JobManager;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.work.Configuration;
+
+import com.chuckerteam.chucker.api.ChuckerCollector;
+import com.chuckerteam.chucker.api.ChuckerInterceptor;
+import com.chuckerteam.chucker.api.RetentionManager;
 import com.google.android.gms.security.ProviderInstaller;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
@@ -30,6 +36,7 @@ import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
+import com.hypertrack.hyperlog.HyperLog;
 import com.mikepenz.iconics.Iconics;
 import com.mikepenz.iconics.IconicsColor;
 import com.mikepenz.iconics.IconicsDrawable;
@@ -52,8 +59,6 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
-import androidx.annotation.RequiresApi;
-import androidx.appcompat.app.AppCompatDelegate;
 import cat.ereza.customactivityoncrash.config.CaocConfig;
 import im.wangchao.mhttp.MHttp;
 import im.wangchao.mhttp.internal.cookie.PersistentCookieJar;
@@ -63,34 +68,38 @@ import me.leolin.shortcutbadger.ShortcutBadger;
 import okhttp3.ConnectionSpec;
 import okhttp3.OkHttpClient;
 import okhttp3.TlsVersion;
-import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity;
-import pl.szczodrzynski.edziennik.data.api.Edziennik;
-import pl.szczodrzynski.edziennik.data.api.Iuczniowie;
-import pl.szczodrzynski.edziennik.data.api.Librus;
-import pl.szczodrzynski.edziennik.data.api.Mobidziennik;
-import pl.szczodrzynski.edziennik.data.api.Vulcan;
 import pl.szczodrzynski.edziennik.data.db.AppDb;
 import pl.szczodrzynski.edziennik.data.db.modules.debuglog.DebugLog;
 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.profiles.ProfileFull;
-import pl.szczodrzynski.edziennik.utils.models.AppConfig;
 import pl.szczodrzynski.edziennik.network.NetworkUtils;
 import pl.szczodrzynski.edziennik.network.TLSSocketFactory;
-import pl.szczodrzynski.edziennik.receivers.JobsCreator;
-import pl.szczodrzynski.edziennik.sync.SyncJob;
+import pl.szczodrzynski.edziennik.sync.SyncWorker;
+import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity;
+import pl.szczodrzynski.edziennik.utils.DebugLogFormat;
 import pl.szczodrzynski.edziennik.utils.PermissionChecker;
 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.modules.login.LoginStore.LOGIN_TYPE_LIBRUS;
 import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_MOBIDZIENNIK;
 import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_VULCAN;
 
-public class App extends androidx.multidex.MultiDexApplication {
+public class App extends androidx.multidex.MultiDexApplication implements Configuration.Provider {
     private static final String TAG = "App";
     public static int profileId = -1;
     private Context mContext;
 
+    @Override
+    public Configuration getWorkManagerConfiguration() {
+        return new Configuration.Builder()
+                .setMinimumLoggingLevel(Log.VERBOSE)
+                .build();
+    }
+
+
     public static final int REQUEST_TIMEOUT = 10 * 1000;
 
     // notifications
@@ -127,12 +136,6 @@ public class App extends androidx.multidex.MultiDexApplication {
     public PersistentCookieJar cookieJar;
     public OkHttpClient http;
     public OkHttpClient httpLazy;
-    //public Jakdojade apiJakdojade;
-    public Edziennik apiEdziennik;
-    public Mobidziennik apiMobidziennik;
-    public Iuczniowie apiIuczniowie;
-    public Librus apiLibrus;
-    public Vulcan apiVulcan;
 
     public SharedPreferences appSharedPrefs; // sharedPreferences for APPCONFIG + JOBS STORE
     public AppConfig appConfig; // APPCONFIG: common for all profiles
@@ -190,12 +193,6 @@ public class App extends androidx.multidex.MultiDexApplication {
         db = AppDb.getDatabase(this);
         gson = new Gson();
         networkUtils = new NetworkUtils(this);
-        apiEdziennik = new Edziennik(this);
-        //apiJakdojade = new Jakdojade(this);
-        apiMobidziennik = new Mobidziennik(this);
-        apiIuczniowie = new Iuczniowie(this);
-        apiLibrus = new Librus(this);
-        apiVulcan = new Vulcan(this);
 
         Iconics.init(getApplicationContext());
         Iconics.registerFont(SzkolnyFont.INSTANCE);
@@ -207,6 +204,33 @@ public class App extends androidx.multidex.MultiDexApplication {
 
         cookieJar = new PersistentCookieJar(new SetCookieCache(), new SharedPrefsCookiePersistor(this));
 
+        appSharedPrefs = getSharedPreferences(getString(R.string.preference_file_global), Context.MODE_PRIVATE);
+
+        loadConfig();
+
+        Themes.INSTANCE.setThemeInt(appConfig.appTheme);
+
+        try {
+            PackageInfo packageInfo = getPackageManager().getPackageInfo(getPackageName(), PackageManager.GET_SIGNATURES);
+            for (Signature signature: packageInfo.signatures) {
+                byte[] signatureBytes = signature.toByteArray();
+                MessageDigest md = MessageDigest.getInstance("SHA");
+                md.update(signatureBytes);
+                this.signature = Base64.encodeToString(md.digest(), Base64.DEFAULT);
+                //Log.d(TAG, "Signature is "+this.signature);
+            }
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        if ("f054761fbdb6a238".equals(deviceId) || BuildConfig.DEBUG) {
+            devMode = true;
+        }
+        else if (appConfig.devModePassword != null) {
+            checkDevModePassword();
+        }
+
         OkHttpClient.Builder httpBuilder = new OkHttpClient.Builder()
                 .cache(null)
                 .followRedirects(true)
@@ -254,6 +278,16 @@ public class App extends androidx.multidex.MultiDexApplication {
             }
         }
 
+        if (App.devMode || BuildConfig.DEBUG) {
+            HyperLog.initialize(this);
+            HyperLog.setLogLevel(Log.VERBOSE);
+            HyperLog.setLogFormat(new DebugLogFormat(this));
+
+            ChuckerCollector chuckerCollector = new ChuckerCollector(this, true, RetentionManager.Period.ONE_HOUR);
+            ChuckerInterceptor chuckerInterceptor = new ChuckerInterceptor(this, chuckerCollector);
+            httpBuilder.addInterceptor(chuckerInterceptor);
+        }
+
         http = httpBuilder.build();
         httpLazy = http.newBuilder().followRedirects(false).followSslRedirects(false).build();
 
@@ -262,41 +296,13 @@ public class App extends androidx.multidex.MultiDexApplication {
 
         //register = new Register(mContext);
 
-        appSharedPrefs = getSharedPreferences(getString(R.string.preference_file_global), Context.MODE_PRIVATE);
-
-        loadConfig();
-
-        Themes.INSTANCE.setThemeInt(appConfig.appTheme);
-
         //profileLoadById(appSharedPrefs.getInt("current_profile_id", 1));
 
-        try {
-            PackageInfo packageInfo = getPackageManager().getPackageInfo(getPackageName(), PackageManager.GET_SIGNATURES);
-            for (Signature signature: packageInfo.signatures) {
-                byte[] signatureBytes = signature.toByteArray();
-                MessageDigest md = MessageDigest.getInstance("SHA");
-                md.update(signatureBytes);
-                this.signature = Base64.encodeToString(md.digest(), Base64.DEFAULT);
-                //Log.d(TAG, "Signature is "+this.signature);
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        if ("f054761fbdb6a238".equals(deviceId)) {
-            devMode = true;
-        }
-        else if (appConfig.devModePassword != null) {
-            checkDevModePassword();
-        }
-
-        JobManager.create(this).addJobCreator(new JobsCreator());
         if (appConfig.registerSyncEnabled) {
-            SyncJob.schedule(this);
+            SyncWorker.Companion.scheduleNext(this, false);
         }
         else {
-            SyncJob.clear();
+            SyncWorker.Companion.cancelNext(this);
         }
 
         db.metadataDao().countUnseen().observeForever(count -> {
@@ -400,20 +406,20 @@ public class App extends androidx.multidex.MultiDexApplication {
             FirebaseApp pushMobidziennikApp = FirebaseApp.initializeApp(
                     this,
                     new FirebaseOptions.Builder()
-                            .setApplicationId("1:1029629079999:android:58bb378dab031f42")
-                            .setGcmSenderId("1029629079999")
+                            .setApiKey("AIzaSyCi5LmsZ5BBCQnGtrdvWnp1bWLCNP8OWQE")
+                            .setApplicationId("1:747285019373:android:f6341bf7b158621d")
                             .build(),
-                    "Mobidziennik"
+                    "Mobidziennik2"
             );
 
-            /*FirebaseApp pushLibrusApp = FirebaseApp.initializeApp(
+            FirebaseApp pushLibrusApp = FirebaseApp.initializeApp(
                     this,
                     new FirebaseOptions.Builder()
                             .setApiKey("AIzaSyDfTuEoYPKdv4aceEws1CO3n0-HvTndz-o")
                             .setApplicationId("1:513056078587:android:1e29083b760af544")
                             .build(),
                     "Librus"
-            );*/
+            );
 
             FirebaseApp pushVulcanApp = FirebaseApp.initializeApp(
                     this,
@@ -434,10 +440,10 @@ public class App extends androidx.multidex.MultiDexApplication {
                     Log.d(TAG, "Token for Mobidziennik is " + instanceIdResult.getToken() + ", ID is " + instanceIdResult.getId());
                     appConfig.fcmTokens.put(LOGIN_TYPE_MOBIDZIENNIK, new Pair<>(instanceIdResult.getToken(), new ArrayList<>()));
                 });
-                /*FirebaseInstanceId.getInstance(pushLibrusApp).getInstanceId().addOnSuccessListener(instanceIdResult -> {
+                FirebaseInstanceId.getInstance(pushLibrusApp).getInstanceId().addOnSuccessListener(instanceIdResult -> {
                     Log.d(TAG, "Token for Librus is " + instanceIdResult.getToken() + ", ID is " + instanceIdResult.getId());
                     appConfig.fcmTokens.put(LOGIN_TYPE_LIBRUS, new Pair<>(instanceIdResult.getToken(), new ArrayList<>()));
-                });*/
+                });
                 FirebaseInstanceId.getInstance(pushVulcanApp).getInstanceId().addOnSuccessListener(instanceIdResult -> {
                     Log.d(TAG, "Token for Vulcan is " + instanceIdResult.getToken() + ", ID is " + instanceIdResult.getId());
                     Pair<String, List<Integer>> pair = appConfig.fcmTokens.get(LOGIN_TYPE_VULCAN);
@@ -606,7 +612,7 @@ public class App extends androidx.multidex.MultiDexApplication {
     }
 
     public ProfileFull profileGetOrNull(int id) {
-        return db.profileDao().getByIdNow(id);
+        return db.profileDao().getFullByIdNow(id);
     }
 
     public void profileLoadById(int id) {
@@ -621,7 +627,7 @@ public class App extends androidx.multidex.MultiDexApplication {
             return;
         }*/
         if (profile == null || profile.getId() != id) {
-            profile = db.profileDao().getByIdNow(id);
+            profile = db.profileDao().getFullByIdNow(id);
             /*if (profile == null) {
                 profileLoadById(id);
                 return;
@@ -648,7 +654,7 @@ public class App extends androidx.multidex.MultiDexApplication {
 
     /*public void profileRemove(int id)
     {
-        Profile profile = db.profileDao().getByIdNow(id);
+        Profile profile = db.profileDao().getFullByIdNow(id);
 
         if (profile.id == profile.loginStoreId) {
             // this profile is the owner of the login store
@@ -700,12 +706,8 @@ public class App extends androidx.multidex.MultiDexApplication {
 
     public void checkDevModePassword() {
         try {
-            if (Utils.AESCrypt.decrypt("nWFVxY65Pa8/aRrT7EylNAencmOD+IxUY2Gg/beiIWY=", appConfig.devModePassword).equals("ok here you go it's enabled now")) {
-                devMode = true;
-            }
-            else {
-                devMode = false;
-            }
+            devMode = Utils.AESCrypt.decrypt("nWFVxY65Pa8/aRrT7EylNAencmOD+IxUY2Gg/beiIWY=", appConfig.devModePassword).equals("ok here you go it's enabled now")
+                    || BuildConfig.DEBUG;
         } catch (Exception e) {
             e.printStackTrace();
             devMode = false;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/Binding.java b/app/src/main/java/pl/szczodrzynski/edziennik/Binding.java
new file mode 100644
index 00000000..d9c97a16
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/Binding.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-11.
+ */
+
+package pl.szczodrzynski.edziennik;
+
+import android.graphics.Paint;
+import android.widget.TextView;
+
+import androidx.databinding.BindingAdapter;
+
+public class Binding {
+    @BindingAdapter("strikeThrough")
+    public static void strikeThrough(TextView textView, Boolean strikeThrough) {
+        if (strikeThrough) {
+            textView.setPaintFlags(textView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+        } else {
+            textView.setPaintFlags(textView.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
index 76719287..0334cde6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
@@ -4,16 +4,43 @@ import android.Manifest
 import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
+import android.content.res.Resources
+import android.graphics.Typeface
+import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
+import android.text.*
+import android.text.style.ForegroundColorSpan
+import android.text.style.StrikethroughSpan
+import android.text.style.StyleSpan
+import android.util.LongSparseArray
+import android.util.SparseArray
+import android.util.TypedValue
+import android.view.View
+import android.widget.CompoundButton
+import android.widget.TextView
+import androidx.annotation.*
 import androidx.core.app.ActivityCompat
+import androidx.core.util.forEach
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Observer
 import com.google.gson.JsonArray
+import com.google.gson.JsonElement
 import com.google.gson.JsonObject
+import im.wangchao.mhttp.Response
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
-import pl.szczodrzynski.navlib.R
-import pl.szczodrzynski.navlib.crc16
+import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
+import pl.szczodrzynski.edziennik.utils.models.Time
 import pl.szczodrzynski.navlib.getColorFromRes
+import java.text.SimpleDateFormat
+import java.util.*
+import java.util.zip.CRC32
+
 
 fun List<Teacher>.byId(id: Long) = firstOrNull { it.id == id }
 fun List<Teacher>.byNameFirstLast(nameFirstLast: String) = firstOrNull { it.name + " " + it.surname == nameFirstLast }
@@ -21,11 +48,25 @@ fun List<Teacher>.byNameLastFirst(nameLastFirst: String) = firstOrNull { it.surn
 fun List<Teacher>.byNameFDotLast(nameFDotLast: String) = firstOrNull { it.name + "." + it.surname == nameFDotLast }
 fun List<Teacher>.byNameFDotSpaceLast(nameFDotSpaceLast: String) = firstOrNull { it.name + ". " + it.surname == nameFDotSpaceLast }
 
-fun JsonObject.getString(key: String): String? = get(key).let { if (it.isJsonNull) null else it.asString }
-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.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 }
+fun JsonObject?.get(key: String): JsonElement? = this?.get(key)
+
+fun JsonObject?.getBoolean(key: String): Boolean? = get(key)?.let { if (it.isJsonNull) null else it.asBoolean }
+fun JsonObject?.getString(key: String): String? = get(key)?.let { if (it.isJsonNull) null else it.asString }
+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?.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 }
+
+fun JsonObject?.getBoolean(key: String, defaultValue: Boolean): Boolean = get(key)?.let { if (it.isJsonNull) defaultValue else it.asBoolean } ?: defaultValue
+fun JsonObject?.getString(key: String, defaultValue: String): String = get(key)?.let { if (it.isJsonNull) defaultValue else it.asString } ?: defaultValue
+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?.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
+
+fun JsonArray?.asJsonObjectList() = this?.map { it.asJsonObject }
 
 fun CharSequence?.isNotNullNorEmpty(): Boolean {
     return this != null && this.isNotEmpty()
@@ -46,8 +87,65 @@ fun Bundle?.getString(key: String, defaultValue: String): String {
     return this?.getString(key, defaultValue) ?: defaultValue
 }
 
+fun String.fixName(): String {
+    return this.fixWhiteSpaces().toProperCase()
+}
+
+fun String.toProperCase(): String = changeStringCase(this)
+
+fun String.swapFirstLastName(): String {
+    return this.split(" ").let {
+        if (it.size > 1)
+            it[1]+" "+it[0]
+        else
+            it[0]
+    }
+}
+
+fun String.getFirstLastName(): Pair<String, String>? {
+    return this.split(" ").let {
+        if (it.size >= 2) Pair(it[0], it[1])
+        else null
+    }
+}
+
+fun String.getLastFirstName() = this.getFirstLastName()
+
+fun changeStringCase(s: String): String {
+    val delimiters = " '-/"
+    val sb = StringBuilder()
+    var capNext = true
+    for (ch in s.toCharArray()) {
+        var c = ch
+        c = if (capNext)
+            Character.toUpperCase(c)
+        else
+            Character.toLowerCase(c)
+        sb.append(c)
+        capNext = delimiters.indexOf(c) >= 0
+    }
+    return sb.toString()
+}
+
+fun buildFullName(firstName: String?, lastName: String?): String {
+    return "$firstName $lastName".fixName()
+}
+
+fun String.getShortName(): String {
+    return split(" ").let {
+        if (it.size > 1)
+            "${it[0]} ${it[1][0]}."
+        else
+            it[0]
+    }
+}
+
+fun List<String>.join(delimiter: String): String {
+    return this.joinToString(delimiter)
+}
+
 fun colorFromName(context: Context, name: String?): Int {
-    var crc = crc16(name ?: "")
+    var crc = (name ?: "").crc16()
     crc = (crc and 0xff) or (crc shr 8)
     crc %= 16
     val color = when (crc) {
@@ -71,8 +169,9 @@ fun colorFromName(context: Context, name: String?): Int {
     return context.getColorFromRes(color)
 }
 
-fun MutableList<out Profile>.filterOutArchived() {
+fun MutableList<Profile>.filterOutArchived(): MutableList<Profile> {
     this.removeAll { it.archived }
+    return this
 }
 
 fun Activity.isStoragePermissionGranted(): Boolean {
@@ -87,3 +186,404 @@ fun Activity.isStoragePermissionGranted(): Boolean {
         true
     }
 }
+
+fun Response?.getUnixDate(): Long {
+    val rfcDate = this?.headers()?.get("date") ?: return currentTimeUnix()
+    val pattern = "EEE, dd MMM yyyy HH:mm:ss Z"
+    val format = SimpleDateFormat(pattern, Locale.ENGLISH)
+    return format.parse(rfcDate).time / 1000
+}
+
+const val MINUTE = 60L
+const val HOUR = 60L*MINUTE
+const val DAY = 24L*HOUR
+const val WEEK = 7L*DAY
+const val MONTH = 30L*DAY
+const val YEAR = 365L*DAY
+
+fun <T> LongSparseArray<T>.values(): List<T> {
+    val result = mutableListOf<T>()
+    forEach { _, value ->
+        result += value
+    }
+    return result
+}
+
+fun <T> SparseArray<T>.values(): List<T> {
+    val result = mutableListOf<T>()
+    forEach { _, value ->
+        result += value
+    }
+    return result
+}
+
+fun <T> List<T>.toSparseArray(destination: SparseArray<T>, key: (T) -> Int) {
+    forEach {
+        destination.put(key(it), it)
+    }
+}
+fun <T> List<T>.toSparseArray(destination: LongSparseArray<T>, key: (T) -> Long) {
+    forEach {
+        destination.put(key(it), it)
+    }
+}
+
+fun <T> List<T>.toSparseArray(key: (T) -> Int): SparseArray<T> {
+    val result = SparseArray<T>()
+    toSparseArray(result, key)
+    return result
+}
+fun <T> List<T>.toSparseArray(key: (T) -> Long): LongSparseArray<T> {
+    val result = LongSparseArray<T>()
+    toSparseArray(result, key)
+    return result
+}
+
+fun <T> SparseArray<T>.singleOrNull(predicate: (T) -> Boolean): T? {
+    forEach { _, value ->
+        if (predicate(value))
+            return value
+    }
+    return null
+}
+fun <T> LongSparseArray<T>.singleOrNull(predicate: (T) -> Boolean): T? {
+    forEach { _, value ->
+        if (predicate(value))
+            return value
+    }
+    return null
+}
+
+fun String.fixWhiteSpaces() = buildString(length) {
+    var wasWhiteSpace = true
+    for (c in this@fixWhiteSpaces) {
+        if (c.isWhitespace()) {
+            if (!wasWhiteSpace) {
+                append(c)
+                wasWhiteSpace = true
+            }
+        } else {
+            append(c)
+            wasWhiteSpace = false
+        }
+    }
+}.trimEnd()
+
+fun List<Team>.getById(id: Long): Team? {
+    return singleOrNull { it.id == id }
+}
+fun LongSparseArray<Team>.getById(id: Long): Team? {
+    forEach { _, value ->
+        if (value.id == id)
+            return value
+    }
+    return null
+}
+
+operator fun MatchResult.get(group: Int): String {
+    if (group >= groupValues.size)
+        return ""
+    return groupValues[group]
+}
+
+fun Activity.setLanguage(language: String) {
+    val locale = Locale(language.toLowerCase(Locale.ROOT))
+    val configuration = resources.configuration
+    Locale.setDefault(locale)
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+        configuration.setLocale(locale)
+    }
+    configuration.locale = locale
+    resources.updateConfiguration(configuration, resources.displayMetrics)
+    baseContext.resources.updateConfiguration(configuration, baseContext.resources.displayMetrics)
+}
+
+/*
+  Code copied from android-28/java.util.Locale.initDefault()
+ */
+fun initDefaultLocale() {
+    run {
+        // user.locale gets priority
+        /*val languageTag: String? = System.getProperty("user.locale", "")
+        if (languageTag.isNotNullNorEmpty()) {
+            return@run Locale(languageTag)
+        }*/
+
+        // user.locale is empty
+        val language: String? = System.getProperty("user.language", "pl")
+        val region: String? = System.getProperty("user.region")
+        val country: String?
+        val variant: String?
+        // for compatibility, check for old user.region property
+        if (region != null) {
+            // region can be of form country, country_variant, or _variant
+            val i = region.indexOf('_')
+            if (i >= 0) {
+                country = region.substring(0, i)
+                variant = region.substring(i + 1)
+            } else {
+                country = region
+                variant = ""
+            }
+        } else {
+            country = System.getProperty("user.country", "")
+            variant = System.getProperty("user.variant", "")
+        }
+        return@run Locale(language)
+    }.let {
+        Locale.setDefault(it)
+    }
+}
+
+fun String.crc16(): Int {
+    var crc = 0xFFFF
+    for (aBuffer in this) {
+        crc = crc.ushr(8) or (crc shl 8) and 0xffff
+        crc = crc xor (aBuffer.toInt() and 0xff) // byte to int, trunc sign
+        crc = crc xor (crc and 0xff shr 4)
+        crc = crc xor (crc shl 12 and 0xffff)
+        crc = crc xor (crc and 0xFF shl 5 and 0xffff)
+    }
+    crc = crc and 0xffff
+    return crc + 32768
+}
+
+fun String.crc32(): Long {
+    val crc = CRC32()
+    crc.update(toByteArray())
+    return crc.value
+}
+
+fun Long.formatDate(format: String = "yyyy-MM-dd HH:mm:ss"): String = SimpleDateFormat(format).format(this)
+
+fun CharSequence?.asColoredSpannable(colorInt: Int): Spannable {
+    val spannable = SpannableString(this)
+    spannable.setSpan(ForegroundColorSpan(colorInt), 0, spannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+    return spannable
+}
+fun CharSequence?.asStrikethroughSpannable(): Spannable {
+    val spannable = SpannableString(this)
+    spannable.setSpan(StrikethroughSpan(), 0, spannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+    return spannable
+}
+fun CharSequence?.asItalicSpannable(): Spannable {
+    val spannable = SpannableString(this)
+    spannable.setSpan(StyleSpan(Typeface.ITALIC), 0, spannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+    return spannable
+}
+
+/**
+ * Returns a new read-only list only of those given elements, that are not empty.
+ * Applies for CharSequence and descendants.
+ */
+fun <T : CharSequence> listOfNotEmpty(vararg elements: T): List<T> = elements.filterNot { it.isEmpty() }
+
+fun List<CharSequence?>.concat(delimiter: String? = null): CharSequence {
+    if (this.isEmpty()) {
+        return ""
+    }
+
+    if (this.size == 1) {
+        return this[0] ?: ""
+    }
+
+    var spanned = false
+    for (piece in this) {
+        if (piece is Spanned) {
+            spanned = true
+            break
+        }
+    }
+
+    var first = true
+    if (spanned) {
+        val ssb = SpannableStringBuilder()
+        for (piece in this) {
+            if (piece == null)
+                continue
+            if (!first && delimiter != null)
+                ssb.append(delimiter)
+            first = false
+            ssb.append(piece)
+        }
+        return SpannedString(ssb)
+    } else {
+        val sb = StringBuilder()
+        for (piece in this) {
+            if (piece == null)
+                continue
+            if (!first && delimiter != null)
+                sb.append(delimiter)
+            first = false
+            sb.append(piece)
+        }
+        return sb.toString()
+    }
+}
+
+fun TextView.setText(@StringRes resid: Int, vararg formatArgs: Any) {
+    text = context.getString(resid, *formatArgs)
+}
+
+fun JsonObject(vararg properties: Pair<String, Any?>): JsonObject {
+    return JsonObject().apply {
+        for (property in properties) {
+            when (property.second) {
+                is JsonElement -> add(property.first, property.second as JsonElement?)
+                is String -> addProperty(property.first, property.second as String?)
+                is Char -> addProperty(property.first, property.second as Char?)
+                is Number -> addProperty(property.first, property.second as Number?)
+                is Boolean -> addProperty(property.first, property.second as Boolean?)
+            }
+        }
+    }
+}
+
+fun JsonArray?.isNullOrEmpty(): Boolean = (this?.size() ?: 0) == 0
+fun JsonArray.isEmpty(): Boolean = this.size() == 0
+
+@Suppress("UNCHECKED_CAST")
+inline fun <T : View> T.onClick(crossinline onClickListener: (v: T) -> Unit) {
+    setOnClickListener { v: View ->
+        onClickListener(v as T)
+    }
+}
+
+@Suppress("UNCHECKED_CAST")
+inline fun <T : CompoundButton> T.onChange(crossinline onChangeListener: (v: T, isChecked: Boolean) -> Unit) {
+    setOnCheckedChangeListener { buttonView, isChecked ->
+        onChangeListener(buttonView as T, isChecked)
+    }
+}
+
+fun <T> LiveData<T>.observeOnce(lifecycleOwner: LifecycleOwner, observer: Observer<T>) {
+    observe(lifecycleOwner, object : Observer<T> {
+        override fun onChanged(t: T?) {
+            observer.onChanged(t)
+            removeObserver(this)
+        }
+    })
+}
+
+/**
+ * Convert a value in dp to pixels.
+ */
+val Int.dp: Int
+    get() = (this * Resources.getSystem().displayMetrics.density).toInt()
+/**
+ * Convert a value in pixels to dp.
+ */
+val Int.px: Int
+    get() = (this / Resources.getSystem().displayMetrics.density).toInt()
+
+@ColorInt
+fun @receiver:AttrRes Int.resolveAttr(context: Context?): Int {
+    val typedValue = TypedValue()
+    context?.theme?.resolveAttribute(this, typedValue, true)
+    return typedValue.data
+}
+@ColorInt
+fun @receiver:ColorRes Int.resolveColor(context: Context): Int {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        context.resources.getColor(this, context.theme)
+    }
+    else {
+        context.resources.getColor(this)
+    }
+}
+fun @receiver:DrawableRes Int.resolveDrawable(context: Context): Drawable {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        context.resources.getDrawable(this, context.theme)
+    }
+    else {
+        context.resources.getDrawable(this)
+    }
+}
+
+fun View.findParentById(targetId: Int): View? {
+    if (id == targetId) {
+        return this
+    }
+    val viewParent = this.parent ?: return null
+    if (viewParent is View) {
+        return viewParent.findParentById(targetId)
+    }
+    return null
+}
+
+fun CoroutineScope.startCoroutineTimer(delayMillis: Long = 0, repeatMillis: Long = 0, action: () -> Unit) = launch {
+    delay(delayMillis)
+    if (repeatMillis > 0) {
+        while (true) {
+            action()
+            delay(repeatMillis)
+        }
+    } else {
+        action()
+    }
+}
+
+operator fun Time?.compareTo(other: Time?): Int {
+    if (this == null && other == null)
+        return 0
+    if (this == null)
+        return -1
+    if (other == null)
+        return 1
+    return this.compareTo(other)
+}
+
+operator fun StringBuilder.plusAssign(str: String?) {
+    this.append(str)
+}
+
+fun Context.timeTill(time: Int, delimiter: String = " "): String {
+    val parts = mutableListOf<Pair<Int, Int>>()
+
+    val hours = time / 3600
+    val minutes = (time - hours*3600) / 60
+    val seconds = time - minutes*60 - hours*3600
+
+    var prefixAdded = false
+    if (hours > 0) {
+        if (!prefixAdded) parts += R.plurals.time_till_text to hours; prefixAdded = true
+        parts += R.plurals.time_till_hours to hours
+    }
+    if (minutes > 0) {
+        if (!prefixAdded) parts += R.plurals.time_till_text to minutes; prefixAdded = true
+        parts += R.plurals.time_till_minutes to minutes
+    }
+    if (hours == 0 && minutes < 10) {
+        if (!prefixAdded) parts += R.plurals.time_till_text to seconds; prefixAdded = true
+        parts += R.plurals.time_till_seconds to seconds
+    }
+
+    return parts.joinToString(delimiter) { resources.getQuantityString(it.first, it.second, it.second) }
+}
+
+fun Context.timeLeft(time: Int, delimiter: String = " "): String {
+    val parts = mutableListOf<Pair<Int, Int>>()
+
+    val hours = time / 3600
+    val minutes = (time - hours*3600) / 60
+    val seconds = time - minutes*60 - hours*3600
+
+    var prefixAdded = false
+    if (hours > 0) {
+        if (!prefixAdded) parts += R.plurals.time_left_text to hours
+        prefixAdded = true
+        parts += R.plurals.time_left_hours to hours
+    }
+    if (minutes > 0) {
+        if (!prefixAdded) parts += R.plurals.time_left_text to minutes
+        prefixAdded = true
+        parts += R.plurals.time_left_minutes to minutes
+    }
+    if (hours == 0 && minutes < 10) {
+        if (!prefixAdded) parts += R.plurals.time_left_text to seconds
+        prefixAdded = true
+        parts += R.plurals.time_left_seconds to seconds
+    }
+
+    return parts.joinToString(delimiter) { resources.getQuantityString(it.first, it.second, it.second) }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
index e617b152..d1ae3ed3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@@ -6,78 +6,84 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
 import android.graphics.drawable.BitmapDrawable
 import android.os.*
-import android.util.Log
+import android.provider.Settings
 import android.view.Gravity
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.Observer
-import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
-import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
-import com.mikepenz.materialdrawer.model.ProfileSettingDrawerItem
-import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem
-import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.*
-import pl.szczodrzynski.edziennik.utils.Themes
-import pl.szczodrzynski.navlib.SystemBarsUtil.Companion.COLOR_HALF_TRANSPARENT
-import pl.szczodrzynski.navlib.bottomsheet.NavBottomSheet
-import pl.szczodrzynski.navlib.drawer.NavDrawer
-import pl.szczodrzynski.navlib.drawer.items.DrawerPrimaryItem
-import pl.szczodrzynski.navlib.drawer.items.withAppTitle
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.graphics.ColorUtils
+import androidx.lifecycle.Observer
 import androidx.navigation.NavOptions
 import com.danimahardhika.cafebar.CafeBar
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.mikepenz.iconics.IconicsColor
 import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.IconicsSize
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
 import com.mikepenz.materialdrawer.model.DividerDrawerItem
 import com.mikepenz.materialdrawer.model.ProfileDrawerItem
+import com.mikepenz.materialdrawer.model.ProfileSettingDrawerItem
+import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem
 import com.mikepenz.materialdrawer.model.interfaces.IProfile
-import me.zhanghai.android.materialprogressbar.internal.ThemeUtils
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 import pl.droidsonroids.gif.GifDrawable
 import pl.szczodrzynski.edziennik.App.APP_URL
-import pl.szczodrzynski.edziennik.data.api.AppError
-import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface.*
-import pl.szczodrzynski.edziennik.data.api.interfaces.SyncCallback
+import pl.szczodrzynski.edziennik.api.v2.events.*
+import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.*
 import pl.szczodrzynski.edziennik.databinding.ActivitySzkolnyBinding
-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.profiles.ProfileFull
-import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog
-import pl.szczodrzynski.edziennik.ui.modules.homework.HomeworkFragment
-import pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesDetailsFragment
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
-import pl.szczodrzynski.edziennik.utils.models.NavTarget
 import pl.szczodrzynski.edziennik.network.ServerRequest
-import pl.szczodrzynski.edziennik.sync.SyncJob
+import pl.szczodrzynski.edziennik.sync.AppManagerDetectedEvent
+import pl.szczodrzynski.edziennik.sync.SyncWorker
+import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.ProfileRemoveDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.sync.SyncViewListDialog
 import pl.szczodrzynski.edziennik.ui.modules.agenda.AgendaFragment
 import pl.szczodrzynski.edziennik.ui.modules.announcements.AnnouncementsFragment
 import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceFragment
 import pl.szczodrzynski.edziennik.ui.modules.base.DebugFragment
+import pl.szczodrzynski.edziennik.ui.modules.behaviour.BehaviourFragment
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar
 import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackFragment
 import pl.szczodrzynski.edziennik.ui.modules.feedback.HelpFragment
-import pl.szczodrzynski.edziennik.ui.modules.grades.editor.GradesEditorFragment
 import pl.szczodrzynski.edziennik.ui.modules.grades.GradesFragment
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
-import pl.szczodrzynski.edziennik.ui.modules.behaviour.BehaviourFragment
+import pl.szczodrzynski.edziennik.ui.modules.grades.editor.GradesEditorFragment
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragmentV2
+import pl.szczodrzynski.edziennik.ui.modules.homework.HomeworkFragment
+import pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessageFragment
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
 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.utils.SwipeRefreshLayoutNoTouch
+import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.Utils.d
 import pl.szczodrzynski.edziennik.utils.Utils.dpToPx
+import pl.szczodrzynski.edziennik.utils.appManagerIntentList
+import pl.szczodrzynski.edziennik.utils.models.NavTarget
 import pl.szczodrzynski.navlib.*
+import pl.szczodrzynski.navlib.SystemBarsUtil.Companion.COLOR_HALF_TRANSPARENT
+import pl.szczodrzynski.navlib.bottomsheet.NavBottomSheet
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
+import pl.szczodrzynski.navlib.drawer.NavDrawer
+import pl.szczodrzynski.navlib.drawer.items.DrawerPrimaryItem
+import pl.szczodrzynski.navlib.drawer.items.withAppTitle
 import java.io.File
 import java.io.IOException
 import java.util.*
-
+import kotlin.math.roundToInt
 
 class MainActivity : AppCompatActivity() {
     companion object {
@@ -116,9 +122,9 @@ class MainActivity : AppCompatActivity() {
             val list: MutableList<NavTarget> = mutableListOf()
 
             // home item
-            list += NavTarget(DRAWER_ITEM_HOME, R.string.menu_home_page, HomeFragment::class)
+            list += NavTarget(DRAWER_ITEM_HOME, R.string.menu_home_page, HomeFragmentV2::class)
                     .withTitle(R.string.app_name)
-                    .withIcon(CommunityMaterial.Icon2.cmd_home)
+                    .withIcon(CommunityMaterial.Icon2.cmd_home_outline)
                     .isInDrawer(true)
                     .isStatic(true)
                     .withPopToHome(false)
@@ -129,50 +135,50 @@ class MainActivity : AppCompatActivity() {
                     .isInDrawer(true)
 
             list += NavTarget(DRAWER_ITEM_AGENDA, R.string.menu_agenda, AgendaFragment::class)
-                    .withIcon(CommunityMaterial.Icon.cmd_calendar)
+                    .withIcon(CommunityMaterial.Icon.cmd_calendar_outline)
                     .withBadgeTypeId(TYPE_EVENT)
                     .isInDrawer(true)
 
             list += NavTarget(DRAWER_ITEM_GRADES, R.string.menu_grades, GradesFragment::class)
-                    .withIcon(CommunityMaterial.Icon2.cmd_numeric_5_box)
+                    .withIcon(CommunityMaterial.Icon2.cmd_numeric_5_box_outline)
                     .withBadgeTypeId(TYPE_GRADE)
                     .isInDrawer(true)
 
             list += NavTarget(DRAWER_ITEM_MESSAGES, R.string.menu_messages, MessagesFragment::class)
-                    .withIcon(CommunityMaterial.Icon.cmd_email)
+                    .withIcon(CommunityMaterial.Icon.cmd_email_outline)
                     .withBadgeTypeId(TYPE_MESSAGE)
                     .isInDrawer(true)
 
             list += NavTarget(DRAWER_ITEM_HOMEWORK, R.string.menu_homework, HomeworkFragment::class)
-                    .withIcon(SzkolnyFont.Icon.szf_file_document_edit)
+                    .withIcon(SzkolnyFont.Icon.szf_notebook_outline)
                     .withBadgeTypeId(TYPE_HOMEWORK)
                     .isInDrawer(true)
 
             list += NavTarget(DRAWER_ITEM_BEHAVIOUR, R.string.menu_notices, BehaviourFragment::class)
-                    .withIcon(CommunityMaterial.Icon2.cmd_message_alert)
+                    .withIcon(CommunityMaterial.Icon.cmd_emoticon_outline)
                     .withBadgeTypeId(TYPE_NOTICE)
                     .isInDrawer(true)
 
             list += NavTarget(DRAWER_ITEM_ATTENDANCE, R.string.menu_attendance, AttendanceFragment::class)
-                    .withIcon(CommunityMaterial.Icon.cmd_calendar_remove)
+                    .withIcon(CommunityMaterial.Icon.cmd_calendar_remove_outline)
                     .withBadgeTypeId(TYPE_ATTENDANCE)
                     .isInDrawer(true)
 
             list += NavTarget(DRAWER_ITEM_ANNOUNCEMENTS, R.string.menu_announcements, AnnouncementsFragment::class)
-                    .withIcon(CommunityMaterial.Icon.cmd_bulletin_board)
+                    .withIcon(CommunityMaterial.Icon.cmd_bullhorn_outline)
                     .withBadgeTypeId(TYPE_ANNOUNCEMENT)
                     .isInDrawer(true)
 
 
             // static drawer items
             list += NavTarget(DRAWER_ITEM_NOTIFICATIONS, R.string.menu_notifications, NotificationsFragment::class)
-                    .withIcon(CommunityMaterial.Icon.cmd_bell_ring)
+                    .withIcon(CommunityMaterial.Icon.cmd_bell_ring_outline)
                     .isInDrawer(true)
                     .isStatic(true)
                     .isBelowSeparator(true)
 
             list += NavTarget(DRAWER_ITEM_SETTINGS, R.string.menu_settings, SettingsNewFragment::class)
-                    .withIcon(CommunityMaterial.Icon2.cmd_settings)
+                    .withIcon(CommunityMaterial.Icon2.cmd_settings_outline)
                     .isInDrawer(true)
                     .isStatic(true)
                     .isBelowSeparator(true)
@@ -191,7 +197,7 @@ class MainActivity : AppCompatActivity() {
                     .isInProfileList(false)
 
             list += NavTarget(DRAWER_PROFILE_SYNC_ALL, R.string.menu_sync_all, null)
-                    .withIcon(CommunityMaterial.Icon2.cmd_sync)
+                    .withIcon(CommunityMaterial.Icon.cmd_download_outline)
                     .isInProfileList(true)
 
 
@@ -199,7 +205,7 @@ class MainActivity : AppCompatActivity() {
             list += NavTarget(TARGET_GRADES_EDITOR, R.string.menu_grades_editor, GradesEditorFragment::class)
             list += NavTarget(TARGET_HELP, R.string.menu_help, HelpFragment::class)
             list += NavTarget(TARGET_FEEDBACK, R.string.menu_feedback, FeedbackFragment::class)
-            list += NavTarget(TARGET_MESSAGES_DETAILS, R.string.menu_message, MessagesDetailsFragment::class)
+            list += NavTarget(TARGET_MESSAGES_DETAILS, R.string.menu_message, MessageFragment::class)
             list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class)
 
             list
@@ -210,6 +216,7 @@ class MainActivity : AppCompatActivity() {
     val navView: NavView by lazy { b.navView }
     val drawer: NavDrawer by lazy { navView.drawer }
     val bottomSheet: NavBottomSheet by lazy { navView.bottomSheet }
+    val errorSnackbar: ErrorSnackbar by lazy { ErrorSnackbar(this) }
 
     val swipeRefreshLayout: SwipeRefreshLayoutNoTouch by lazy { b.swipeRefreshLayout }
 
@@ -236,8 +243,14 @@ class MainActivity : AppCompatActivity() {
 
         setTheme(Themes.appTheme)
 
+        app.appConfig.language?.let {
+            setLanguage(it)
+        }
+
         setContentView(b.root)
 
+        errorSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
+
         navLoading = true
 
         b.navView.apply {
@@ -337,7 +350,7 @@ class MainActivity : AppCompatActivity() {
         if (!profileListEmpty) {
             handleIntent(intent?.extras)
         }
-        app.db.profileDao().getAllFull().observe(this, Observer { profiles ->
+        app.db.profileDao().allFull.observe(this, Observer { profiles ->
             // TODO fix weird -1 profiles ???
             profiles.removeAll { it.id < 0 }
             drawer.setProfileList(profiles)
@@ -354,7 +367,7 @@ class MainActivity : AppCompatActivity() {
         if (app.profile != null)
             setDrawerItems()
 
-        app.db.metadataDao().getUnreadCounts().observe(this, Observer { unreadCounters ->
+        app.db.metadataDao().unreadCounts.observe(this, Observer { unreadCounters ->
             unreadCounters.map {
                 it.type = it.thingType
             }
@@ -363,10 +376,15 @@ class MainActivity : AppCompatActivity() {
 
         b.swipeRefreshLayout.isEnabled = true
         b.swipeRefreshLayout.setOnRefreshListener { this.syncCurrentFeature() }
+        b.swipeRefreshLayout.setColorSchemeResources(
+                R.color.md_blue_500,
+                R.color.md_amber_500,
+                R.color.md_green_500
+        )
 
         isStoragePermissionGranted()
 
-        SyncJob.schedule(app)
+        SyncWorker.scheduleNext(app)
 
         // APP BACKGROUND
         if (app.appConfig.appBackground != null) {
@@ -416,7 +434,7 @@ class MainActivity : AppCompatActivity() {
             navView.coordinator.postDelayed({
                 CafeBar.builder(this)
                         .content(R.string.rate_snackbar_text)
-                        .icon(IconicsDrawable(this).icon(CommunityMaterial.Icon2.cmd_star).size(IconicsSize.dp(20)).color(IconicsColor.colorInt(Themes.getPrimaryTextColor(this))))
+                        .icon(IconicsDrawable(this).icon(CommunityMaterial.Icon2.cmd_star_outline).size(IconicsSize.dp(20)).color(IconicsColor.colorInt(Themes.getPrimaryTextColor(this))))
                         .positiveText(R.string.rate_snackbar_positive)
                         .positiveColor(-0xb350b0)
                         .negativeText(R.string.rate_snackbar_negative)
@@ -453,27 +471,34 @@ class MainActivity : AppCompatActivity() {
         bottomSheet.appendItems(
                 BottomSheetPrimaryItem(false)
                         .withTitle(R.string.menu_sync)
-                        .withIcon(CommunityMaterial.Icon2.cmd_sync)
+                        .withIcon(CommunityMaterial.Icon.cmd_download_outline)
                         .withOnClickListener(View.OnClickListener {
                             bottomSheet.close()
-                            app.apiEdziennik.guiSyncFeature(app, this, App.profileId, R.string.sync_dialog_title, R.string.sync_dialog_text, R.string.sync_done, fragmentToFeature(navTargetId))
+                            SyncViewListDialog(this, navTargetId)
                         }),
                 BottomSheetSeparatorItem(false),
                 BottomSheetPrimaryItem(false)
                         .withTitle(R.string.menu_settings)
-                        .withIcon(CommunityMaterial.Icon2.cmd_settings)
+                        .withIcon(CommunityMaterial.Icon2.cmd_settings_outline)
                         .withOnClickListener(View.OnClickListener { loadTarget(DRAWER_ITEM_SETTINGS) }),
                 BottomSheetPrimaryItem(false)
                         .withTitle(R.string.menu_feedback)
-                        .withIcon(CommunityMaterial.Icon2.cmd_help_circle)
+                        .withIcon(CommunityMaterial.Icon2.cmd_help_circle_outline)
                         .withOnClickListener(View.OnClickListener { loadTarget(TARGET_FEEDBACK) })
         )
         if (App.devMode) {
             bottomSheet += BottomSheetPrimaryItem(false)
                     .withTitle(R.string.menu_debug)
-                    .withIcon(CommunityMaterial.Icon.cmd_android_debug_bridge)
+                    .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 = {
@@ -488,7 +513,7 @@ class MainActivity : AppCompatActivity() {
                 profileListEmptyListener()
             }
             DRAWER_PROFILE_SYNC_ALL -> {
-                SyncJob.run(app)
+                EdziennikTask.sync().enqueue(this)
             }
             else -> {
                 loadTarget(id)
@@ -508,52 +533,99 @@ class MainActivity : AppCompatActivity() {
     fun syncCurrentFeature() {
         swipeRefreshLayout.isRefreshing = true
         Toast.makeText(this, fragmentToSyncName(navTargetId), Toast.LENGTH_SHORT).show()
-        val callback = object : SyncCallback {
-            override fun onLoginFirst(profileList: List<Profile>, loginStore: LoginStore) {
-
-            }
-
-            override fun onSuccess(activityContext: Context, profileFull: ProfileFull) {
-                swipeRefreshLayout.isRefreshing = false
-            }
-
-            override fun onError(activityContext: Context, error: AppError) {
-                swipeRefreshLayout.isRefreshing = false
-                app.apiEdziennik.guiShowErrorSnackbar(this@MainActivity, error)
-            }
-
-            override fun onProgress(progressStep: Int) {
-
-            }
-
-            override fun onActionStarted(stringResId: Int) {
-
-            }
+        val fragmentParam = when (navTargetId) {
+            DRAWER_ITEM_MESSAGES -> MessagesFragment.pageSelection
+            else -> 0
         }
-        val feature = fragmentToFeature(navTargetId)
-        if (feature == FEATURE_ALL) {
-            swipeRefreshLayout.isRefreshing = false
-            app.apiEdziennik.guiSync(app, this, App.profileId, R.string.sync_dialog_title, R.string.sync_dialog_text, R.string.sync_done)
-        } else {
-            app.apiEdziennik.guiSyncSilent(app, this, App.profileId, callback, feature)
+        val arguments = when (navTargetId) {
+            DRAWER_ITEM_TIMETABLE -> JsonObject("weekStart" to TimetableFragment.pageSelection?.weekStart?.stringY_m_d)
+            else -> null
+        }
+        EdziennikTask.syncProfile(
+                App.profileId,
+                listOf(navTargetId to fragmentParam),
+                arguments
+        ).enqueue(this)
+    }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onSyncStartedEvent(event: ApiTaskStartedEvent) {
+        swipeRefreshLayout.isRefreshing = true
+        if (event.profileId == App.profileId) {
+            navView.toolbar.apply {
+                subtitleFormat = null
+                subtitleFormatWithUnread = null
+                subtitle = getString(R.string.toolbar_subtitle_syncing)
+            }
         }
     }
-    private fun fragmentToFeature(currentFragment: Int): Int {
-        return when (currentFragment) {
-            DRAWER_ITEM_TIMETABLE -> FEATURE_TIMETABLE
-            DRAWER_ITEM_AGENDA -> FEATURE_AGENDA
-            DRAWER_ITEM_GRADES -> FEATURE_GRADES
-            DRAWER_ITEM_HOMEWORK -> FEATURE_HOMEWORK
-            DRAWER_ITEM_BEHAVIOUR -> FEATURE_NOTICES
-            DRAWER_ITEM_ATTENDANCE -> FEATURE_ATTENDANCE
-            DRAWER_ITEM_MESSAGES -> when (MessagesFragment.pageSelection) {
-                1 -> FEATURE_MESSAGES_OUTBOX
-                else -> FEATURE_MESSAGES_INBOX
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onSyncProgressEvent(event: ApiTaskProgressEvent) {
+        if (event.profileId == App.profileId) {
+            navView.toolbar.apply {
+                subtitleFormat = null
+                subtitleFormatWithUnread = null
+                subtitle = if (event.progress < 0f)
+                    event.progressText ?: ""
+                else
+                    getString(R.string.toolbar_subtitle_syncing_format, event.progress.roundToInt(), event.progressText ?: "")
+
             }
-            DRAWER_ITEM_ANNOUNCEMENTS -> FEATURE_ANNOUNCEMENTS
-            else -> FEATURE_ALL
         }
     }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onSyncProfileFinishedEvent(event: ApiTaskFinishedEvent) {
+        if (event.profileId == App.profileId) {
+            navView.toolbar.apply {
+                subtitleFormat = R.string.toolbar_subtitle
+                subtitleFormatWithUnread = R.plurals.toolbar_subtitle_with_unread
+                subtitle = "Gotowe"
+            }
+        }
+    }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onSyncFinishedEvent(event: ApiTaskAllFinishedEvent) {
+        swipeRefreshLayout.isRefreshing = false
+    }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onSyncErrorEvent(event: ApiTaskErrorEvent) {
+        navView.toolbar.apply {
+            subtitleFormat = R.string.toolbar_subtitle
+            subtitleFormatWithUnread = R.plurals.toolbar_subtitle_with_unread
+            subtitle = "Gotowe"
+        }
+        errorSnackbar.addError(event.error).show()
+    }
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onAppManagerDetectedEvent(event: AppManagerDetectedEvent) {
+        if (app.appConfig.dontShowAppManagerDialog)
+            return
+        MaterialAlertDialogBuilder(this)
+                .setTitle(R.string.app_manager_dialog_title)
+                .setMessage(R.string.app_manager_dialog_text)
+                .setPositiveButton(R.string.ok) { dialog, which ->
+                    try {
+                        for (intent in appManagerIntentList) {
+                            if (packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) != null) {
+                                startActivity(intent)
+                            }
+                        }
+                    } catch (e: Exception) {
+                        try {
+                            startActivity(Intent(Settings.ACTION_SETTINGS))
+                        } catch (e: Exception) {
+                            e.printStackTrace()
+                            Toast.makeText(this, R.string.app_manager_open_failed, Toast.LENGTH_SHORT).show()
+                        }
+                    }
+                }
+                .setNeutralButton(R.string.dont_ask_again) { dialog, which ->
+                    app.appConfig.dontShowAppManagerDialog = true
+                    app.saveConfig("dontShowAppManagerDialog")
+                }
+                .setCancelable(false)
+                .show()
+    }
+
     private fun fragmentToSyncName(currentFragment: Int): Int {
         return when (currentFragment) {
             DRAWER_ITEM_TIMETABLE -> R.string.sync_feature_timetable
@@ -584,11 +656,11 @@ class MainActivity : AppCompatActivity() {
     }
     private fun handleIntent(extras: Bundle?) {
 
-        Log.d(TAG, "handleIntent() {")
+        d(TAG, "handleIntent() {")
         extras?.keySet()?.forEach { key ->
-            Log.d(TAG, "    \"$key\": "+extras.get(key))
+            d(TAG, "    \"$key\": "+extras.get(key))
         }
-        Log.d(TAG, "}")
+        d(TAG, "}")
 
         if (extras?.containsKey("reloadProfileId") == true) {
             val reloadProfileId = extras.getInt("reloadProfileId", -1)
@@ -627,14 +699,18 @@ class MainActivity : AppCompatActivity() {
             app.profile == null -> {
                 if (intentProfileId == -1)
                     intentProfileId = app.appSharedPrefs.getInt("current_profile_id", 1)
-                loadProfile(intentProfileId, intentTargetId)
+                loadProfile(intentProfileId, intentTargetId, extras)
             }
             intentProfileId != -1 -> {
-                loadProfile(intentProfileId, intentTargetId)
+                if (app.profile.id != intentProfileId)
+                    loadProfile(intentProfileId, intentTargetId, extras)
+                else
+                    loadTarget(intentTargetId, extras)
             }
             intentTargetId != -1 -> {
                 drawer.currentProfile = app.profile.id
-                loadTarget(intentTargetId, extras)
+                if (navTargetId != intentTargetId)
+                    loadTarget(intentTargetId, extras)
             }
             else -> {
                 drawer.currentProfile = app.profile.id
@@ -712,7 +788,7 @@ class MainActivity : AppCompatActivity() {
     fun loadProfile(id: Int) = loadProfile(id, navTargetId)
     fun loadProfile(id: Int, arguments: Bundle?) = loadProfile(id, navTargetId, arguments)
     fun loadProfile(id: Int, drawerSelection: Int, arguments: Bundle? = null) {
-        Log.d("NavDebug", "loadProfile(id = $id, drawerSelection = $drawerSelection)")
+        //d("NavDebug", "loadProfile(id = $id, drawerSelection = $drawerSelection)")
         if (app.profile != null && App.profileId == id) {
             drawer.currentProfile = app.profile.id
             loadTarget(drawerSelection, arguments)
@@ -752,7 +828,7 @@ class MainActivity : AppCompatActivity() {
         }
     }
     private fun loadTarget(target: NavTarget, arguments: Bundle? = null) {
-        Log.d("NavDebug", "loadItem(id = ${target.id})")
+        d("NavDebug", "loadItem(id = ${target.id})")
 
         bottomSheet.close()
         bottomSheet.removeAllContextual()
@@ -765,7 +841,7 @@ class MainActivity : AppCompatActivity() {
         navView.bottomBar.fabExtended = false
         navView.bottomBar.setFabOnClickListener(null)
 
-        Log.d("NavDebug", "Navigating from ${navTarget.fragmentClass?.java?.simpleName} to ${target.fragmentClass?.java?.simpleName}")
+        d("NavDebug", "Navigating from ${navTarget.fragmentClass?.java?.simpleName} to ${target.fragmentClass?.java?.simpleName}")
 
         val fragment = target.fragmentClass?.java?.newInstance() ?: return
         fragment.arguments = arguments
@@ -824,9 +900,9 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-        Log.d("NavDebug", "Current fragment ${navTarget.fragmentClass?.java?.simpleName}, pop to home ${navTarget.popToHome}, back stack:")
+        d("NavDebug", "Current fragment ${navTarget.fragmentClass?.java?.simpleName}, pop to home ${navTarget.popToHome}, back stack:")
         navBackStack.forEachIndexed { index, target2 ->
-            Log.d("NavDebug", " - $index: ${target2.fragmentClass?.java?.simpleName}")
+            d("NavDebug", " - $index: ${target2.fragmentClass?.java?.simpleName}")
         }
 
         transaction.replace(R.id.fragment, fragment)
@@ -917,7 +993,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun setDrawerItems() {
-        Log.d("NavDebug", "setDrawerItems() app.profile = ${app.profile ?: "null"}")
+        d("NavDebug", "setDrawerItems() app.profile = ${app.profile ?: "null"}")
         val drawerItems = arrayListOf<IDrawerItem<*>>()
         val drawerProfiles = arrayListOf<ProfileSettingDrawerItem>()
 
@@ -975,7 +1051,7 @@ class MainActivity : AppCompatActivity() {
                 }
                 loadTarget(DRAWER_ITEM_SETTINGS, null)
             } else if (item.itemId == 2) {
-                app.apiEdziennik.guiRemoveProfile(this@MainActivity, profileId, profile.name?.getText(this).toString())
+                ProfileRemoveDialog(this, profileId, profile.name?.getText(this)?.toString() ?: "?")
             }
             true
         }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java b/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java
index cc2237c3..32f769dc 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java
@@ -8,24 +8,22 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
+import android.util.Log;
+
 import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
-import android.util.Log;
 
 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;
-import pl.szczodrzynski.edziennik.receivers.BootReceiver;
-import pl.szczodrzynski.edziennik.sync.SyncJob;
-import pl.szczodrzynski.edziennik.sync.SyncService;
 
 import static androidx.core.app.NotificationCompat.PRIORITY_DEFAULT;
 import static androidx.core.app.NotificationCompat.PRIORITY_MAX;
-import static pl.szczodrzynski.edziennik.sync.SyncService.ACTION_CANCEL;
 
 public class Notifier {
 
@@ -36,14 +34,14 @@ public class Notifier {
     private static String CHANNEL_GET_DATA_DESC;
     private static final String GROUP_KEY_GET_DATA = "pl.szczodrzynski.edziennik.GET_DATA";
 
-    private static final int ID_NOTIFICATIONS = 1337002;
-    private static String CHANNEL_NOTIFICATIONS_NAME;
-    private static String CHANNEL_NOTIFICATIONS_DESC;
+    public static final int ID_NOTIFICATIONS = 1337002;
+    public static String CHANNEL_NOTIFICATIONS_NAME;
+    public static String CHANNEL_NOTIFICATIONS_DESC;
     public static final String GROUP_KEY_NOTIFICATIONS = "pl.szczodrzynski.edziennik.NOTIFICATIONS";
 
-    private static final int ID_NOTIFICATIONS_QUIET = 1337002;
-    private static String CHANNEL_NOTIFICATIONS_QUIET_NAME;
-    private static String CHANNEL_NOTIFICATIONS_QUIET_DESC;
+    public static final int ID_NOTIFICATIONS_QUIET = 1337002;
+    public static String CHANNEL_NOTIFICATIONS_QUIET_NAME;
+    public static String CHANNEL_NOTIFICATIONS_QUIET_DESC;
     public static final String GROUP_KEY_NOTIFICATIONS_QUIET = "pl.szczodrzynski.edziennik.NOTIFICATIONS_QUIET";
 
     private static final int ID_UPDATES = 1337003;
@@ -52,9 +50,9 @@ public class Notifier {
     private static final String GROUP_KEY_UPDATES = "pl.szczodrzynski.edziennik.UPDATES";
 
     private App app;
-    private NotificationManager notificationManager;
+    public NotificationManager notificationManager;
     private NotificationCompat.Builder getDataNotificationBuilder;
-    private int notificationColor;
+    public int notificationColor;
 
     Notifier(App _app) {
         this.app = _app;
@@ -71,7 +69,7 @@ public class Notifier {
         notificationColor = ContextCompat.getColor(app.getContext(), R.color.colorPrimary);
         notificationManager = (NotificationManager) app.getSystemService(Context.NOTIFICATION_SERVICE);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel channelGetData = new NotificationChannel(GROUP_KEY_GET_DATA, CHANNEL_GET_DATA_NAME, NotificationManager.IMPORTANCE_LOW);
+            NotificationChannel channelGetData = new NotificationChannel(GROUP_KEY_GET_DATA, CHANNEL_GET_DATA_NAME, NotificationManager.IMPORTANCE_MIN);
             channelGetData.setDescription(CHANNEL_GET_DATA_DESC);
             notificationManager.createNotificationChannel(channelGetData);
 
@@ -109,13 +107,13 @@ public class Notifier {
         return app.appConfig.quietHoursStart > 0 && now >= start && now <= end;
     }
 
-    private int getNotificationDefaults() {
+    public int getNotificationDefaults() {
         return (shouldBeQuiet() ? 0 : Notification.DEFAULT_ALL);
     }
-    private String getNotificationGroup() {
+    public String getNotificationGroup() {
         return shouldBeQuiet() ? GROUP_KEY_NOTIFICATIONS_QUIET : GROUP_KEY_NOTIFICATIONS;
     }
-    private int getNotificationPriority() {
+    public int getNotificationPriority() {
         return shouldBeQuiet() ? PRIORITY_DEFAULT : PRIORITY_MAX;
     }
 
@@ -126,17 +124,17 @@ public class Notifier {
          | |__| | (_| | || (_| | | |__| |  __/ |_
          |_____/ \__,_|\__\__,_|  \_____|\___|\_*/
     public Notification notificationGetDataShow(int maxProgress) {
-        Intent notificationIntent = new Intent(app.getContext(), SyncService.class);
+        /*Intent notificationIntent = new Intent(app.getContext(), SyncService.class);
         notificationIntent.setAction(ACTION_CANCEL);
         PendingIntent pendingIntent = PendingIntent.getService(app.getContext(), 0,
-                notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);
+                notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);*/
 
         getDataNotificationBuilder = new NotificationCompat.Builder(app, GROUP_KEY_GET_DATA)
                 .setSmallIcon(android.R.drawable.stat_sys_download)
                 .setColor(notificationColor)
                 .setContentTitle(app.getString(R.string.notification_get_data_title))
                 .setContentText(app.getString(R.string.notification_get_data_text))
-                .addAction(R.drawable.ic_notification, app.getString(R.string.notification_get_data_cancel), pendingIntent)
+                //.addAction(R.drawable.ic_notification, app.getString(R.string.notification_get_data_cancel), pendingIntent)
                 //.setGroup(GROUP_KEY_GET_DATA)
                 .setOngoing(true)
                 .setProgress(maxProgress, 0, false)
@@ -208,10 +206,8 @@ public class Notifier {
 
         @Override
         protected void onHandleIntent(Intent intent) {
-            SyncJob.run((App) getApplication(), intent.getExtras().getInt("failedProfileId", -1), -1);
-            NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-            assert notificationManager != null;
-            notificationManager.cancel(ID_GET_DATA_ERROR);
+
+
         }
     }
 
@@ -315,13 +311,14 @@ public class Notifier {
           \____/| .__/ \__,_|\__,_|\__\___||___/
                 | |
                 |*/
-    public void notificationUpdatesShow(String updateVersion, String updateUrl, String updateFilename) {
+    public void notificationUpdatesShow(String updateVersion, String updateUrl, String updateFilename, boolean updateDirect) {
         if (!app.appConfig.notifyAboutUpdates)
             return;
         Intent notificationIntent = new Intent(app.getContext(), BootReceiver.NotificationActionService.class)
                 .putExtra("update_version", updateVersion)
                 .putExtra("update_url", updateUrl)
-                .putExtra("update_filename", updateFilename);
+                .putExtra("update_filename", updateFilename)
+                .putExtra("update_direct", updateDirect);
 
         PendingIntent pendingIntent = PendingIntent.getService(app.getContext(), 0,
                 notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.java b/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.java
deleted file mode 100644
index 36296e39..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.java
+++ /dev/null
@@ -1,450 +0,0 @@
-package pl.szczodrzynski.edziennik;
-
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Build;
-import android.util.SparseArray;
-import android.view.View;
-import android.widget.RemoteViews;
-
-import com.mikepenz.iconics.IconicsColor;
-import com.mikepenz.iconics.IconicsDrawable;
-import com.mikepenz.iconics.IconicsSize;
-import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
-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.sync.SyncJob;
-import pl.szczodrzynski.edziennik.widgets.timetable.LessonDetailsActivity;
-import pl.szczodrzynski.edziennik.widgets.timetable.WidgetTimetableService;
-
-import static pl.szczodrzynski.edziennik.ExtensionsKt.filterOutArchived;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_HOMEWORK;
-import static pl.szczodrzynski.edziennik.utils.Utils.bs;
-
-
-public class WidgetTimetable extends AppWidgetProvider {
-
-
-    public static final String ACTION_SYNC_DATA = "ACTION_SYNC_DATA";
-    private static final String TAG = "WidgetTimetable";
-    private static int modeInt = 0;
-
-    public WidgetTimetable() {
-        // Start the worker thread
-        //HandlerThread sWorkerThread = new HandlerThread("WidgetTimetable-worker");
-        //sWorkerThread.start();
-        //Handler sWorkerQueue = new Handler(sWorkerThread.getLooper());
-    }
-
-    public static SparseArray<List<ItemWidgetTimetableModel>> timetables = null;
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (ACTION_SYNC_DATA.equals(intent.getAction())){
-            SyncJob.run((App) context.getApplicationContext());
-        }
-        super.onReceive(context, intent);
-    }
-
-    public static PendingIntent getPendingSelfIntent(Context context, String action) {
-        Intent intent = new Intent(context, WidgetTimetable.class);
-        intent.setAction(action);
-        return getPendingSelfIntent(context, intent);
-    }
-    public static PendingIntent getPendingSelfIntent(Context context, Intent intent) {
-        return PendingIntent.getBroadcast(context, 0, intent, 0);
-    }
-
-    public static Bitmap drawableToBitmap (Drawable drawable) {
-
-        if (drawable instanceof BitmapDrawable) {
-            return ((BitmapDrawable)drawable).getBitmap();
-        }
-
-        Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(bitmap);
-        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-        drawable.draw(canvas);
-
-        return bitmap;
-    }
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        ComponentName thisWidget = new ComponentName(context, WidgetTimetable.class);
-
-        timetables = new SparseArray<>();
-        //timetables.clear();
-
-        App app = (App)context.getApplicationContext();
-
-        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
-        // There may be multiple widgets active, so update all of them
-        for (int appWidgetId : allWidgetIds) {
-
-            //d(TAG, "thr "+Thread.currentThread().getName());
-
-            WidgetConfig widgetConfig = app.appConfig.widgetTimetableConfigs.get(appWidgetId);
-            if (widgetConfig == null) {
-                widgetConfig = new WidgetConfig(app.profileFirstId());
-                app.appConfig.widgetTimetableConfigs.put(appWidgetId, widgetConfig);
-                app.appConfig.savePending = true;
-            }
-
-            RemoteViews views;
-            if (widgetConfig.bigStyle) {
-                views = new RemoteViews(context.getPackageName(), widgetConfig.darkTheme ? R.layout.widget_timetable_dark_big : R.layout.widget_timetable_big);
-            }
-            else {
-                views = new RemoteViews(context.getPackageName(), widgetConfig.darkTheme ? R.layout.widget_timetable_dark : R.layout.widget_timetable);
-            }
-
-            PorterDuff.Mode mode = PorterDuff.Mode.DST_IN;
-            /*if (widgetConfig.darkTheme) {
-                switch (modeInt) {
-                    case 0:
-                        mode = PorterDuff.Mode.ADD;
-                        d(TAG, "ADD");
-                        break;
-                    case 1:
-                        mode = PorterDuff.Mode.DST_ATOP;
-                        d(TAG, "DST_ATOP");
-                        break;
-                    case 2:
-                        mode = PorterDuff.Mode.DST_IN;
-                        d(TAG, "DST_IN");
-                        break;
-                    case 3:
-                        mode = PorterDuff.Mode.DST_OUT;
-                        d(TAG, "DST_OUT");
-                        break;
-                    case 4:
-                        mode = PorterDuff.Mode.DST_OVER;
-                        d(TAG, "DST_OVER");
-                        break;
-                    case 5:
-                        mode = PorterDuff.Mode.LIGHTEN;
-                        d(TAG, "LIGHTEN");
-                        break;
-                    case 6:
-                        mode = PorterDuff.Mode.MULTIPLY;
-                        d(TAG, "MULTIPLY");
-                        break;
-                    case 7:
-                        mode = PorterDuff.Mode.OVERLAY;
-                        d(TAG, "OVERLAY");
-                        break;
-                    case 8:
-                        mode = PorterDuff.Mode.SCREEN;
-                        d(TAG, "SCREEN");
-                        break;
-                    case 9:
-                        mode = PorterDuff.Mode.SRC_ATOP;
-                        d(TAG, "SRC_ATOP");
-                        break;
-                    case 10:
-                        mode = PorterDuff.Mode.SRC_IN;
-                        d(TAG, "SRC_IN");
-                        break;
-                    case 11:
-                        mode = PorterDuff.Mode.SRC_OUT;
-                        d(TAG, "SRC_OUT");
-                        break;
-                    case 12:
-                        mode = PorterDuff.Mode.SRC_OVER;
-                        d(TAG, "SRC_OVER");
-                        break;
-                    case 13:
-                        mode = PorterDuff.Mode.XOR;
-                        d(TAG, "XOR");
-                        break;
-                    default:
-                        modeInt = 0;
-                        mode = PorterDuff.Mode.ADD;
-                        d(TAG, "ADD");
-                        break;
-                }
-            }*/
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-                // this code seems to crash the launcher on >= P
-                float transparency = widgetConfig.opacity;  //0...1
-                long colorFilter = 0x01000000L * (long) (255f * transparency);
-                try {
-                    final Method[] declaredMethods = Class.forName("android.widget.RemoteViews").getDeclaredMethods();
-                    final int len = declaredMethods.length;
-                    if (len > 0) {
-                        for (int m = 0; m < len; m++) {
-                            final Method method = declaredMethods[m];
-                            if (method.getName().equals("setDrawableParameters")) {
-                                method.setAccessible(true);
-                                method.invoke(views, R.id.widgetTimetableListView, true, -1, (int) colorFilter, mode, -1);
-                                method.invoke(views, R.id.widgetTimetableHeader, true, -1, (int) colorFilter, mode, -1);
-                                break;
-                            }
-                        }
-                    }
-                } catch (ClassNotFoundException e) {
-                    e.printStackTrace();
-                } catch (InvocationTargetException e) {
-                    e.printStackTrace();
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                } catch (IllegalArgumentException e) {
-                    e.printStackTrace();
-                }
-            }
-
-            Intent refreshIntent = new Intent(context, WidgetTimetable.class);
-            refreshIntent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-            refreshIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds);
-            PendingIntent pendingRefreshIntent = PendingIntent.getBroadcast(context,
-                    0, refreshIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-            views.setOnClickPendingIntent(R.id.widgetTimetableRefresh, pendingRefreshIntent);
-
-            views.setOnClickPendingIntent(R.id.widgetTimetableSync, WidgetTimetable.getPendingSelfIntent(context, ACTION_SYNC_DATA));
-
-            views.setImageViewBitmap(R.id.widgetTimetableRefresh, new IconicsDrawable(context, CommunityMaterial.Icon2.cmd_refresh)
-                    .color(IconicsColor.colorInt(Color.WHITE))
-                    .size(IconicsSize.dp(widgetConfig.bigStyle ? 24 : 16)).toBitmap());
-
-            views.setImageViewBitmap(R.id.widgetTimetableSync, new IconicsDrawable(context, CommunityMaterial.Icon2.cmd_sync)
-                    .color(IconicsColor.colorInt(Color.WHITE))
-                    .size(IconicsSize.dp(widgetConfig.bigStyle ? 24 : 16)).toBitmap());
-
-            boolean unified = widgetConfig.profileId == -1;
-
-            List<Profile> profileList = new ArrayList<>();
-            if (unified) {
-                profileList = app.db.profileDao().getAllNow();
-                filterOutArchived(profileList);
-            }
-            else {
-                Profile profile = app.db.profileDao().getByIdNow(widgetConfig.profileId);
-                if (profile != null) {
-                    profileList.add(profile);
-                }
-            }
-
-            //d(TAG, "Profiles: "+ Arrays.toString(profileList.toArray()));
-
-            if (profileList == null || profileList.size() == 0) {
-                views.setViewVisibility(R.id.widgetTimetableLoading, View.VISIBLE);
-                views.setTextViewText(R.id.widgetTimetableLoading, app.getString(R.string.widget_timetable_profile_doesnt_exist));
-            }
-            else {
-                views.setViewVisibility(R.id.widgetTimetableLoading, View.GONE);
-                //Register profile;
-
-                long bellSyncDiffMillis = 0;
-                if (app.appConfig.bellSyncDiff != null) {
-                    bellSyncDiffMillis = app.appConfig.bellSyncDiff.hour * 60 * 60 * 1000 + app.appConfig.bellSyncDiff.minute * 60 * 1000 + app.appConfig.bellSyncDiff.second * 1000;
-                    bellSyncDiffMillis *= app.appConfig.bellSyncMultiplier;
-                    bellSyncDiffMillis *= -1;
-                }
-
-                List<ItemWidgetTimetableModel> lessonList = new ArrayList<>();
-
-                Time syncedNow = Time.fromMillis(Time.getNow().getInMillis() + bellSyncDiffMillis);
-
-                Date today = Date.getToday();
-
-                int openProfileId = -1;
-                Date displayingDate = null;
-                int displayingWeekDay = 0;
-                if (unified) {
-                    views.setTextViewText(R.id.widgetTimetableSubtitle, app.getString(R.string.widget_timetable_title_unified));
-                }
-                else {
-                    views.setTextViewText(R.id.widgetTimetableSubtitle, profileList.get(0).getName());
-                    openProfileId = profileList.get(0).getId();
-                }
-
-                List<LessonFull> lessons = app.db.lessonDao().getAllWeekNow(unified ? -1 : openProfileId, today.clone().stepForward(0, 0, -today.getWeekDay()), today);
-
-                int scrollPos = 0;
-
-                for (Profile profile: profileList) {
-                    Date profileDisplayingDate = HomeFragment.findDateWithLessons(profile.getId(), lessons, syncedNow, 1);
-                    int profileDisplayingWeekDay = profileDisplayingDate.getWeekDay();
-                    int dayDiff = Date.diffDays(profileDisplayingDate, Date.getToday());
-
-                    //d(TAG, "For profile "+profile.name+" displayingDate is "+profileDisplayingDate.getStringY_m_d());
-                    if (displayingDate == null || profileDisplayingDate.getValue() < displayingDate.getValue()) {
-                        displayingDate = profileDisplayingDate;
-                        displayingWeekDay = profileDisplayingWeekDay;
-                        //d(TAG, "Setting as global dd");
-                        if (dayDiff == 0) {
-                            views.setTextViewText(R.id.widgetTimetableTitle, app.getString(R.string.day_today_format, Week.getFullDayName(displayingWeekDay)));
-                        } else if (dayDiff == 1) {
-                            views.setTextViewText(R.id.widgetTimetableTitle, app.getString(R.string.day_tomorrow_format, Week.getFullDayName(displayingWeekDay)));
-                        } else {
-                            views.setTextViewText(R.id.widgetTimetableTitle, Week.getFullDayName(displayingWeekDay) + " " + profileDisplayingDate.getStringDm());
-                        }
-                    }
-                }
-
-                for (Profile profile: profileList) {
-                    int pos = 0;
-
-                    List<EventFull> events = app.db.eventDao().getAllByDateNow(profile.getId(), displayingDate);
-                    if (events == null)
-                        events = new ArrayList<>();
-
-                    if (unified) {
-                        ItemWidgetTimetableModel separator = new ItemWidgetTimetableModel();
-                        separator.profileId = profile.getId();
-                        separator.bigStyle = widgetConfig.bigStyle;
-                        separator.darkTheme = widgetConfig.darkTheme;
-                        separator.separatorProfileName = profile.getName();
-                        lessonList.add(separator);
-                    }
-
-                    for (LessonFull lesson : lessons) {
-                        //d(TAG, "Profile "+profile.id+" Lesson profileId "+lesson.profileId+" weekDay "+lesson.weekDay+", "+lesson);
-                        if (profile.getId() != lesson.profileId || displayingWeekDay != lesson.weekDay)
-                            continue;
-                        //d(TAG, "Not skipped");
-                        ItemWidgetTimetableModel model = new ItemWidgetTimetableModel();
-
-                        model.bigStyle = widgetConfig.bigStyle;
-                        model.darkTheme = widgetConfig.darkTheme;
-
-                        model.profileId = profile.getId();
-
-                        model.lessonDate = displayingDate;
-                        model.startTime = lesson.startTime;
-                        model.endTime = lesson.endTime;
-
-                        model.lessonPassed = (syncedNow.getValue() > lesson.endTime.getValue()) && displayingWeekDay == Week.getTodayWeekDay();
-                        model.lessonCurrent = (Time.inRange(lesson.startTime, lesson.endTime, syncedNow)) && displayingWeekDay == Week.getTodayWeekDay();
-
-                        if (model.lessonCurrent) {
-                            scrollPos = pos;
-                        } else if (model.lessonPassed) {
-                            scrollPos = pos + 1;
-                        }
-                        pos++;
-
-                        model.subjectName = bs(lesson.subjectLongName);
-                        model.classroomName = lesson.classroomName;
-
-                        model.bellSyncDiffMillis = bellSyncDiffMillis;
-
-                        if (lesson.changeId != 0) {
-                            if (lesson.changeType == LessonChange.TYPE_CHANGE) {
-                                model.lessonChange = true;
-                                if (lesson.changedClassroomName()) {
-                                    model.newClassroomName = lesson.changeClassroomName;
-                                }
-
-                                if (lesson.changedSubjectLongName()) {
-                                    model.newSubjectName = lesson.changeSubjectLongName;
-                                }
-                            }
-                            if (lesson.changeType == LessonChange.TYPE_CANCELLED) {
-                                model.lessonCancelled = true;
-                            }
-                        }
-
-                        for (EventFull event : events) {
-                            if (event.startTime == null)
-                                continue;
-                            if (event.eventDate.getValue() == displayingDate.getValue()
-                                    && event.startTime.getValue() == lesson.startTime.getValue()) {
-                                model.eventColors.add(event.type == TYPE_HOMEWORK ? ItemWidgetTimetableModel.EVENT_COLOR_HOMEWORK : event.getColor());
-                            }
-                        }
-
-                        lessonList.add(model);
-                    }
-                }
-
-                if (lessonList.size() == 0) {
-                    views.setViewVisibility(R.id.widgetTimetableLoading, View.VISIBLE);
-                    views.setRemoteAdapter(R.id.widgetTimetableListView, new Intent());
-                    views.setTextViewText(R.id.widgetTimetableLoading, app.getString(R.string.widget_timetable_no_lessons));
-                    appWidgetManager.updateAppWidget(appWidgetId, views);
-                }
-                else {
-                    views.setViewVisibility(R.id.widgetTimetableLoading, View.GONE);
-
-                    timetables.put(appWidgetId, lessonList);
-                    //WidgetTimetableListProvider.widgetsLessons.put(appWidgetId, lessons);
-                    //views.setRemoteAdapter(R.id.widgetTimetableListView, new Intent());
-                    Intent listIntent = new Intent(context, WidgetTimetableService.class);
-                    listIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-                    listIntent.setData(Uri.parse(listIntent.toUri(Intent.URI_INTENT_SCHEME)));
-                    views.setRemoteAdapter(R.id.widgetTimetableListView, listIntent);
-
-                    // template to handle the click listener for each item
-                    Intent intentTemplate = new Intent(context, LessonDetailsActivity.class);
-                    // Old activities shouldn't be in the history stack
-                    intentTemplate.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-                    PendingIntent pendingIntentTimetable = PendingIntent.getActivity(context,
-                            0,
-                            intentTemplate,
-                            0);
-                    views.setPendingIntentTemplate(R.id.widgetTimetableListView, pendingIntentTimetable);
-
-                    Intent openIntent = new Intent(context, MainActivity.class);
-                    openIntent.setAction("android.intent.action.MAIN");
-                    if (!unified) {
-                        openIntent.putExtra("profileId", openProfileId);
-                        openIntent.putExtra("timetableDate", displayingDate.getValue());
-                    }
-                    openIntent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE);
-                    PendingIntent pendingOpenIntent = PendingIntent.getActivity(context,
-                            appWidgetId, openIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-                    views.setOnClickPendingIntent(R.id.widgetTimetableHeader, pendingOpenIntent);
-
-                    if (!unified)
-                        views.setScrollPosition(R.id.widgetTimetableListView, scrollPos);
-                }
-            }
-
-            appWidgetManager.updateAppWidget(appWidgetId, views);
-            appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.widgetTimetableListView);
-        }
-        //modeInt++;
-    }
-
-    @Override
-    public void onEnabled(Context context) {
-        // Enter relevant functionality for when the first widget is created
-    }
-
-    @Override
-    public void onDeleted(Context context, int[] appWidgetIds) {
-        App app = (App) context.getApplicationContext();
-        for (int appWidgetId: appWidgetIds) {
-            app.appConfig.widgetTimetableConfigs.remove(appWidgetId);
-        }
-        app.saveConfig("widgetTimetableConfigs");
-    }
-}
-
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.kt
new file mode 100644
index 00000000..8a28d1f3
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.kt
@@ -0,0 +1,371 @@
+package pl.szczodrzynski.edziennik
+
+import android.app.PendingIntent
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProvider
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.PorterDuff
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import android.os.Build
+import android.util.SparseArray
+import android.view.View
+import android.widget.RemoteViews
+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.api.v2.events.task.EdziennikTask
+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 WidgetTimetable : AppWidgetProvider() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (ACTION_SYNC_DATA == intent.action) {
+            EdziennikTask.sync().enqueue(context)
+        }
+        super.onReceive(context, intent)
+    }
+
+    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
+        val thisWidget = ComponentName(context, WidgetTimetable::class.java)
+
+        timetables = SparseArray()
+        //timetables.clear();
+
+        val app = context.applicationContext as App
+
+        var bellSyncDiffMillis: Long = 0
+        if (app.appConfig.bellSyncDiff != null) {
+            bellSyncDiffMillis = (app.appConfig.bellSyncDiff.hour * 60 * 60 * 1000 + app.appConfig.bellSyncDiff.minute * 60 * 1000 + app.appConfig.bellSyncDiff.second * 1000).toLong()
+            bellSyncDiffMillis *= app.appConfig.bellSyncMultiplier.toLong()
+            bellSyncDiffMillis *= -1
+        }
+
+        val allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
+
+        allWidgetIds?.forEach { appWidgetId ->
+            var widgetConfig = app.appConfig.widgetTimetableConfigs[appWidgetId]
+            if (widgetConfig == null) {
+                widgetConfig = WidgetConfig(app.profileFirstId())
+                app.appConfig.widgetTimetableConfigs[appWidgetId] = widgetConfig
+                app.appConfig.savePending = true
+            }
+
+            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 pendingRefreshIntent = PendingIntent.getBroadcast(context,
+                    0, refreshIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+            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 (widgetConfig.bigStyle) 24 else 16).toBitmap())
+
+            views.setImageViewBitmap(R.id.widgetTimetableSync, IconicsDrawable(context, CommunityMaterial.Icon.cmd_download_outline)
+                    .colorInt(Color.WHITE)
+                    .sizeDp(if (widgetConfig.bigStyle) 24 else 16).toBitmap())
+
+            prepareAppWidget(app, appWidgetId, views, widgetConfig, bellSyncDiffMillis)
+
+            appWidgetManager.updateAppWidget(appWidgetId, views)
+            appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.widgetTimetableListView)
+        }
+    }
+
+    private fun prepareAppWidget(
+            app: App,
+            appWidgetId: Int,
+            views: RemoteViews,
+            widgetConfig: WidgetConfig,
+            bellSyncDiffMillis: Long
+    ) {
+        // get the current bell-synced time
+        val now = Time.fromMillis(Time.getNow().inMillis + bellSyncDiffMillis)
+
+        // set the widget transparency
+        val mode = PorterDuff.Mode.DST_IN
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            // this code seems to crash the launcher on >= P
+            val transparency = widgetConfig.opacity  //0...1
+            val colorFilter = 0x01000000L * (255f * transparency).toLong()
+            try {
+                val declaredMethods = Class.forName("android.widget.RemoteViews").declaredMethods
+                val len = declaredMethods.size
+                if (len > 0) {
+                    for (m in 0 until len) {
+                        val method = declaredMethods[m]
+                        if (method.name == "setDrawableParameters") {
+                            method.isAccessible = true
+                            method.invoke(views, R.id.widgetTimetableListView, true, -1, colorFilter.toInt(), mode, -1)
+                            method.invoke(views, R.id.widgetTimetableHeader, true, -1, colorFilter.toInt(), mode, -1)
+                            break
+                        }
+                    }
+                }
+            } catch (e: ClassNotFoundException) {
+                e.printStackTrace()
+            } catch (e: InvocationTargetException) {
+                e.printStackTrace()
+            } catch (e: IllegalAccessException) {
+                e.printStackTrace()
+            } catch (e: IllegalArgumentException) {
+                e.printStackTrace()
+            }
+        }
+
+        val unified = widgetConfig.profileId == -1
+
+        // get all profiles or one profile with the specified id
+        val profileList = if (unified)
+            app.db.profileDao().allNow.filterOutArchived()
+        else
+            listOfNotNull(app.db.profileDao().getByIdNow(widgetConfig.profileId))
+
+        // no profile was found
+        if (profileList.isEmpty()) {
+            views.setViewVisibility(R.id.widgetTimetableLoading, View.VISIBLE)
+            views.setTextViewText(R.id.widgetTimetableLoading, app.getString(R.string.widget_timetable_profile_doesnt_exist))
+            return
+        }
+
+        views.setViewVisibility(R.id.widgetTimetableLoading, View.GONE)
+
+        // set lesson search bounds
+        val today = Date.getToday()
+        val searchEnd = today.clone().stepForward(0, 0, 7)
+
+        var scrollPos = 0
+
+        var profileId: Int? = null
+        var displayingDate: Date? = null
+
+        val models = mutableListOf<ItemWidgetTimetableModel>()
+
+        // get all lessons within the search bounds
+        val lessonList = app.db.timetableDao().getBetweenDatesNow(today, searchEnd)
+
+        for (profile in profileList) {
+
+            // add a profile separator with its name
+            if (unified) {
+                val separator = ItemWidgetTimetableModel()
+                separator.profileId = profile.id
+                separator.bigStyle = widgetConfig.bigStyle
+                separator.darkTheme = widgetConfig.darkTheme
+                separator.separatorProfileName = profile.name
+                models.add(separator)
+            }
+
+            // search for lessons to display
+            val timetableDate = Date.getToday()
+            var checkedDays = 0
+            var lessons = lessonList.filter { it.profileId == profile.id && it.displayDate == timetableDate && it.type != Lesson.TYPE_NO_LESSONS }
+            while ((lessons.isEmpty() || lessons.none {
+                        it.displayDate != today || (it.displayDate == today && it.displayEndTime != null && it.displayEndTime!! >= now)
+                    }) && checkedDays < 7) {
+                timetableDate.stepForward(0, 0, 1)
+                lessons = lessonList.filter { it.profileId == profile.id && it.displayDate == timetableDate && it.type != Lesson.TYPE_NO_LESSONS }
+                checkedDays++
+            }
+
+            // set the displayingDate to show in the header
+            if (!unified) {
+                if (lessons.isNotEmpty())
+                    displayingDate = timetableDate
+                profileId = profile.id
+            }
+
+            // get all events for the current date
+            val events = app.db.eventDao().getAllByDateNow(profile.id, timetableDate)?.filterNotNull() ?: emptyList()
+
+            lessons.forEachIndexed { pos, lesson ->
+                val model = ItemWidgetTimetableModel()
+
+                model.bigStyle = widgetConfig.bigStyle
+                model.darkTheme = widgetConfig.darkTheme
+
+                model.profileId = profile.id
+
+                model.lessonId = lesson.id
+                model.lessonDate = timetableDate
+                model.startTime = lesson.displayStartTime
+                model.endTime = lesson.displayEndTime
+
+                // check if the lesson has already passed or it's currently in progress
+                if (lesson.displayDate == today) {
+                    lesson.displayEndTime?.let { endTime ->
+                        model.lessonPassed = now > endTime
+                        lesson.displayStartTime?.let { startTime ->
+                            model.lessonCurrent = now in startTime..endTime
+                        }
+                    }
+                }
+
+                // set where should the list view scroll to
+                if (model.lessonCurrent) {
+                    scrollPos = pos
+                } else if (model.lessonPassed) {
+                    scrollPos = pos + 1
+                }
+
+                // set the subject and classroom name
+                model.subjectName = lesson.displaySubjectName
+                model.classroomName = lesson.displayClassroom
+
+                // set the bell sync to calculate progress in ListProvider
+                model.bellSyncDiffMillis = bellSyncDiffMillis
+
+                // make the model aware of the lesson type
+                when (lesson.type) {
+                    Lesson.TYPE_CANCELLED -> {
+                        model.lessonCancelled = true
+                    }
+                    Lesson.TYPE_CHANGE,
+                        Lesson.TYPE_SHIFTED_SOURCE,
+                        Lesson.TYPE_SHIFTED_TARGET -> {
+                        model.lessonChange = true
+                    }
+                }
+
+                // add every event on this lesson
+                for (event in events) {
+                    if (event.startTime != null && event.startTime != lesson.displayStartTime)
+                        continue
+                    model.eventColors.add(if (event.type == TYPE_HOMEWORK) ItemWidgetTimetableModel.EVENT_COLOR_HOMEWORK else event.getColor())
+                }
+
+                models += model
+            }
+        }
+
+        if (unified) {
+            // set the title for an unified widget
+            views.setTextViewText(R.id.widgetTimetableTitle, app.getString(R.string.widget_timetable_title_unified))
+            views.setViewVisibility(R.id.widgetTimetableSubtitle, View.GONE)
+        } else {
+            // set the title to present the widget's profile
+            views.setTextViewText(R.id.widgetTimetableTitle, profileList[0].name)
+            views.setViewVisibility(R.id.widgetTimetableTitle, View.VISIBLE)
+            // make the subtitle show current date for these lessons
+            displayingDate?.let {
+                when (Date.diffDays(it, Date.getToday())) {
+                    0 -> views.setTextViewText(R.id.widgetTimetableSubtitle, app.getString(R.string.day_today_format, Week.getFullDayName(it.weekDay)))
+                    1 -> views.setTextViewText(R.id.widgetTimetableSubtitle, app.getString(R.string.day_tomorrow_format, Week.getFullDayName(it.weekDay)))
+                    else -> views.setTextViewText(R.id.widgetTimetableSubtitle, Week.getFullDayName(it.weekDay) + " " + it.formattedString)
+                }
+            }
+        }
+
+        // intent running when the header is clicked
+        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 {
+                openIntent.putExtra("profileId", it)
+            }
+            displayingDate?.let {
+                openIntent.putExtra("timetableDate", it.value)
+            }
+        }
+        openIntent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE)
+        val pendingOpenIntent = PendingIntent.getActivity(app, appWidgetId, openIntent, 0)
+        views.setOnClickPendingIntent(R.id.widgetTimetableHeader, pendingOpenIntent)
+
+        if (lessonList.isEmpty()) {
+            views.setViewVisibility(R.id.widgetTimetableLoading, View.VISIBLE)
+            views.setRemoteAdapter(R.id.widgetTimetableListView, Intent())
+            views.setTextViewText(R.id.widgetTimetableLoading, app.getString(R.string.widget_timetable_no_lessons))
+            return
+        }
+
+        timetables!!.put(appWidgetId, models)
+
+        // apply the list service to the list view
+        val listIntent = Intent(app, WidgetTimetableService::class.java)
+        listIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
+        listIntent.data = Uri.parse(listIntent.toUri(Intent.URI_INTENT_SCHEME))
+        views.setRemoteAdapter(R.id.widgetTimetableListView, listIntent)
+
+        // create an intent used to display the lesson details dialog
+        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
+        for (appWidgetId in appWidgetIds) {
+            app.appConfig.widgetTimetableConfigs.remove(appWidgetId)
+        }
+        app.saveConfig("widgetTimetableConfigs")
+    }
+
+    companion object {
+
+
+        val ACTION_SYNC_DATA = "ACTION_SYNC_DATA"
+        private val TAG = "WidgetTimetable"
+        private val modeInt = 0
+
+        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
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/ApiService.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/ApiService.kt
new file mode 100644
index 00000000..6a5bde01
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/ApiService.kt
@@ -0,0 +1,298 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-28.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2
+
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.IBinder
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.api.v2.events.*
+import pl.szczodrzynski.edziennik.api.v2.events.requests.ServiceCloseRequest
+import pl.szczodrzynski.edziennik.api.v2.events.requests.TaskCancelRequest
+import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask
+import pl.szczodrzynski.edziennik.api.v2.events.task.ErrorReportTask
+import pl.szczodrzynski.edziennik.api.v2.events.task.IApiTask
+import pl.szczodrzynski.edziennik.api.v2.events.task.NotifyTask
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import kotlin.math.min
+import kotlin.math.roundToInt
+
+class ApiService : Service() {
+    companion object {
+        const val TAG = "ApiService"
+        const val NOTIFICATION_API_CHANNEL_ID = "pl.szczodrzynski.edziennik.GET_DATA"
+        fun start(context: Context) {
+            context.startService(Intent(context, ApiService::class.java))
+        }
+        fun startAndRequest(context: Context, request: Any) {
+            context.startService(Intent(context, ApiService::class.java))
+            EventBus.getDefault().postSticky(request)
+        }
+    }
+
+    private val app by lazy { applicationContext as App }
+
+    private val finishingTaskQueue = mutableListOf(
+            NotifyTask(),
+            ErrorReportTask()
+    )
+    private val taskQueue = mutableListOf<IApiTask>()
+    private val errorList = mutableListOf<ApiError>()
+
+    private var serviceClosed = false
+    private var taskCancelled = false
+    private var taskIsRunning = false
+    private var taskRunning: IApiTask? = null // for debug purposes
+    private var taskRunningId = -1
+    private var taskMaximumId = 0
+
+    private var taskProfileId = -1
+    private var taskProgress = -1f
+    private var taskProgressText: String? = null
+
+    private val notification by lazy { EdziennikNotification(this) }
+
+    private var lastEventTime = System.currentTimeMillis()
+    private var taskCancelTries = 0
+
+    /*    ______    _     _                  _ _       _____      _ _ _                _
+         |  ____|  | |   (_)                (_) |     / ____|    | | | |              | |
+         | |__   __| |_____  ___ _ __  _ __  _| | __ | |     __ _| | | |__   __ _  ___| | __
+         |  __| / _` |_  / |/ _ \ '_ \| '_ \| | |/ / | |    / _` | | | '_ \ / _` |/ __| |/ /
+         | |___| (_| |/ /| |  __/ | | | | | | |   <  | |___| (_| | | | |_) | (_| | (__|   <
+         |______\__,_/___|_|\___|_| |_|_| |_|_|_|\_\  \_____\__,_|_|_|_.__/ \__,_|\___|_|\*/
+    private val taskCallback = object : EdziennikCallback {
+        override fun onCompleted() {
+            lastEventTime = System.currentTimeMillis()
+            d(TAG, "Task $taskRunningId (profile $taskProfileId) - $taskProgressText - finished")
+            EventBus.getDefault().post(ApiTaskFinishedEvent(taskProfileId))
+            clearTask()
+
+            notification.setIdle().post()
+            runTask()
+        }
+
+        override fun onError(apiError: ApiError) {
+            lastEventTime = System.currentTimeMillis()
+            d(TAG, "Task $taskRunningId threw an error - $apiError")
+            apiError.profileId = taskProfileId
+            EventBus.getDefault().post(ApiTaskErrorEvent(apiError))
+            errorList.add(apiError)
+            apiError.throwable?.printStackTrace()
+            if (apiError.isCritical) {
+                taskRunning?.cancel()
+                notification.setCriticalError().post()
+                clearTask()
+                runTask()
+            }
+            else {
+                notification.addError().post()
+            }
+        }
+
+        override fun onProgress(step: Float) {
+            lastEventTime = System.currentTimeMillis()
+            if (step <= 0)
+                return
+            if (taskProgress < 0)
+                taskProgress = 0f
+            taskProgress += step
+            taskProgress = min(100f, taskProgress)
+            d(TAG, "Task $taskRunningId progress: ${taskProgress.roundToInt()}%")
+            EventBus.getDefault().post(ApiTaskProgressEvent(taskProfileId, taskProgress, taskProgressText))
+            notification.setProgress(taskProgress).post()
+        }
+
+        override fun onStartProgress(stringRes: Int) {
+            lastEventTime = System.currentTimeMillis()
+            taskProgressText = getString(stringRes)
+            d(TAG, "Task $taskRunningId progress: $taskProgressText")
+            EventBus.getDefault().post(ApiTaskProgressEvent(taskProfileId, taskProgress, taskProgressText))
+            notification.setProgressText(taskProgressText).post()
+        }
+    }
+
+    /*    _______        _                               _   _
+         |__   __|      | |                             | | (_)
+            | | __ _ ___| | __   _____  _____  ___ _   _| |_ _  ___  _ __
+            | |/ _` / __| |/ /  / _ \ \/ / _ \/ __| | | | __| |/ _ \| '_ \
+            | | (_| \__ \   <  |  __/>  <  __/ (__| |_| | |_| | (_) | | | |
+            |_|\__,_|___/_|\_\  \___/_/\_\___|\___|\__,_|\__|_|\___/|_| |*/
+    private fun runTask() {
+        checkIfTaskFrozen()
+        if (taskIsRunning)
+            return
+        if (taskCancelled || serviceClosed || (taskQueue.isEmpty() && finishingTaskQueue.isEmpty())) {
+            serviceClosed = false
+            allCompleted()
+            return
+        }
+
+        lastEventTime = System.currentTimeMillis()
+
+        val task = if (taskQueue.isEmpty()) finishingTaskQueue.removeAt(0) else taskQueue.removeAt(0)
+        task.taskId = ++taskMaximumId
+        task.prepare(app)
+        taskIsRunning = true
+        taskRunningId = task.taskId
+        taskRunning = task
+        taskProfileId = task.profileId
+        taskProgress = -1f
+        taskProgressText = task.taskName
+
+        d(TAG, "Executing task $taskRunningId ($taskProgressText) - $task")
+
+        // update the notification
+        notification.setCurrentTask(taskRunningId, taskProgressText).post()
+
+        // post an event
+        EventBus.getDefault().post(ApiTaskStartedEvent(taskProfileId, task.profile))
+
+        try {
+            when (task) {
+                is EdziennikTask -> task.run(app, taskCallback)
+                is NotifyTask -> task.run(app, taskCallback)
+                is ErrorReportTask -> task.run(app, taskCallback, notification, errorList)
+            }
+        } catch (e: Exception) {
+            taskCallback.onError(ApiError(TAG, EXCEPTION_API_TASK).withThrowable(e))
+        }
+    }
+
+    /**
+     * Check if a task is inactive for more than 30 seconds.
+     * If the user tries to cancel a task with no success at least three times,
+     * consider it frozen as well.
+     *
+     * This usually means it is broken and won't become active again.
+     * This method cancels the task and removes any pointers to it.
+     */
+    private fun checkIfTaskFrozen(): Boolean {
+        if (System.currentTimeMillis() - lastEventTime > 30*1000
+                || taskCancelTries >= 3) {
+            val time = System.currentTimeMillis() - lastEventTime
+            d(TAG, "!!! Task $taskRunningId froze for $time ms. $taskRunning")
+            clearTask()
+            return true
+        }
+        return false
+    }
+
+    /**
+     * Stops the service if the current task is frozen/broken.
+     */
+    private fun stopIfTaskFrozen() {
+        if (checkIfTaskFrozen()) {
+            stopSelf()
+        }
+    }
+
+    /**
+     * Remove any task descriptors or pointers from the service.
+     */
+    private fun clearTask() {
+        taskIsRunning = false
+        taskRunningId = -1
+        taskRunning = null
+        taskProfileId = -1
+        taskProgress = -1f
+        taskProgressText = null
+        taskCancelled = false
+        taskCancelTries = 0
+    }
+
+    private fun allCompleted() {
+        EventBus.getDefault().post(ApiTaskAllFinishedEvent())
+        stopSelf()
+    }
+
+    /*    ______               _   ____
+         |  ____|             | | |  _ \
+         | |____   _____ _ __ | |_| |_) |_   _ ___
+         |  __\ \ / / _ \ '_ \| __|  _ <| | | / __|
+         | |___\ V /  __/ | | | |_| |_) | |_| \__ \
+         |______\_/ \___|_| |_|\__|____/ \__,_|__*/
+    @Subscribe(sticky = true, threadMode = ThreadMode.ASYNC)
+    fun onApiTask(task: IApiTask) {
+        EventBus.getDefault().removeStickyEvent(task)
+        d(TAG, task.toString())
+
+        if (task is EdziennikTask) {
+            when (task.request) {
+                is EdziennikTask.SyncRequest -> app.db.profileDao().idsForSyncNow.forEach {
+                    taskQueue += EdziennikTask.syncProfile(it)
+                }
+                is EdziennikTask.SyncProfileListRequest -> task.request.profileList.forEach {
+                    taskQueue += EdziennikTask.syncProfile(it)
+                }
+                else -> {
+                    taskQueue += task
+                }
+            }
+        }
+        else {
+            taskQueue += task
+        }
+        d(TAG, "EventBus received an IApiTask: $task")
+        d(TAG, "Current queue:")
+        taskQueue.forEach {
+            d(TAG, "  - $it")
+        }
+        runTask()
+    }
+
+    @Subscribe(sticky = true, threadMode = ThreadMode.ASYNC)
+    fun onTaskCancelRequest(request: TaskCancelRequest) {
+        EventBus.getDefault().removeStickyEvent(request)
+        d(TAG, request.toString())
+
+        taskCancelTries++
+        taskCancelled = true
+        taskRunning?.cancel()
+        stopIfTaskFrozen()
+    }
+    @Subscribe(sticky = true, threadMode = ThreadMode.ASYNC)
+    fun onServiceCloseRequest(request: ServiceCloseRequest) {
+        EventBus.getDefault().removeStickyEvent(request)
+        d(TAG, request.toString())
+
+        serviceClosed = true
+        taskCancelled = true
+        taskRunning?.cancel()
+        stopSelf()
+    }
+
+    /*     _____                 _                                     _     _
+          / ____|               (_)                                   (_)   | |
+         | (___   ___ _ ____   ___  ___ ___    _____   _____ _ __ _ __ _  __| | ___  ___
+          \___ \ / _ \ '__\ \ / / |/ __/ _ \  / _ \ \ / / _ \ '__| '__| |/ _` |/ _ \/ __|
+          ____) |  __/ |   \ V /| | (_|  __/ | (_) \ V /  __/ |  | |  | | (_| |  __/\__ \
+         |_____/ \___|_|    \_/ |_|\___\___|  \___/ \_/ \___|_|  |_|  |_|\__,_|\___||__*/
+    override fun onCreate() {
+        d(TAG, "Service created")
+        EventBus.getDefault().register(this)
+        notification.setIdle().setCloseAction()
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        d(TAG, "Foreground service onStartCommand")
+        startForeground(EdziennikNotification.NOTIFICATION_ID, notification.notification)
+        return START_NOT_STICKY
+    }
+
+    override fun onDestroy() {
+        EventBus.getDefault().unregister(this)
+    }
+
+    override fun onBind(intent: Intent?): IBinder? {
+        return null
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Constants.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Constants.kt
new file mode 100644
index 00000000..3c2cc86e
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Constants.kt
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-19.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2
+
+import android.os.Build
+import pl.szczodrzynski.edziennik.BuildConfig
+
+const val GET = 0
+const val POST = 1
+
+val SYSTEM_USER_AGENT = System.getProperty("http.agent") ?: "Dalvik/2.1.0 Android"
+
+val SERVER_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME} $SYSTEM_USER_AGENT"
+
+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"
+
+val LIBRUS_USER_AGENT = "$SYSTEM_USER_AGENT LibrusMobileApp"
+const val SYNERGIA_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) Gecko/20100101 Firefox/62.0"
+const val LIBRUS_CLIENT_ID = "wmSyUMo8llDAs4y9tJVYY92oyZ6h4lAt7KCuy0Gv"
+const val LIBRUS_REDIRECT_URL = "http://localhost/bar"
+const val LIBRUS_AUTHORIZE_URL = "https://portal.librus.pl/oauth2/authorize?client_id=$LIBRUS_CLIENT_ID&redirect_uri=$LIBRUS_REDIRECT_URL&response_type=code"
+const val LIBRUS_LOGIN_URL = "https://portal.librus.pl/rodzina/login/action"
+const val LIBRUS_TOKEN_URL = "https://portal.librus.pl/oauth2/access_token"
+
+const val LIBRUS_ACCOUNT_URL = "/v2/SynergiaAccounts/fresh/" // + login
+const val LIBRUS_ACCOUNTS_URL = "/v2/SynergiaAccounts"
+
+/** https://api.librus.pl/2.0 */
+const val LIBRUS_API_URL = "https://api.librus.pl/2.0"
+/** https://portal.librus.pl/api */
+const val LIBRUS_PORTAL_URL = "https://portal.librus.pl/api"
+/** https://api.librus.pl/OAuth/Token */
+const val LIBRUS_API_TOKEN_URL = "https://api.librus.pl/OAuth/Token"
+/** https://api.librus.pl/OAuth/TokenJST */
+const val LIBRUS_API_TOKEN_JST_URL = "https://api.librus.pl/OAuth/TokenJST"
+const val LIBRUS_API_AUTHORIZATION = "Mjg6ODRmZGQzYTg3YjAzZDNlYTZmZmU3NzdiNThiMzMyYjE="
+const val LIBRUS_API_SECRET_JST = "18b7c1ee08216f636a1b1a2440e68398"
+const val LIBRUS_API_CLIENT_ID_JST = "49"
+//const val LIBRUS_API_CLIENT_ID_JST_REFRESH = "42"
+
+const val LIBRUS_JST_DEMO_CODE = "68656A21"
+const val LIBRUS_JST_DEMO_PIN = "1290"
+
+const val LIBRUS_SYNERGIA_URL = "https://synergia.librus.pl"
+/** https://synergia.librus.pl/loguj/token/TOKEN/przenies */
+const val LIBRUS_SYNERGIA_TOKEN_LOGIN_URL = "https://synergia.librus.pl/loguj/token/TOKEN/przenies"
+
+const val LIBRUS_MESSAGES_URL = "https://wiadomosci.librus.pl/module"
+const val LIBRUS_SANDBOX_URL = "https://sandbox.librus.pl/index.php?action="
+
+const val IDZIENNIK_USER_AGENT = SYNERGIA_USER_AGENT
+const val IDZIENNIK_WEB_URL = "https://iuczniowie.progman.pl/idziennik"
+const val IDZIENNIK_WEB_LOGIN = "login.aspx"
+const val IDZIENNIK_WEB_SETTINGS = "mod_panelRodzica/Ustawienia.aspx"
+const val IDZIENNIK_WEB_TIMETABLE = "mod_panelRodzica/plan/WS_Plan.asmx/pobierzPlanZajec"
+const val IDZIENNIK_WEB_GRADES = "mod_panelRodzica/oceny/WS_ocenyUcznia.asmx/pobierzOcenyUcznia"
+const val IDZIENNIK_WEB_MISSING_GRADES = "mod_panelRodzica/brak_ocen/WS_BrakOcenUcznia.asmx/pobierzBrakujaceOcenyUcznia"
+const val IDZIENNIK_WEB_EXAMS = "mod_panelRodzica/sprawdziany/mod_sprawdzianyPanel.asmx/pobierzListe"
+const val IDZIENNIK_WEB_HOMEWORK = "mod_panelRodzica/pracaDomowa/WS_pracaDomowa.asmx/pobierzPraceDomowe"
+const val IDZIENNIK_WEB_NOTICES = "mod_panelRodzica/uwagi/WS_uwagiUcznia.asmx/pobierzUwagiUcznia"
+const val IDZIENNIK_WEB_ATTENDANCE = "mod_panelRodzica/obecnosci/WS_obecnosciUcznia.asmx/pobierzObecnosciUcznia"
+const val IDZIENNIK_WEB_ANNOUNCEMENTS = "mod_panelRodzica/tabOgl/WS_tablicaOgloszen.asmx/GetOgloszenia"
+const val IDZIENNIK_WEB_MESSAGES_LIST = "mod_komunikator/WS_wiadomosci.asmx/PobierzListeWiadomosci"
+
+val IDZIENNIK_API_USER_AGENT = SYSTEM_USER_AGENT
+const val IDZIENNIK_API_URL = "https://iuczniowie.progman.pl/idziennik/api"
+const val IDZIENNIK_API_CURRENT_REGISTER = "Uczniowie/\$STUDENT_ID/AktualnyDziennik"
+const val IDZIENNIK_API_GRADES = "Uczniowie/\$STUDENT_ID/Oceny/" /* + semester */
+const val IDZIENNIK_API_MESSAGES_INBOX = "Wiadomosci/Odebrane"
+const val IDZIENNIK_API_MESSAGES_SENT = "Wiadomosci/Wyslane"
+
+
+val MOBIDZIENNIK_USER_AGENT = SYSTEM_USER_AGENT
+
+const val VULCAN_API_USER_AGENT = "MobileUserAgent"
+const val VULCAN_API_APP_NAME = "VULCAN-Android-ModulUcznia"
+const val VULCAN_API_APP_VERSION = "19.4.1.436"
+const val VULCAN_API_PASSWORD = "CE75EA598C7743AD9B0B7328DED85B06"
+const val VULCAN_API_PASSWORD_FAKELOG = "012345678901234567890123456789AB"
+val VULCAN_API_DEVICE_NAME = "Szkolny.eu ${Build.MODEL}"
+
+const val VULCAN_API_ENDPOINT_CERTIFICATE = "mobile-api/Uczen.v3.UczenStart/Certyfikat"
+const val VULCAN_API_ENDPOINT_STUDENT_LIST = "mobile-api/Uczen.v3.UczenStart/ListaUczniow"
+const val VULCAN_API_ENDPOINT_DICTIONARIES = "mobile-api/Uczen.v3.Uczen/Slowniki"
+const val VULCAN_API_ENDPOINT_TIMETABLE = "mobile-api/Uczen.v3.Uczen/PlanLekcjiZeZmianami"
+const val VULCAN_API_ENDPOINT_GRADES = "mobile-api/Uczen.v3.Uczen/Oceny"
+const val VULCAN_API_ENDPOINT_GRADES_PROPOSITIONS = "mobile-api/Uczen.v3.Uczen/OcenyPodsumowanie"
+const val VULCAN_API_ENDPOINT_EVENTS = "mobile-api/Uczen.v3.Uczen/Sprawdziany"
+const val VULCAN_API_ENDPOINT_HOMEWORK = "mobile-api/Uczen.v3.Uczen/ZadaniaDomowe"
+const val VULCAN_API_ENDPOINT_NOTICES = "mobile-api/Uczen.v3.Uczen/UwagiUcznia"
+const val VULCAN_API_ENDPOINT_ATTENDANCE = "mobile-api/Uczen.v3.Uczen/Frekwencje"
+const val VULCAN_API_ENDPOINT_MESSAGES_RECEIVED = "mobile-api/Uczen.v3.Uczen/WiadomosciOdebrane"
+const val VULCAN_API_ENDPOINT_MESSAGES_SENT = "mobile-api/Uczen.v3.Uczen/WiadomosciWyslane"
+const val VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS = "mobile-api/Uczen.v3.Uczen/ZmienStatusWiadomosci"
+const val VULCAN_API_ENDPOINT_PUSH = "mobile-api/Uczen.v3.Uczen/UstawPushToken"
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/DataNotifications.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/DataNotifications.kt
new file mode 100644
index 00000000..12c10dcd
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/DataNotifications.kt
@@ -0,0 +1,210 @@
+package pl.szczodrzynski.edziennik.api.v2
+
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ANNOUNCEMENTS
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ATTENDANCE
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_BEHAVIOUR
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_GRADES
+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.R
+import pl.szczodrzynski.edziennik.api.v2.models.Data
+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) {
+    companion object {
+        private const val TAG = "DataNotifications"
+    }
+
+    val app = data.app
+    val profileId = data.profile?.id ?: -1
+    val profileName = data.profile?.name ?: ""
+    val profile = data.profile
+    val loginStore = data.loginStore
+
+    init { run {
+        if (profile == null) {
+            return@run
+        }
+
+        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)
+            data.notifications += Notification(
+                    title = app.getNotificationTitle(TYPE_TIMETABLE_LESSON_CHANGE),
+                    text = text,
+                    type = TYPE_TIMETABLE_LESSON_CHANGE,
+                    profileId = profileId,
+                    profileName = profileName,
+                    viewId = DRAWER_ITEM_TIMETABLE,
+                    addedDate = lesson.addedDate
+            ).addExtra("timetableDate", lesson.displayDate?.stringY_m_d ?: "")
+        }
+
+        for (event in app.db.eventDao().getNotNotifiedNow(profileId)) {
+            val text = if (event.type == Event.TYPE_HOMEWORK)
+                app.getString(
+                        if (event.subjectLongName.isNullOrEmpty())
+                            R.string.notification_homework_no_subject_format
+                        else
+                            R.string.notification_homework_format,
+                        event.subjectLongName,
+                        event.eventDate.formattedString
+                )
+            else
+                app.getString(
+                        if (event.subjectLongName.isNullOrEmpty())
+                            R.string.notification_event_no_subject_format
+                        else
+                            R.string.notification_event_format,
+                        event.typeName,
+                        event.eventDate.formattedString,
+                        event.subjectLongName
+                )
+            val type = if (event.type == Event.TYPE_HOMEWORK) TYPE_NEW_HOMEWORK else TYPE_NEW_EVENT
+            data.notifications += Notification(
+                    title = app.getNotificationTitle(type),
+                    text = text,
+                    type = type,
+                    profileId = profileId,
+                    profileName = profileName,
+                    viewId = if (event.type == Event.TYPE_HOMEWORK) DRAWER_ITEM_HOMEWORK else DRAWER_ITEM_AGENDA,
+                    addedDate = event.addedDate
+            ).addExtra("eventId", event.id).addExtra("eventDate", event.eventDate.value.toLong())
+        }
+
+        val today = Date.getToday()
+        val todayValue = today.value
+        profile.currentSemester = profile.dateToSemester(today)
+
+        for (grade in app.db.gradeDao().getNotNotifiedNow(profileId)) {
+            val gradeName = when (grade.type) {
+                TYPE_SEMESTER1_PROPOSED, TYPE_SEMESTER2_PROPOSED -> app.getString(R.string.grade_semester_proposed_format_2, grade.name)
+                TYPE_SEMESTER1_FINAL, TYPE_SEMESTER2_FINAL -> app.getString(R.string.grade_semester_final_format_2, grade.name)
+                TYPE_YEAR_PROPOSED -> app.getString(R.string.grade_year_proposed_format_2, grade.name)
+                TYPE_YEAR_FINAL -> app.getString(R.string.grade_year_final_format_2, grade.name)
+                else -> grade.name
+            }
+            val text = app.getString(R.string.notification_grade_format, gradeName, grade.subjectLongName)
+            data.notifications += Notification(
+                    title = app.getNotificationTitle(TYPE_NEW_GRADE),
+                    text = text,
+                    type = TYPE_NEW_GRADE,
+                    profileId = profileId,
+                    profileName = profileName,
+                    viewId = DRAWER_ITEM_GRADES,
+                    addedDate = grade.addedDate
+            ).addExtra("gradeId", grade.id).addExtra("gradesSubjectId", grade.subjectId)
+        }
+
+        for (notice in app.db.noticeDao().getNotNotifiedNow(profileId)) {
+            val noticeTypeStr = if (notice.type == Notice.TYPE_POSITIVE) app.getString(R.string.notification_notice_praise) else if (notice.type == Notice.TYPE_NEGATIVE) app.getString(R.string.notification_notice_warning) else app.getString(R.string.notification_notice_new)
+            val text = app.getString(R.string.notification_notice_format, noticeTypeStr, notice.teacherFullName, Date.fromMillis(notice.addedDate).formattedString)
+            data.notifications += Notification(
+                    title = app.getNotificationTitle(TYPE_NEW_NOTICE),
+                    text = text,
+                    type = TYPE_NEW_NOTICE,
+                    profileId = profileId,
+                    profileName = profileName,
+                    viewId = DRAWER_ITEM_BEHAVIOUR,
+                    addedDate = notice.addedDate
+            ).addExtra("noticeId", notice.id)
+        }
+
+        for (attendance in app.db.attendanceDao().getNotNotifiedNow(profileId)) {
+            var attendanceTypeStr = app.getString(R.string.notification_type_attendance)
+            when (attendance.type) {
+                Attendance.TYPE_ABSENT -> attendanceTypeStr = app.getString(R.string.notification_absence)
+                Attendance.TYPE_ABSENT_EXCUSED -> attendanceTypeStr = app.getString(R.string.notification_absence_excused)
+                Attendance.TYPE_BELATED -> attendanceTypeStr = app.getString(R.string.notification_belated)
+                Attendance.TYPE_BELATED_EXCUSED -> attendanceTypeStr = app.getString(R.string.notification_belated_excused)
+                Attendance.TYPE_RELEASED -> attendanceTypeStr = app.getString(R.string.notification_release)
+            }
+            val text = app.getString(
+                    if (attendance.subjectLongName.isNullOrEmpty())
+                        R.string.notification_attendance_no_lesson_format
+                    else
+                        R.string.notification_attendance_format,
+                    attendanceTypeStr,
+                    attendance.subjectLongName,
+                    attendance.lessonDate.formattedString
+            )
+            data.notifications += Notification(
+                    title = app.getNotificationTitle(TYPE_NEW_ATTENDANCE),
+                    text = text,
+                    type = TYPE_NEW_ATTENDANCE,
+                    profileId = profileId,
+                    profileName = profileName,
+                    viewId = DRAWER_ITEM_ATTENDANCE,
+                    addedDate = attendance.addedDate
+            ).addExtra("attendanceId", attendance.id).addExtra("attendanceSubjectId", attendance.subjectId)
+        }
+
+        for (announcement in app.db.announcementDao().getNotNotifiedNow(profileId)) {
+            val text = app.context.getString(R.string.notification_announcement_format, announcement.subject)
+            data.notifications += Notification(
+                    title = app.getNotificationTitle(TYPE_NEW_ANNOUNCEMENT),
+                    text = text,
+                    type = TYPE_NEW_ANNOUNCEMENT,
+                    profileId = profileId,
+                    profileName = profileName,
+                    viewId = DRAWER_ITEM_ANNOUNCEMENTS,
+                    addedDate = announcement.addedDate
+            ).addExtra("announcementId", announcement.id)
+        }
+
+        for (message in app.db.messageDao().getReceivedNotNotifiedNow(profileId)) {
+            val text = app.context.getString(R.string.notification_message_format, message.senderFullName, message.subject)
+            data.notifications += Notification(
+                    title = app.getNotificationTitle(TYPE_NEW_MESSAGE),
+                    text = text,
+                    type = TYPE_NEW_MESSAGE,
+                    profileId = profileId,
+                    profileName = profileName,
+                    viewId = DRAWER_ITEM_MESSAGES,
+                    addedDate = message.addedDate
+            ).addExtra("messageType", Message.TYPE_RECEIVED.toLong()).addExtra("messageId", message.id)
+        }
+
+        val luckyNumbers = app.db.luckyNumberDao().getNotNotifiedNow(profileId)
+        luckyNumbers?.removeAll { it.date < today }
+        luckyNumbers?.forEach { luckyNumber ->
+            val text = when (luckyNumber.date.value) {
+                todayValue -> // LN for today
+                    app.getString(if (profile.studentNumber != -1 && profile.studentNumber == luckyNumber.number) R.string.notification_lucky_number_yours_format else R.string.notification_lucky_number_format, luckyNumber.number)
+                todayValue + 1 -> // LN for tomorrow
+                    app.getString(if (profile.studentNumber != -1 && profile.studentNumber == luckyNumber.number) R.string.notification_lucky_number_yours_tomorrow_format else R.string.notification_lucky_number_tomorrow_format, luckyNumber.number)
+                else -> // LN for later
+                    app.getString(if (profile.studentNumber != -1 && profile.studentNumber == luckyNumber.number) R.string.notification_lucky_number_yours_later_format else R.string.notification_lucky_number_later_format, luckyNumber.date.formattedString, luckyNumber.number)
+            }
+            data.notifications += Notification(
+                    title = app.getNotificationTitle(TYPE_LUCKY_NUMBER),
+                    text = text,
+                    type = TYPE_LUCKY_NUMBER,
+                    profileId = profileId,
+                    profileName = profileName,
+                    viewId = DRAWER_ITEM_HOME,
+                    addedDate = luckyNumber.addedDate
+            )
+        }
+
+        data.db.metadataDao().setAllNotified(profileId, true)
+    }}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/EdziennikNotification.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/EdziennikNotification.kt
new file mode 100644
index 00000000..2db9ecf1
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/EdziennikNotification.kt
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-1.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2
+
+import android.app.Notification
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.PRIORITY_MIN
+import pl.szczodrzynski.edziennik.R
+import kotlin.math.roundToInt
+
+
+class EdziennikNotification(val context: Context) {
+    companion object {
+        const val NOTIFICATION_ID = 20191001
+    }
+
+    private val notificationManager by lazy { context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager }
+
+    private val notificationBuilder: NotificationCompat.Builder by lazy {
+        NotificationCompat.Builder(context, ApiService.NOTIFICATION_API_CHANNEL_ID)
+                .setSmallIcon(R.drawable.ic_notification)
+                .setPriority(PRIORITY_MIN)
+                .setOngoing(true)
+                .setLocalOnly(true)
+    }
+
+    val notification: Notification
+        get() = notificationBuilder.build()
+
+    private var errorCount = 0
+    private var criticalErrorCount = 0
+
+    private fun cancelPendingIntent(taskId: Int): PendingIntent {
+        val intent = Intent("pl.szczodrzynski.edziennik.SZKOLNY_MAIN")
+        intent.putExtra("task", "TaskCancelRequest")
+        intent.putExtra("taskId", taskId)
+        return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT) as PendingIntent
+    }
+    private val closePendingIntent: PendingIntent
+        get() {
+            val intent = Intent("pl.szczodrzynski.edziennik.SZKOLNY_MAIN")
+            intent.putExtra("task", "ServiceCloseRequest")
+            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT) as PendingIntent
+        }
+
+    private fun errorCountText(): String? {
+        var result = ""
+        if (criticalErrorCount > 0) {
+            result += context.resources.getQuantityString(R.plurals.critical_errors_format, criticalErrorCount, criticalErrorCount)
+        }
+        if (criticalErrorCount > 0 && errorCount > 0) {
+            result += ", "
+        }
+        if (errorCount > 0) {
+            result += context.resources.getQuantityString(R.plurals.normal_errors_format, errorCount, errorCount)
+        }
+        return if (result.isEmpty()) null else result
+    }
+
+    fun setIdle(): EdziennikNotification {
+        notificationBuilder.setContentTitle(context.getString(R.string.edziennik_notification_api_title))
+        notificationBuilder.setProgress(0, 0, false)
+        notificationBuilder.apply {
+            val str = context.getString(R.string.edziennik_notification_api_text)
+            setStyle(NotificationCompat.BigTextStyle().bigText(str))
+            setContentText(str)
+        }
+        setCloseAction()
+        return this
+    }
+
+    fun addError(): EdziennikNotification {
+        errorCount++
+        return this
+    }
+    fun setCriticalError(): EdziennikNotification {
+        criticalErrorCount++
+        notificationBuilder.setContentTitle(context.getString(R.string.edziennik_notification_api_error_title))
+        notificationBuilder.setProgress(0, 0, false)
+        notificationBuilder.apply {
+            val str = errorCountText()
+            setStyle(NotificationCompat.BigTextStyle().bigText(str))
+            setContentText(str)
+        }
+        setCloseAction()
+        return this
+    }
+
+    fun setProgress(progress: Float): EdziennikNotification {
+        notificationBuilder.setProgress(100, progress.roundToInt(), progress < 0f)
+        return this
+    }
+    fun setProgressText(progressText: String?): EdziennikNotification {
+        notificationBuilder.setContentTitle(progressText)
+        return this
+    }
+
+    fun setCurrentTask(taskId: Int, progressText: String?): EdziennikNotification {
+        notificationBuilder.setProgress(100, 0, true)
+        notificationBuilder.setContentTitle(progressText)
+        notificationBuilder.apply {
+            val str = errorCountText()
+            setStyle(NotificationCompat.BigTextStyle().bigText(str))
+            setContentText(str)
+        }
+        setCancelAction(taskId)
+        return this
+    }
+
+    fun setCloseAction(): EdziennikNotification {
+        notificationBuilder.mActions.clear()
+        notificationBuilder.addAction(
+                NotificationCompat.Action(
+                        R.drawable.ic_notification,
+                        context.getString(R.string.edziennik_notification_api_close),
+                        closePendingIntent
+                ))
+        return this
+    }
+    private fun setCancelAction(taskId: Int) {
+        notificationBuilder.mActions.clear()
+        notificationBuilder.addAction(
+                NotificationCompat.Action(
+                        R.drawable.ic_notification,
+                        context.getString(R.string.edziennik_notification_api_cancel),
+                        cancelPendingIntent(taskId)
+                ))
+    }
+
+    fun post() {
+        notificationManager.notify(NOTIFICATION_ID, notification)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/EndpointChooser.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/EndpointChooser.kt
new file mode 100644
index 00000000..c4a97f98
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/EndpointChooser.kt
@@ -0,0 +1,83 @@
+package pl.szczodrzynski.edziennik.api.v2
+
+import pl.szczodrzynski.edziennik.api.v2.models.Data
+import pl.szczodrzynski.edziennik.api.v2.models.Feature
+import pl.szczodrzynski.edziennik.api.v2.models.LoginMethod
+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
+
+    val possibleLoginMethods = data.loginMethods.toMutableList()
+
+    for (loginMethod in loginMethods) {
+        if (loginMethod.isPossible(profile, loginStore))
+            possibleLoginMethods += loginMethod.loginMethodId
+    }
+
+    //var highestLoginMethod = 0
+    var endpointList = mutableListOf<Feature>()
+    val requiredLoginMethods = mutableListOf<Int>()
+
+    data.targetEndpointIds.clear()
+    data.targetLoginMethodIds.clear()
+
+    // get all endpoints for every feature, only if possible to login and possible/necessary to sync
+    for (featureId in featureIds) {
+        features.filter {
+            it.featureId == featureId // feature ID matches
+                    && possibleLoginMethods.containsAll(it.requiredLoginMethods) // is possible to login
+                    && it.shouldSync?.invoke(data) ?: true // is necessary/possible to sync
+        }.let {
+            endpointList.addAll(it)
+        }
+    }
+
+    val timestamp = System.currentTimeMillis()
+
+    endpointList = endpointList
+            // sort the endpoint list by feature ID and priority
+            .sortedWith(compareBy(Feature::featureId, Feature::priority))
+            // select only the most important endpoint for each feature
+            .distinctBy { it.featureId }
+            .toMutableList()
+            // add all endpoint IDs and required login methods, filtering using timers
+            .onEach { feature ->
+                feature.endpointIds.forEach { endpoint ->
+                    (data.endpointTimers
+                            .singleOrNull { it.endpointId == endpoint.first } ?: EndpointTimer(data.profile?.id ?: -1, endpoint.first))
+                            .let { timer ->
+                                if (timer.nextSync == SYNC_ALWAYS ||
+                                        (viewId != null && timer.viewId == viewId) ||
+                                        (timer.nextSync != SYNC_NEVER && timer.nextSync < timestamp)) {
+                                    data.targetEndpointIds.add(endpoint.first)
+                                    requiredLoginMethods.add(endpoint.second)
+                                }
+                            }
+                }
+            }
+
+    // check every login method for any dependencies
+    for (loginMethodId in requiredLoginMethods) {
+        var requiredLoginMethod: Int? = loginMethodId
+        while (requiredLoginMethod != LOGIN_METHOD_NOT_NEEDED) {
+            loginMethods.singleOrNull { it.loginMethodId == requiredLoginMethod }?.let { loginMethod ->
+                if (requiredLoginMethod != null)
+                    data.targetLoginMethodIds.add(requiredLoginMethod!!)
+                requiredLoginMethod = loginMethod.requiredLoginMethod(data.profile, data.loginStore)
+            }
+        }
+    }
+
+    // sort and distinct every login method and endpoint
+    data.targetLoginMethodIds = data.targetLoginMethodIds.toHashSet().toMutableList()
+    data.targetLoginMethodIds.sort()
+
+    data.targetEndpointIds = data.targetEndpointIds.toHashSet().toMutableList()
+    data.targetEndpointIds.sort()
+
+    progressCount = targetLoginMethodIds.size + targetEndpointIds.size
+    progressStep = if (progressCount <= 0) 0f else 100f / progressCount.toFloat()
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Errors.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Errors.kt
new file mode 100644
index 00000000..c6a2a35a
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Errors.kt
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-21.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2
+
+/*const val CODE_OTHER                                        = 0
+const val CODE_OK                                           = 1
+const val CODE_NO_INTERNET                                  = 10
+const val CODE_SSL_ERROR                                    = 13
+const val CODE_ARCHIVED                                     = 5
+const val CODE_MAINTENANCE                                  = 6
+const val CODE_LOGIN_ERROR                                  = 7
+const val CODE_ACCOUNT_MISMATCH                             = 8
+const val CODE_APP_SERVER_ERROR                             = 9
+const val CODE_MULTIACCOUNT_SETUP                           = 12
+const val CODE_TIMEOUT                                      = 11
+const val CODE_PROFILE_NOT_FOUND                            = 14
+const val CODE_ATTACHMENT_NOT_AVAILABLE                     = 28
+const val CODE_INVALID_LOGIN                                = 2
+const val CODE_INVALID_SERVER_ADDRESS                       = 21
+const val CODE_INVALID_SCHOOL_NAME                          = 22
+const val CODE_INVALID_DEVICE                               = 23
+const val CODE_OLD_PASSWORD                                 = 4
+const val CODE_INVALID_TOKEN                                = 24
+const val CODE_EXPIRED_TOKEN                                = 27
+const val CODE_INVALID_SYMBOL                               = 25
+const val CODE_INVALID_PIN                                  = 26
+const val CODE_LIBRUS_NOT_ACTIVATED                         = 29
+const val CODE_SYNERGIA_NOT_ACTIVATED                       = 32
+const val CODE_LIBRUS_DISCONNECTED                          = 31
+const val CODE_PROFILE_ARCHIVED                             = 30*/
+
+const val ERROR_REQUEST_FAILURE                             = 50
+const val ERROR_REQUEST_HTTP_400                            = 51
+const val ERROR_REQUEST_HTTP_401                            = 52
+const val ERROR_REQUEST_HTTP_403                            = 53
+const val ERROR_REQUEST_HTTP_404                            = 54
+const val ERROR_REQUEST_HTTP_405                            = 55
+const val ERROR_REQUEST_HTTP_410                            = 56
+const val ERROR_REQUEST_HTTP_500                            = 57
+const val ERROR_REQUEST_FAILURE_HOSTNAME_NOT_FOUND          = 60
+const val ERROR_REQUEST_FAILURE_TIMEOUT                     = 61
+const val ERROR_REQUEST_FAILURE_NO_INTERNET                 = 62
+const val ERROR_RESPONSE_EMPTY                              = 100
+const val ERROR_LOGIN_DATA_MISSING                          = 101
+const val ERROR_PROFILE_MISSING                             = 105
+const val ERROR_INVALID_LOGIN_MODE                          = 110
+const val ERROR_LOGIN_METHOD_NOT_SATISFIED                  = 111
+const val ERROR_NOT_IMPLEMENTED                             = 112
+const val ERROR_FILE_DOWNLOAD                               = 113
+
+const val ERROR_NO_STUDENTS_IN_ACCOUNT                      = 115
+
+const val CODE_INTERNAL_LIBRUS_ACCOUNT_410                  = 120
+const val CODE_INTERNAL_LIBRUS_SYNERGIA_EXPIRED             = 121
+const val ERROR_LOGIN_LIBRUS_API_CAPTCHA_NEEDED             = 124
+const val ERROR_LOGIN_LIBRUS_API_CONNECTION_PROBLEMS        = 125
+const val ERROR_LOGIN_LIBRUS_API_INVALID_CLIENT             = 126
+const val ERROR_LOGIN_LIBRUS_API_REG_ACCEPT_NEEDED          = 127
+const val ERROR_LOGIN_LIBRUS_API_CHANGE_PASSWORD_ERROR      = 128
+const val ERROR_LOGIN_LIBRUS_API_PASSWORD_CHANGE_REQUIRED   = 129
+const val ERROR_LOGIN_LIBRUS_API_INVALID_LOGIN              = 130
+const val ERROR_LOGIN_LIBRUS_API_OTHER                      = 131
+const val ERROR_LOGIN_LIBRUS_PORTAL_CSRF_MISSING            = 132
+const val ERROR_LOGIN_LIBRUS_PORTAL_NOT_ACTIVATED           = 133
+const val ERROR_LOGIN_LIBRUS_PORTAL_ACTION_ERROR            = 134
+const val ERROR_LOGIN_LIBRUS_PORTAL_SYNERGIA_TOKEN_MISSING  = 139
+const val ERROR_LIBRUS_API_TOKEN_EXPIRED                    = 140
+const val ERROR_LIBRUS_API_INSUFFICIENT_SCOPES              = 141
+const val ERROR_LIBRUS_API_OTHER                            = 142
+const val ERROR_LIBRUS_API_ACCESS_DENIED                    = 143
+const val ERROR_LIBRUS_API_RESOURCE_NOT_FOUND               = 144
+const val ERROR_LIBRUS_API_DATA_NOT_FOUND                   = 145
+const val ERROR_LIBRUS_API_TIMETABLE_NOT_PUBLIC             = 146
+const val ERROR_LIBRUS_API_RESOURCE_ACCESS_DENIED           = 147
+const val ERROR_LIBRUS_API_INVALID_REQUEST_PARAMS           = 148
+const val ERROR_LIBRUS_API_INCORRECT_ENDPOINT               = 149
+const val ERROR_LIBRUS_API_LUCKY_NUMBER_NOT_ACTIVE          = 150
+const val ERROR_LIBRUS_API_NOTES_NOT_ACTIVE                 = 151
+const val ERROR_LOGIN_LIBRUS_SYNERGIA_NO_TOKEN              = 152
+const val ERROR_LOGIN_LIBRUS_SYNERGIA_TOKEN_INVALID         = 153
+const val ERROR_LOGIN_LIBRUS_SYNERGIA_NO_SESSION_ID         = 154
+const val ERROR_LIBRUS_MESSAGES_ACCESS_DENIED               = 155
+const val ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED               = 156
+const val ERROR_LOGIN_LIBRUS_MESSAGES_NO_SESSION_ID         = 157
+const val ERROR_LIBRUS_PORTAL_ACCESS_DENIED                 = 158
+const val ERROR_LIBRUS_PORTAL_API_DISABLED                  = 159
+const val ERROR_LIBRUS_PORTAL_SYNERGIA_DISCONNECTED         = 160
+const val ERROR_LIBRUS_PORTAL_OTHER                         = 161
+const val ERROR_LIBRUS_PORTAL_SYNERGIA_NOT_FOUND            = 162
+const val ERROR_LOGIN_LIBRUS_PORTAL_OTHER                   = 163
+const val ERROR_LOGIN_LIBRUS_PORTAL_CODE_EXPIRED            = 164
+const val ERROR_LOGIN_LIBRUS_PORTAL_CODE_REVOKED            = 165
+const val ERROR_LOGIN_LIBRUS_PORTAL_NO_CLIENT_ID            = 166
+const val ERROR_LOGIN_LIBRUS_PORTAL_NO_CODE                 = 167
+const val ERROR_LOGIN_LIBRUS_PORTAL_NO_REFRESH              = 168
+const val ERROR_LOGIN_LIBRUS_PORTAL_NO_REDIRECT             = 169
+const val ERROR_LOGIN_LIBRUS_PORTAL_UNSUPPORTED_GRANT       = 170
+const val ERROR_LOGIN_LIBRUS_PORTAL_INVALID_CLIENT_ID       = 171
+const val ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_INVALID         = 172
+const val ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_REVOKED         = 173
+const val ERROR_LIBRUS_SYNERGIA_OTHER                       = 174
+const val ERROR_LIBRUS_SYNERGIA_MAINTENANCE                 = 175
+const val ERROR_LIBRUS_MESSAGES_MAINTENANCE                 = 176
+const val ERROR_LIBRUS_MESSAGES_ERROR                       = 177
+const val ERROR_LIBRUS_MESSAGES_OTHER                       = 178
+const val ERROR_LOGIN_LIBRUS_MESSAGES_INVALID_LOGIN         = 179
+const val ERROR_LOGIN_LIBRUS_PORTAL_INVALID_LOGIN           = 180
+const val ERROR_LIBRUS_API_MAINTENANCE                      = 181
+const val ERROR_LIBRUS_PORTAL_MAINTENANCE                   = 182
+
+const val ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_LOGIN        = 201
+const val ERROR_LOGIN_MOBIDZIENNIK_WEB_OLD_PASSWORD         = 202
+const val ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_DEVICE       = 203
+const val ERROR_LOGIN_MOBIDZIENNIK_WEB_ARCHIVED             = 204
+const val ERROR_LOGIN_MOBIDZIENNIK_WEB_MAINTENANCE          = 205
+const val ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_ADDRESS      = 206
+const val ERROR_LOGIN_MOBIDZIENNIK_WEB_OTHER                = 210
+const val ERROR_MOBIDZIENNIK_WEB_ACCESS_DENIED              = 211
+const val ERROR_MOBIDZIENNIK_WEB_NO_SESSION_KEY             = 212
+const val ERROR_MOBIDZIENNIK_WEB_NO_SESSION_VALUE           = 216
+const val ERROR_MOBIDZIENNIK_WEB_NO_SERVER_ID               = 213
+const val ERROR_MOBIDZIENNIK_WEB_INVALID_RESPONSE           = 214
+const val ERROR_LOGIN_MOBIDZIENNIK_WEB_NO_SESSION_ID        = 215
+
+const val ERROR_LOGIN_VULCAN_INVALID_SYMBOL                 = 301
+const val ERROR_LOGIN_VULCAN_INVALID_TOKEN                  = 302
+const val ERROR_LOGIN_VULCAN_INVALID_PIN                    = 309
+const val ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING        = 310
+const val ERROR_LOGIN_VULCAN_INVALID_PIN_1_REMAINING        = 311
+const val ERROR_LOGIN_VULCAN_INVALID_PIN_2_REMAINING        = 312
+const val ERROR_LOGIN_VULCAN_EXPIRED_TOKEN                  = 321
+const val ERROR_LOGIN_VULCAN_OTHER                          = 322
+const val ERROR_LOGIN_VULCAN_ONLY_KINDERGARTEN              = 330
+const val ERROR_LOGIN_VULCAN_NO_PUPILS                      = 331
+const val ERROR_VULCAN_API_MAINTENANCE                      = 340
+const val ERROR_VULCAN_API_BAD_REQUEST                      = 341
+const val ERROR_VULCAN_API_OTHER                            = 342
+
+const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN           = 401
+const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME     = 402
+const val ERROR_LOGIN_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED  = 403
+const val ERROR_LOGIN_IDZIENNIK_WEB_MAINTENANCE             = 404
+const val ERROR_LOGIN_IDZIENNIK_WEB_SERVER_ERROR            = 405
+const val ERROR_LOGIN_IDZIENNIK_WEB_OTHER                   = 410
+const val ERROR_LOGIN_IDZIENNIK_WEB_API_NO_ACCESS           = 411 /* {"d":{"__type":"mds.Web.mod_komunikator.WS_mod_wiadomosci+detailWiadomosci","Wiadomosc":{"_recordId":0,"DataNadania":null,"DataOdczytania":null,"Nadawca":null,"ListaOdbiorcow":[],"Tytul":null,"Text":null,"ListaZal":[]},"Bledy":{"__type":"mds.Module.Globalne+sBledy","CzyJestBlad":true,"ListaBledow":["Nie masz dostępu do tych zasobów!"],"ListaKodowBledow":[]},"czyJestWiecej":false}} */
+const val ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION              = 420
+const val ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH                 = 421
+const val ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER               = 422
+const val ERROR_IDZIENNIK_WEB_ACCESS_DENIED                 = 430
+const val ERROR_IDZIENNIK_WEB_OTHER                         = 431
+const val ERROR_IDZIENNIK_WEB_MAINTENANCE                   = 432
+const val ERROR_IDZIENNIK_WEB_SERVER_ERROR                  = 433
+const val ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED        = 434
+const val ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR        = 440
+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_TEMPLATE_WEB_OTHER                          = 801
+
+const val EXCEPTION_API_TASK                                = 900
+const val EXCEPTION_LOGIN_LIBRUS_API_TOKEN                  = 901
+const val EXCEPTION_LOGIN_LIBRUS_PORTAL_TOKEN               = 902
+const val EXCEPTION_LIBRUS_PORTAL_SYNERGIA_TOKEN            = 903
+const val EXCEPTION_LIBRUS_API_REQUEST                      = 904
+const val EXCEPTION_LIBRUS_SYNERGIA_REQUEST                 = 905
+const val EXCEPTION_MOBIDZIENNIK_WEB_REQUEST                = 906
+const val EXCEPTION_VULCAN_API_REQUEST                      = 907
+const val EXCEPTION_NOTIFY_AND_SYNC                         = 910
+const val EXCEPTION_LIBRUS_MESSAGES_REQUEST                 = 911
+const val EXCEPTION_IDZIENNIK_WEB_REQUEST                   = 912
+const val EXCEPTION_IDZIENNIK_WEB_API_REQUEST               = 913
+const val EXCEPTION_IDZIENNIK_API_REQUEST                   = 914
+
+const val LOGIN_NO_ARGUMENTS                                = 1201
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Features.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Features.kt
new file mode 100644
index 00000000..78b77f07
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Features.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-29.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2
+
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ANNOUNCEMENTS
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ATTENDANCE
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_BEHAVIOUR
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_GRADES
+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.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
+internal const val FEATURE_GRADES = 3
+internal const val FEATURE_HOMEWORK = 4
+internal const val FEATURE_BEHAVIOUR = 5
+internal const val FEATURE_ATTENDANCE = 6
+internal const val FEATURE_MESSAGES_INBOX = 7
+internal const val FEATURE_MESSAGES_SENT = 8
+internal const val FEATURE_ANNOUNCEMENTS = 9
+
+internal const val FEATURE_ALWAYS_NEEDED = 100
+internal const val FEATURE_STUDENT_INFO = 101
+internal const val FEATURE_STUDENT_NUMBER = 109
+internal const val FEATURE_SCHOOL_INFO = 102
+internal const val FEATURE_CLASS_INFO = 103
+internal const val FEATURE_TEAM_INFO = 104
+internal const val FEATURE_LUCKY_NUMBER = 105
+internal const val FEATURE_TEACHERS = 106
+internal const val FEATURE_SUBJECTS = 107
+internal const val FEATURE_CLASSROOMS = 108
+internal const val FEATURE_PUSH_CONFIG = 120
+
+object Features {
+    private fun getAllNecessary(): List<Int> = listOf(
+            FEATURE_ALWAYS_NEEDED,
+            FEATURE_STUDENT_INFO,
+            FEATURE_STUDENT_NUMBER,
+            FEATURE_SCHOOL_INFO,
+            FEATURE_CLASS_INFO,
+            FEATURE_TEAM_INFO,
+            FEATURE_LUCKY_NUMBER,
+            FEATURE_TEACHERS,
+            FEATURE_SUBJECTS,
+            FEATURE_CLASSROOMS)
+
+    private fun getAllFeatures(): List<Int> = listOf(
+            FEATURE_TIMETABLE,
+            FEATURE_AGENDA,
+            FEATURE_GRADES,
+            FEATURE_HOMEWORK,
+            FEATURE_BEHAVIOUR,
+            FEATURE_ATTENDANCE,
+            FEATURE_MESSAGES_INBOX,
+            FEATURE_MESSAGES_SENT,
+            FEATURE_ANNOUNCEMENTS)
+
+    fun getAllIds(): List<Int> = getAllFeatures() + getAllNecessary()
+
+    fun getIdsByView(targetId: Int, targetType: Int): List<Int> {
+        return (when (targetId) {
+            DRAWER_ITEM_HOME -> getAllFeatures()
+            DRAWER_ITEM_TIMETABLE -> listOf(FEATURE_TIMETABLE)
+            DRAWER_ITEM_AGENDA -> listOf(FEATURE_AGENDA)
+            DRAWER_ITEM_GRADES -> listOf(FEATURE_GRADES)
+            DRAWER_ITEM_MESSAGES -> when (targetType) {
+                TYPE_RECEIVED -> listOf(FEATURE_MESSAGES_INBOX)
+                TYPE_SENT -> listOf(FEATURE_MESSAGES_SENT)
+                else -> listOf(FEATURE_MESSAGES_INBOX, FEATURE_MESSAGES_SENT)
+            }
+            DRAWER_ITEM_HOMEWORK -> listOf(FEATURE_HOMEWORK)
+            DRAWER_ITEM_BEHAVIOUR -> listOf(FEATURE_BEHAVIOUR)
+            DRAWER_ITEM_ATTENDANCE -> listOf(FEATURE_ATTENDANCE)
+            DRAWER_ITEM_ANNOUNCEMENTS -> listOf(FEATURE_ANNOUNCEMENTS)
+            else -> getAllFeatures()
+        } + getAllNecessary()).sorted()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/LoginMethods.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/LoginMethods.kt
new file mode 100644
index 00000000..1d4b6288
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/LoginMethods.kt
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-20.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2
+
+import pl.szczodrzynski.edziennik.api.v2.idziennik.login.IdziennikLoginApi
+import pl.szczodrzynski.edziennik.api.v2.idziennik.login.IdziennikLoginWeb
+import pl.szczodrzynski.edziennik.api.v2.librus.login.LibrusLoginApi
+import pl.szczodrzynski.edziennik.api.v2.librus.login.LibrusLoginMessages
+import pl.szczodrzynski.edziennik.api.v2.librus.login.LibrusLoginPortal
+import pl.szczodrzynski.edziennik.api.v2.librus.login.LibrusLoginSynergia
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.login.MobidziennikLoginWeb
+import pl.szczodrzynski.edziennik.api.v2.models.LoginMethod
+import pl.szczodrzynski.edziennik.api.v2.template.login.TemplateLoginApi
+import pl.szczodrzynski.edziennik.api.v2.template.login.TemplateLoginWeb
+import pl.szczodrzynski.edziennik.api.v2.vulcan.login.VulcanLoginApi
+
+// librus
+// mobidziennik
+// idziennik
+// vulcan
+// mobireg
+
+const val SYNERGIA_API_ENABLED = true
+
+
+
+const val LOGIN_TYPE_IDZIENNIK = 3
+
+const val LOGIN_TYPE_TEMPLATE = 21
+
+// LOGIN MODES
+const val LOGIN_MODE_IDZIENNIK_WEB = 0
+
+const val LOGIN_MODE_TEMPLATE_WEB = 0
+
+// LOGIN METHODS
+const val LOGIN_METHOD_NOT_NEEDED = -1
+const val LOGIN_METHOD_IDZIENNIK_WEB = 100
+const val LOGIN_METHOD_IDZIENNIK_API = 200
+const val LOGIN_METHOD_TEMPLATE_WEB = 100
+const val LOGIN_METHOD_TEMPLATE_API = 200
+
+const val LOGIN_TYPE_LIBRUS = 2
+const val LOGIN_MODE_LIBRUS_EMAIL = 0
+const val LOGIN_MODE_LIBRUS_SYNERGIA = 1
+const val LOGIN_MODE_LIBRUS_JST = 2
+const val LOGIN_METHOD_LIBRUS_PORTAL = 100
+const val LOGIN_METHOD_LIBRUS_API = 200
+const val LOGIN_METHOD_LIBRUS_SYNERGIA = 300
+const val LOGIN_METHOD_LIBRUS_MESSAGES = 400
+val librusLoginMethods = listOf(
+        LoginMethod(LOGIN_TYPE_LIBRUS, LOGIN_METHOD_LIBRUS_PORTAL, LibrusLoginPortal::class.java)
+                .withIsPossible { _, loginStore ->
+                    loginStore.mode == LOGIN_MODE_LIBRUS_EMAIL
+                }
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED },
+
+        LoginMethod(LOGIN_TYPE_LIBRUS, LOGIN_METHOD_LIBRUS_API, LibrusLoginApi::class.java)
+                .withIsPossible { _, loginStore ->
+                    loginStore.mode != LOGIN_MODE_LIBRUS_SYNERGIA || SYNERGIA_API_ENABLED
+                }
+                .withRequiredLoginMethod { _, loginStore ->
+                    if (loginStore.mode == LOGIN_MODE_LIBRUS_EMAIL) LOGIN_METHOD_LIBRUS_PORTAL else LOGIN_METHOD_NOT_NEEDED
+                },
+
+        LoginMethod(LOGIN_TYPE_LIBRUS, LOGIN_METHOD_LIBRUS_SYNERGIA, LibrusLoginSynergia::class.java)
+                .withIsPossible { _, loginStore -> !loginStore.hasLoginData("fakeLogin") }
+                .withRequiredLoginMethod { profile, _ ->
+                    if (profile?.hasStudentData("accountPassword") == false) LOGIN_METHOD_LIBRUS_API else LOGIN_METHOD_NOT_NEEDED
+                },
+
+        LoginMethod(LOGIN_TYPE_LIBRUS, LOGIN_METHOD_LIBRUS_MESSAGES, LibrusLoginMessages::class.java)
+                .withIsPossible { _, loginStore -> !loginStore.hasLoginData("fakeLogin") }
+                .withRequiredLoginMethod { profile, _ ->
+                    if (profile?.hasStudentData("accountPassword") == false) LOGIN_METHOD_LIBRUS_SYNERGIA else LOGIN_METHOD_NOT_NEEDED
+                }
+)
+
+const val LOGIN_TYPE_MOBIDZIENNIK = 1
+const val LOGIN_MODE_MOBIDZIENNIK_WEB = 0
+const val LOGIN_METHOD_MOBIDZIENNIK_WEB = 100
+const val LOGIN_METHOD_MOBIDZIENNIK_API2 = 300
+val mobidziennikLoginMethods = listOf(
+        LoginMethod(LOGIN_TYPE_MOBIDZIENNIK, LOGIN_METHOD_MOBIDZIENNIK_WEB, MobidziennikLoginWeb::class.java)
+                .withIsPossible { _, _ -> true }
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }/*,
+
+        LoginMethod(LOGIN_TYPE_MOBIDZIENNIK, LOGIN_METHOD_MOBIDZIENNIK_API2, MobidziennikLoginApi2::class.java)
+                .withIsPossible { _, loginStore -> loginStore.hasLoginData("email") }
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }*/
+)
+
+const val LOGIN_TYPE_VULCAN = 4
+const val LOGIN_MODE_VULCAN_API = 0
+const val LOGIN_MODE_VULCAN_WEB = 1
+const val LOGIN_METHOD_VULCAN_WEB_MAIN = 100
+const val LOGIN_METHOD_VULCAN_WEB_NEW = 200
+const val LOGIN_METHOD_VULCAN_WEB_OLD = 300
+const val LOGIN_METHOD_VULCAN_WEB_MESSAGES = 400
+const val LOGIN_METHOD_VULCAN_API = 500
+val vulcanLoginMethods = listOf(
+        /*LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_WEB_MAIN, VulcanLoginWebMain::class.java)
+                .withIsPossible { _, _ -> false }
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED },
+
+        LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_WEB_NEW, VulcanLoginWebNew::class.java)
+                .withIsPossible { _, _ -> false }
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_VULCAN_WEB_MAIN },
+
+        LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_WEB_OLD, VulcanLoginWebOld::class.java)
+                .withIsPossible { _, _ -> false }
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_VULCAN_WEB_MAIN },*/
+
+        LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_API, VulcanLoginApi::class.java)
+                .withIsPossible { _, _ -> true }
+                .withRequiredLoginMethod { _, loginStore ->
+                    if (loginStore.mode == LOGIN_MODE_VULCAN_WEB) LOGIN_METHOD_VULCAN_WEB_NEW else LOGIN_METHOD_NOT_NEEDED
+                }
+)
+
+val idziennikLoginMethods = listOf(
+        LoginMethod(LOGIN_TYPE_IDZIENNIK, LOGIN_METHOD_IDZIENNIK_WEB, IdziennikLoginWeb::class.java)
+                .withIsPossible { _, _ -> true }
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED },
+
+        LoginMethod(LOGIN_TYPE_IDZIENNIK, LOGIN_METHOD_IDZIENNIK_API, IdziennikLoginApi::class.java)
+                .withIsPossible { _, _ -> true }
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_IDZIENNIK_WEB }
+)
+
+val templateLoginMethods = listOf(
+        LoginMethod(LOGIN_TYPE_TEMPLATE, LOGIN_METHOD_TEMPLATE_WEB, TemplateLoginWeb::class.java)
+                .withIsPossible { _, _ -> true }
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED },
+
+        LoginMethod(LOGIN_TYPE_TEMPLATE, LOGIN_METHOD_TEMPLATE_API, TemplateLoginApi::class.java)
+                .withIsPossible { _, _ -> true }
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_TEMPLATE_WEB }
+)
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Regexes.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Regexes.kt
new file mode 100644
index 00000000..b6039a46
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Regexes.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-6.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2
+
+object Regexes {
+    val MOBIDZIENNIK_GRADES_SUBJECT_NAME by lazy {
+        """<div.*?>\n*\s*(.+?)\s*\n*(?:<.*?)??</div>""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_GRADES_COLOR by lazy {
+        """background-color:([#A-Fa-f0-9]+);""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_GRADES_CATEGORY by lazy {
+        """>&nbsp;(.+?):</span>""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_GRADES_CLASS_AVERAGE by lazy {
+        """Średnia ocen:.*<strong>([0-9]*\.?[0-9]*)</strong>""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_GRADES_ADDED_DATE by lazy {
+        """Wpisano:.*<strong>.+?,\s([0-9]+)\s(.+?)\s([0-9]{4}),\sgodzina\s([0-9:]+)</strong>""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_GRADES_COUNT_TO_AVG by lazy {
+        """Liczona do średniej:.*?<strong>nie<br/?></strong>""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_GRADES_DETAILS by lazy {
+        """<strong.*?>(.+?)</strong>.*?<sup>.+?</sup>.*?<small>\((.+?)\)</small>.*?<span>.*?Wartość oceny:.*?<strong>([0-9.]+)</strong>.*?Wpisał\(a\):.*?<strong>(.+?)</strong>""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+
+    val MOBIDZIENNIK_EVENT_TYPE by lazy {
+        """\(([0-9A-ząęóżźńśłć]*?)\)$""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_LUCKY_NUMBER by lazy {
+        """class="szczesliwy_numerek".*>0*([0-9]+)(?:/0*[0-9]+)*</a>""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_CLASS_CALENDAR by lazy {
+        """events: (.+),$""".toRegex(RegexOption.MULTILINE)
+    }
+
+    val MOBIDZIENNIK_MESSAGE_READ_DATE by lazy {
+        """czas przeczytania:.+?,\s([0-9]+)\s(.+?)\s([0-9]{4}),\sgodzina\s([0-9:]+)""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_MESSAGE_SENT_READ_DATE by lazy {
+        """.+?,\s([0-9]+)\s(.+?)\s([0-9]{4}),\sgodzina\s([0-9:]+)""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_MESSAGE_ATTACHMENT by lazy {
+        """href="https://.+?\.mobidziennik.pl/.+?&(?:amp;)?zalacznik=([0-9]+)"(?:.+?<small.+?\(([0-9.]+)\s(M|K|G|)B\))*""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+
+
+
+    val IDZIENNIK_LOGIN_HIDDEN_FIELDS by lazy {
+        """<input type="hidden".+?name="([A-z0-9_]+)?".+?value="([A-z0-9_+-/=]+)?".+?>""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+    val IDZIENNIK_LOGIN_ERROR by lazy {
+        """id="spanErrorMessage">(.*?)</""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+    val IDZIENNIK_LOGIN_FIRST_ACCOUNT_NAME by lazy {
+        """Imię i nazwisko:.+?">(.+?)</div>""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+    val IDZIENNIK_LOGIN_FIRST_IS_PARENT by lazy {
+        """id="ctl00_CzyRodzic" value="([01])" />""".toRegex()
+    }
+    val IDZIENNIK_LOGIN_FIRST_SCHOOL_YEAR by lazy {
+        """name="ctl00\${"$"}dxComboRokSzkolny".+?selected="selected".*?value="([0-9]+)">([0-9/]+)<""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+    val IDZIENNIK_LOGIN_FIRST_STUDENT_SELECT by lazy {
+        """<select.*?name="ctl00\${"$"}dxComboUczniowie".*?</select>""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+    val IDZIENNIK_LOGIN_FIRST_STUDENT by lazy {
+        """<option.*?value="([0-9]+)"\sdata-id-ucznia="([A-z0-9]+?)".*?>(.+?)\s(.+?)\s*\((.+?),\s*(.+?)\)</option>""".toRegex(RegexOption.DOT_MATCHES_ALL)
+    }
+
+
+
+    val VULCAN_SHITFT_ANNOTATION by lazy {
+        """\(przeniesiona (z|na) lekcj[ię] ([0-9]+), (.+)\)""".toRegex()
+    }
+
+
+
+    val LIBRUS_ATTACHMENT_KEY by lazy {
+        """singleUseKey=([0-9A-f_]+)""".toRegex()
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/ServerSync.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/ServerSync.kt
new file mode 100644
index 00000000..7114501a
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/ServerSync.kt
@@ -0,0 +1,179 @@
+package pl.szczodrzynski.edziennik.api.v2
+
+import pl.szczodrzynski.edziennik.App.APP_URL
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOMEWORK
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.models.Data
+import pl.szczodrzynski.edziennik.data.api.AppError.CODE_APP_SERVER_ERROR
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_HOMEWORK
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_SHARED_EVENT
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_SHARED_HOMEWORK
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_SERVER_MESSAGE
+import pl.szczodrzynski.edziennik.data.db.modules.notification.getNotificationTitle
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.getJsonArray
+import pl.szczodrzynski.edziennik.getLong
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.network.ServerRequest
+
+class ServerSync(val data: Data, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "ServerSync"
+    }
+
+    val app = data.app
+    val profileId = data.profile?.id ?: -1
+    val profileName = data.profile?.name ?: ""
+    val profile = data.profile
+    val loginStore = data.loginStore
+
+    private fun getUsernameId(): String {
+        if (loginStore.data == null) {
+            return "NO_LOGIN_STORE"
+        }
+        if (profile?.studentData == null) {
+            return "NO_STUDENT_STORE"
+        }
+        return when (data.loginStore.type) {
+            LoginStore.LOGIN_TYPE_MOBIDZIENNIK -> loginStore.getLoginData("serverName", "MOBI_UN") + ":" + loginStore.getLoginData("username", "MOBI_UN") + ":" + profile.getStudentData("studentId", -1)
+            LoginStore.LOGIN_TYPE_LIBRUS -> profile.getStudentData("schoolName", "LIBRUS_UN") + ":" + profile.getStudentData("accountLogin", "LIBRUS_LOGIN_UN")
+            LoginStore.LOGIN_TYPE_IUCZNIOWIE -> loginStore.getLoginData("schoolName", "IUCZNIOWIE_UN") + ":" + loginStore.getLoginData("username", "IUCZNIOWIE_UN") + ":" + profile.getStudentData("registerId", -1)
+            LoginStore.LOGIN_TYPE_VULCAN -> profile.getStudentData("schoolName", "VULCAN_UN") + ":" + profile.getStudentData("studentId", -1)
+            LoginStore.LOGIN_TYPE_DEMO -> loginStore.getLoginData("serverName", "DEMO_UN") + ":" + loginStore.getLoginData("username", "DEMO_UN") + ":" + profile.getStudentData("studentId", -1)
+            else -> "TYPE_UNKNOWN"
+        }
+    }
+
+    init { run {
+        if (profile?.registration != Profile.REGISTRATION_ENABLED) {
+            onSuccess()
+            return@run
+        }
+
+        val request = ServerRequest(
+                app,
+                app.requestScheme+APP_URL+"main.php?sync",
+                "Edziennik2/REG",
+                profile,
+                data.loginStore.type,
+                getUsernameId()
+        )
+
+        if (profile.empty) {
+            request.setBodyParameter("first_run", "true")
+        }
+
+        var hasNotifications = true
+        if (app.appConfig.webPushEnabled) {
+            data.notifications
+                    .filterNot { it.posted }
+                    .let {
+                        if (it.isEmpty()) {
+                            hasNotifications = false
+                            null
+                        }
+                        else
+                            it
+                    }?.forEachIndexed { index, notification ->
+                        if (notification.type != TYPE_NEW_SHARED_EVENT
+                                && notification.type != TYPE_SERVER_MESSAGE
+                                && notification.type != TYPE_NEW_SHARED_HOMEWORK) {
+                            request.setBodyParameter("notify[$index][type]", notification.type.toString())
+                            request.setBodyParameter("notify[$index][title]", notification.title)
+                            request.setBodyParameter("notify[$index][text]", notification.text)
+                        }
+                    }
+        }
+
+        if ((!app.appConfig.webPushEnabled || !hasNotifications) && !profile.enableSharedEvents) {
+            onSuccess()
+            return@run
+        }
+
+        val result = request.runSync()
+
+        if (result == null) {
+            data.error(ApiError(TAG, CODE_APP_SERVER_ERROR)
+                    .setCritical(false))
+            onSuccess()
+            return@run
+        }
+        var apiResponse = result.toString()
+        if (result.getString("success") != "true") {
+            data.error(ApiError(TAG, CODE_APP_SERVER_ERROR)
+                    .setCritical(false))
+            onSuccess()
+            return@run
+        }
+        // HERE PROCESS ALL THE RECEIVED EVENTS
+        // add them to the profile and create appropriate notifications
+        result.getJsonArray("events")?.forEach { jEventEl ->
+            val event = jEventEl.asJsonObject
+            val teamCode = event.getString("team")
+
+            // get the target Team from teamCode
+            val team = app.db.teamDao().getByCodeNow(profile.id, teamCode)
+            if (team != null) {
+
+                // create the event from Json. Add the missing teamId and !!profileId!!
+                val eventObject = app.gson.fromJson(event.toString(), Event::class.java)
+                // proguard. disable for Event.class
+                if (eventObject.eventDate == null) {
+                    apiResponse += "\n\nEventDate == null\n$event"
+                }
+                eventObject.profileId = profileId
+                eventObject.teamId = team.id
+                eventObject.addedManually = true
+
+                if (eventObject.sharedBy == getUsernameId()) {
+                    eventObject.sharedBy = "self"
+                    eventObject.sharedByName = profile.studentNameLong
+                }
+
+                val typeObject = app.db.eventTypeDao().getByIdNow(profileId, eventObject.type)
+
+                app.db.eventDao().add(eventObject)
+
+                val metadata = Metadata(
+                        profileId,
+                        if (eventObject.type == TYPE_HOMEWORK) Metadata.TYPE_HOMEWORK else Metadata.TYPE_EVENT,
+                        eventObject.id,
+                        profile.empty,
+                        true,
+                        event.getLong("addedDate") ?: 0
+                )
+
+                val metadataId = app.db.metadataDao().add(metadata)
+
+                // notify if the event is new and not first sync
+                if (metadataId != -1L && !profile.empty) {
+                    val text = app.getString(
+                            R.string.notification_shared_event_format,
+                            eventObject.sharedByName,
+                            if (typeObject != null) typeObject.name else "wydarzenie",
+                            if (eventObject.eventDate == null) "???" else eventObject.eventDate.formattedString,
+                            eventObject.topic
+                    )
+                    val type = if (eventObject.type == TYPE_HOMEWORK) TYPE_NEW_SHARED_HOMEWORK else TYPE_NEW_SHARED_EVENT
+                    data.notifications += Notification(
+                            title = app.getNotificationTitle(type),
+                            text = text,
+                            type = type,
+                            profileId = profileId,
+                            profileName = profileName,
+                            viewId = if (eventObject.type == TYPE_HOMEWORK) DRAWER_ITEM_HOMEWORK else DRAWER_ITEM_AGENDA,
+                            addedDate = metadata.addedDate
+                    ).addExtra("eventId", eventObject.id).addExtra("eventDate", eventObject.eventDate.value.toLong())
+                }
+            }
+        }
+
+        onSuccess()
+    }}
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskAllFinishedEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskAllFinishedEvent.kt
new file mode 100644
index 00000000..1bef5708
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskAllFinishedEvent.kt
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-28.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.events
+
+class ApiTaskAllFinishedEvent
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskErrorEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskErrorEvent.kt
new file mode 100644
index 00000000..5b76dfe5
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskErrorEvent.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-28.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.events
+
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+
+class ApiTaskErrorEvent(val error: ApiError)
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskFinishedEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskFinishedEvent.kt
new file mode 100644
index 00000000..546fe3ae
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskFinishedEvent.kt
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-28.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.events
+
+class ApiTaskFinishedEvent(val profileId: Int)
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskProgressEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskProgressEvent.kt
new file mode 100644
index 00000000..e639a0ac
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskProgressEvent.kt
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-28.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.events
+
+class ApiTaskProgressEvent(val profileId: Int, val progress: Float, val progressText: String?)
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskStartedEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskStartedEvent.kt
new file mode 100644
index 00000000..b8af894e
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskStartedEvent.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-28.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.events
+
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+
+class ApiTaskStartedEvent(val profileId: Int, val profile: Profile? = null)
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/AttachmentGetEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/AttachmentGetEvent.kt
new file mode 100644
index 00000000..cc17291b
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/AttachmentGetEvent.kt
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-24
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.events
+
+data class AttachmentGetEvent(val profileId: Int, val messageId: Long, val attachmentId: Long,
+                              var eventType: Int = TYPE_PROGRESS, val fileName: String? = null,
+                              val bytesWritten: Long = 0) {
+    companion object {
+        const val TYPE_PROGRESS = 0
+        const val TYPE_FINISHED = 1
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/FirstLoginFinishedEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/FirstLoginFinishedEvent.kt
new file mode 100644
index 00000000..31fba7c9
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/FirstLoginFinishedEvent.kt
@@ -0,0 +1,6 @@
+package pl.szczodrzynski.edziennik.api.v2.events
+
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+
+data class FirstLoginFinishedEvent(val profileList: List<Profile>, val loginStore: LoginStore)
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/MessageGetEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/MessageGetEvent.kt
new file mode 100644
index 00000000..353667ac
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/MessageGetEvent.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-12.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.events
+
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+
+data class MessageGetEvent(val message: MessageFull)
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/requests/ServiceCloseRequest.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/requests/ServiceCloseRequest.kt
new file mode 100644
index 00000000..a859301c
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/requests/ServiceCloseRequest.kt
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-1.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.events.requests
+
+class ServiceCloseRequest
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/requests/TaskCancelRequest.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/requests/TaskCancelRequest.kt
new file mode 100644
index 00000000..f40a9455
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/requests/TaskCancelRequest.kt
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-1.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.events.requests
+
+class TaskCancelRequest(val taskId: Int)
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/task/EdziennikTask.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/task/EdziennikTask.kt
new file mode 100644
index 00000000..9fd44537
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/task/EdziennikTask.kt
@@ -0,0 +1,96 @@
+package pl.szczodrzynski.edziennik.api.v2.events.task
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.idziennik.Idziennik
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikInterface
+import pl.szczodrzynski.edziennik.api.v2.librus.Librus
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.Mobidziennik
+import pl.szczodrzynski.edziennik.api.v2.template.Template
+import pl.szczodrzynski.edziennik.api.v2.vulcan.Vulcan
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+
+open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTask(profileId) {
+    companion object {
+        private const val TAG = "EdziennikTask"
+
+        fun firstLogin(loginStore: LoginStore) = EdziennikTask(-1, FirstLoginRequest(loginStore))
+        fun sync() = EdziennikTask(-1, SyncRequest())
+        fun syncProfile(profileId: Int, viewIds: List<Pair<Int, Int>>? = null, arguments: JsonObject? = null) = EdziennikTask(profileId, SyncProfileRequest(viewIds, arguments))
+        fun syncProfileList(profileList: List<Int>) = EdziennikTask(-1, SyncProfileListRequest(profileList))
+        fun messageGet(profileId: Int, message: MessageFull) = EdziennikTask(profileId, MessageGetRequest(message))
+        fun announcementsRead(profileId: Int) = EdziennikTask(profileId, AnnouncementsReadRequest())
+        fun attachmentGet(profileId: Int, messageId: Long, attachmentId: Long, attachmentName: String) = EdziennikTask(profileId, AttachmentGetRequest(messageId, attachmentId, attachmentName))
+    }
+
+    private lateinit var loginStore: LoginStore
+
+    override fun prepare(app: App) {
+        if (request is FirstLoginRequest) {
+            // get the requested profile and login store
+            this.profile = null
+            loginStore = request.loginStore
+            // save the profile ID and name as the current task's
+            taskName = app.getString(R.string.edziennik_notification_api_first_login_title)
+        } else {
+            // get the requested profile and login store
+            val profile = app.db.profileDao().getByIdNow(profileId)
+            this.profile = profile
+            if (profile == null) {
+                return
+            }
+            val loginStore = app.db.loginStoreDao().getByIdNow(profile.loginStoreId) ?: return
+            this.loginStore = loginStore
+            // save the profile ID and name as the current task's
+            taskName = app.getString(R.string.edziennik_notification_api_sync_title_format, profile.name)
+        }
+    }
+
+    private var edziennikInterface: EdziennikInterface? = null
+
+    internal fun run(app: App, taskCallback: EdziennikCallback) {
+        edziennikInterface = when (loginStore.type) {
+            LOGIN_TYPE_LIBRUS -> Librus(app, profile, loginStore, taskCallback)
+            LOGIN_TYPE_MOBIDZIENNIK -> Mobidziennik(app, profile, loginStore, taskCallback)
+            LOGIN_TYPE_VULCAN -> Vulcan(app, profile, loginStore, taskCallback)
+            LOGIN_TYPE_IDZIENNIK -> Idziennik(app, profile, loginStore, taskCallback)
+            LOGIN_TYPE_TEMPLATE -> Template(app, profile, loginStore, taskCallback)
+            else -> null
+        }
+        if (edziennikInterface == null) {
+            return
+        }
+
+        when (request) {
+            is SyncProfileRequest -> edziennikInterface?.sync(
+                    featureIds = request.viewIds?.flatMap { Features.getIdsByView(it.first, it.second) }
+                            ?: Features.getAllIds(),
+                    viewId = request.viewIds?.get(0)?.first,
+                    arguments = request.arguments)
+            is MessageGetRequest -> edziennikInterface?.getMessage(request.message)
+            is FirstLoginRequest -> edziennikInterface?.firstLogin()
+            is AnnouncementsReadRequest -> edziennikInterface?.markAllAnnouncementsAsRead()
+            is AttachmentGetRequest -> edziennikInterface?.getAttachment(request.messageId, request.attachmentId, request.attachmentName)
+        }
+    }
+
+    override fun cancel() {
+        edziennikInterface?.cancel()
+    }
+
+    override fun toString(): String {
+        return "EdziennikTask(profileId=$profileId, request=$request, edziennikInterface=$edziennikInterface)"
+    }
+
+    data class FirstLoginRequest(val loginStore: LoginStore)
+    class SyncRequest
+    data class SyncProfileRequest(val viewIds: List<Pair<Int, Int>>? = null, val arguments: JsonObject? = null)
+    data class SyncProfileListRequest(val profileList: List<Int>)
+    data class MessageGetRequest(val message: MessageFull)
+    class AnnouncementsReadRequest
+    data class AttachmentGetRequest(val messageId: Long, val attachmentId: Long, val attachmentName: String)
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/task/ErrorReportTask.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/task/ErrorReportTask.kt
new file mode 100644
index 00000000..3643d544
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/task/ErrorReportTask.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-1.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.events.task
+
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.ApiService
+import pl.szczodrzynski.edziennik.api.v2.EdziennikNotification
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class ErrorReportTask : IApiTask(-1) {
+    override fun prepare(app: App) {
+        taskName = app.getString(R.string.edziennik_notification_api_error_report_title)
+    }
+
+    override fun cancel() {
+
+    }
+
+    fun run(app: App, taskCallback: EdziennikCallback, notification: EdziennikNotification, errorList: MutableList<ApiError>) {
+        errorList.forEach { error ->
+            Utils.d(ApiService.TAG, "Error ${error.tag} profile ${error.profileId}: code ${error.errorCode}")
+        }
+        errorList.clear()
+
+        taskCallback.onCompleted()
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/task/IApiTask.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/task/IApiTask.kt
new file mode 100644
index 00000000..df3fa33a
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/task/IApiTask.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-28.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.events.task
+
+import android.content.Context
+import android.content.Intent
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.O
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.api.v2.ApiService
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+
+abstract class IApiTask(open val profileId: Int) {
+    var taskId: Int = 0
+    var profile: Profile? = null
+    var taskName: String? = null
+
+    /**
+     * A method called before running the task.
+     * It is synchronous and its main task is
+     * to prepare the correct task name.
+     */
+    abstract fun prepare(app: App)
+    abstract fun cancel()
+
+    fun enqueue(context: Context) {
+        Intent(context, ApiService::class.java).let {
+            if (SDK_INT >= O)
+                context.startForegroundService(it)
+            else
+                context.startService(it)
+        }
+        EventBus.getDefault().postSticky(this)
+    }
+
+    override fun toString(): String {
+        return "IApiTask(profileId=$profileId, taskId=$taskId, profile=$profile, taskName=$taskName)"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/task/NotifyTask.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/task/NotifyTask.kt
new file mode 100644
index 00000000..d5806ba0
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/task/NotifyTask.kt
@@ -0,0 +1,90 @@
+package pl.szczodrzynski.edziennik.api.v2.events.task
+
+import android.app.PendingIntent
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.Notifier.ID_NOTIFICATIONS
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
+import pl.szczodrzynski.edziennik.data.db.modules.notification.getNotificationTitle
+import pl.szczodrzynski.edziennik.utils.models.Notification
+import kotlin.math.min
+
+class NotifyTask : IApiTask(-1) {
+    override fun prepare(app: App) {
+        taskName = app.getString(R.string.edziennik_notification_api_notify_title)
+    }
+
+    override fun cancel() {
+
+    }
+
+    fun run(app: App, taskCallback: EdziennikCallback) {
+        val list = app.db.notificationDao().getNotPostedNow()
+        val notificationList = list.subList(0, min(15, list.size))
+
+        var unreadCount = list.size
+
+        for (notification in notificationList) {
+            val intent = Intent(app, MainActivity::class.java)
+            notification.fillIntent(intent)
+            val pendingIntent = PendingIntent.getActivity(app, notification.id, intent, 0)
+            val notificationBuilder = NotificationCompat.Builder(app, app.notifier.notificationGroup)
+                    // title, text, type, date
+                    .setContentTitle(notification.profileName)
+                    .setContentText(notification.text)
+                    .setSubText(app.getNotificationTitle(notification.type))
+                    .setWhen(notification.addedDate)
+                    .setTicker(app.getString(R.string.notification_ticker_format, Notification.stringType(app, notification.type)))
+                    // icon, color, lights, priority
+                    .setSmallIcon(R.drawable.ic_notification)
+                    .setColor(app.notifier.notificationColor)
+                    .setLights(-0xff0001, 2000, 2000)
+                    .setPriority(app.notifier.notificationPriority)
+                    // channel, group, style
+                    .setChannelId(app.notifier.notificationGroup)
+                    .setGroup(app.notifier.notificationGroup)
+                    .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY)
+                    .setStyle(NotificationCompat.BigTextStyle().bigText(notification.text))
+                    // intent, auto cancel
+                    .setContentIntent(pendingIntent)
+                    .setAutoCancel(true)
+            if (!app.notifier.shouldBeQuiet()) {
+                notificationBuilder.setDefaults(app.notifier.notificationDefaults)
+            }
+            app.notifier.notificationManager.notify(notification.id, notificationBuilder.build())
+        }
+
+        if (notificationList.isNotEmpty() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            val intent = Intent(app, MainActivity::class.java)
+            intent.action = "android.intent.action.MAIN"
+            intent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_NOTIFICATIONS)
+            val pendingIntent = PendingIntent.getActivity(app, ID_NOTIFICATIONS,
+                    intent, 0)
+
+            val groupBuilder = NotificationCompat.Builder(app, app.notifier.notificationGroup)
+                    .setSmallIcon(R.drawable.ic_notification)
+                    .setColor(app.notifier.notificationColor)
+                    .setContentTitle(app.getString(R.string.notification_new_notification_title_format, unreadCount))
+                    .setGroupSummary(true)
+                    .setAutoCancel(true)
+                    .setChannelId(app.notifier.notificationGroup)
+                    .setGroup(app.notifier.notificationGroup)
+                    .setLights(-0xff0001, 2000, 2000)
+                    .setPriority(app.notifier.notificationPriority)
+                    .setContentIntent(pendingIntent)
+                    .setStyle(NotificationCompat.BigTextStyle())
+            if (!app.notifier.shouldBeQuiet()) {
+                groupBuilder.setDefaults(app.notifier.notificationDefaults)
+            }
+            app.notifier.notificationManager.notify(ID_NOTIFICATIONS, groupBuilder.build())
+        }
+
+        app.db.notificationDao().setAllPosted()
+
+        taskCallback.onCompleted()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/DataIdziennik.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/DataIdziennik.kt
new file mode 100644
index 00000000..3db12ef9
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/DataIdziennik.kt
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik
+
+import androidx.core.util.set
+import okhttp3.Cookie
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_IDZIENNIK_API
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_IDZIENNIK_WEB
+import pl.szczodrzynski.edziennik.api.v2.models.Data
+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) {
+
+    fun isWebLoginValid() = loginExpiryTime-30 > currentTimeUnix() && webSessionId.isNotNullNorEmpty() && webAuth.isNotNullNorEmpty()
+    fun isApiLoginValid() = apiExpiryTime-30 > currentTimeUnix() && apiBearer.isNotNullNorEmpty()
+
+    override fun satisfyLoginMethods() {
+        loginMethods.clear()
+        if (isWebLoginValid()) {
+            loginMethods += LOGIN_METHOD_IDZIENNIK_WEB
+            app.cookieJar.saveFromResponse(null, listOf(
+                    Cookie.Builder()
+                            .name("ASP.NET_SessionId_iDziennik")
+                            .value(webSessionId!!)
+                            .domain("iuczniowie.progman.pl")
+                            .secure().httpOnly().build(),
+                    Cookie.Builder()
+                            .name(".ASPXAUTH")
+                            .value(webAuth!!)
+                            .domain("iuczniowie.progman.pl")
+                            .secure().httpOnly().build()
+            ))
+        }
+        if (isApiLoginValid())
+            loginMethods += LOGIN_METHOD_IDZIENNIK_API
+    }
+
+    private var mLoginExpiryTime: Long? = null
+    var loginExpiryTime: Long
+        get() { mLoginExpiryTime = mLoginExpiryTime ?: loginStore.getLoginData("loginExpiryTime", 0L); return mLoginExpiryTime ?: 0L }
+        set(value) { loginStore.putLoginData("loginExpiryTime", value); mLoginExpiryTime = value }
+
+    private var mApiExpiryTime: Long? = null
+    var apiExpiryTime: Long
+        get() { mApiExpiryTime = mApiExpiryTime ?: loginStore.getLoginData("apiExpiryTime", 0L); return mApiExpiryTime ?: 0L }
+        set(value) { loginStore.putLoginData("apiExpiryTime", value); mApiExpiryTime = value }
+
+    /*   __          __  _
+         \ \        / / | |
+          \ \  /\  / /__| |__
+           \ \/  \/ / _ \ '_ \
+            \  /\  /  __/ |_) |
+             \/  \/ \___|_._*/
+    private var mWebSchoolName: String? = null
+    var webSchoolName: String?
+        get() { mWebSchoolName = mWebSchoolName ?: loginStore.getLoginData("schoolName", null); return mWebSchoolName }
+        set(value) { loginStore.putLoginData("schoolName", value); mWebSchoolName = value }
+    private var mWebUsername: String? = null
+    var webUsername: String?
+        get() { mWebUsername = mWebUsername ?: loginStore.getLoginData("username", null); return mWebUsername }
+        set(value) { loginStore.putLoginData("username", value); mWebUsername = value }
+    private var mWebPassword: String? = null
+    var webPassword: String?
+        get() { mWebPassword = mWebPassword ?: loginStore.getLoginData("password", null); return mWebPassword }
+        set(value) { loginStore.putLoginData("password", value); mWebPassword = value }
+
+    private var mWebSessionId: String? = null
+    var webSessionId: String?
+        get() { mWebSessionId = mWebSessionId ?: loginStore.getLoginData("webSessionId", null); return mWebSessionId }
+        set(value) { loginStore.putLoginData("webSessionId", value); mWebSessionId = value }
+    private var mWebAuth: String? = null
+    var webAuth: String?
+        get() { mWebAuth = mWebAuth ?: loginStore.getLoginData("webAuth", null); return mWebAuth }
+        set(value) { loginStore.putLoginData("webAuth", value); mWebAuth = value }
+
+    /*                   _
+             /\         (_)
+            /  \   _ __  _
+           / /\ \ | '_ \| |
+          / ____ \| |_) | |
+         /_/    \_\ .__/|_|
+                  | |
+                  |*/
+    private var mApiBearer: String? = null
+    var apiBearer: String?
+        get() { mApiBearer = mApiBearer ?: loginStore.getLoginData("apiBearer", null); return mApiBearer }
+        set(value) { loginStore.putLoginData("apiBearer", value); mApiBearer = value }
+
+    /*     ____  _   _
+          / __ \| | | |
+         | |  | | |_| |__   ___ _ __
+         | |  | | __| '_ \ / _ \ '__|
+         | |__| | |_| | | |  __/ |
+          \____/ \__|_| |_|\___|*/
+    private var mStudentId: String? = null
+    var studentId: String?
+        get() { mStudentId = mStudentId ?: profile?.getStudentData("studentId", null); return mStudentId }
+        set(value) { profile?.putStudentData("studentId", value) ?: return; mStudentId = value }
+
+    private var mRegisterId: Int? = null
+    var registerId: Int
+        get() { mRegisterId = mRegisterId ?: profile?.getStudentData("registerId", 0); return mRegisterId ?: 0 }
+        set(value) { profile?.putStudentData("registerId", value) ?: return; mRegisterId = value }
+
+    private var mSchoolYearId: Int? = null
+    var schoolYearId: Int
+        get() { mSchoolYearId = mSchoolYearId ?: profile?.getStudentData("schoolYearId", 0); return mSchoolYearId ?: 0 }
+        set(value) { profile?.putStudentData("schoolYearId", value) ?: return; mSchoolYearId = value }
+
+
+
+    /*    _    _ _   _ _
+         | |  | | | (_) |
+         | |  | | |_ _| |___
+         | |  | | __| | / __|
+         | |__| | |_| | \__ \
+          \____/ \__|_|_|__*/
+    fun getSubject(name: String, id: Long?, shortName: String): Subject {
+        var subject = if (id == null)
+            subjectList.singleOrNull { it.longName == name }
+        else
+            subjectList.singleOrNull { it.id == id }
+
+        if (subject == null) {
+            subject = Subject(profileId, id ?: name.crc16().toLong(), name, shortName)
+            subjectList[subject.id] = subject
+        }
+        return subject
+    }
+
+    fun getTeacher(firstName: String, lastName: String): Teacher {
+        val teacher = teacherList.singleOrNull { it.fullName == "$firstName $lastName" }
+        return validateTeacher(teacher, firstName, lastName)
+    }
+
+    fun getTeacher(firstNameChar: Char, lastName: String): Teacher {
+        val teacher = teacherList.singleOrNull { it.shortName == "$firstNameChar.$lastName" }
+        return validateTeacher(teacher, firstNameChar.toString(), lastName)
+    }
+
+    fun getTeacherByLastFirst(nameLastFirst: String): Teacher {
+        val nameParts = nameLastFirst.split(" ")
+        return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[1], nameParts[0])
+    }
+
+    fun getTeacherByFirstLast(nameFirstLast: String): Teacher {
+        val nameParts = nameFirstLast.split(" ")
+        return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[0], nameParts[1])
+    }
+
+    fun getTeacherByFDotLast(nameFDotLast: String): Teacher {
+        val nameParts = nameFDotLast.split(".")
+        return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[0][0], nameParts[1])
+    }
+
+    fun getTeacherByFDotSpaceLast(nameFDotSpaceLast: String): Teacher {
+        val nameParts = nameFDotSpaceLast.split(".")
+        return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[0][0], nameParts[1])
+    }
+
+    private fun validateTeacher(teacher: Teacher?, firstName: String, lastName: String): Teacher {
+        (teacher ?: Teacher(profileId, -1, firstName, lastName).apply {
+            id = shortName.crc16().toLong()
+            teacherList[id] = this
+        }).apply {
+            if (firstName.length > 1)
+                name = firstName
+            surname = lastName
+            return this
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/Idziennik.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/Idziennik.kt
new file mode 100644
index 00000000..53361e28
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/Idziennik.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.api.v2.CODE_INTERNAL_LIBRUS_ACCOUNT_410
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikData
+import pl.szczodrzynski.edziennik.api.v2.idziennik.firstlogin.IdziennikFirstLogin
+import pl.szczodrzynski.edziennik.api.v2.idziennik.login.IdziennikLogin
+import pl.szczodrzynski.edziennik.api.v2.idziennikLoginMethods
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikInterface
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.prepare
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.utils.Utils.d
+
+class Idziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
+    companion object {
+        private const val TAG = "Idziennik"
+    }
+
+    val internalErrorList = mutableListOf<Int>()
+    val data: DataIdziennik
+
+    init {
+        data = DataIdziennik(app, profile, loginStore).apply {
+            callback = wrapCallback(this@Idziennik.callback)
+            satisfyLoginMethods()
+        }
+    }
+
+    private fun completed() {
+        data.saveData()
+        data.notifyAndSyncEvents {
+            callback.onCompleted()
+        }
+    }
+
+    /*    _______ _                     _                  _ _   _
+         |__   __| |              /\   | |                (_) | | |
+            | |  | |__   ___     /  \  | | __ _  ___  _ __ _| |_| |__  _ __ ___
+            | |  | '_ \ / _ \   / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \
+            | |  | | | |  __/  / ____ \| | (_| | (_) | |  | | |_| | | | | | | | |
+            |_|  |_| |_|\___| /_/    \_\_|\__, |\___/|_|  |_|\__|_| |_|_| |_| |_|
+                                           __/ |
+                                          |__*/
+    override fun sync(featureIds: List<Int>, viewId: Int?, arguments: JsonObject?) {
+        data.arguments = arguments
+        data.prepare(idziennikLoginMethods, IdziennikFeatures, featureIds, viewId)
+        d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}")
+        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        IdziennikLogin(data) {
+            IdziennikData(data) {
+                completed()
+            }
+        }
+    }
+
+    override fun getMessage(message: MessageFull) {
+
+    }
+
+    override fun markAllAnnouncementsAsRead() {
+
+    }
+
+    override fun getAttachment(messageId: Long, attachmentId: Long, attachmentName: String) {
+
+    }
+
+    override fun firstLogin() {
+        IdziennikFirstLogin(data) {
+            completed()
+        }
+    }
+
+    override fun cancel() {
+        d(TAG, "Cancelled")
+        data.cancel()
+    }
+
+    private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
+        return object : EdziennikCallback {
+            override fun onCompleted() {
+                callback.onCompleted()
+            }
+
+            override fun onProgress(step: Float) {
+                callback.onProgress(step)
+            }
+
+            override fun onStartProgress(stringRes: Int) {
+                callback.onStartProgress(stringRes)
+            }
+
+            override fun onError(apiError: ApiError) {
+                when (apiError.errorCode) {
+                    in internalErrorList -> {
+                        // finish immediately if the same error occurs twice during the same sync
+                        callback.onError(apiError)
+                    }
+                    CODE_INTERNAL_LIBRUS_ACCOUNT_410 -> {
+                        internalErrorList.add(apiError.errorCode)
+                        loginStore.removeLoginData("refreshToken") // force a clean login
+                        //loginLibrus()
+                    }
+                    else -> callback.onError(apiError)
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/IdziennikFeatures.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/IdziennikFeatures.kt
new file mode 100644
index 00000000..f57a4bb9
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/IdziennikFeatures.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik
+
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.models.Feature
+
+const val ENDPOINT_IDZIENNIK_WEB_TIMETABLE              = 1030
+const val ENDPOINT_IDZIENNIK_WEB_GRADES                 = 1040
+const val ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES        = 1050
+const val ENDPOINT_IDZIENNIK_WEB_EXAMS                  = 1060
+const val ENDPOINT_IDZIENNIK_WEB_HOMEWORK               = 1061
+const val ENDPOINT_IDZIENNIK_WEB_NOTICES                = 1070
+const val ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS          = 1080
+const val ENDPOINT_IDZIENNIK_WEB_ATTENDANCE             = 1090
+const val ENDPOINT_IDZIENNIK_WEB_MESSAGES_INBOX         = 1110
+const val ENDPOINT_IDZIENNIK_WEB_MESSAGES_SENT          = 1120
+const val ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER       = 2010
+const val ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX         = 2110
+const val ENDPOINT_IDZIENNIK_API_MESSAGES_SENT          = 2120
+
+val IdziennikFeatures = listOf(
+        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_TIMETABLE, listOf(
+                ENDPOINT_IDZIENNIK_WEB_TIMETABLE to LOGIN_METHOD_IDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
+
+        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_GRADES, listOf(
+                ENDPOINT_IDZIENNIK_WEB_GRADES to LOGIN_METHOD_IDZIENNIK_WEB,
+                ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES to LOGIN_METHOD_IDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
+
+        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_AGENDA, listOf(
+                ENDPOINT_IDZIENNIK_WEB_EXAMS to LOGIN_METHOD_IDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
+
+        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_HOMEWORK, listOf(
+                ENDPOINT_IDZIENNIK_WEB_HOMEWORK to LOGIN_METHOD_IDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
+
+        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_BEHAVIOUR, listOf(
+                ENDPOINT_IDZIENNIK_WEB_NOTICES to LOGIN_METHOD_IDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
+
+        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_ATTENDANCE, listOf(
+                ENDPOINT_IDZIENNIK_WEB_ATTENDANCE to LOGIN_METHOD_IDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
+
+        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_ANNOUNCEMENTS, listOf(
+                ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS to LOGIN_METHOD_IDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
+
+        /*Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_INBOX, listOf(
+                ENDPOINT_IDZIENNIK_WEB_MESSAGES_INBOX to LOGIN_METHOD_IDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)).withPriority(2),
+        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_SENT, listOf(
+                ENDPOINT_IDZIENNIK_WEB_MESSAGES_SENT to LOGIN_METHOD_IDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)).withPriority(2),*/
+
+        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_INBOX, listOf(
+                ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX to LOGIN_METHOD_IDZIENNIK_API
+        ), listOf(LOGIN_METHOD_IDZIENNIK_API)),
+        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_SENT, listOf(
+                ENDPOINT_IDZIENNIK_API_MESSAGES_SENT to LOGIN_METHOD_IDZIENNIK_API
+        ), listOf(LOGIN_METHOD_IDZIENNIK_API)),
+
+        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_LUCKY_NUMBER, listOf(
+                ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER to LOGIN_METHOD_IDZIENNIK_API
+        ), listOf(LOGIN_METHOD_IDZIENNIK_API))
+)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/IdziennikApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/IdziennikApi.kt
new file mode 100644
index 00000000..66a87dfa
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/IdziennikApi.kt
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-29.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.data
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.Utils
+import java.net.HttpURLConnection
+
+open class IdziennikApi(open val data: DataIdziennik) {
+    companion object {
+        const val TAG = "IdziennikApi"
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    val profile
+        get() = data.profile
+
+    fun apiGet(tag: String, endpointTemplate: String, method: Int = GET, parameters: Map<String, Any> = emptyMap(), onSuccess: (json: JsonElement) -> Unit) {
+        val endpoint = endpointTemplate.replace("\$STUDENT_ID", data.studentId ?: "")
+        Utils.d(tag, "Request: Idziennik/API - $IDZIENNIK_API_URL/$endpoint")
+
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                if (text == null) {
+                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                val json = try {
+                    JsonParser().parse(text)
+                } catch (_: Exception) { null }
+
+                var error: String? = null
+                if (json == null) {
+                    error = text
+                }
+                else if (json is JsonObject) {
+                    error = if (response?.code() == 200) null else
+                        json.getString("message") ?: json.toString()
+                }
+                error?.let { code ->
+                    when (code) {
+                        "Authorization has been denied for this request." -> ERROR_IDZIENNIK_API_ACCESS_DENIED
+                        else -> ERROR_IDZIENNIK_API_OTHER
+                    }.let { errorCode ->
+                        data.error(ApiError(tag, errorCode)
+                                .withApiResponse(text)
+                                .withResponse(response))
+                        return
+                    }
+                }
+
+                try {
+                    onSuccess(json!!)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_IDZIENNIK_API_REQUEST)
+                            .withResponse(response)
+                            .withThrowable(e)
+                            .withApiResponse(text))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url("$IDZIENNIK_API_URL/$endpoint")
+                .userAgent(IDZIENNIK_API_USER_AGENT)
+                .addHeader("Authorization", "Bearer ${data.apiBearer}")
+                .apply {
+                    when (method) {
+                        GET -> get()
+                        POST -> {
+                            postJson()
+                            val json = JsonObject()
+                            parameters.map { (name, value) ->
+                                when (value) {
+                                    is JsonObject -> json.add(name, value)
+                                    is JsonArray -> json.add(name, value)
+                                    is String -> json.addProperty(name, value)
+                                    is Int -> json.addProperty(name, value)
+                                    is Long -> json.addProperty(name, value)
+                                    is Float -> json.addProperty(name, value)
+                                    is Char -> json.addProperty(name, value)
+                                }
+                            }
+                            setJsonBody(json)
+                        }
+                    }
+                }
+                .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED)
+                .allowErrorCode(HttpURLConnection.HTTP_INTERNAL_ERROR)
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/IdziennikData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/IdziennikData.kt
new file mode 100644
index 00000000..c1a7ef8f
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/IdziennikData.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.data
+
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.idziennik.*
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.api.IdziennikApiCurrentRegister
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.api.IdziennikApiMessagesInbox
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.api.IdziennikApiMessagesSent
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.web.*
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class IdziennikData(val data: DataIdziennik, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "IdziennikData"
+    }
+
+    init {
+        nextEndpoint(onSuccess)
+    }
+
+    private fun nextEndpoint(onSuccess: () -> Unit) {
+        if (data.targetEndpointIds.isEmpty()) {
+            onSuccess()
+            return
+        }
+        if (data.cancelled) {
+            onSuccess()
+            return
+        }
+        useEndpoint(data.targetEndpointIds.removeAt(0)) {
+            data.progress(data.progressStep)
+            nextEndpoint(onSuccess)
+        }
+    }
+
+    private fun useEndpoint(endpointId: Int, onSuccess: () -> Unit) {
+        Utils.d(TAG, "Using endpoint $endpointId")
+        when (endpointId) {
+            ENDPOINT_IDZIENNIK_WEB_TIMETABLE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_timetable)
+                IdziennikWebTimetable(data, onSuccess)
+            }
+            ENDPOINT_IDZIENNIK_WEB_GRADES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_grades)
+                IdziennikWebGrades(data, onSuccess)
+            }
+            ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades)
+                IdziennikWebProposedGrades(data, onSuccess)
+            }
+            ENDPOINT_IDZIENNIK_WEB_EXAMS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_exams)
+                IdziennikWebExams(data, onSuccess)
+            }
+            ENDPOINT_IDZIENNIK_WEB_HOMEWORK -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_homework)
+                IdziennikWebHomework(data, onSuccess)
+            }
+            ENDPOINT_IDZIENNIK_WEB_NOTICES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_notices)
+                IdziennikWebNotices(data, onSuccess)
+            }
+            ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_announcements)
+                IdziennikWebAnnouncements(data, onSuccess)
+            }
+            ENDPOINT_IDZIENNIK_WEB_ATTENDANCE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_attendance)
+                IdziennikWebAttendance(data, onSuccess)
+            }
+            ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
+                IdziennikApiCurrentRegister(data, onSuccess)
+            }
+            ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
+                IdziennikApiMessagesInbox(data, onSuccess)
+            }
+            ENDPOINT_IDZIENNIK_API_MESSAGES_SENT -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
+                IdziennikApiMessagesSent(data, onSuccess)
+            }
+            else -> onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/IdziennikWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/IdziennikWeb.kt
new file mode 100644
index 00000000..5485e951
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/IdziennikWeb.kt
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-25.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.data
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.JsonCallbackHandler
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import java.net.HttpURLConnection.HTTP_INTERNAL_ERROR
+import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
+
+open class IdziennikWeb(open val data: DataIdziennik) {
+    companion object {
+        const val TAG = "IdziennikWeb"
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    val profile
+        get() = data.profile
+
+    fun webApiGet(tag: String, endpoint: String, parameters: Map<String, Any> = emptyMap(), onSuccess: (json: JsonObject) -> Unit) {
+        d(tag, "Request: Idziennik/Web/API - $IDZIENNIK_WEB_URL/$endpoint")
+
+        val callback = object : JsonCallbackHandler() {
+            override fun onSuccess(json: JsonObject?, response: Response?) {
+                if (json == null && response?.parserErrorBody == null) {
+                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                when {
+                    response?.code() == HTTP_UNAUTHORIZED -> ERROR_IDZIENNIK_WEB_ACCESS_DENIED
+                    response?.code() == HTTP_INTERNAL_ERROR -> ERROR_IDZIENNIK_WEB_SERVER_ERROR
+                    response?.parserErrorBody != null -> when {
+                        response.parserErrorBody.contains("Identyfikator zgłoszenia") -> ERROR_IDZIENNIK_WEB_SERVER_ERROR
+                        response.parserErrorBody.contains("Hasło dostępu do systemu wygasło") -> ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED
+                        response.parserErrorBody.contains("Trwają prace konserwacyjne") -> ERROR_IDZIENNIK_WEB_MAINTENANCE
+                        else -> ERROR_IDZIENNIK_WEB_OTHER
+                    }
+                    else -> null
+                }?.let { errorCode ->
+                    data.error(ApiError(TAG, errorCode)
+                            .withApiResponse(json?.toString() ?: response?.parserErrorBody)
+                            .withResponse(response))
+                    return
+                }
+
+                if (json == null) {
+                    data.error(ApiError(tag, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                try {
+                    onSuccess(json)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_IDZIENNIK_WEB_API_REQUEST)
+                            .withResponse(response)
+                            .withThrowable(e)
+                            .withApiResponse(json))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url("$IDZIENNIK_WEB_URL/$endpoint")
+                .userAgent(IDZIENNIK_USER_AGENT)
+                .postJson()
+                .apply {
+                    val json = JsonObject()
+                    parameters.map { (name, value) ->
+                        when (value) {
+                            is JsonObject -> json.add(name, value)
+                            is JsonArray -> json.add(name, value)
+                            is String -> json.addProperty(name, value)
+                            is Int -> json.addProperty(name, value)
+                            is Long -> json.addProperty(name, value)
+                            is Float -> json.addProperty(name, value)
+                            is Char -> json.addProperty(name, value)
+                            is Boolean -> json.addProperty(name, value)
+                        }
+                    }
+                    setJsonBody(json)
+                }
+                .allowErrorCode(HTTP_UNAUTHORIZED)
+                .allowErrorCode(HTTP_INTERNAL_ERROR)
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+
+    fun webGet(tag: String, endpoint: String, onSuccess: (text: String) -> Unit) {
+        d(tag, "Request: Idziennik/Web - $IDZIENNIK_WEB_URL/$endpoint")
+
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                if (text == null) {
+                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                if (!text.contains("czyWyswietlicDostepMobilny")) {
+                    when {
+                        text.contains("Identyfikator zgłoszenia") -> ERROR_IDZIENNIK_WEB_SERVER_ERROR
+                        text.contains("Hasło dostępu do systemu wygasło") -> ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED
+                        text.contains("Trwają prace konserwacyjne") -> ERROR_IDZIENNIK_WEB_MAINTENANCE
+                        else -> ERROR_IDZIENNIK_WEB_OTHER
+                    }.let { errorCode ->
+                        data.error(ApiError(TAG, errorCode)
+                                .withApiResponse(text)
+                                .withResponse(response))
+                        return
+                    }
+                }
+
+                try {
+                    onSuccess(text)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_IDZIENNIK_WEB_REQUEST)
+                            .withResponse(response)
+                            .withThrowable(e)
+                            .withApiResponse(text))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url("$IDZIENNIK_WEB_URL/$endpoint")
+                .userAgent(IDZIENNIK_USER_AGENT)
+                .get()
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/api/IdziennikApiCurrentRegister.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/api/IdziennikApiCurrentRegister.kt
new file mode 100644
index 00000000..2366e625
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/api/IdziennikApiCurrentRegister.kt
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-29.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.data.api
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_API_CURRENT_REGISTER
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikApi
+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
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class IdziennikApiCurrentRegister(override val data: DataIdziennik,
+                          val onSuccess: () -> Unit) : IdziennikApi(data) {
+    companion object {
+        private const val TAG = "IdziennikApiCurrentRegister"
+    }
+
+    init {
+        data.profile?.luckyNumber = -1
+        data.profile?.luckyNumberDate = null
+
+        apiGet(TAG, IDZIENNIK_API_CURRENT_REGISTER) { json ->
+            if (json !is JsonObject) {
+                onSuccess()
+                return@apiGet
+            }
+
+            var nextSync = System.currentTimeMillis() + 14*DAY*1000
+
+            val settings = json.getJsonObject("ustawienia")?.apply {
+                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 ->
+                val luckyNumberDate = Date.getToday()
+                settings.getString("godzinaPublikacjiSzczesliwegoLosu")
+                        ?.let { Time.fromH_m(it) }
+                        ?.let { publishTime ->
+                            val now = Time.getNow()
+                            if (publishTime.value < 150000 && now.value < publishTime.value) {
+                                nextSync = luckyNumberDate.combineWith(publishTime)
+                                luckyNumberDate.stepForward(0, 0, -1) // the lucky number is still for yesterday
+                            }
+                            else if (publishTime.value >= 150000 && now.value > publishTime.value) {
+                                luckyNumberDate.stepForward(0, 0, 1) // the lucky number is already for tomorrow
+                                nextSync = luckyNumberDate.combineWith(publishTime)
+                            }
+                            else if (publishTime.value < 150000) {
+                                nextSync = luckyNumberDate
+                                        .clone()
+                                        .stepForward(0, 0, 1)
+                                        .combineWith(publishTime)
+                            }
+                            else {
+                                nextSync = luckyNumberDate.combineWith(publishTime)
+                            }
+                        }
+
+
+                val luckyNumberObject = LuckyNumber(
+                        data.profileId,
+                        Date.getToday(),
+                        luckyNumber
+                )
+
+                data.luckyNumberList.add(luckyNumberObject)
+                data.metadataList.add(
+                        Metadata(
+                                profileId,
+                                Metadata.TYPE_LUCKY_NUMBER,
+                                luckyNumberObject.date.value.toLong(),
+                                data.profile?.empty ?: false,
+                                data.profile?.empty ?: false,
+                                System.currentTimeMillis()
+                        ))
+            }
+
+
+            data.setSyncNext(ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER, syncAt = nextSync)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/api/IdziennikApiMessagesInbox.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/api/IdziennikApiMessagesInbox.kt
new file mode 100644
index 00000000..abe3c140
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/api/IdziennikApiMessagesInbox.kt
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-30.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.data.api
+
+import com.google.gson.JsonArray
+import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_API_MESSAGES_INBOX
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikApi
+import pl.szczodrzynski.edziennik.asJsonObjectList
+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.getBoolean
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.Utils.crc32
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class IdziennikApiMessagesInbox(override val data: DataIdziennik,
+                                  val onSuccess: () -> Unit) : IdziennikApi(data) {
+    companion object {
+        private const val TAG = "IdziennikApiMessagesInbox"
+    }
+
+    init {
+        apiGet(TAG, IDZIENNIK_API_MESSAGES_INBOX) { json ->
+            if (json !is JsonArray) {
+                onSuccess()
+                return@apiGet
+            }
+
+            json.asJsonObjectList()?.forEach { jMessage ->
+                val subject = jMessage.getString("tytul")
+                if (subject?.contains("(") == true && subject.startsWith("iDziennik - "))
+                    return@forEach
+                if (subject?.startsWith("Uwaga dla ucznia (klasa:") == true)
+                    return@forEach
+
+                val messageIdStr = jMessage.getString("id")
+                val messageId = crc32((messageIdStr + "0").toByteArray())
+
+                var body = "[META:$messageIdStr;-1]"
+                body += jMessage.getString("tresc")?.replace("\n".toRegex(), "<br>")
+
+                val readDate = if (jMessage.getBoolean("odczytana") == true) Date.fromIso(jMessage.getString("wersjaRekordu")) else 0
+                val sentDate = Date.fromIso(jMessage.getString("dataWyslania"))
+
+                val sender = jMessage.getAsJsonObject("nadawca")
+                val rTeacher = data.getTeacher(
+                        sender.getString("imie") ?: "",
+                        sender.getString("nazwisko") ?: ""
+                )
+                rTeacher.loginId = sender.getString("id") + ":" + sender.getString("usr")
+
+                val message = Message(
+                        profileId,
+                        messageId,
+                        subject,
+                        body,
+                        if (jMessage.getBoolean("rekordUsuniety") == true) TYPE_DELETED else TYPE_RECEIVED,
+                        rTeacher.id,
+                        -1
+                )
+
+                val messageRecipient = MessageRecipient(
+                        profileId,
+                        -1 /* me */,
+                        -1,
+                        readDate,
+                        /*messageId*/ messageId
+                )
+
+                data.messageIgnoreList.add(message)
+                data.messageRecipientList.add(messageRecipient)
+                data.messageMetadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_MESSAGE,
+                        message.id,
+                        readDate > 0,
+                        readDate > 0 || profile?.empty ?: false,
+                        sentDate
+                ))
+            }
+
+            data.setSyncNext(ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/api/IdziennikApiMessagesSent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/api/IdziennikApiMessagesSent.kt
new file mode 100644
index 00000000..6c809d8b
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/api/IdziennikApiMessagesSent.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-30.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.data.api
+
+import com.google.gson.JsonArray
+import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
+import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_API_MESSAGES_SENT
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_SENT
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikApi
+import pl.szczodrzynski.edziennik.asJsonObjectList
+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
+
+class IdziennikApiMessagesSent(override val data: DataIdziennik,
+                                val onSuccess: () -> Unit) : IdziennikApi(data) {
+    companion object {
+        private const val TAG = "IdziennikApiMessagesSent"
+    }
+
+    init {
+        apiGet(TAG, IDZIENNIK_API_MESSAGES_SENT) { json ->
+            if (json !is JsonArray) {
+                onSuccess()
+                return@apiGet
+            }
+
+            json.asJsonObjectList()?.forEach { jMessage ->
+                val messageIdStr = jMessage.get("id").asString
+                val messageId = crc32((messageIdStr + "1").toByteArray())
+
+                val subject = jMessage.get("tytul").asString
+
+                var body = "[META:$messageIdStr;-1]"
+                body += jMessage.get("tresc").asString.replace("\n".toRegex(), "<br>")
+
+                val sentDate = Date.fromIso(jMessage.get("dataWyslania").asString)
+
+                val message = Message(
+                        profileId,
+                        messageId,
+                        subject,
+                        body,
+                        TYPE_SENT,
+                        -1,
+                        -1
+                )
+
+                for (recipientEl in jMessage.getAsJsonArray("odbiorcy")) {
+                    val recipient = recipientEl.asJsonObject
+                    var firstName = recipient.get("imie").asString
+                    var lastName = recipient.get("nazwisko").asString
+                    if (firstName.isEmpty() || lastName.isEmpty()) {
+                        firstName = "usunięty"
+                        lastName = "użytkownik"
+                    }
+                    val rTeacher = data.getTeacher(firstName, lastName)
+                    rTeacher.loginId = recipient.get("id").asString + ":" + recipient.get("usr").asString
+
+                    val messageRecipient = MessageRecipient(
+                            profileId,
+                            rTeacher.id,
+                            -1,
+                            -1,
+                            /*messageId*/ messageId
+                    )
+                    data.messageRecipientIgnoreList.add(messageRecipient)
+                }
+
+                data.messageIgnoreList.add(message)
+                data.metadataList.add(Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, true, true, sentDate))
+            }
+
+            data.setSyncNext(ENDPOINT_IDZIENNIK_API_MESSAGES_SENT, DAY, DRAWER_ITEM_MESSAGES)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebAnnouncements.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebAnnouncements.kt
new file mode 100644
index 00000000..5f700482
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebAnnouncements.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-28.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.data.web
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.api.v2.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_WEB_ANNOUNCEMENTS
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+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
+
+class IdziennikWebAnnouncements(override val data: DataIdziennik,
+                          val onSuccess: () -> Unit) : IdziennikWeb(data) {
+    companion object {
+        private const val TAG = "IdziennikWebAnnouncements"
+    }
+
+    init {
+        val param = JsonObject()
+        param.add("parametryFiltrow", JsonArray())
+
+        webApiGet(TAG, IDZIENNIK_WEB_ANNOUNCEMENTS, mapOf(
+                "uczenId" to (data.studentId ?: ""),
+                "param" to param
+        )) { result ->
+            val json = result.getJsonObject("d") ?: run {
+                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+                        .withApiResponse(result))
+                return@webApiGet
+            }
+
+            for (jAnnouncementEl in json.getAsJsonArray("ListK")) {
+                val jAnnouncement = jAnnouncementEl.asJsonObject
+                // jAnnouncement
+                val announcementId = jAnnouncement.get("Id").asLong
+
+                val rTeacher = data.getTeacherByFirstLast(jAnnouncement.get("Autor").asString)
+                val addedDate = java.lang.Long.parseLong(jAnnouncement.get("DataDodania").asString.replace("[^\\d]".toRegex(), ""))
+                val startDate = Date.fromMillis(java.lang.Long.parseLong(jAnnouncement.get("DataWydarzenia").asString.replace("[^\\d]".toRegex(), "")))
+
+                val announcementObject = Announcement(
+                        profileId,
+                        announcementId,
+                        jAnnouncement.get("Temat").asString,
+                        jAnnouncement.get("Tresc").asString,
+                        startDate,
+                        null,
+                        rTeacher.id
+                )
+                data.announcementList.add(announcementObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_ANNOUNCEMENT,
+                        announcementObject.id,
+                        profile?.empty ?: false,
+                        profile?.empty ?: false,
+                        addedDate
+                ))
+            }
+
+            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebAttendance.kt
new file mode 100644
index 00000000..1bcbddac
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebAttendance.kt
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-28.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.data.web
+
+import pl.szczodrzynski.edziennik.api.v2.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_WEB_ATTENDANCE
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_WEB_ATTENDANCE
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.crc16
+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
+
+class IdziennikWebAttendance(override val data: DataIdziennik,
+                          val onSuccess: () -> Unit) : IdziennikWeb(data) {
+    companion object {
+        private const val TAG = "IdziennikWebAttendance"
+    }
+
+    private var attendanceYear = Date.getToday().year
+    private var attendanceMonth = Date.getToday().month
+    private var attendancePrevMonthChecked = false
+
+    init {
+        getAttendance()
+    }
+
+    private fun getAttendance() {
+        webApiGet(TAG, IDZIENNIK_WEB_ATTENDANCE, mapOf(
+                "idPozDziennika" to data.registerId,
+                "mc" to attendanceMonth,
+                "rok" to attendanceYear,
+                "dataTygodnia" to ""
+        )) { result ->
+            val json = result.getJsonObject("d") ?: run {
+                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+                        .withApiResponse(result))
+                return@webApiGet
+            }
+
+            for (jAttendanceEl in json.getAsJsonArray("Obecnosci")) {
+                val jAttendance = jAttendanceEl.asJsonObject
+                // jAttendance
+                val attendanceTypeIdziennik = jAttendance.get("TypObecnosci").asInt
+                if (attendanceTypeIdziennik == 5 || attendanceTypeIdziennik == 7)
+                    continue
+                val attendanceDate = Date.fromY_m_d(jAttendance.get("Data").asString)
+                val attendanceTime = Time.fromH_m(jAttendance.get("OdDoGodziny").asString)
+                if (attendanceDate.combineWith(attendanceTime) > System.currentTimeMillis())
+                    continue
+
+                val attendanceId = jAttendance.get("IdLesson").asString.crc16().toLong()
+                val rSubject = data.getSubject(jAttendance.get("Przedmiot").asString, jAttendance.get("IdPrzedmiot").asLong, "")
+                val rTeacher = data.getTeacherByFDotSpaceLast(jAttendance.get("PrzedmiotNauczyciel").asString)
+
+                var attendanceName = "obecność"
+                var attendanceType = Attendance.TYPE_CUSTOM
+
+                when (attendanceTypeIdziennik) {
+                    1 /* nieobecność usprawiedliwiona */ -> {
+                        attendanceName = "nieobecność usprawiedliwiona"
+                        attendanceType = TYPE_ABSENT_EXCUSED
+                    }
+                    2 /* spóźnienie */ -> {
+                        attendanceName = "spóźnienie"
+                        attendanceType = TYPE_BELATED
+                    }
+                    3 /* nieobecność nieusprawiedliwiona */ -> {
+                        attendanceName = "nieobecność nieusprawiedliwiona"
+                        attendanceType = TYPE_ABSENT
+                    }
+                    4 /* zwolnienie */, 9 /* zwolniony / obecny */ -> {
+                        attendanceType = TYPE_RELEASED
+                        if (attendanceTypeIdziennik == 4)
+                            attendanceName = "zwolnienie"
+                        if (attendanceTypeIdziennik == 9)
+                            attendanceName = "zwolnienie / obecność"
+                    }
+                    0 /* obecny */, 8 /* Wycieczka */ -> {
+                        attendanceType = TYPE_PRESENT
+                        if (attendanceTypeIdziennik == 8)
+                            attendanceName = "wycieczka"
+                    }
+                }
+
+                val semester = profile?.dateToSemester(attendanceDate) ?: 1
+
+                val attendanceObject = Attendance(
+                        profileId,
+                        attendanceId,
+                        rTeacher.id,
+                        rSubject.id,
+                        semester,
+                        attendanceName,
+                        attendanceDate,
+                        attendanceTime,
+                        attendanceType
+                )
+
+                data.attendanceList.add(attendanceObject)
+                if (attendanceObject.type != TYPE_PRESENT) {
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_ATTENDANCE,
+                            attendanceObject.id,
+                            profile?.empty ?: false,
+                            profile?.empty ?: false,
+                            System.currentTimeMillis()
+                    ))
+                }
+            }
+
+            val attendanceDateValue = attendanceYear * 10000 + attendanceMonth * 100
+            if (profile?.empty == true && attendanceDateValue > profile?.getSemesterStart(1)?.value ?: 99999999) {
+                attendancePrevMonthChecked = true // do not need to check prev month later
+                attendanceMonth--
+                if (attendanceMonth < 1) {
+                    attendanceMonth = 12
+                    attendanceYear--
+                }
+                getAttendance()
+            } else if (!attendancePrevMonthChecked /* get also the previous month */) {
+                attendanceMonth--
+                if (attendanceMonth < 1) {
+                    attendanceMonth = 12
+                    attendanceYear--
+                }
+                attendancePrevMonthChecked = true
+                getAttendance()
+            } else {
+                data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_ATTENDANCE, SYNC_ALWAYS)
+                onSuccess()
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebExams.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebExams.kt
new file mode 100644
index 00000000..01b31ad0
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebExams.kt
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-28.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.data.web
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_WEB_EXAMS
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_WEB_EXAMS
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+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,
+                        val onSuccess: () -> Unit) : IdziennikWeb(data) {
+    companion object {
+        private const val TAG = "IdziennikWebExams"
+    }
+
+    private var examsYear = Date.getToday().year
+    private var examsMonth = Date.getToday().month
+    private var examsMonthsChecked = 0
+    private var examsNextMonthChecked = false // TO DO temporary // no more // idk
+
+    init {
+        getExams()
+    }
+
+    private fun getExams() {
+        val param = JsonObject().apply {
+            addProperty("strona", 1)
+            addProperty("iloscNaStrone", "99")
+            addProperty("iloscRekordow", -1)
+            addProperty("kolumnaSort", "ss.Nazwa,sp.Data_sprawdzianu")
+            addProperty("kierunekSort", 0)
+            addProperty("maxIloscZaznaczonych", 0)
+            addProperty("panelFiltrow", 0)
+        }
+
+        webApiGet(TAG, IDZIENNIK_WEB_EXAMS, mapOf(
+                "idP" to data.registerId,
+                "rok" to examsYear,
+                "miesiac" to examsMonth,
+                "param" to param
+        )) { result ->
+            val json = result.getJsonObject("d") ?: run {
+                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+                        .withApiResponse(result))
+                return@webApiGet
+            }
+
+            json.getJsonArray("ListK")?.asJsonObjectList()?.forEach { exam ->
+                val id = exam.getLong("_recordId") ?: return@forEach
+                val examDate = Date.fromY_m_d(exam.getString("data") ?: return@forEach)
+                val subjectId = data.getSubject(exam.getString("przedmiot") ?: return@forEach,
+                        -1, "").id
+                val teacherId = data.getTeacherByLastFirst(exam.getString("wpisal")
+                        ?: return@forEach).id
+                val lessonList = data.db.timetableDao().getForDateNow(profileId, examDate)
+                val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime
+                val topic = exam.getString("zakres") ?: ""
+
+                val eventType = when (exam.getString("rodzaj")) {
+                    "sprawdzian/praca klasowa" -> Event.TYPE_EXAM
+                    else -> Event.TYPE_SHORT_QUIZ
+                }
+
+                val eventObject = Event(
+                        profileId,
+                        id,
+                        examDate,
+                        startTime,
+                        topic,
+                        -1,
+                        eventType,
+                        false,
+                        teacherId,
+                        subjectId,
+                        data.teamClass?.id ?: -1
+                )
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_EVENT,
+                        eventObject.id,
+                        profile?.empty ?: false,
+                        profile?.empty ?: false,
+                        System.currentTimeMillis()
+                ))
+            }
+
+            if (profile?.empty == true && examsMonthsChecked < 3 /* how many months backwards to check? */) {
+                examsMonthsChecked++
+                examsMonth--
+                if (examsMonth < 1) {
+                    examsMonth = 12
+                    examsYear--
+                }
+                getExams()
+            } else if (!examsNextMonthChecked /* get also one month forward */) {
+                val showDate = Date.getToday().stepForward(0, 1, 0)
+                examsYear = showDate.year
+                examsMonth = showDate.month
+                examsNextMonthChecked = true
+                getExams()
+            } else {
+                data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK))
+
+                data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_EXAMS, SYNC_ALWAYS)
+                onSuccess()
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebGrades.kt
new file mode 100644
index 00000000..e99387f6
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebGrades.kt
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-28.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.data.web
+
+import android.graphics.Color
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_WEB_GRADES
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_WEB_GRADES
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+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,
+                            val onSuccess: () -> Unit) : IdziennikWeb(data) {
+    companion object {
+        private const val TAG = "IdziennikWebGrades"
+    }
+
+    init {
+        webApiGet(TAG, IDZIENNIK_WEB_GRADES, mapOf(
+                "idPozDziennika" to data.registerId
+        )) { result ->
+            val json = result.getJsonObject("d") ?: run {
+                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+                        .withApiResponse(result))
+                return@webApiGet
+            }
+
+            json.getJsonArray("Przedmioty")?.asJsonObjectList()?.onEach { subjectJson ->
+                val subject = data.getSubject(
+                        subjectJson.getString("Przedmiot") ?: return@onEach,
+                        subjectJson.getLong("IdPrzedmiotu") ?: return@onEach,
+                        subjectJson.getString("Przedmiot") ?: return@onEach
+                )
+                subjectJson.getJsonArray("Oceny")?.asJsonObjectList()?.forEach { grade ->
+                    val id = grade.getLong("idK") ?: return@forEach
+                    val category = grade.getString("Kategoria") ?: ""
+                    val name = grade.getString("Ocena") ?: "?"
+                    val semester = grade.getInt("Semestr") ?: 1
+                    val teacher = data.getTeacherByLastFirst(grade.getString("Wystawil") ?: return@forEach)
+
+                    val countToAverage = grade.getBoolean("DoSredniej") ?: true
+                    var value = grade.getFloat("WartoscDoSred") ?: 0.0f
+                    val weight = if (countToAverage)
+                        grade.getFloat("Waga") ?: 0.0f
+                    else
+                        0.0f
+
+                    val gradeColor = grade.getString("Kolor") ?: ""
+                    var colorInt = 0xff2196f3.toInt()
+                    if (gradeColor.isNotEmpty()) {
+                        colorInt = Color.parseColor("#$gradeColor")
+                    }
+
+                    val gradeObject = Grade(
+                            profileId,
+                            id,
+                            category,
+                            colorInt,
+                            "",
+                            name,
+                            value,
+                            weight,
+                            semester,
+                            teacher.id,
+                            subject.id)
+
+                    when (grade.getInt("Typ")) {
+                        0 -> {
+                            val history = grade.getJsonArray("Historia")?.asJsonObjectList()
+                            if (history?.isNotEmpty() == true) {
+                                var sum = gradeObject.value * gradeObject.weight
+                                var count = gradeObject.weight
+                                for (historyItem in history) {
+                                    val countToTheAverage = historyItem.getBoolean("DoSredniej") ?: false
+                                    value = historyItem.get("WartoscDoSred").asFloat
+                                    val weight = historyItem.get("Waga").asFloat
+
+                                    if (value > 0 && countToTheAverage) {
+                                        sum += value * weight
+                                        count += weight
+                                    }
+
+                                    val historyObject = Grade(
+                                            profileId,
+                                            gradeObject.id * -1,
+                                            historyItem.get("Kategoria").asString,
+                                            Color.parseColor("#" + historyItem.get("Kolor").asString),
+                                            historyItem.get("Uzasadnienie").asString,
+                                            historyItem.get("Ocena").asString,
+                                            value,
+                                            if (value > 0f && countToTheAverage) weight * -1f else 0f,
+                                            historyItem.get("Semestr").asInt,
+                                            teacher.id,
+                                            subject.id)
+                                    historyObject.parentId = gradeObject.id
+
+                                    val addedDate = historyItem.getString("Data_wystaw")?.let { Date.fromY_m_d(it).inMillis } ?: System.currentTimeMillis()
+
+                                    data.gradeList.add(historyObject)
+                                    data.metadataList.add(Metadata(
+                                            profileId,
+                                            Metadata.TYPE_GRADE,
+                                            historyObject.id,
+                                            true,
+                                            true,
+                                            addedDate
+                                    ))
+                                }
+                                // update the current grade's value with an average of all historical grades and itself
+                                if (sum > 0 && count > 0) {
+                                    gradeObject.value = sum / count
+                                }
+                                gradeObject.isImprovement = true // gradeObject is the improved grade. Originals are historyObjects
+                            }
+                        }
+                        1 -> {
+                            gradeObject.type = Grade.TYPE_SEMESTER1_FINAL
+                            gradeObject.name = name
+                            gradeObject.weight = 0f
+                        }
+                        2 -> {
+                            gradeObject.type = Grade.TYPE_YEAR_FINAL
+                            gradeObject.name = name
+                            gradeObject.weight = 0f
+                        }
+                    }
+
+                    val addedDate = grade.getString("Data_wystaw")?.let { Date.fromY_m_d(it).inMillis } ?: System.currentTimeMillis()
+
+                    data.gradeList.add(gradeObject)
+                    data.metadataList.add(
+                            Metadata(
+                                    profileId,
+                                    Metadata.TYPE_GRADE,
+                                    id,
+                                    data.profile?.empty ?: false,
+                                    data.profile?.empty ?: false,
+                                    addedDate
+                            ))
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_GRADES, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebHomework.kt
new file mode 100644
index 00000000..d749cea5
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebHomework.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-25
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.data.web
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_WEB_HOMEWORK
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_WEB_HOMEWORK
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+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,
+                           val onSuccess: () -> Unit) : IdziennikWeb(data) {
+    companion object {
+        private const val TAG = "IdziennikWebHomework"
+    }
+
+    init {
+        val param = JsonObject().apply {
+            addProperty("strona", 1)
+            addProperty("iloscNaStrone", 997)
+            addProperty("iloscRekordow", -1)
+            addProperty("kolumnaSort", "DataZadania")
+            addProperty("kierunekSort", 0)
+            addProperty("maxIloscZaznaczonych", 0)
+            addProperty("panelFiltrow", 0)
+        }
+
+        webApiGet(TAG, IDZIENNIK_WEB_HOMEWORK, mapOf(
+                "idP" to data.registerId,
+                "data" to Date.getToday().stringY_m_d,
+                "wszystkie" to true,
+                "param" to param
+        )) { result ->
+            val json = result.getJsonObject("d") ?: run {
+                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+                        .withApiResponse(result))
+                return@webApiGet
+            }
+
+            json.getJsonArray("ListK")?.asJsonObjectList()?.forEach { homework ->
+                val id = homework.getLong("_recordId") ?: return@forEach
+                val eventDate = Date.fromY_m_d(homework.getString("dataO") ?: return@forEach)
+                val subjectId = data.getSubject(homework.getString("przed") ?: return@forEach,
+                        -1, "").id
+                val teacherId = data.getTeacherByLastFirst(homework.getString("usr")
+                        ?: return@forEach).id
+                val lessonList = data.db.timetableDao().getForDateNow(profileId, eventDate)
+                val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.displayStartTime
+                val topic = homework.getString("tytul") ?: ""
+
+                val seen = when (profile?.empty) {
+                    true -> true
+                    else -> eventDate < Date.getToday()
+                }
+
+
+                val eventObject = Event(
+                        profileId,
+                        id,
+                        eventDate,
+                        startTime,
+                        topic,
+                        -1,
+                        Event.TYPE_HOMEWORK,
+                        false,
+                        teacherId,
+                        subjectId,
+                        data.teamClass?.id ?: -1
+                )
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_HOMEWORK,
+                        eventObject.id,
+                        seen,
+                        seen,
+                        System.currentTimeMillis()
+                ))
+            }
+
+            data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK))
+
+            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_HOMEWORK, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebNotices.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebNotices.kt
new file mode 100644
index 00000000..7cdaf3af
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebNotices.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-28.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.data.web
+
+import pl.szczodrzynski.edziennik.api.v2.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_WEB_NOTICES
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_WEB_NOTICES
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.crc16
+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
+
+class IdziennikWebNotices(override val data: DataIdziennik,
+                         val onSuccess: () -> Unit) : IdziennikWeb(data) {
+    companion object {
+        private const val TAG = "IdziennikWebNotices"
+    }
+
+    init {
+        webApiGet(TAG, IDZIENNIK_WEB_NOTICES, mapOf(
+                "idPozDziennika" to data.registerId
+        )) { result ->
+            val json = result.getJsonObject("d") ?: run {
+                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+                        .withApiResponse(result))
+                return@webApiGet
+            }
+
+            for (jNoticeEl in json.getAsJsonArray("SUwaga")) {
+                val jNotice = jNoticeEl.asJsonObject
+                // jNotice
+                val noticeId = jNotice.get("id").asString.crc16().toLong()
+
+                val rTeacher = data.getTeacherByLastFirst(jNotice.get("Nauczyciel").asString)
+                val addedDate = Date.fromY_m_d(jNotice.get("Data").asString)
+
+                var nType = TYPE_NEUTRAL
+                val jType = jNotice.get("Typ").asString
+                if (jType == "n") {
+                    nType = TYPE_NEGATIVE
+                } else if (jType == "p") {
+                    nType = TYPE_POSITIVE
+                }
+
+                val noticeObject = Notice(
+                        profileId,
+                        noticeId,
+                        jNotice.get("Tresc").asString,
+                        jNotice.get("Semestr").asInt,
+                        nType,
+                        rTeacher.id)
+                data.noticeList.add(noticeObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_NOTICE,
+                        noticeObject.id,
+                        profile?.empty ?: false,
+                        profile?.empty ?: false,
+                        addedDate.inMillis
+                ))
+            }
+
+            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_NOTICES, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebProposedGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebProposedGrades.kt
new file mode 100644
index 00000000..376aa8cf
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebProposedGrades.kt
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-28.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.data.web
+
+import pl.szczodrzynski.edziennik.api.v2.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_WEB_MISSING_GRADES
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+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.getJsonObject
+import pl.szczodrzynski.edziennik.utils.Utils.getWordGradeValue
+
+class IdziennikWebProposedGrades(override val data: DataIdziennik,
+                         val onSuccess: () -> Unit) : IdziennikWeb(data) {
+    companion object {
+        private const val TAG = "IdziennikWebProposedGrades"
+    }
+
+    init {
+        webApiGet(TAG, IDZIENNIK_WEB_MISSING_GRADES, mapOf(
+                "idPozDziennika" to data.registerId
+        )) { result ->
+            val json = result.getJsonObject("d") ?: run {
+                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+                        .withApiResponse(result))
+                return@webApiGet
+            }
+
+            val jSubjects = json.getAsJsonArray("Przedmioty")
+            for (jSubjectEl in jSubjects) {
+                val jSubject = jSubjectEl.getAsJsonObject()
+                // jSubject
+                val rSubject = data.getSubject(jSubject.get("Przedmiot").getAsString(), -1, jSubject.get("Przedmiot").getAsString())
+                val semester1Proposed = jSubject.get("OcenaSem1").getAsString()
+                val semester2Proposed = jSubject.get("OcenaSem2").getAsString()
+                val semester1Value = getWordGradeValue(semester1Proposed)
+                val semester2Value = getWordGradeValue(semester2Proposed)
+                val semester1Id = rSubject.id * -100 - 1
+                val semester2Id = rSubject.id * -100 - 2
+
+                if (semester1Proposed != "") {
+                    val gradeObject = Grade(
+                            profileId,
+                            semester1Id,
+                            "",
+                            -1,
+                            "",
+                            semester1Value.toString(),
+                            semester1Value.toFloat(),
+                            0f,
+                            1,
+                            -1,
+                            rSubject.id)
+
+                    gradeObject.type = TYPE_SEMESTER1_PROPOSED
+
+                    data.gradeList.add(gradeObject)
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_GRADE,
+                            gradeObject.id,
+                            profile?.empty ?: false,
+                            profile?.empty ?: false,
+                            System.currentTimeMillis()
+                    ))
+                }
+
+                if (semester2Proposed != "") {
+                    val gradeObject = Grade(
+                            profileId,
+                            semester2Id,
+                            "",
+                            -1,
+                            "",
+                            semester2Value.toString(),
+                            semester2Value.toFloat(),
+                            0f,
+                            2,
+                            -1,
+                            rSubject.id)
+
+                    gradeObject.type = TYPE_YEAR_PROPOSED
+
+                    data.gradeList.add(gradeObject)
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_GRADE,
+                            gradeObject.id,
+                            profile?.empty ?: false,
+                            profile?.empty ?: false,
+                            System.currentTimeMillis()
+                    ))
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebTimetable.kt
new file mode 100644
index 00000000..e2250c38
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebTimetable.kt
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-22
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.data.web
+
+import androidx.core.util.set
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_WEB_TIMETABLE
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_WEB_TIMETABLE
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+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
+import pl.szczodrzynski.edziennik.utils.models.Week
+
+class IdziennikWebTimetable(override val data: DataIdziennik,
+                            val onSuccess: () -> Unit) : IdziennikWeb(data) {
+    companion object {
+        private const val TAG = "IdziennikWebTimetable"
+    }
+
+    init { data.profile?.also { profile ->
+        val currentWeekStart = Week.getWeekStart()
+
+        if (Date.getToday().weekDay > 4) {
+            currentWeekStart.stepForward(0, 0, 7)
+        }
+
+        val getDate = data.arguments?.getString("weekStart") ?: currentWeekStart.stringY_m_d
+
+        val weekStart = Date.fromY_m_d(getDate)
+        val weekEnd = weekStart.clone().stepForward(0, 0, 6)
+
+        webApiGet(TAG, IDZIENNIK_WEB_TIMETABLE, mapOf(
+                "idPozDziennika" to data.registerId,
+                "pidRokSzkolny" to data.schoolYearId,
+                "data" to "${weekStart.stringY_m_d}T10:00:00.000Z"
+        )) { result ->
+            val json = result.getJsonObject("d") ?: run {
+                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+                        .withApiResponse(result))
+                return@webApiGet
+            }
+
+            json.getJsonArray("GodzinyLekcyjne")?.asJsonObjectList()?.forEach { range ->
+                val lessonRange = LessonRange(
+                        profileId,
+                        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
+            }
+
+            val dates = mutableSetOf<Int>()
+            val lessons = mutableListOf<Lesson>()
+
+            json.getJsonArray("Przedmioty")?.asJsonObjectList()?.forEach { lesson ->
+                val subject = data.getSubject(
+                        lesson.getString("Nazwa") ?: return@forEach,
+                        lesson.getLong("Id"),
+                        lesson.getString("Skrot") ?: ""
+                )
+                val teacher = data.getTeacherByFDotLast(lesson.getString("Nauczyciel")
+                        ?: return@forEach)
+
+                val newSubjectName = lesson.getString("PrzedmiotZastepujacy")
+                val newSubject = when (newSubjectName.isNullOrBlank()) {
+                    true -> null
+                    else -> data.getSubject(newSubjectName, null, newSubjectName)
+                }
+
+                val newTeacherName = lesson.getString("NauZastepujacy")
+                val newTeacher = when (newTeacherName.isNullOrBlank()) {
+                    true -> null
+                    else -> data.getTeacherByFDotLast(newTeacherName)
+                }
+
+                val weekDay = lesson.getInt("DzienTygodnia")?.minus(1) ?: return@forEach
+                val lessonRange = data.lessonRanges[lesson.getInt("Godzina")?.plus(1)
+                        ?: return@forEach]
+                val lessonDate = weekStart.clone().stepForward(0, 0, weekDay)
+                val classroom = lesson.getString("NazwaSali")
+
+                val type = lesson.getInt("TypZastepstwa") ?: -1
+
+                val lessonObject = Lesson(profileId, -1)
+
+                when (type) {
+                    1, 2, 3, 4, 5 -> {
+                        lessonObject.apply {
+                            this.type = Lesson.TYPE_CHANGE
+
+                            this.date = lessonDate
+                            this.lessonNumber = lessonRange.lessonNumber
+                            this.startTime = lessonRange.startTime
+                            this.endTime = lessonRange.endTime
+                            this.subjectId = newSubject?.id
+                            this.teacherId = newTeacher?.id
+                            this.teamId = data.teamClass?.id
+                            this.classroom = classroom
+
+                            this.oldDate = lessonDate
+                            this.oldLessonNumber = lessonRange.lessonNumber
+                            this.oldStartTime = lessonRange.startTime
+                            this.oldEndTime = lessonRange.endTime
+                            this.oldSubjectId = subject.id
+                            this.oldTeacherId = teacher.id
+                            this.oldTeamId = data.teamClass?.id
+                            this.oldClassroom = classroom
+                        }
+                    }
+                    0 -> {
+                        lessonObject.apply {
+                            this.type = Lesson.TYPE_CANCELLED
+
+                            this.oldDate = lessonDate
+                            this.oldLessonNumber = lessonRange.lessonNumber
+                            this.oldStartTime = lessonRange.startTime
+                            this.oldEndTime = lessonRange.endTime
+                            this.oldSubjectId = subject.id
+                            this.oldTeacherId = teacher.id
+                            this.oldTeamId = data.teamClass?.id
+                            this.oldClassroom = classroom
+                        }
+                    }
+                    else -> {
+                        lessonObject.apply {
+                            this.type = Lesson.TYPE_NORMAL
+
+                            this.date = lessonDate
+                            this.lessonNumber = lessonRange.lessonNumber
+                            this.startTime = lessonRange.startTime
+                            this.endTime = lessonRange.endTime
+                            this.subjectId = subject.id
+                            this.teacherId = teacher.id
+                            this.teamId = data.teamClass?.id
+                            this.classroom = classroom
+                        }
+                    }
+                }
+
+                lessonObject.id = lessonObject.buildId()
+
+                dates.add(lessonDate.value)
+                lessons.add(lessonObject)
+
+                val seen = profile.empty || lessonDate < Date.getToday()
+
+                if (lessonObject.type != Lesson.TYPE_NORMAL && lessonDate >= Date.getToday()) {
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_LESSON_CHANGE,
+                            lessonObject.id,
+                            seen,
+                            seen,
+                            System.currentTimeMillis()
+                    ))
+                }
+            }
+
+            val date: Date = weekStart.clone()
+            while (date <= weekEnd) {
+                if (!dates.contains(date.value)) {
+                    lessons.add(Lesson(profileId, date.value.toLong()).apply {
+                        this.type = Lesson.TYPE_NO_LESSONS
+                        this.date = date.clone()
+                    })
+                }
+
+                date.stepForward(0, 0, 1)
+            }
+
+            d(TAG, "Clearing lessons between ${weekStart.stringY_m_d} and ${weekEnd.stringY_m_d} - timetable downloaded for $getDate")
+
+            data.lessonNewList.addAll(lessons)
+            data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd))
+
+            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_TIMETABLE, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/firstlogin/IdziennikFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/firstlogin/IdziennikFirstLogin.kt
new file mode 100644
index 00000000..b282643b
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/firstlogin/IdziennikFirstLogin.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-27. 
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.firstlogin
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.api.v2.ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR
+import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_WEB_SETTINGS
+import pl.szczodrzynski.edziennik.api.v2.Regexes
+import pl.szczodrzynski.edziennik.api.v2.events.FirstLoginFinishedEvent
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.api.v2.idziennik.login.IdziennikLoginWeb
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.fixName
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.swapFirstLastName
+
+class IdziennikFirstLogin(val data: DataIdziennik, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "IdziennikFirstLogin"
+    }
+
+    private val web = IdziennikWeb(data)
+    private val profileList = mutableListOf<Profile>()
+
+    init {
+        IdziennikLoginWeb(data) {
+            web.webGet(TAG, IDZIENNIK_WEB_SETTINGS) { text ->
+                //val accounts = json.getJsonArray("accounts")
+
+                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
+
+                var schoolYearName: String? = null
+                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)
+                            .withApiResponse(text))
+                    return@webGet
+                }
+
+                Regexes.IDZIENNIK_LOGIN_FIRST_STUDENT.findAll(text)
+                        .toMutableList()
+                        .reversed()
+                        .forEach { match ->
+                            val registerId = match[1].toIntOrNull() ?: return@forEach
+                            val studentId = match[2]
+                            val firstName = match[3]
+                            val lastName = match[4]
+                            val className = match[5] + " " + match[6]
+
+                            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)
+                        }
+
+                EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore))
+                onSuccess()
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/login/IdziennikLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/login/IdziennikLogin.kt
new file mode 100644
index 00000000..ff6adb6e
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/login/IdziennikLogin.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.login
+
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_IDZIENNIK_API
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_IDZIENNIK_WEB
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class IdziennikLogin(val data: DataIdziennik, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "IdziennikLogin"
+    }
+
+    private var cancelled = false
+
+    init {
+        nextLoginMethod(onSuccess)
+    }
+
+    private fun nextLoginMethod(onSuccess: () -> Unit) {
+        if (data.targetLoginMethodIds.isEmpty()) {
+            onSuccess()
+            return
+        }
+        if (cancelled) {
+            onSuccess()
+            return
+        }
+        useLoginMethod(data.targetLoginMethodIds.removeAt(0)) { usedMethodId ->
+            data.progress(data.progressStep)
+            if (usedMethodId != -1)
+                data.loginMethods.add(usedMethodId)
+            nextLoginMethod(onSuccess)
+        }
+    }
+
+    private fun useLoginMethod(loginMethodId: Int, onSuccess: (usedMethodId: Int) -> Unit) {
+        // this should never be true
+        if (data.loginMethods.contains(loginMethodId)) {
+            onSuccess(-1)
+            return
+        }
+        Utils.d(TAG, "Using login method $loginMethodId")
+        when (loginMethodId) {
+            LOGIN_METHOD_IDZIENNIK_WEB -> {
+                data.startProgress(R.string.edziennik_progress_login_idziennik_web)
+                IdziennikLoginWeb(data) { onSuccess(loginMethodId) }
+            }
+            LOGIN_METHOD_IDZIENNIK_API -> {
+                data.startProgress(R.string.edziennik_progress_login_idziennik_api)
+                IdziennikLoginApi(data) { onSuccess(loginMethodId) }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/login/IdziennikLoginApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/login/IdziennikLoginApi.kt
new file mode 100644
index 00000000..4782b980
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/login/IdziennikLoginApi.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-27. 
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.login
+
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+
+class IdziennikLoginApi(val data: DataIdziennik, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "IdziennikLoginApi"
+    }
+
+    init { run {
+        if (data.isApiLoginValid()) {
+            onSuccess()
+        }
+        else {
+            onSuccess()
+        }
+    }}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/login/IdziennikLoginWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/login/IdziennikLoginWeb.kt
new file mode 100644
index 00000000..88729206
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/login/IdziennikLoginWeb.kt
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-26.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.idziennik.login
+
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import okhttp3.Cookie
+import pl.szczodrzynski.edziennik.HOUR
+import pl.szczodrzynski.edziennik.MINUTE
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.getUnixDate
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class IdziennikLoginWeb(val data: DataIdziennik, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "IdziennikLoginWeb"
+    }
+
+    init { run {
+        if (data.isWebLoginValid()) {
+            data.app.cookieJar.saveFromResponse(null, listOf(
+                    Cookie.Builder()
+                            .name("ASP.NET_SessionId_iDziennik")
+                            .value(data.webSessionId!!)
+                            .domain("iuczniowie.progman.pl")
+                            .secure().httpOnly().build(),
+                    Cookie.Builder()
+                            .name(".ASPXAUTH")
+                            .value(data.webAuth!!)
+                            .domain("iuczniowie.progman.pl")
+                            .secure().httpOnly().build()
+            ))
+            onSuccess()
+        }
+        else {
+            data.app.cookieJar.clearForDomain("iuczniowie.progman.pl")
+            if (data.webSchoolName != null && data.webUsername != null && data.webPassword != null) {
+                loginWithCredentials()
+            }
+            else {
+                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            }
+        }
+    }}
+
+    private fun loginWithCredentials() {
+        Utils.d(TAG, "Request: Idziennik/Login/Web - $IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN")
+
+        val loginCallback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                if (text.isNullOrEmpty()) {
+                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                // login succeeded: there is a start page
+                if (text.contains("czyWyswietlicDostepMobilny")) {
+                    val cookies = data.app.cookieJar.getForDomain("iuczniowie.progman.pl")
+                    run {
+                        data.webSessionId = cookies.singleOrNull { it.name() == "ASP.NET_SessionId_iDziennik" }?.value() ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION
+                        data.webAuth = cookies.singleOrNull { it.name() == ".ASPXAUTH" }?.value() ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH
+                        data.apiBearer = cookies.singleOrNull { it.name() == "Bearer" }?.value() ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER
+                        data.loginExpiryTime = response.getUnixDate() + 30 * MINUTE /* after about 40 minutes the login didn't work already */
+                        data.apiExpiryTime = response.getUnixDate() + 12 * HOUR /* actually it expires after 24 hours but I'm not sure when does the token refresh. */
+                        return@run null
+                    }?.let { errorCode ->
+                        data.error(ApiError(TAG, errorCode)
+                                .withApiResponse(text)
+                                .withResponse(response))
+                        return
+                    }
+
+                    onSuccess()
+                    return
+                }
+
+                val errorText = Regexes.IDZIENNIK_LOGIN_ERROR.find(text)?.get(1)
+                when {
+                    errorText?.contains("nieprawidłową nazwę szkoły") == true -> ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME
+                    errorText?.contains("nieprawidłowy login lub hasło") == true -> ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN
+                    text.contains("Identyfikator zgłoszenia") -> ERROR_LOGIN_IDZIENNIK_WEB_SERVER_ERROR
+                    text.contains("Hasło dostępu do systemu wygasło") -> ERROR_LOGIN_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED
+                    text.contains("Trwają prace konserwacyjne") -> ERROR_LOGIN_IDZIENNIK_WEB_MAINTENANCE
+                    else -> ERROR_LOGIN_IDZIENNIK_WEB_OTHER
+                }.let { errorCode ->
+                    data.error(ApiError(TAG, errorCode)
+                            .withApiResponse(text)
+                            .withResponse(response))
+                    return
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        val getCallback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                Request.builder()
+                        .url("$IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN")
+                        .userAgent(IDZIENNIK_USER_AGENT)
+                        .addHeader("Origin", "https://iuczniowie.progman.pl")
+                        .addHeader("Referer", "$IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN")
+                        .apply {
+                            Regexes.IDZIENNIK_LOGIN_HIDDEN_FIELDS.findAll(text ?: return@apply).forEach {
+                                addParameter(it[1], it[2])
+                            }
+                        }
+                        .addParameter("ctl00\$ContentPlaceHolder\$nazwaPrzegladarki", IDZIENNIK_USER_AGENT)
+                        .addParameter("ctl00\$ContentPlaceHolder\$NazwaSzkoly", data.webSchoolName)
+                        .addParameter("ctl00\$ContentPlaceHolder\$UserName", data.webUsername)
+                        .addParameter("ctl00\$ContentPlaceHolder\$Password", data.webPassword)
+                        .addParameter("ctl00\$ContentPlaceHolder\$captcha", "")
+                        .addParameter("ctl00\$ContentPlaceHolder\$Logowanie", "Zaloguj")
+                        .post()
+                        .allowErrorCode(502)
+                        .callback(loginCallback)
+                        .build()
+                        .enqueue()
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url("$IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN")
+                .userAgent(IDZIENNIK_USER_AGENT)
+                .get()
+                .allowErrorCode(502)
+                .callback(getCallback)
+                .build()
+                .enqueue()
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/interfaces/EdziennikCallback.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/interfaces/EdziennikCallback.kt
new file mode 100644
index 00000000..5ce22d96
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/interfaces/EdziennikCallback.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-29.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.interfaces
+
+import pl.szczodrzynski.edziennik.api.v2.models.Feature
+import pl.szczodrzynski.edziennik.api.v2.models.LoginMethod
+
+/**
+ * A callback passed only to an e-register class.
+ * All [Feature]s and [LoginMethod]s receive this callback,
+ * but may only use [EndpointCallback]'s methods.
+ */
+interface EdziennikCallback : EndpointCallback {
+    fun onCompleted()
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/interfaces/EdziennikInterface.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/interfaces/EdziennikInterface.kt
new file mode 100644
index 00000000..3f8a0373
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/interfaces/EdziennikInterface.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-29.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.interfaces
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+
+interface EdziennikInterface {
+    fun sync(featureIds: List<Int>, viewId: Int? = null, arguments: JsonObject? = null)
+    fun getMessage(message: MessageFull)
+    fun markAllAnnouncementsAsRead()
+    fun getAttachment(messageId: Long, attachmentId: Long, attachmentName: String)
+    fun firstLogin()
+    fun cancel()
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/interfaces/EndpointCallback.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/interfaces/EndpointCallback.kt
new file mode 100644
index 00000000..daddcb9a
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/interfaces/EndpointCallback.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-29.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.interfaces
+
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.models.Feature
+import pl.szczodrzynski.edziennik.api.v2.models.LoginMethod
+
+/**
+ * A callback passed to all [Feature]s and [LoginMethod]s
+ */
+interface EndpointCallback {
+    fun onError(apiError: ApiError)
+    fun onProgress(step: Float)
+    fun onStartProgress(stringRes: Int)
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/DataLibrus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/DataLibrus.kt
new file mode 100644
index 00000000..a18b4511
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/DataLibrus.kt
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-21.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus
+
+import okhttp3.Cookie
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_LIBRUS_API
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_LIBRUS_MESSAGES
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_LIBRUS_PORTAL
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_LIBRUS_SYNERGIA
+import pl.szczodrzynski.edziennik.api.v2.models.Data
+import pl.szczodrzynski.edziennik.currentTimeUnix
+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) {
+
+    fun isPortalLoginValid() = portalTokenExpiryTime-30 > currentTimeUnix() && portalRefreshToken.isNotNullNorEmpty() && portalAccessToken.isNotNullNorEmpty()
+    fun isApiLoginValid() = apiTokenExpiryTime-30 > currentTimeUnix() && apiAccessToken.isNotNullNorEmpty()
+    fun isSynergiaLoginValid() = synergiaSessionIdExpiryTime-30 > currentTimeUnix() && synergiaSessionId.isNotNullNorEmpty()
+    fun isMessagesLoginValid() = messagesSessionIdExpiryTime-30 > currentTimeUnix() && messagesSessionId.isNotNullNorEmpty()
+
+    override fun satisfyLoginMethods() {
+        loginMethods.clear()
+        if (isPortalLoginValid())
+            loginMethods += LOGIN_METHOD_LIBRUS_PORTAL
+        if (isApiLoginValid())
+            loginMethods += LOGIN_METHOD_LIBRUS_API
+        if (isSynergiaLoginValid()) {
+            loginMethods += LOGIN_METHOD_LIBRUS_SYNERGIA
+            app.cookieJar.saveFromResponse(null, listOf(
+                    Cookie.Builder()
+                            .name("DZIENNIKSID")
+                            .value(synergiaSessionId!!)
+                            .domain("synergia.librus.pl")
+                            .secure().httpOnly().build()
+            ))
+        }
+        if (isMessagesLoginValid()) {
+            loginMethods += LOGIN_METHOD_LIBRUS_MESSAGES
+            app.cookieJar.saveFromResponse(null, listOf(
+                    Cookie.Builder()
+                            .name("DZIENNIKSID")
+                            .value(messagesSessionId!!)
+                            .domain("wiadomosci.librus.pl")
+                            .secure().httpOnly().build()
+            ))
+        }
+    }
+
+    fun getColor(id: Int?): Int {
+        return when (id) {
+             1 -> 0xFFF0E68C
+             2 -> 0xFF87CEFA
+             3 -> 0xFFB0C4DE
+             4 -> 0xFFF0F8FF
+             5 -> 0xFFF0FFFF
+             6 -> 0xFFF5F5DC
+             7 -> 0xFFFFEBCD
+             8 -> 0xFFFFF8DC
+             9 -> 0xFFA9A9A9
+            10 -> 0xFFBDB76B
+            11 -> 0xFF8FBC8F
+            12 -> 0xFFDCDCDC
+            13 -> 0xFFDAA520
+            14 -> 0xFFE6E6FA
+            15 -> 0xFFFFA07A
+            16 -> 0xFF32CD32
+            17 -> 0xFF66CDAA
+            18 -> 0xFF66CDAA
+            19 -> 0xFFC0C0C0
+            20 -> 0xFFD2B48C
+            21 -> 0xFF3333FF
+            22 -> 0xFF7B68EE
+            23 -> 0xFFBA55D3
+            24 -> 0xFFFFB6C1
+            25 -> 0xFFFF1493
+            26 -> 0xFFDC143C
+            27 -> 0xFFFF0000
+            28 -> 0xFFFF8C00
+            29 -> 0xFFFFD700
+            30 -> 0xFFADFF2F
+            31 -> 0xFF7CFC00
+            else -> 0xff2196f3
+        }.toInt()
+    }
+
+    /*    _____           _        _
+         |  __ \         | |      | |
+         | |__) |__  _ __| |_ __ _| |
+         |  ___/ _ \| '__| __/ _` | |
+         | |  | (_) | |  | || (_| | |
+         |_|   \___/|_|   \__\__,_|*/
+    private var mPortalEmail: String? = null
+    var portalEmail: String?
+        get() { mPortalEmail = mPortalEmail ?: loginStore.getLoginData("email", null); return mPortalEmail }
+        set(value) { loginStore.putLoginData("email", value); mPortalEmail = value }
+    private var mPortalPassword: String? = null
+    var portalPassword: String?
+        get() { mPortalPassword = mPortalPassword ?: loginStore.getLoginData("password", null); return mPortalPassword }
+        set(value) { loginStore.putLoginData("password", value); mPortalPassword = value }
+
+    private var mPortalAccessToken: String? = null
+    var portalAccessToken: String?
+        get() { mPortalAccessToken = mPortalAccessToken ?: loginStore.getLoginData("accessToken", null); return mPortalAccessToken }
+        set(value) { loginStore.putLoginData("accessToken", value); mPortalAccessToken = value }
+    private var mPortalRefreshToken: String? = null
+    var portalRefreshToken: String?
+        get() { mPortalRefreshToken = mPortalRefreshToken ?: loginStore.getLoginData("refreshToken", null); return mPortalRefreshToken }
+        set(value) { loginStore.putLoginData("refreshToken", value); mPortalRefreshToken = value }
+    private var mPortalTokenExpiryTime: Long? = null
+    var portalTokenExpiryTime: Long
+        get() { mPortalTokenExpiryTime = mPortalTokenExpiryTime ?: loginStore.getLoginData("tokenExpiryTime", 0L); return mPortalTokenExpiryTime ?: 0L }
+        set(value) { loginStore.putLoginData("tokenExpiryTime", value); mPortalTokenExpiryTime = value }
+
+    /*             _____ _____
+             /\   |  __ \_   _|
+            /  \  | |__) || |
+           / /\ \ |  ___/ | |
+          / ____ \| |    _| |_
+         /_/    \_\_|   |____*/
+    /**
+     * A Synergia login, like 1234567u.
+     * Used: for login (API Login Method) in Synergia mode.
+     * Used: for login (Synergia Login Method) in Synergia mode.
+     * And also in various places in [pl.szczodrzynski.edziennik.api.v2.models.Feature]s
+     */
+    private var mApiLogin: String? = null
+    var apiLogin: String?
+        get() { mApiLogin = mApiLogin ?: profile?.getStudentData("accountLogin", null); return mApiLogin }
+        set(value) { profile?.putStudentData("accountLogin", value) ?: return; mApiLogin = value }
+    /**
+     * A Synergia password.
+     * Used: for login (API Login Method) in Synergia mode.
+     * Used: for login (Synergia Login Method) in Synergia mode.
+     */
+    private var mApiPassword: String? = null
+    var apiPassword: String?
+        get() { mApiPassword = mApiPassword ?: profile?.getStudentData("accountPassword", null); return mApiPassword }
+        set(value) { profile?.putStudentData("accountPassword", value) ?: return; mApiPassword = value }
+
+    /**
+     * A JST login Code.
+     * Used only during first login in JST mode.
+     */
+    private var mApiCode: String? = null
+    var apiCode: String?
+        get() { mApiCode = mApiCode ?: profile?.getStudentData("accountCode", null); return mApiCode }
+        set(value) { profile?.putStudentData("accountCode", value) ?: return; mApiCode = value }
+    /**
+     * A JST login PIN.
+     * Used only during first login in JST mode.
+     */
+    private var mApiPin: String? = null
+    var apiPin: String?
+        get() { mApiPin = mApiPin ?: profile?.getStudentData("accountPin", null); return mApiPin }
+        set(value) { profile?.putStudentData("accountPin", value) ?: return; mApiPin = value }
+
+    /**
+     * A Synergia API access token.
+     * Used in all Api Endpoints.
+     * Created in Login Method Api.
+     * Applicable for all login modes.
+     */
+    private var mApiAccessToken: String? = null
+    var apiAccessToken: String?
+        get() { mApiAccessToken = mApiAccessToken ?: profile?.getStudentData("accountToken", null); return mApiAccessToken }
+        set(value) { profile?.putStudentData("accountToken", value) ?: return; mApiAccessToken = value }
+    /**
+     * A Synergia API refresh token.
+     * Used when refreshing the [apiAccessToken] in JST, Synergia modes.
+     */
+    private var mApiRefreshToken: String? = null
+    var apiRefreshToken: String?
+        get() { mApiRefreshToken = mApiRefreshToken ?: profile?.getStudentData("accountRefreshToken", null); return mApiRefreshToken }
+        set(value) { profile?.putStudentData("accountRefreshToken", value) ?: return; mApiRefreshToken = value }
+    /**
+     * The expiry time for [apiAccessToken], as a UNIX timestamp.
+     * Used when refreshing the [apiAccessToken] in JST, Synergia modes.
+     * Used when refreshing the [apiAccessToken] in Portal mode ([pl.szczodrzynski.edziennik.api.v2.librus.login.SynergiaTokenExtractor])
+     */
+    private var mApiTokenExpiryTime: Long? = null
+    var apiTokenExpiryTime: Long
+        get() { mApiTokenExpiryTime = mApiTokenExpiryTime ?: profile?.getStudentData("accountTokenTime", 0L); return mApiTokenExpiryTime ?: 0L }
+        set(value) { profile?.putStudentData("accountTokenTime", value) ?: return; mApiTokenExpiryTime = value }
+
+    /*     _____                            _
+          / ____|                          (_)
+         | (___  _   _ _ __   ___ _ __ __ _ _  __ _
+          \___ \| | | | '_ \ / _ \ '__/ _` | |/ _` |
+          ____) | |_| | | | |  __/ | | (_| | | (_| |
+         |_____/ \__, |_| |_|\___|_|  \__, |_|\__,_|
+                  __/ |                __/ |
+                 |___/                |__*/
+    /**
+     * A Synergia web Session ID (DZIENNIKSID).
+     * Used in endpoints with Synergia login method.
+     */
+    private var mSynergiaSessionId: String? = null
+    var synergiaSessionId: String?
+        get() { mSynergiaSessionId = mSynergiaSessionId ?: profile?.getStudentData("accountSID", null); return mSynergiaSessionId }
+        set(value) { profile?.putStudentData("accountSID", value) ?: return; mSynergiaSessionId = value }
+    /**
+     * The expiry time for [synergiaSessionId], as a UNIX timestamp.
+     * Used in endpoints with Synergia login method.
+     * TODO verify how long is the session ID valid.
+     */
+    private var mSynergiaSessionIdExpiryTime: Long? = null
+    var synergiaSessionIdExpiryTime: Long
+        get() { mSynergiaSessionIdExpiryTime = mSynergiaSessionIdExpiryTime ?: profile?.getStudentData("accountSIDTime", 0L); return mSynergiaSessionIdExpiryTime ?: 0L }
+        set(value) { profile?.putStudentData("accountSIDTime", value) ?: return; mSynergiaSessionIdExpiryTime = value }
+
+
+    /**
+     * A Messages web Session ID (DZIENNIKSID).
+     * Used in endpoints with Messages login method.
+     */
+    private var mMessagesSessionId: String? = null
+    var messagesSessionId: String?
+        get() { mMessagesSessionId = mMessagesSessionId ?: profile?.getStudentData("messagesSID", null); return mMessagesSessionId }
+        set(value) { profile?.putStudentData("messagesSID", value) ?: return; mMessagesSessionId = value }
+    /**
+     * The expiry time for [messagesSessionId], as a UNIX timestamp.
+     * Used in endpoints with Messages login method.
+     * TODO verify how long is the session ID valid.
+     */
+    private var mMessagesSessionIdExpiryTime: Long? = null
+    var messagesSessionIdExpiryTime: Long
+        get() { mMessagesSessionIdExpiryTime = mMessagesSessionIdExpiryTime ?: profile?.getStudentData("messagesSIDTime", 0L); return mMessagesSessionIdExpiryTime ?: 0L }
+        set(value) { profile?.putStudentData("messagesSIDTime", value) ?: return; mMessagesSessionIdExpiryTime = value }
+
+    /*     ____  _   _
+          / __ \| | | |
+         | |  | | |_| |__   ___ _ __
+         | |  | | __| '_ \ / _ \ '__|
+         | |__| | |_| | | |  __/ |
+          \____/ \__|_| |_|\___|*/
+    var isPremium
+        get() = profile?.getStudentData("isPremium", false) ?: false
+        set(value) { profile?.putStudentData("isPremium", 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 mUnitId: Long? = null
+    var unitId: Long
+        get() { mUnitId = mUnitId ?: profile?.getStudentData("unitId", 0L); return mUnitId ?: 0L }
+        set(value) { profile?.putStudentData("unitId", value) ?: return; mUnitId = value }
+
+    private var mStartPointsSemester1: Int? = null
+    var startPointsSemester1: Int
+        get() { mStartPointsSemester1 = mStartPointsSemester1 ?: profile?.getStudentData("startPointsSemester1", 0); return mStartPointsSemester1 ?: 0 }
+        set(value) { profile?.putStudentData("startPointsSemester1", value) ?: return; mStartPointsSemester1 = value }
+    private var mStartPointsSemester2: Int? = null
+    var startPointsSemester2: Int
+        get() { mStartPointsSemester2 = mStartPointsSemester2 ?: profile?.getStudentData("startPointsSemester2", 0); return mStartPointsSemester2 ?: 0 }
+        set(value) { profile?.putStudentData("startPointsSemester2", value) ?: return; mStartPointsSemester2 = value }
+
+    private var mEnablePointGrades: Boolean? = null
+    var enablePointGrades: Boolean
+        get() { mEnablePointGrades = mEnablePointGrades ?: profile?.getStudentData("enablePointGrades", true); return mEnablePointGrades ?: true }
+        set(value) { profile?.putStudentData("enablePointGrades", value) ?: return; mEnablePointGrades = value }
+    private var mEnableDescriptiveGrades: Boolean? = null
+    var enableDescriptiveGrades: Boolean
+        get() { mEnableDescriptiveGrades = mEnableDescriptiveGrades ?: profile?.getStudentData("enableDescriptiveGrades", true); return mEnableDescriptiveGrades ?: true }
+        set(value) { profile?.putStudentData("enableDescriptiveGrades", value) ?: return; mEnableDescriptiveGrades = value }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/Librus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/Librus.kt
new file mode 100644
index 00000000..8f281480
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/Librus.kt
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-21.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikInterface
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusData
+import pl.szczodrzynski.edziennik.api.v2.librus.data.messages.LibrusMessagesGetAttachment
+import pl.szczodrzynski.edziennik.api.v2.librus.data.messages.LibrusMessagesGetMessage
+import pl.szczodrzynski.edziennik.api.v2.librus.data.synergia.LibrusSynergiaMarkAllAnnouncementsAsRead
+import pl.szczodrzynski.edziennik.api.v2.librus.firstlogin.LibrusFirstLogin
+import pl.szczodrzynski.edziennik.api.v2.librus.login.*
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.utils.Utils.d
+
+class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
+    companion object {
+        private const val TAG = "Librus"
+    }
+
+    val internalErrorList = mutableListOf<Int>()
+    val data: DataLibrus
+
+    init {
+        data = DataLibrus(app, profile, loginStore).apply {
+            callback = wrapCallback(this@Librus.callback)
+            satisfyLoginMethods()
+        }
+    }
+
+    private fun completed() {
+        data.saveData()
+        data.notifyAndSyncEvents {
+            callback.onCompleted()
+        }
+    }
+
+    /*    _______ _                     _                  _ _   _
+         |__   __| |              /\   | |                (_) | | |
+            | |  | |__   ___     /  \  | | __ _  ___  _ __ _| |_| |__  _ __ ___
+            | |  | '_ \ / _ \   / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \
+            | |  | | | |  __/  / ____ \| | (_| | (_) | |  | | |_| | | | | | | | |
+            |_|  |_| |_|\___| /_/    \_\_|\__, |\___/|_|  |_|\__|_| |_|_| |_| |_|
+                                           __/ |
+                                          |__*/
+    override fun sync(featureIds: List<Int>, viewId: Int?, arguments: JsonObject?) {
+        data.arguments = arguments
+        data.prepare(librusLoginMethods, LibrusFeatures, featureIds, viewId)
+        login()
+    }
+
+    private fun login() {
+        d(TAG, "Trying to login with ${data.targetLoginMethodIds}")
+        if (internalErrorList.isNotEmpty()) {
+            d(TAG, "  - Internal errors:")
+            internalErrorList.forEach { d(TAG, "      - code $it") }
+        }
+        LibrusLogin(data) {
+            data()
+        }
+    }
+
+    private fun data() {
+        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        if (internalErrorList.isNotEmpty()) {
+            d(TAG, "  - Internal errors:")
+            internalErrorList.forEach { d(TAG, "      - code $it") }
+        }
+        LibrusData(data) {
+            completed()
+        }
+    }
+
+    override fun getMessage(message: MessageFull) {
+        LibrusLoginPortal(data) {
+            LibrusLoginApi(data) {
+                LibrusLoginSynergia(data) {
+                    LibrusLoginMessages(data) {
+                        LibrusMessagesGetMessage(data, message) {
+                            completed()
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    override fun markAllAnnouncementsAsRead() {
+        LibrusLoginPortal(data) {
+            LibrusLoginApi(data) {
+                LibrusLoginSynergia(data) {
+                    LibrusSynergiaMarkAllAnnouncementsAsRead(data) {
+                        completed()
+                    }
+                }
+            }
+        }
+    }
+
+    override fun getAttachment(messageId: Long, attachmentId: Long, attachmentName: String) {
+        LibrusLoginPortal(data) {
+            LibrusLoginApi(data) {
+                LibrusLoginSynergia(data) {
+                    LibrusLoginMessages(data) {
+                        LibrusMessagesGetAttachment(data, messageId, attachmentId, attachmentName) {
+                            completed()
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    override fun firstLogin() {
+        LibrusFirstLogin(data) {
+            completed()
+        }
+    }
+
+    override fun cancel() {
+        d(TAG, "Cancelled")
+        data.cancel()
+    }
+
+    private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
+        return object : EdziennikCallback {
+            override fun onCompleted() {
+                callback.onCompleted()
+            }
+
+            override fun onProgress(step: Float) {
+                callback.onProgress(step)
+            }
+
+            override fun onStartProgress(stringRes: Int) {
+                callback.onStartProgress(stringRes)
+            }
+
+            override fun onError(apiError: ApiError) {
+                if (apiError.errorCode in internalErrorList) {
+                    // finish immediately if the same error occurs twice during the same sync
+                    callback.onError(apiError)
+                    return
+                }
+                internalErrorList.add(apiError.errorCode)
+                when (apiError.errorCode) {
+                    ERROR_LIBRUS_PORTAL_ACCESS_DENIED -> {
+                        data.loginMethods.remove(LOGIN_METHOD_LIBRUS_PORTAL)
+                        data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_PORTAL)
+                        data.targetLoginMethodIds.sort()
+                        data.portalTokenExpiryTime = 0
+                        login()
+                    }
+                    ERROR_LIBRUS_API_ACCESS_DENIED,
+                    ERROR_LIBRUS_API_TOKEN_EXPIRED -> {
+                        data.loginMethods.remove(LOGIN_METHOD_LIBRUS_API)
+                        data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_API)
+                        data.targetLoginMethodIds.sort()
+                        data.apiTokenExpiryTime = 0
+                        login()
+                    }
+                    ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED -> {
+                        data.loginMethods.remove(LOGIN_METHOD_LIBRUS_SYNERGIA)
+                        data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_SYNERGIA)
+                        data.targetLoginMethodIds.sort()
+                        data.synergiaSessionIdExpiryTime = 0
+                        login()
+                    }
+                    ERROR_LIBRUS_MESSAGES_ACCESS_DENIED -> {
+                        data.loginMethods.remove(LOGIN_METHOD_LIBRUS_MESSAGES)
+                        data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_MESSAGES)
+                        data.targetLoginMethodIds.sort()
+                        data.messagesSessionIdExpiryTime = 0
+                        login()
+                    }
+                    ERROR_LOGIN_LIBRUS_PORTAL_NO_CODE,
+                    ERROR_LOGIN_LIBRUS_PORTAL_CSRF_MISSING,
+                    ERROR_LOGIN_LIBRUS_PORTAL_CODE_REVOKED,
+                    ERROR_LOGIN_LIBRUS_PORTAL_CODE_EXPIRED -> {
+                        login()
+                    }
+                    ERROR_LOGIN_LIBRUS_PORTAL_NO_REFRESH,
+                    ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_REVOKED,
+                    ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_INVALID -> {
+                        data.portalRefreshToken = null
+                        login()
+                    }
+                    ERROR_LOGIN_LIBRUS_SYNERGIA_TOKEN_INVALID,
+                    ERROR_LOGIN_LIBRUS_SYNERGIA_NO_TOKEN,
+                    ERROR_LOGIN_LIBRUS_SYNERGIA_NO_SESSION_ID -> {
+                        login()
+                    }
+                    ERROR_LOGIN_LIBRUS_MESSAGES_NO_SESSION_ID -> {
+                        login()
+                    }
+                    // TODO PORTAL CAPTCHA
+                    ERROR_LIBRUS_API_TIMETABLE_NOT_PUBLIC -> {
+                        loginStore.putLoginData("timetableNotPublic", true)
+                        data()
+                    }
+                    ERROR_LIBRUS_API_LUCKY_NUMBER_NOT_ACTIVE,
+                    ERROR_LIBRUS_API_NOTES_NOT_ACTIVE -> {
+                        data()
+                    }
+                    else -> callback.onError(apiError)
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/LibrusFeatures.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/LibrusFeatures.kt
new file mode 100644
index 00000000..02bd46d7
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/LibrusFeatures.kt
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus
+
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.models.Feature
+
+const val ENDPOINT_LIBRUS_API_ME                        = 1001
+const val ENDPOINT_LIBRUS_API_SCHOOLS                   = 1002
+const val ENDPOINT_LIBRUS_API_CLASSES                   = 1003
+const val ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES           = 1004
+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_PUSH_CONFIG               = 1010
+const val ENDPOINT_LIBRUS_API_TIMETABLES                = 1015
+const val ENDPOINT_LIBRUS_API_SUBSTITUTIONS             = 1016
+const val ENDPOINT_LIBRUS_API_NORMAL_GC                 = 1021
+const val ENDPOINT_LIBRUS_API_POINT_GC                  = 1022
+const val ENDPOINT_LIBRUS_API_DESCRIPTIVE_GC            = 1023
+const val ENDPOINT_LIBRUS_API_TEXT_GC                   = 1024
+const val ENDPOINT_LIBRUS_API_DESCRIPTIVE_TEXT_GC       = 1025
+const val ENDPOINT_LIBRUS_API_BEHAVIOUR_GC              = 1026
+const val ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS = 1030
+const val ENDPOINT_LIBRUS_API_NORMAL_GRADES             = 1031
+const val ENDPOINT_LIBRUS_API_POINT_GRADES              = 1032
+const val ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADES        = 1033
+const val ENDPOINT_LIBRUS_API_TEXT_GRADES               = 1034
+const val ENDPOINT_LIBRUS_API_DESCRIPTIVE_TEXT_GRADES   = 1035
+const val ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADES          = 1036
+const val ENDPOINT_LIBRUS_API_EVENT_TYPES               = 1040
+const val ENDPOINT_LIBRUS_API_EVENTS                    = 1041
+const val ENDPOINT_LIBRUS_API_HOMEWORK                  = 1050
+const val ENDPOINT_LIBRUS_API_LUCKY_NUMBER              = 1060
+const val ENDPOINT_LIBRUS_API_NOTICE_TYPES              = 1070
+const val ENDPOINT_LIBRUS_API_NOTICES                   = 1071
+const val ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES          = 1080
+const val ENDPOINT_LIBRUS_API_ATTENDANCES               = 1081
+const val ENDPOINT_LIBRUS_API_ANNOUNCEMENTS             = 1090
+const val ENDPOINT_LIBRUS_API_PT_MEETINGS               = 1100
+const val ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES    = 1109
+const val ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS         = 1110
+const val ENDPOINT_LIBRUS_API_SCHOOL_FREE_DAYS          = 1120
+const val ENDPOINT_LIBRUS_API_CLASS_FREE_DAYS           = 1130
+const val ENDPOINT_LIBRUS_SYNERGIA_INFO                 = 2010
+const val ENDPOINT_LIBRUS_SYNERGIA_GRADES               = 2020
+const val ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK             = 2030
+const val ENDPOINT_LIBRUS_MESSAGES_RECEIVED             = 3010
+const val ENDPOINT_LIBRUS_MESSAGES_SENT                 = 3020
+const val ENDPOINT_LIBRUS_MESSAGES_TRASH                = 3030
+const val ENDPOINT_LIBRUS_MESSAGES_RECEIVERS            = 3040
+const val ENDPOINT_LIBRUS_MESSAGES_GET                  = 3040
+
+val LibrusFeatures = listOf(
+
+        // push config
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_PUSH_CONFIG, listOf(
+                ENDPOINT_LIBRUS_API_PUSH_CONFIG to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)).withShouldSync { data ->
+                data.app.appConfig.fcmTokens[LOGIN_TYPE_LIBRUS]?.second?.contains(data.profileId) == false
+        },
+
+
+
+
+
+        /**
+         * Timetable - using API.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_TIMETABLE, listOf(
+                ENDPOINT_LIBRUS_API_TIMETABLES to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_SUBSTITUTIONS to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)),
+        /**
+         * Agenda - using API.
+         * Events, Parent-teacher meetings, free days (teacher/school/class).
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_AGENDA, listOf(
+                ENDPOINT_LIBRUS_API_EVENTS to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_EVENT_TYPES to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_PT_MEETINGS to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_SCHOOL_FREE_DAYS to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_CLASS_FREE_DAYS to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)),
+        /**
+         * Grades - using API.
+         * All grades + categories.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_GRADES, listOf(
+                ENDPOINT_LIBRUS_API_NORMAL_GC to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_POINT_GC to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_DESCRIPTIVE_GC to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_TEXT_GC to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_DESCRIPTIVE_TEXT_GC to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_BEHAVIOUR_GC to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_NORMAL_GRADES to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_POINT_GRADES to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADES to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_TEXT_GRADES to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_DESCRIPTIVE_TEXT_GRADES to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADES to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)),
+        /**
+         * Homework - using API.
+         * Sync only if account has premium access.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_HOMEWORK, listOf(
+                ENDPOINT_LIBRUS_API_HOMEWORK to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)).withShouldSync { data ->
+                (data as DataLibrus).isPremium
+        },
+        /**
+         * Behaviour - using API.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_BEHAVIOUR, listOf(
+                ENDPOINT_LIBRUS_API_NOTICES to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)),
+        /**
+         * Attendance - using API.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_ATTENDANCE, listOf(
+                ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_ATTENDANCES to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)),
+        /**
+         * Announcements - using API.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_ANNOUNCEMENTS, listOf(
+                ENDPOINT_LIBRUS_API_ANNOUNCEMENTS to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)),
+
+
+
+
+
+        /**
+         * Student info - using API.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_STUDENT_INFO, listOf(
+                ENDPOINT_LIBRUS_API_ME to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)),
+        /**
+         * School info - using API.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_SCHOOL_INFO, listOf(
+                ENDPOINT_LIBRUS_API_SCHOOLS to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_UNITS to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)),
+        /**
+         * Class info - using API.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_CLASS_INFO, listOf(
+                ENDPOINT_LIBRUS_API_CLASSES to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)),
+        /**
+         * Team info - using API.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_TEAM_INFO, listOf(
+                ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)),
+        /**
+         * Lucky number - using API.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_LUCKY_NUMBER, listOf(
+                ENDPOINT_LIBRUS_API_LUCKY_NUMBER to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)).withShouldSync { data -> data.shouldSyncLuckyNumber() },
+        /**
+         * Teacher list - using API.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_TEACHERS, listOf(
+                ENDPOINT_LIBRUS_API_USERS to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)),
+        /**
+         * Subject list - using API.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_SUBJECTS, listOf(
+                ENDPOINT_LIBRUS_API_SUBJECTS to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)),
+        /**
+         * Classroom list - using API.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_CLASSROOMS, listOf(
+                ENDPOINT_LIBRUS_API_CLASSROOMS to LOGIN_METHOD_LIBRUS_API
+        ), listOf(LOGIN_METHOD_LIBRUS_API)),
+
+        /**
+         * Student info - using synergia scrapper.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_STUDENT_INFO, listOf(
+                ENDPOINT_LIBRUS_SYNERGIA_INFO to LOGIN_METHOD_LIBRUS_SYNERGIA
+        ), listOf(LOGIN_METHOD_LIBRUS_SYNERGIA)),
+        /**
+         * Student number - using synergia scrapper.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_STUDENT_NUMBER, listOf(
+                ENDPOINT_LIBRUS_SYNERGIA_INFO to LOGIN_METHOD_LIBRUS_SYNERGIA
+        ), listOf(LOGIN_METHOD_LIBRUS_SYNERGIA)),
+
+
+        /**
+         * Grades - using API + synergia scrapper.
+         */
+        /*Feature(LOGIN_TYPE_LIBRUS, FEATURE_GRADES, listOf(
+                ENDPOINT_LIBRUS_API_NORMAL_GC to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_API_NORMAL_GRADES to LOGIN_METHOD_LIBRUS_API,
+                ENDPOINT_LIBRUS_SYNERGIA_GRADES to LOGIN_METHOD_LIBRUS_SYNERGIA
+        ), listOf(LOGIN_METHOD_LIBRUS_API, LOGIN_METHOD_LIBRUS_SYNERGIA)),*/
+        /*Endpoint(LOGIN_TYPE_LIBRUS, FEATURE_GRADES, listOf(
+                ENDPOINT_LIBRUS_SYNERGIA_GRADES to LOGIN_METHOD_LIBRUS_SYNERGIA
+        ), listOf(LOGIN_METHOD_LIBRUS_SYNERGIA)),*/
+
+        /**
+         * Homework - using scrapper.
+         * Sync only if account has not premium access.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_HOMEWORK, listOf(
+                ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK to LOGIN_METHOD_LIBRUS_SYNERGIA
+        ), listOf(LOGIN_METHOD_LIBRUS_SYNERGIA)).withShouldSync { data ->
+                !(data as DataLibrus).isPremium
+        },
+
+        /**
+         * Messages inbox - using messages website.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_MESSAGES_INBOX, listOf(
+                ENDPOINT_LIBRUS_MESSAGES_RECEIVED to LOGIN_METHOD_LIBRUS_MESSAGES
+        ), listOf(LOGIN_METHOD_LIBRUS_MESSAGES)),
+        /**
+         * Messages sent - using messages website.
+         */
+        Feature(LOGIN_TYPE_LIBRUS, FEATURE_MESSAGES_SENT, listOf(
+                ENDPOINT_LIBRUS_MESSAGES_SENT to LOGIN_METHOD_LIBRUS_MESSAGES
+        ), listOf(LOGIN_METHOD_LIBRUS_MESSAGES))
+)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusApi.kt
new file mode 100644
index 00000000..837695d3
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusApi.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-21.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data
+
+import com.google.gson.JsonObject
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.JsonCallbackHandler
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import java.net.HttpURLConnection.*
+
+open class LibrusApi(open val data: DataLibrus) {
+    companion object {
+        private const val TAG = "LibrusApi"
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    val profile
+        get() = data.profile
+
+    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")
+
+        val callback = object : JsonCallbackHandler() {
+            override fun onSuccess(json: JsonObject?, response: Response?) {
+                if (response?.code() == HTTP_UNAVAILABLE) {
+                    data.error(ApiError(tag, ERROR_LIBRUS_API_MAINTENANCE)
+                            .withApiResponse(json)
+                            .withResponse(response))
+                    return
+                }
+
+                if (json == null && response?.parserErrorBody == null) {
+                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+                val error = if (response?.code() == 200) null else
+                    json.getString("Code") ?:
+                    json.getString("Message") ?:
+                    response?.parserErrorBody
+                error?.let { code ->
+                    when (code) {
+                        "TokenIsExpired" -> ERROR_LIBRUS_API_TOKEN_EXPIRED
+                        "Insufficient scopes" -> ERROR_LIBRUS_API_INSUFFICIENT_SCOPES
+                        "Request is denied" -> ERROR_LIBRUS_API_ACCESS_DENIED
+                        "Resource not found" -> ERROR_LIBRUS_API_RESOURCE_NOT_FOUND
+                        "NotFound" -> ERROR_LIBRUS_API_DATA_NOT_FOUND
+                        "AccessDeny" -> when (json.getString("Message")) {
+                            "Student timetable is not public" -> ERROR_LIBRUS_API_TIMETABLE_NOT_PUBLIC
+                            else -> ERROR_LIBRUS_API_RESOURCE_ACCESS_DENIED
+                        }
+                        "LuckyNumberIsNotActive" -> ERROR_LIBRUS_API_LUCKY_NUMBER_NOT_ACTIVE
+                        "NotesIsNotActive" -> ERROR_LIBRUS_API_NOTES_NOT_ACTIVE
+                        "InvalidRequest" -> ERROR_LIBRUS_API_INVALID_REQUEST_PARAMS
+                        "Nieprawidłowy węzeł." -> ERROR_LIBRUS_API_INCORRECT_ENDPOINT
+                        else -> ERROR_LIBRUS_API_OTHER
+                    }.let { errorCode ->
+                        data.error(ApiError(tag, errorCode)
+                                .withApiResponse(json)
+                                .withResponse(response))
+                        return
+                    }
+                }
+
+                if (json == null) {
+                    data.error(ApiError(tag, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                try {
+                    onSuccess(json)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_LIBRUS_API_REQUEST)
+                            .withResponse(response)
+                            .withThrowable(e)
+                            .withApiResponse(json))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                // TODO add hotfix for Classrooms 500
+                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url("${if (data.fakeLogin) FAKE_LIBRUS_API else LIBRUS_API_URL}/$endpoint")
+                .userAgent(LIBRUS_USER_AGENT)
+                .addHeader("Authorization", "Bearer ${data.apiAccessToken}")
+                .apply {
+                    when (method) {
+                        GET -> get()
+                        POST -> post()
+                    }
+                    if (payload != null)
+                        setJsonBody(payload)
+                }
+                .allowErrorCode(HTTP_BAD_REQUEST)
+                .allowErrorCode(HTTP_FORBIDDEN)
+                .allowErrorCode(HTTP_UNAUTHORIZED)
+                .allowErrorCode(HTTP_UNAVAILABLE)
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusData.kt
new file mode 100644
index 00000000..c919cd52
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusData.kt
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data
+
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.librus.*
+import pl.szczodrzynski.edziennik.api.v2.librus.data.api.*
+import pl.szczodrzynski.edziennik.api.v2.librus.data.messages.LibrusMessagesGetList
+import pl.szczodrzynski.edziennik.api.v2.librus.data.synergia.LibrusSynergiaHomework
+import pl.szczodrzynski.edziennik.api.v2.librus.data.synergia.LibrusSynergiaInfo
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "LibrusEndpoints"
+    }
+
+    init {
+        nextEndpoint(onSuccess)
+    }
+
+    private fun nextEndpoint(onSuccess: () -> Unit) {
+        if (data.targetEndpointIds.isEmpty()) {
+            onSuccess()
+            return
+        }
+        if (data.cancelled) {
+            onSuccess()
+            return
+        }
+        useEndpoint(data.targetEndpointIds.removeAt(0)) {
+            data.progress(data.progressStep)
+            nextEndpoint(onSuccess)
+        }
+    }
+
+    private fun useEndpoint(endpointId: Int, onSuccess: () -> Unit) {
+        Utils.d(TAG, "Using endpoint $endpointId")
+        when (endpointId) {
+            /**
+             * API
+             */
+            ENDPOINT_LIBRUS_API_ME -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_student_info)
+                LibrusApiMe(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_SCHOOLS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_school_info)
+                LibrusApiSchools(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_CLASSES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_classes)
+                LibrusApiClasses(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_teams)
+                LibrusApiVirtualClasses(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_UNITS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_units)
+                LibrusApiUnits(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_USERS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_teachers)
+                LibrusApiUsers(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_SUBJECTS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_subjects)
+                LibrusApiSubjects(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_CLASSROOMS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_classrooms)
+                LibrusApiClassrooms(data, onSuccess)
+            }
+            // TODO push config
+            ENDPOINT_LIBRUS_API_TIMETABLES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_timetable)
+                LibrusApiTimetables(data, onSuccess)
+            }
+
+            ENDPOINT_LIBRUS_API_NORMAL_GRADES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_grades)
+                LibrusApiGrades(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_grade_comments)
+                LibrusApiGradeComments(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_NORMAL_GC -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_grade_categories)
+                LibrusApiGradeCategories(data, onSuccess)
+            }
+            // TODO grades
+
+            ENDPOINT_LIBRUS_API_EVENT_TYPES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_event_types)
+                LibrusApiEventTypes(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_EVENTS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_events)
+                LibrusApiEvents(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_HOMEWORK -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_homework)
+                LibrusApiHomework(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_LUCKY_NUMBER -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
+                LibrusApiLuckyNumber(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_NOTICE_TYPES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_notice_types)
+                LibrusApiNoticeTypes(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_NOTICES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_notices)
+                LibrusApiNotices(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_attendance_types)
+                LibrusApiAttendanceTypes(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_ATTENDANCES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_attendance)
+                LibrusApiAttendances(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_ANNOUNCEMENTS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_announcements)
+                LibrusApiAnnouncements(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_PT_MEETINGS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_pt_meetings)
+                LibrusApiPtMeetings(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_teacher_free_day_types)
+                LibrusApiTeacherFreeDayTypes(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_teacher_free_days)
+                LibrusApiTeacherFreeDays(data, onSuccess)
+            }
+
+            /**
+             * SYNERGIA
+             */
+            ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_homework)
+                LibrusSynergiaHomework(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_SYNERGIA_INFO -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_student_info)
+                LibrusSynergiaInfo(data, onSuccess)
+            }
+
+            /**
+             * MESSAGES
+             */
+            ENDPOINT_LIBRUS_MESSAGES_RECEIVED -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
+                LibrusMessagesGetList(data, type = Message.TYPE_RECEIVED, onSuccess = onSuccess)
+            }
+            ENDPOINT_LIBRUS_MESSAGES_SENT -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
+                LibrusMessagesGetList(data, type = Message.TYPE_SENT, onSuccess = onSuccess)
+            }
+
+            else -> onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusMessages.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusMessages.kt
new file mode 100644
index 00000000..60bb1b67
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusMessages.kt
@@ -0,0 +1,229 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-24
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data
+
+import com.google.gson.JsonObject
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.body.MediaTypeUtils
+import im.wangchao.mhttp.callback.FileCallbackHandler
+import im.wangchao.mhttp.callback.JsonCallbackHandler
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import okhttp3.Cookie
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Document
+import org.jsoup.parser.Parser
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import java.io.File
+import java.io.StringWriter
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.transform.OutputKeys
+import javax.xml.transform.TransformerFactory
+import javax.xml.transform.dom.DOMSource
+import javax.xml.transform.stream.StreamResult
+
+open class LibrusMessages(open val data: DataLibrus) {
+    companion object {
+        private const val TAG = "LibrusMessages"
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    val profile
+        get() = data.profile
+
+    fun messagesGet(tag: String, endpoint: String, method: Int = POST,
+                    parameters: Map<String, Any>? = null, onSuccess: (doc: Document) -> Unit) {
+
+        d(tag, "Request: Librus/Messages - $LIBRUS_MESSAGES_URL/$endpoint")
+
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                if (text.isNullOrEmpty()) {
+                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                when {
+                    text.contains("<message>Niepoprawny login i/lub hasło.</message>") -> data.error(TAG, ERROR_LOGIN_LIBRUS_MESSAGES_INVALID_LOGIN, response, text)
+                    text.contains("stop.png") -> data.error(TAG, ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED, response, text)
+                    text.contains("eAccessDeny") -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED, response, text)
+                    text.contains("OffLine") -> data.error(TAG, ERROR_LIBRUS_MESSAGES_MAINTENANCE, response, text)
+                    text.contains("<status>error</status>") -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ERROR, response, text)
+                    text.contains("<type>eVarWhitThisNameNotExists</type>") -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED, response, text)
+                    text.contains("<error>") -> data.error(TAG, ERROR_LIBRUS_MESSAGES_OTHER, response, text)
+                }
+
+                try {
+                    val doc = Jsoup.parse(text, "", Parser.xmlParser())
+                    onSuccess(doc)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_LIBRUS_MESSAGES_REQUEST)
+                            .withResponse(response)
+                            .withThrowable(e)
+                            .withApiResponse(text))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        data.app.cookieJar.saveFromResponse(null, listOf(
+                Cookie.Builder()
+                        .name("DZIENNIKSID")
+                        .value(data.messagesSessionId!!)
+                        .domain("wiadomosci.librus.pl")
+                        .secure().httpOnly().build()
+        ))
+
+
+        val docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder()
+        val doc = docBuilder.newDocument()
+        val serviceElement = doc.createElement("service")
+        val headerElement = doc.createElement("header")
+        val dataElement = doc.createElement("data")
+        for ((key, value) in parameters.orEmpty()) {
+            val element = doc.createElement(key)
+            element.appendChild(doc.createTextNode(value.toString()))
+            dataElement.appendChild(element)
+        }
+        serviceElement.appendChild(headerElement)
+        serviceElement.appendChild(dataElement)
+        doc.appendChild(serviceElement)
+        val transformer = TransformerFactory.newInstance().newTransformer()
+        transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes")
+        val stringWriter = StringWriter()
+        transformer.transform(DOMSource(doc), StreamResult(stringWriter))
+        val requestXml = stringWriter.toString()
+
+        /*val requestXml = xml("service") {
+            "header" { }
+            "data" {
+                for ((key, value) in parameters.orEmpty()) {
+                    key {
+                        -value.toString()
+                    }
+                }
+            }
+        }.toString(PrintOptions(
+                singleLineTextElements = true,
+                useSelfClosingTags = true
+        ))*/
+
+        Request.builder()
+                .url("$LIBRUS_MESSAGES_URL/$endpoint")
+                .userAgent(SYNERGIA_USER_AGENT)
+                .setTextBody(requestXml, MediaTypeUtils.APPLICATION_XML)
+                .apply {
+                    when (method) {
+                        GET -> get()
+                        POST -> post()
+                    }
+                }
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+
+    fun sandboxGet(tag: String, action: String, parameters: Map<String, Any>? = null,
+                   onSuccess: (json: JsonObject) -> Unit) {
+
+        d(tag, "Request: Librus/Messages - $LIBRUS_SANDBOX_URL$action")
+
+        val callback = object : JsonCallbackHandler() {
+            override fun onSuccess(json: JsonObject?, response: Response?) {
+                if (json == null) {
+                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                try {
+                    onSuccess(json)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_LIBRUS_MESSAGES_REQUEST)
+                            .withResponse(response)
+                            .withThrowable(e)
+                            .withApiResponse(json))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url("$LIBRUS_SANDBOX_URL$action")
+                .userAgent(SYNERGIA_USER_AGENT)
+                .apply {
+                    parameters?.forEach { (k, v) ->
+                        addParameter(k, v)
+                    }
+                }
+                .post()
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+
+    fun sandboxGetFile(tag: String, action: String, targetFile: File, onSuccess: (file: File) -> Unit,
+                       onProgress: (written: Long, total: Long) -> Unit) {
+
+        d(tag, "Request: Librus/Messages - $LIBRUS_SANDBOX_URL$action")
+
+        val callback = object : FileCallbackHandler(targetFile) {
+            override fun onSuccess(file: File?, response: Response?) {
+                if (file == null) {
+                    data.error(ApiError(TAG, ERROR_FILE_DOWNLOAD)
+                            .withResponse(response))
+                    return
+                }
+
+                try {
+                    onSuccess(file)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_LIBRUS_MESSAGES_REQUEST)
+                            .withResponse(response)
+                            .withThrowable(e))
+                }
+            }
+
+            override fun onProgress(bytesWritten: Long, bytesTotal: Long) {
+                try {
+                    onProgress(bytesWritten, bytesTotal)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_LIBRUS_MESSAGES_REQUEST)
+                            .withThrowable(e))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url("$LIBRUS_SANDBOX_URL$action")
+                .userAgent(SYNERGIA_USER_AGENT)
+                .post()
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusPortal.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusPortal.kt
new file mode 100644
index 00000000..97fdf33d
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusPortal.kt
@@ -0,0 +1,104 @@
+package pl.szczodrzynski.edziennik.api.v2.librus.data
+
+import com.google.gson.JsonObject
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.JsonCallbackHandler
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import java.net.HttpURLConnection
+
+open class LibrusPortal(open val data: DataLibrus) {
+    companion object {
+        private const val TAG = "LibrusPortal"
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    val profile
+        get() = data.profile
+
+    fun portalGet(tag: String, endpoint: String, method: Int = GET, payload: JsonObject? = null, onSuccess: (json: JsonObject, response: Response?) -> Unit) {
+
+        d(tag, "Request: Librus/Portal - ${if (data.fakeLogin) FAKE_LIBRUS_PORTAL else LIBRUS_PORTAL_URL}$endpoint")
+
+        val callback = object : JsonCallbackHandler() {
+            override fun onSuccess(json: JsonObject?, response: Response?) {
+                if (json == null) {
+                    data.error(ApiError(tag, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+                val error = if (response?.code() == 200) null else
+                    json.getString("reason") ?:
+                    json.getString("message") ?:
+                    json.getString("hint") ?:
+                    json.getString("Code")
+                error?.let { code ->
+                    when (code) {
+                        "requires_an_action" -> ERROR_LIBRUS_PORTAL_SYNERGIA_DISCONNECTED
+                        "Access token is invalid" -> ERROR_LIBRUS_PORTAL_ACCESS_DENIED
+                        "ApiDisabled" -> ERROR_LIBRUS_PORTAL_API_DISABLED
+                        "Account not found" -> ERROR_LIBRUS_PORTAL_SYNERGIA_NOT_FOUND
+                        else -> when (json.getString("hint")) {
+                            "Error while decoding to JSON" -> ERROR_LIBRUS_PORTAL_ACCESS_DENIED
+                            else -> ERROR_LIBRUS_PORTAL_OTHER
+                        }
+                    }.let { errorCode ->
+                        data.error(ApiError(tag, errorCode)
+                                .withApiResponse(json)
+                                .withResponse(response))
+                        return
+                    }
+                }
+                if (response?.code() == HttpURLConnection.HTTP_OK) {
+                    try {
+                        onSuccess(json, response)
+                    } catch (e: NullPointerException) {
+                        e.printStackTrace()
+                        data.error(ApiError(tag, EXCEPTION_LIBRUS_PORTAL_SYNERGIA_TOKEN)
+                                .withResponse(response)
+                                .withThrowable(e)
+                                .withApiResponse(json))
+                    }
+
+                } else {
+                    data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                            .withResponse(response)
+                            .withApiResponse(json))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url((if (data.fakeLogin) FAKE_LIBRUS_PORTAL else LIBRUS_PORTAL_URL) + endpoint)
+                .userAgent(LIBRUS_USER_AGENT)
+                .addHeader("Authorization", "Bearer ${data.portalAccessToken}")
+                .apply {
+                    when (method) {
+                        GET -> get()
+                        POST -> post()
+                    }
+                    if (payload != null)
+                        setJsonBody(payload)
+                }
+                .allowErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
+                .allowErrorCode(HttpURLConnection.HTTP_FORBIDDEN)
+                .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED)
+                .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST)
+                .allowErrorCode(HttpURLConnection.HTTP_GONE)
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusSynergia.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusSynergia.kt
new file mode 100644
index 00000000..11bb0c58
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusSynergia.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-21.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data
+
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.utils.Utils.d
+
+open class LibrusSynergia(open val data: DataLibrus) {
+    companion object {
+        private const val TAG = "LibrusSynergia"
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    val profile
+        get() = data.profile
+
+    fun synergiaGet(tag: String, endpoint: String, method: Int = GET,
+                    parameters: Map<String, Any> = emptyMap(), onSuccess: (text: String) -> Unit) {
+        d(tag, "Request: Librus/Synergia - $LIBRUS_SYNERGIA_URL/$endpoint")
+
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                if (text.isNullOrEmpty()) {
+                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                if (!text.contains("jesteś zalogowany")) {
+                    when {
+                        text.contains("stop.png") -> ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED
+                        text.contains("Przerwa techniczna") -> ERROR_LIBRUS_SYNERGIA_MAINTENANCE
+                        else -> ERROR_LIBRUS_SYNERGIA_OTHER
+                    }.let { errorCode ->
+                        data.error(ApiError(tag, errorCode)
+                                .withResponse(response)
+                                .withApiResponse(text))
+                        return
+                    }
+                }
+
+
+                try {
+                    onSuccess(text)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_LIBRUS_SYNERGIA_REQUEST)
+                            .withResponse(response)
+                            .withThrowable(e)
+                            .withApiResponse(text))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        /*data.app.cookieJar.saveFromResponse(null, listOf(
+                Cookie.Builder()
+                        .name("DZIENNIKSID")
+                        .value(data.synergiaSessionId!!)
+                        .domain("synergia.librus.pl")
+                        .secure().httpOnly().build()
+        ))*/
+
+        Request.builder()
+                .url("$LIBRUS_SYNERGIA_URL/$endpoint")
+                .userAgent(LIBRUS_USER_AGENT)
+                .apply {
+                    when (method) {
+                        GET -> get()
+                        POST -> post()
+                    }
+                    parameters.map { (name, value) ->
+                        addParameter(name, value)
+                    }
+                }
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiAnnouncements.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiAnnouncements.kt
new file mode 100644
index 00000000..e05f1ef0
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiAnnouncements.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-13
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_ANNOUNCEMENTS
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+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.Utils
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class LibrusApiAnnouncements(override val data: DataLibrus,
+                             val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiAnnouncements"
+    }
+
+    init {
+        apiGet(TAG, "SchoolNotices") { json ->
+            val announcements = json.getJsonArray("SchoolNotices").asJsonObjectList()
+
+            announcements?.forEach { announcement ->
+                val id = Utils.crc16(announcement.getString("Id")?.toByteArray()
+                        ?: return@forEach).toLong()
+                val subject = announcement.getString("Subject") ?: ""
+                val text = announcement.getString("Content") ?: ""
+                val startDate = Date.fromY_m_d(announcement.getString("StartDate"))
+                val endDate = Date.fromY_m_d(announcement.getString("EndDate"))
+                val teacherId = announcement.getJsonObject("AddedBy")?.getLong("Id") ?: -1
+                val addedDate = Date.fromIso(announcement.getString("CreationDate"))
+                val read = announcement.getBoolean("WasRead") ?: false
+
+                val announcementObject = Announcement(
+                        profileId,
+                        id,
+                        subject,
+                        text,
+                        startDate,
+                        endDate,
+                        teacherId
+                )
+
+                data.announcementList.add(announcementObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_ANNOUNCEMENT,
+                        id,
+                        read,
+                        read,
+                        addedDate
+                ))
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_ANNOUNCEMENTS, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiAttendanceTypes.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiAttendanceTypes.kt
new file mode 100644
index 00000000..1ee34f9f
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiAttendanceTypes.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-13
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import android.graphics.Color
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+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) {
+    companion object {
+        const val TAG = "LibrusApiAttendanceTypes"
+    }
+
+    init {
+        apiGet(TAG, "Attendances/Types") { json ->
+            val attendanceTypes = json.getJsonArray("Types").asJsonObjectList()
+
+            attendanceTypes?.forEach { attendanceType ->
+                val id = attendanceType.getLong("Id") ?: return@forEach
+                val name = attendanceType.getString("Name") ?: ""
+                val color = attendanceType.getString("ColorRGB")?.let { Color.parseColor("#$it") } ?: -1
+
+                val standardId = when (attendanceType.getBoolean("Standard") ?: false) {
+                    true -> id
+                    false -> attendanceType.getJsonObject("StandardType")?.getLong("Id") ?: id
+                }
+                val type = when (standardId) {
+                    1L -> Attendance.TYPE_ABSENT
+                    2L -> Attendance.TYPE_BELATED
+                    3L -> Attendance.TYPE_ABSENT_EXCUSED
+                    4L -> Attendance.TYPE_RELEASED
+                    /*100*/else -> Attendance.TYPE_PRESENT
+                }
+
+                data.attendanceTypes.put(id, AttendanceType(profileId, id, name, type, color))
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES, 4*DAY)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiAttendances.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiAttendances.kt
new file mode 100644
index 00000000..52a3ea26
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiAttendances.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-13
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import androidx.core.util.isEmpty
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_ATTENDANCES
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+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
+
+class LibrusApiAttendances(override val data: DataLibrus,
+                           val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiAttendances"
+    }
+
+    init {
+        if (data.attendanceTypes.isEmpty()) {
+            data.db.attendanceTypeDao().getAllNow(profileId).toSparseArray(data.attendanceTypes) { it.id }
+        }
+
+        apiGet(TAG, "Attendances") { json ->
+            val attendances = json.getJsonArray("Attendances").asJsonObjectList()
+
+            attendances?.forEach { attendance ->
+                val id = Utils.strToInt((attendance.getString("Id") ?: return@forEach)
+                        .replace("[^\\d.]".toRegex(), "")).toLong()
+                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 subjectId = data.lessonList.singleOrNull {
+                    it.weekDay ==  lessonDate.weekDay && it.startTime.value == startTime.value
+                }?.subjectId ?: -1
+                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 attendanceObject = Attendance(
+                        profileId,
+                        id,
+                        teacherId,
+                        subjectId,
+                        semester,
+                        topic,
+                        lessonDate,
+                        startTime,
+                        typeObject.type
+                )
+
+                val addedDate = Date.fromIso(attendance.getString("AddDate") ?: return@forEach)
+
+                data.attendanceList.add(attendanceObject)
+                if(typeObject.type != Attendance.TYPE_PRESENT) {
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_ATTENDANCE,
+                            id,
+                            profile?.empty ?: false,
+                            profile?.empty ?: false,
+                            addedDate
+                    ))
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_ATTENDANCES, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiClasses.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiClasses.kt
new file mode 100644
index 00000000..d41206b4
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiClasses.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-14
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_CLASSES
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
+import pl.szczodrzynski.edziennik.getJsonObject
+import pl.szczodrzynski.edziennik.getLong
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class LibrusApiClasses(override val data: DataLibrus,
+                       val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiClasses"
+    }
+
+    init {
+        apiGet(TAG, "Classes") { json ->
+            json.getJsonObject("Class")?.also { studentClass ->
+                val id = studentClass.getLong("Id") ?: return@also
+                val name = studentClass.getString("Number") +
+                        studentClass.getString("Symbol")
+                val code = data.schoolName + ":" + name
+                val teacherId = studentClass.getJsonObject("ClassTutor")?.getLong("Id") ?: -1
+
+                val teamObject = Team(
+                        profileId,
+                        id,
+                        name,
+                        1,
+                        code,
+                        teacherId
+                )
+
+                data.teamList.put(id, teamObject)
+
+                data.unitId = studentClass.getJsonObject("Unit").getLong("Id") ?: 0L
+
+                profile?.apply {
+                    dateSemester1Start = Date.fromY_m_d(studentClass.getString("BeginSchoolYear")
+                            ?: return@apply)
+                    dateSemester2Start = Date.fromY_m_d(studentClass.getString("EndFirstSemester")
+                            ?: return@apply)
+                    dateYearEnd = Date.fromY_m_d(studentClass.getString("EndSchoolYear")
+                            ?: return@apply)
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_CLASSES, 4 * DAY)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiClassrooms.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiClassrooms.kt
new file mode 100644
index 00000000..662225e0
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiClassrooms.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-24.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_CLASSROOMS
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.db.modules.classrooms.Classroom
+import java.util.*
+
+class LibrusApiClassrooms(override val data: DataLibrus,
+                        val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiClassrooms"
+    }
+
+    init {
+        apiGet(TAG, "Classrooms") { json ->
+            val classrooms = json.getJsonArray("Classrooms").asJsonObjectList()
+
+            classrooms?.forEach { classroom ->
+                val id = classroom.getLong("Id") ?: return@forEach
+                val name = classroom.getString("Name")?.toLowerCase(Locale.getDefault()) ?: ""
+                val symbol = classroom.getString("Symbol")?.toLowerCase(Locale.getDefault()) ?: ""
+                val nameShort = name.split(" ").onEach { it[0] }.joinToString()
+
+                val friendlyName = if (name != symbol && !name.contains(symbol) && !nameShort.contains(symbol)) {
+                    classroom.getString("Symbol") + " " + classroom.getString("Name")
+                }
+                else {
+                    classroom.getString("Name") ?: ""
+                }
+
+                data.classrooms.put(id, Classroom(profileId, id, friendlyName))
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_CLASSROOMS, 4*DAY)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiEventTypes.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiEventTypes.kt
new file mode 100644
index 00000000..42fad5d2
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiEventTypes.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-24.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_EVENT_TYPES
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.db.modules.events.EventType
+
+class LibrusApiEventTypes(override val data: DataLibrus,
+                           val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiEventTypes"
+    }
+
+    init {
+        apiGet(TAG, "HomeWorks/Categories") { json ->
+            val eventTypes = json.getJsonArray("Categories").asJsonObjectList()
+
+            eventTypes?.forEach { eventType ->
+                val id = eventType.getLong("Id") ?: return@forEach
+                val name = eventType.getString("Name") ?: ""
+                val color = data.getColor(eventType.getJsonObject("Color")?.getInt("Id"))
+
+                data.eventTypes.put(id, EventType(profileId, id, name, color))
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_EVENT_TYPES, 4*DAY)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiEvents.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiEvents.kt
new file mode 100644
index 00000000..1f6e0e15
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiEvents.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-4.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import androidx.core.util.isEmpty
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_EVENTS
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+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
+
+class LibrusApiEvents(override val data: DataLibrus,
+                      val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiEvents"
+    }
+
+    init {
+        if (data.eventTypes.isEmpty()) {
+            data.db.eventTypeDao().getAllNow(profileId).toSparseArray(data.eventTypes) { it.id }
+        }
+
+        apiGet(TAG, "HomeWorks") { json ->
+            val events = json.getJsonArray("HomeWorks").asJsonObjectList()
+
+            events?.forEach { event ->
+                val id = event.getLong("Id") ?: return@forEach
+                val eventDate = Date.fromY_m_d(event.getString("Date"))
+                val topic = event.getString("Content") ?: ""
+                val type = event.getJsonObject("Category")?.getInt("Id") ?: -1
+                val teacherId = event.getJsonObject("CreatedBy")?.getLong("Id") ?: -1
+                val subjectId = event.getJsonObject("Subject")?.getLong("Id") ?: -1
+                val teamId = event.getJsonObject("Class")?.getLong("Id") ?: -1
+
+                val lessonNo = event.getInt("LessonNo")
+                val lessonRange = data.lessonRanges.singleOrNull { it.lessonNumber == lessonNo }
+                val startTime = lessonRange?.startTime ?: Time.fromH_m(event.getString("TimeFrom"))
+                val addedDate = Date.fromIso(event.getString("AddDate"))
+
+                val eventObject = Event(
+                        profileId,
+                        id,
+                        eventDate,
+                        startTime,
+                        topic,
+                        -1,
+                        type,
+                        false,
+                        teacherId,
+                        subjectId,
+                        teamId
+                )
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(
+                        Metadata(
+                                profileId,
+                                Metadata.TYPE_EVENT,
+                                id,
+                                profile?.empty ?: false,
+                                profile?.empty ?: false,
+                                addedDate
+                        ))
+            }
+
+            data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK))
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_EVENTS, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiGradeCategories.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiGradeCategories.kt
new file mode 100644
index 00000000..b91eae8a
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiGradeCategories.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-5
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import android.graphics.Color
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_NORMAL_GC
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+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) {
+    companion object {
+        const val TAG = "LibrusApiGradeCategories"
+    }
+
+    init {
+        apiGet(TAG, "Grades/Categories") { json ->
+            json.getJsonArray("Categories")?.asJsonObjectList()?.forEach { category ->
+                val id = category.getLong("Id") ?: return@forEach
+                val name = category.getString("Name") ?: ""
+                val weight = when (category.getBoolean("CountToTheAverage")) {
+                    true -> category.getFloat("Weight") ?: 0f
+                    else -> 0f
+                }
+                val color = category.getJsonObject("Color")?.getInt("Id")
+                        ?.let { data.getColor(it) } ?: Color.BLUE
+
+                val gradeCategoryObject = GradeCategory(
+                        profileId,
+                        id,
+                        weight,
+                        color,
+                        name
+                )
+
+                data.gradeCategories.put(id, gradeCategoryObject)
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_NORMAL_GC, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiGradeComments.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiGradeComments.kt
new file mode 100644
index 00000000..26a1b76b
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiGradeComments.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-20
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.asJsonObjectList
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
+import pl.szczodrzynski.edziennik.getJsonArray
+import pl.szczodrzynski.edziennik.getLong
+import pl.szczodrzynski.edziennik.getString
+
+class LibrusApiGradeComments(override val data: DataLibrus,
+                             val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiGradeComments"
+    }
+
+    init {
+        apiGet(TAG, "Grades/Comments") { json ->
+
+            json.getJsonArray("Comments")?.asJsonObjectList()?.forEach { comment ->
+                val id = comment.getLong("Id") ?: return@forEach
+                val text = comment.getString("Text")
+
+                val gradeCategoryObject = GradeCategory(
+                        profileId,
+                        id,
+                        -1f,
+                        -1,
+                        text
+                ).apply {
+                    type = GradeCategory.TYPE_COMMENT
+                }
+
+                data.gradeCategories.put(id, gradeCategoryObject)
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiGrades.kt
new file mode 100644
index 00000000..07c76f00
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiGrades.kt
@@ -0,0 +1,107 @@
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADES
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+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.Utils
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class LibrusApiGrades(override val data: DataLibrus,
+                      val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiGrades"
+    }
+
+    init {
+        apiGet(TAG, "Grades") { json ->
+            val grades = json.getJsonArray("Grades").asJsonObjectList()
+
+            grades?.forEach { grade ->
+                val id = grade.getLong("Id") ?: return@forEach
+                val categoryId = grade.getJsonObject("Category")?.getLong("Id") ?: -1
+                val name = grade.getString("Grade") ?: ""
+                val semester = grade.getInt("Semester") ?: return@forEach
+                val teacherId = grade.getJsonObject("AddedBy")?.getLong("Id") ?: -1
+                val subjectId = grade.getJsonObject("Subject")?.getLong("Id") ?: -1
+                val addedDate = Date.fromIso(grade.getString("AddDate"))
+
+                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)
+
+
+                if (name == "-" || name == "+"
+                        || name.equals("np", ignoreCase = true)
+                        || name.equals("bz", ignoreCase = true)) {
+                    weight = 0f
+                }
+
+                val description = grade.getJsonArray("Comments")?.asJsonObjectList()?.let { comments ->
+                    if (comments.isNotEmpty()) {
+                        data.gradeCategories.singleOrNull {
+                            it.type == GradeCategory.TYPE_COMMENT
+                                    && it.categoryId == comments[0].asJsonObject.getLong("Id")
+                        }?.text
+                    } else null
+                } ?: ""
+
+                val gradeObject = Grade(
+                        profileId,
+                        id,
+                        categoryName,
+                        color,
+                        description,
+                        name,
+                        value,
+                        weight,
+                        semester,
+                        teacherId,
+                        subjectId
+                )
+
+                when {
+                    grade.getBoolean("IsConstituent") ?: false ->
+                        gradeObject.type = Grade.TYPE_NORMAL
+                    grade.getBoolean("IsSemester") ?: false -> // semester final
+                        gradeObject.type = if (gradeObject.semester == 1) Grade.TYPE_SEMESTER1_FINAL else Grade.TYPE_SEMESTER2_FINAL
+                    grade.getBoolean("IsSemesterProposition") ?: false -> // semester proposed
+                        gradeObject.type = if (gradeObject.semester == 1) Grade.TYPE_SEMESTER1_PROPOSED else Grade.TYPE_SEMESTER2_PROPOSED
+                    grade.getBoolean("IsFinal") ?: false -> // year final
+                        gradeObject.type = Grade.TYPE_YEAR_FINAL
+                    grade.getBoolean("IsFinalProposition") ?: false -> // year final
+                        gradeObject.type = Grade.TYPE_YEAR_PROPOSED
+                }
+
+                grade.getJsonObject("Improvement")?.also {
+                    val historicalId = it.getLong("Id")
+                    data.gradeList.firstOrNull { grade -> grade.id == historicalId }?.also { grade ->
+                        grade.parentId = gradeObject.id
+                        if (grade.name == "nb") grade.weight = 0f
+                    }
+                    gradeObject.isImprovement = true
+                }
+
+                data.gradeList.add(gradeObject)
+                data.metadataList.add(
+                        Metadata(
+                                profileId,
+                                Metadata.TYPE_GRADE,
+                                id,
+                                profile?.empty ?: false,
+                                profile?.empty ?: false,
+                                addedDate
+                        ))
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_NORMAL_GRADES, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiHomework.kt
new file mode 100644
index 00000000..2dcec68b
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiHomework.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-12.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_HOMEWORK
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+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,
+                        val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiHomework"
+    }
+
+    init {
+        apiGet(TAG, "HomeWorkAssignments") { json ->
+            val homeworkList = json.getJsonArray("HomeWorkAssignments").asJsonObjectList()
+
+            homeworkList?.forEach { homework ->
+                val id = homework.getLong("Id") ?: return@forEach
+                val eventDate = Date.fromY_m_d(homework.getString("DueDate"))
+                val topic = homework.getString("Topic") + "\n" + homework.getString("Text")
+                val teacherId = homework.getJsonObject("Teacher")?.getLong("Id") ?: -1
+                val addedDate = Date.fromY_m_d(homework.getString("Date"))
+
+                val eventObject = Event(
+                        profileId,
+                        id,
+                        eventDate,
+                        null,
+                        topic,
+                        -1,
+                        -1,
+                        false,
+                        teacherId,
+                        -1,
+                        -1
+                )
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_HOMEWORK,
+                        id,
+                        profile?.empty ?: false,
+                        profile?.empty ?: false,
+                        addedDate.inMillis
+                ))
+            }
+
+            data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK))
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_HOMEWORK, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiLuckyNumber.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiLuckyNumber.kt
new file mode 100644
index 00000000..93579a02
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiLuckyNumber.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-14
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_LUCKY_NUMBER
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+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
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class LibrusApiLuckyNumber(override val data: DataLibrus,
+                           val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiLuckyNumber"
+    }
+
+    init {
+        data.profile?.luckyNumber = -1
+        data.profile?.luckyNumberDate = null
+
+        var nextSync = System.currentTimeMillis() + 2*DAY*1000
+
+        apiGet(TAG, "LuckyNumbers") { json ->
+            if (json.isJsonNull) {
+                //profile?.luckyNumberEnabled = false
+            } else {
+                json.getJsonObject("LuckyNumber")?.also { luckyNumberEl ->
+
+                    val luckyNumberDate = Date.fromY_m_d(luckyNumberEl.getString("LuckyNumberDay")) ?: Date.getToday()
+                    val luckyNumber = luckyNumberEl.getInt("LuckyNumber") ?: -1
+                    val luckyNumberObject = LuckyNumber(
+                            profileId,
+                            luckyNumberDate,
+                            luckyNumber
+                    )
+
+                    //if (luckyNumberDate > Date.getToday()) {
+                        nextSync = luckyNumberDate.combineWith(Time(15, 0, 0))
+                    //}
+
+                    data.luckyNumberList.add(luckyNumberObject)
+                    data.metadataList.add(
+                            Metadata(
+                                    profileId,
+                                    Metadata.TYPE_LUCKY_NUMBER,
+                                    luckyNumberObject.date.value.toLong(),
+                                    profile?.empty ?: false,
+                                    profile?.empty ?: false,
+                                    System.currentTimeMillis()
+                            ))
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_LUCKY_NUMBER, syncAt = nextSync)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiMe.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiMe.kt
new file mode 100644
index 00000000..8a5df3d0
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiMe.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-3.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_ME
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+
+class LibrusApiMe(override val data: DataLibrus,
+                  val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiMe"
+    }
+
+    init {
+        apiGet(TAG, "Me") { json ->
+            val me = json.getJsonObject("Me")
+            val account = me?.getJsonObject("Account")
+            val user = me?.getJsonObject("User")
+
+            data.isPremium = account?.getBoolean("IsPremium") == true || account?.getBoolean("IsPremiumDemo") == true
+
+            val isParent = account?.getInt("GroupId") == 5
+            data.profile?.accountNameLong =
+                    if (isParent)
+                        buildFullName(account?.getString("FirstName"), account?.getString("LastName"))
+                    else null
+
+            data.profile?.studentNameLong =
+                    buildFullName(user?.getString("FirstName"), user?.getString("LastName"))
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_ME, 2*DAY)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiNoticeTypes.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiNoticeTypes.kt
new file mode 100644
index 00000000..f49b15c7
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiNoticeTypes.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-24.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_NOTICE_TYPES
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeType
+
+class LibrusApiNoticeTypes(override val data: DataLibrus,
+                               val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiNoticeTypes"
+    }
+
+    init {
+        apiGet(TAG, "Notes/Categories") { json ->
+            val noticeTypes = json.getJsonArray("Categories").asJsonObjectList()
+
+            noticeTypes?.forEach { noticeType ->
+                val id = noticeType.getLong("Id") ?: return@forEach
+                val name = noticeType.getString("CategoryName") ?: ""
+
+                data.noticeTypes.put(id, NoticeType(profileId, id, name))
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_NOTICE_TYPES, 4*DAY)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiNotices.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiNotices.kt
new file mode 100644
index 00000000..2f4ca5c9
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiNotices.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-24.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import androidx.core.util.isEmpty
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_NOTICES
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+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,
+                      val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiNotices"
+    }
+
+    init {
+        if (data.noticeTypes.isEmpty()) {
+            data.db.noticeTypeDao().getAllNow(profileId).toSparseArray(data.noticeTypes) { it.id }
+        }
+
+        apiGet(TAG, "Notes") { json ->
+            val notes = json.getJsonArray("Notes").asJsonObjectList()
+
+            notes?.forEach { note ->
+                val id = note.getLong("Id") ?: return@forEach
+                val text = note.getString("Text") ?: ""
+                val categoryId = note.getJsonObject("Category")?.getLong("Id") ?: -1
+                val teacherId = note.getJsonObject("AddedBy")?.getLong("Id") ?: -1
+                val addedDate = note.getString("Date")?.let { Date.fromY_m_d(it) } ?: return@forEach
+
+                val type = when (note.getInt("Positive")) {
+                    0 -> Notice.TYPE_NEGATIVE
+                    1 -> Notice.TYPE_POSITIVE
+                    /*2*/else -> Notice.TYPE_NEUTRAL
+                }
+                val categoryText = data.noticeTypes[categoryId]?.name ?: ""
+                val semester = profile?.dateToSemester(addedDate) ?: 1
+
+                val noticeObject = Notice(
+                        profileId,
+                        id,
+                        categoryText+"\n"+text,
+                        semester,
+                        type,
+                        teacherId
+                )
+
+                data.noticeList.add(noticeObject)
+                data.metadataList.add(
+                        Metadata(
+                                profileId,
+                                Metadata.TYPE_NOTICE,
+                                id,
+                                profile?.empty ?: false,
+                                profile?.empty ?: false,
+                                addedDate.inMillis
+                        ))
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_NOTICES, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiPtMeetings.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiPtMeetings.kt
new file mode 100644
index 00000000..2c4e5f53
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiPtMeetings.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-24.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_PT_MEETINGS
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+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
+
+class LibrusApiPtMeetings(override val data: DataLibrus,
+                       val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiPtMeetings"
+    }
+
+    init {
+        apiGet(TAG, "ParentTeacherConferences") { json ->
+            val ptMeetings = json.getJsonArray("ParentTeacherConferences").asJsonObjectList()
+
+            ptMeetings?.forEach { meeting ->
+                val id = meeting.getLong("Id") ?: return@forEach
+                val topic = meeting.getString("Topic") ?: ""
+                val teacherId = meeting.getJsonObject("Teacher")?.getLong("Id") ?: -1
+                val eventDate = meeting.getString("Date")?.let { Date.fromY_m_d(it) } ?: return@forEach
+                val startTime = meeting.getString("Time")?.let {
+                    if (it == "00:00:00")
+                        null
+                    else
+                        Time.fromH_m_s(it)
+                }
+
+                val eventObject = Event(
+                        profileId,
+                        id,
+                        eventDate,
+                        startTime,
+                        topic,
+                        -1,
+                        Event.TYPE_PT_MEETING,
+                        false,
+                        teacherId,
+                        -1,
+                        data.teamClass?.id ?: -1
+                )
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(
+                        Metadata(
+                                profileId,
+                                Metadata.TYPE_EVENT,
+                                id,
+                                profile?.empty ?: false,
+                                profile?.empty ?: false,
+                                System.currentTimeMillis()
+                        ))
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_PT_MEETINGS, 12*HOUR)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiSchools.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiSchools.kt
new file mode 100644
index 00000000..5b1b1086
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiSchools.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-4.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_SCHOOLS
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange
+import pl.szczodrzynski.edziennik.utils.models.Time
+import java.util.*
+
+class LibrusApiSchools(override val data: DataLibrus,
+                       val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiSchools"
+    }
+
+    init {
+        apiGet(TAG, "Schools") { json ->
+            val school = json.getJsonObject("School")
+            val schoolId = school?.getInt("Id")
+            val schoolNameLong = school?.getString("Name")
+
+            // create the school's short name using first letters of each long name's word
+            // append the town name and save to student data
+            var schoolNameShort = ""
+            schoolNameLong?.split(" ")?.forEach {
+                if (it.isBlank())
+                    return@forEach
+                schoolNameShort += it[0].toLowerCase()
+            }
+            val schoolTown = school?.getString("Town")?.toLowerCase(Locale.getDefault())
+            data.schoolName = schoolId.toString() + schoolNameShort + "_" + schoolTown
+
+            school?.getJsonArray("LessonsRange")?.let { ranges ->
+                data.lessonRanges.clear()
+                ranges.forEachIndexed { index, rangeEl ->
+                    val range = rangeEl.asJsonObject
+                    val from = range.getString("From") ?: return@forEachIndexed
+                    val to = range.getString("To") ?: return@forEachIndexed
+                    data.lessonRanges.put(
+                            index,
+                            LessonRange(
+                                    profileId,
+                                    index,
+                                    Time.fromH_m(from),
+                                    Time.fromH_m(to)
+                            ))
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_SCHOOLS, 4 * DAY)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiSubjects.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiSubjects.kt
new file mode 100644
index 00000000..2cfd9be2
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiSubjects.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-23.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_SUBJECTS
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject
+
+class LibrusApiSubjects(override val data: DataLibrus,
+                              val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiSubjects"
+    }
+
+    init {
+        apiGet(TAG, "Subjects") { json ->
+            val subjects = json.getJsonArray("Subjects").asJsonObjectList()
+
+            subjects?.forEach { subject ->
+                val id = subject.getLong("Id") ?: return@forEach
+                val longName = subject.getString("Name") ?: ""
+                val shortName = subject.getString("Short") ?: ""
+
+                data.subjectList.put(id, Subject(profileId, id, longName, shortName))
+            }
+
+            data.subjectList.put(1, Subject(profileId, 1, "Zachowanie", "zach"))
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_SUBJECTS, 4*DAY)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiTeacherFreeDayTypes.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiTeacherFreeDayTypes.kt
new file mode 100644
index 00000000..eb82bbe2
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiTeacherFreeDayTypes.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-19
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceType
+
+class LibrusApiTeacherFreeDayTypes(override val data: DataLibrus,
+                                   val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiTeacherFreeDayTypes"
+    }
+
+    init {
+        apiGet(TAG, "TeacherFreeDays/Types") { json ->
+            val teacherAbsenceTypes = json.getJsonArray("Types").asJsonObjectList()
+
+            teacherAbsenceTypes?.forEach { teacherAbsenceType ->
+                val id = teacherAbsenceType.getLong("Id") ?: return@forEach
+                val name = teacherAbsenceType.getString("Name") ?: return@forEach
+
+                val teacherAbsenceTypeObject = TeacherAbsenceType(
+                        profileId,
+                        id,
+                        name
+                )
+
+                data.teacherAbsenceTypes.put(id, teacherAbsenceTypeObject)
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES, 7 * DAY)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiTeacherFreeDays.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiTeacherFreeDays.kt
new file mode 100644
index 00000000..649e3377
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiTeacherFreeDays.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-4.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import androidx.core.util.isEmpty
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+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
+
+class LibrusApiTeacherFreeDays(override val data: DataLibrus,
+                               val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiTeacherFreeDays"
+    }
+
+    init {
+        if (data.teacherAbsenceTypes.isEmpty()) {
+            data.db.teacherAbsenceTypeDao().getAllNow(profileId).toSparseArray(data.teacherAbsenceTypes) { it.id }
+        }
+
+        apiGet(TAG, "TeacherFreeDays") { json ->
+            val teacherAbsences = json.getJsonArray("TeacherFreeDays").asJsonObjectList()
+
+            teacherAbsences?.forEach { teacherAbsence ->
+                val id = teacherAbsence.getLong("Id") ?: return@forEach
+                val teacherId = teacherAbsence.getJsonObject("Teacher")?.getLong("Id")
+                        ?: return@forEach
+                val type = teacherAbsence.getJsonObject("Type").getLong("Id") ?: return@forEach
+                val name = data.teacherAbsenceTypes.singleOrNull { it.id == type }?.name
+                val dateFrom = Date.fromY_m_d(teacherAbsence.getString("DateFrom"))
+                val dateTo = Date.fromY_m_d(teacherAbsence.getString("DateTo"))
+                val timeFrom = teacherAbsence.getString("TimeFrom")?.let { Time.fromH_m_s(it) }
+                val timeTo = teacherAbsence.getString("TimeTo")?.let { Time.fromH_m_s(it) }
+
+                val teacherAbsenceObject = TeacherAbsence(
+                        profileId,
+                        id,
+                        teacherId,
+                        type,
+                        name,
+                        dateFrom,
+                        dateTo,
+                        timeFrom,
+                        timeTo
+                )
+
+                data.teacherAbsenceList.add(teacherAbsenceObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_TEACHER_ABSENCE,
+                        id,
+                        profile?.empty ?: false,
+                        profile?.empty ?: false,
+                        System.currentTimeMillis()
+                ))
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS, 6*HOUR, DRAWER_ITEM_AGENDA)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiTemplate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiTemplate.kt
new file mode 100644
index 00000000..efa7baf6
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiTemplate.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-4.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+
+class LibrusApiTemplate(override val data: DataLibrus,
+                        val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApi"
+    }
+
+    init {
+        /*apiGet(TAG, "") { json ->
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_, SYNC_ALWAYS)
+            onSuccess()
+        }*/
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiTimetables.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiTimetables.kt
new file mode 100644
index 00000000..44ba9288
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiTimetables.kt
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-10.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import androidx.core.util.isEmpty
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_TIMETABLES
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+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
+import pl.szczodrzynski.edziennik.utils.models.Week
+
+class LibrusApiTimetables(override val data: DataLibrus,
+                        val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiTimetables"
+    }
+
+    init {
+        if (data.classrooms.isEmpty()) {
+            data.db.classroomDao().getAllNow(profileId).toSparseArray(data.classrooms) { it.id }
+        }
+
+        val currentWeekStart = Week.getWeekStart()
+
+        if (Date.getToday().weekDay > 4) {
+            currentWeekStart.stepForward(0, 0, 7)
+        }
+
+        val getDate = data.arguments?.getString("weekStart") ?: currentWeekStart.stringY_m_d
+
+        val weekStart = Date.fromY_m_d(getDate)
+        val weekEnd = weekStart.clone().stepForward(0, 0, 6)
+
+        apiGet(TAG, "Timetables?weekStart=${weekStart.stringY_m_d}") { json ->
+            val days = json.getJsonObject("Timetable")
+
+            days?.entrySet()?.forEach { (dateString, dayEl) ->
+                val day = dayEl?.asJsonArray
+
+                val lessonDate = dateString?.let { Date.fromY_m_d(it) } ?: return@forEach
+
+                var lessonsFound = false
+                day?.forEach { lessonRangeEl ->
+                    val lessonRange = lessonRangeEl?.asJsonArray?.asJsonObjectList()
+                    if (lessonRange?.isNullOrEmpty() == false)
+                        lessonsFound = true
+                    lessonRange?.forEach { lesson ->
+                        parseLesson(lessonDate, lesson)
+                    }
+                }
+
+                if (day.isNullOrEmpty() || !lessonsFound) {
+                    data.lessonNewList.add(Lesson(profileId, lessonDate.value.toLong()).apply {
+                        type = Lesson.TYPE_NO_LESSONS
+                        date = lessonDate
+                    })
+                }
+            }
+
+            d(TAG, "Clearing lessons between ${weekStart.stringY_m_d} and ${weekEnd.stringY_m_d} - timetable downloaded for $getDate")
+
+            data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd))
+            data.setSyncNext(ENDPOINT_LIBRUS_API_TIMETABLES, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+
+    private fun parseLesson(lessonDate: Date, lesson: JsonObject) { data.profile?.also { profile ->
+        val isSubstitution = lesson.getBoolean("IsSubstitutionClass") ?: false
+        val isCancelled = lesson.getBoolean("IsCanceled") ?: false
+
+        val lessonNo = lesson.getInt("LessonNo") ?: return
+        val startTime = lesson.getString("HourFrom")?.let { Time.fromH_m(it) } ?: return
+        val endTime = lesson.getString("HourTo")?.let { Time.fromH_m(it) } ?: return
+        val subjectId = lesson.getJsonObject("Subject")?.getLong("Id")
+        val teacherId = lesson.getJsonObject("Teacher")?.getLong("Id")
+        val classroomId = lesson.getJsonObject("Classroom")?.getLong("Id") ?: -1
+        val virtualClassId = lesson.getJsonObject("VirtualClass")?.getLong("Id")
+        val teamId = lesson.getJsonObject("Class")?.getLong("Id") ?: virtualClassId
+
+        val lessonObject = Lesson(profileId, -1)
+
+        if (isSubstitution && isCancelled) {
+            // shifted lesson - source
+            val newDate = lesson.getString("NewDate")?.let { Date.fromY_m_d(it) } ?: return
+            val newLessonNo = lesson.getInt("NewLessonNo") ?: return
+            val newStartTime = lesson.getString("NewHourFrom")?.let { Time.fromH_m(it) } ?: return
+            val newEndTime = lesson.getString("NewHourTo")?.let { Time.fromH_m(it) } ?: return
+            val newSubjectId = lesson.getJsonObject("NewSubject")?.getLong("Id")
+            val newTeacherId = lesson.getJsonObject("NewTeacher")?.getLong("Id")
+            val newClassroomId = lesson.getJsonObject("NewClassroom")?.getLong("Id") ?: -1
+            val newVirtualClassId = lesson.getJsonObject("NewVirtualClass")?.getLong("Id")
+            val newTeamId = lesson.getJsonObject("NewClass")?.getLong("Id") ?: newVirtualClassId
+
+            lessonObject.let {
+                it.type = Lesson.TYPE_SHIFTED_SOURCE
+                it.oldDate = lessonDate
+                it.oldLessonNumber = lessonNo
+                it.oldStartTime = startTime
+                it.oldEndTime = endTime
+                it.oldSubjectId = subjectId
+                it.oldTeacherId = teacherId
+                it.oldTeamId = teamId
+                it.oldClassroom = data.classrooms[classroomId]?.name
+
+                it.date = newDate
+                it.lessonNumber = newLessonNo
+                it.startTime = newStartTime
+                it.endTime = newEndTime
+                it.subjectId = newSubjectId
+                it.teacherId = newTeacherId
+                it.teamId = newTeamId
+                it.classroom = data.classrooms[newClassroomId]?.name
+            }
+        }
+        else if (isSubstitution) {
+            // lesson change OR shifted lesson - target
+            val oldDate = lesson.getString("OrgDate")?.let { Date.fromY_m_d(it) } ?: return
+            val oldLessonNo = lesson.getInt("OrgLessonNo") ?: return
+            val oldStartTime = lesson.getString("OrgHourFrom")?.let { Time.fromH_m(it) } ?: return
+            val oldEndTime = lesson.getString("OrgHourTo")?.let { Time.fromH_m(it) } ?: return
+            val oldSubjectId = lesson.getJsonObject("OrgSubject")?.getLong("Id")
+            val oldTeacherId = lesson.getJsonObject("OrgTeacher")?.getLong("Id")
+            val oldClassroomId = lesson.getJsonObject("OrgClassroom")?.getLong("Id") ?: -1
+            val oldVirtualClassId = lesson.getJsonObject("OrgVirtualClass")?.getLong("Id")
+            val oldTeamId = lesson.getJsonObject("OrgClass")?.getLong("Id") ?: oldVirtualClassId
+
+            lessonObject.let {
+                it.type = if (lessonDate == oldDate && lessonNo == oldLessonNo) Lesson.TYPE_CHANGE else Lesson.TYPE_SHIFTED_TARGET
+                it.oldDate = oldDate
+                it.oldLessonNumber = oldLessonNo
+                it.oldStartTime = oldStartTime
+                it.oldEndTime = oldEndTime
+                it.oldSubjectId = oldSubjectId
+                it.oldTeacherId = oldTeacherId
+                it.oldTeamId = oldTeamId
+                it.oldClassroom = data.classrooms[oldClassroomId]?.name
+
+                it.date = lessonDate
+                it.lessonNumber = lessonNo
+                it.startTime = startTime
+                it.endTime = endTime
+                it.subjectId = subjectId
+                it.teacherId = teacherId
+                it.teamId = teamId
+                it.classroom = data.classrooms[classroomId]?.name
+            }
+        }
+        else if (isCancelled) {
+            lessonObject.let {
+                it.type = Lesson.TYPE_CANCELLED
+                it.oldDate = lessonDate
+                it.oldLessonNumber = lessonNo
+                it.oldStartTime = startTime
+                it.oldEndTime = endTime
+                it.oldSubjectId = subjectId
+                it.oldTeacherId = teacherId
+                it.oldTeamId = teamId
+                it.oldClassroom = data.classrooms[classroomId]?.name
+            }
+        }
+        else {
+            lessonObject.let {
+                it.type = Lesson.TYPE_NORMAL
+                it.date = lessonDate
+                it.lessonNumber = lessonNo
+                it.startTime = startTime
+                it.endTime = endTime
+                it.subjectId = subjectId
+                it.teacherId = teacherId
+                it.teamId = teamId
+                it.classroom = data.classrooms[classroomId]?.name
+            }
+        }
+
+        lessonObject.id = lessonObject.buildId()
+
+        val seen = profile.empty || lessonDate < Date.getToday()
+
+        if (lessonObject.type != Lesson.TYPE_NORMAL) {
+            data.metadataList.add(
+                    Metadata(
+                            profileId,
+                            Metadata.TYPE_LESSON_CHANGE,
+                            lessonObject.id,
+                            seen,
+                            seen,
+                            System.currentTimeMillis()
+                    ))
+        }
+        data.lessonNewList.add(lessonObject)
+    }}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiUnits.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiUnits.kt
new file mode 100644
index 00000000..42353ad5
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiUnits.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-23.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_UNITS
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+
+class LibrusApiUnits(override val data: DataLibrus,
+                       val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiUnits"
+    }
+
+    init { run {
+        if (data.unitId == 0L) {
+            data.setSyncNext(ENDPOINT_LIBRUS_API_UNITS, 12 * DAY)
+            onSuccess()
+            return@run
+        }
+
+        apiGet(TAG, "Units") { json ->
+            val units = json.getJsonArray("Units").asJsonObjectList()
+
+            units?.singleOrNull { it.getLong("Id") == data.unitId }?.also { unit ->
+                val startPoints = unit.getJsonObject("BehaviourGradesSettings")?.getJsonObject("StartPoints")
+                startPoints?.apply {
+                    data.startPointsSemester1 = getInt("Semester1", defaultValue = 0)
+                    data.startPointsSemester2 = getInt("Semester2", defaultValue = data.startPointsSemester1)
+                }
+                unit.getJsonObject("GradesSettings")?.apply {
+                    data.enablePointGrades = getBoolean("PointGradesEnabled", true)
+                    data.enableDescriptiveGrades = getBoolean("DescriptiveGradesEnabled", true)
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_UNITS, 7 * DAY)
+            onSuccess()
+        }
+    }}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiUsers.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiUsers.kt
new file mode 100644
index 00000000..9b1b3c93
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiUsers.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-23.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_USERS
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+
+class LibrusApiUsers(override val data: DataLibrus,
+                        val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiUsers"
+    }
+
+    init {
+        apiGet(TAG, "Users") { json ->
+            val users = json.getJsonArray("Users").asJsonObjectList()
+
+            users?.forEach { user ->
+                val id = user.getLong("Id") ?: return@forEach
+                val firstName = user.getString("FirstName")?.fixName() ?: ""
+                val lastName = user.getString("LastName")?.fixName() ?: ""
+
+                data.teacherList.put(id, Teacher(profileId, id, firstName, lastName))
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_USERS, 4*DAY)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiVirtualClasses.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiVirtualClasses.kt
new file mode 100644
index 00000000..3cc1559e
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiVirtualClasses.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-23.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
+
+class LibrusApiVirtualClasses(override val data: DataLibrus,
+                       val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiVirtualClasses"
+    }
+
+    init {
+        apiGet(TAG, "VirtualClasses") { json ->
+            val virtualClasses = json.getJsonArray("VirtualClasses").asJsonObjectList()
+
+            virtualClasses?.forEach { virtualClass ->
+                val id = virtualClass.getLong("Id") ?: return@forEach
+                val name = virtualClass.getString("Name") ?: ""
+                val teacherId = virtualClass.getJsonObject("Teacher")?.getLong("Id") ?: -1
+                val code = "${data.schoolName}:$name"
+
+                data.teamList.put(id, Team(profileId, id, name, 2, code, teacherId))
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES, 4*DAY)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/messages/LibrusMessagesGetAttachment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/messages/LibrusMessagesGetAttachment.kt
new file mode 100644
index 00000000..c1a54773
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/messages/LibrusMessagesGetAttachment.kt
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-24
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.messages
+
+import kotlinx.coroutines.*
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.api.v2.ERROR_FILE_DOWNLOAD
+import pl.szczodrzynski.edziennik.api.v2.EXCEPTION_LIBRUS_MESSAGES_REQUEST
+import pl.szczodrzynski.edziennik.api.v2.Regexes
+import pl.szczodrzynski.edziennik.api.v2.events.AttachmentGetEvent
+import pl.szczodrzynski.edziennik.api.v2.events.AttachmentGetEvent.Companion.TYPE_FINISHED
+import pl.szczodrzynski.edziennik.api.v2.events.AttachmentGetEvent.Companion.TYPE_PROGRESS
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusMessages
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.Utils
+import java.io.File
+import kotlin.coroutines.CoroutineContext
+
+
+class LibrusMessagesGetAttachment(override val data: DataLibrus, val messageId: Long, val attachmentId: Long,
+                                  val attachmentName: String, val onSuccess: () -> Unit) : LibrusMessages(data), CoroutineScope {
+    companion object {
+        const val TAG = "LibrusMessagesGetAttachment"
+    }
+
+    private var job = Job()
+
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Default
+
+    private var getAttachmentCheckKeyTries = 0
+
+    init {
+        messagesGet(TAG, "GetFileDownloadLink", parameters = mapOf(
+                "fileId" to attachmentId,
+                "msgId" to messageId,
+                "archive" to 0
+        )) { doc ->
+            val downloadLink = doc.select("response GetFileDownloadLink downloadLink").text()
+            val keyMatcher = Regexes.LIBRUS_ATTACHMENT_KEY.find(downloadLink)
+
+            if (keyMatcher != null) {
+                getAttachmentCheckKeyTries = 0
+
+                val attachmentKey = keyMatcher[1]
+                getAttachmentCheckKey(attachmentKey) {
+                    downloadAttachment(attachmentKey)
+                }
+            } else {
+                data.error(ApiError(TAG, ERROR_FILE_DOWNLOAD)
+                        .withApiResponse(doc.toString()))
+            }
+
+            onSuccess()
+        }
+    }
+
+    private fun getAttachmentCheckKey(attachmentKey: String, callback: () -> Unit) {
+        sandboxGet(TAG, "CSCheckKey",
+                parameters = mapOf("singleUseKey" to attachmentKey)) { json ->
+
+            when (json.getString("status")) {
+                "not_downloaded_yet" -> {
+                    if (getAttachmentCheckKeyTries++ > 5) {
+                        data.error(ApiError(TAG, ERROR_FILE_DOWNLOAD)
+                                .withApiResponse(json))
+                        return@sandboxGet
+                    }
+                    launch {
+                        delay(2000)
+                        getAttachmentCheckKey(attachmentKey, callback)
+                    }
+                }
+
+                "ready" -> {
+                    launch { callback() }
+                }
+
+                else -> {
+                    data.error(ApiError(TAG, EXCEPTION_LIBRUS_MESSAGES_REQUEST)
+                            .withApiResponse(json))
+                }
+            }
+        }
+    }
+
+    private fun downloadAttachment(attachmentKey: String) {
+        val targetFile = File(Utils.getStorageDir(), attachmentName)
+
+        sandboxGetFile(TAG, "CSDownload&singleUseKey=$attachmentKey",
+                targetFile, { file ->
+
+            val event = AttachmentGetEvent(
+                    profileId,
+                    messageId,
+                    attachmentId,
+                    TYPE_FINISHED,
+                    file.absolutePath
+            )
+
+            val attachmentDataFile = File(Utils.getStorageDir(), ".${profileId}_${event.messageId}_${event.attachmentId}")
+            Utils.writeStringToFile(attachmentDataFile, event.fileName)
+
+            EventBus.getDefault().post(event)
+
+        }) { written, _ ->
+            val event = AttachmentGetEvent(
+                    profileId,
+                    messageId,
+                    attachmentId,
+                    TYPE_PROGRESS,
+                    bytesWritten = written
+            )
+
+            EventBus.getDefault().post(event)
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/messages/LibrusMessagesGetList.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/messages/LibrusMessagesGetList.kt
new file mode 100644
index 00000000..3aee398d
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/messages/LibrusMessagesGetList.kt
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-24
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.messages
+
+import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
+import pl.szczodrzynski.edziennik.api.v2.ERROR_NOT_IMPLEMENTED
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_MESSAGES_RECEIVED
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_MESSAGES_SENT
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusMessages
+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.singleOrNull
+import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int = TYPE_RECEIVED,
+                            archived: Boolean = false, val onSuccess: () -> Unit) : LibrusMessages(data) {
+    companion object {
+        const val TAG = "LibrusMessagesGetList"
+    }
+
+    init {
+        val endpoint = when (type) {
+            TYPE_RECEIVED -> "Inbox/action/GetList"
+            Message.TYPE_SENT -> "Outbox/action/GetList"
+            else -> null
+        }
+
+        if (endpoint != null) {
+            messagesGet(TAG, endpoint, parameters = mapOf(
+                    "archive" to if (archived) 1 else 0
+            )) { doc ->
+                doc.select("GetList data").firstOrNull()?.children()?.forEach { element ->
+                    val id = element.select("messageId").text().toLong()
+                    val subject = element.select("topic").text().trim()
+                    val readDateText = element.select("readDate").text().trim()
+                    val readDate = when (readDateText.isNotBlank()) {
+                        true -> Date.fromIso(readDateText)
+                        else -> 0
+                    }
+                    val sentDate = Date.fromIso(element.select("sendDate").text().trim())
+
+                    val recipientFirstName = element.select(when (type) {
+                        TYPE_RECEIVED -> "senderFirstName"
+                        else -> "receiverFirstName"
+                    }).text().trim()
+
+                    val recipientLastName = element.select(when (type) {
+                        TYPE_RECEIVED -> "senderLastName"
+                        else -> "receiverLastName"
+                    }).text().trim()
+
+                    val recipientId = data.teacherList.singleOrNull {
+                        it.name == recipientFirstName && it.surname == recipientLastName
+                    }?.id ?: {
+                        val teacherObject = Teacher(
+                                profileId,
+                                -1 * Utils.crc16("$recipientFirstName $recipientLastName".toByteArray()).toLong(),
+                                recipientFirstName,
+                                recipientLastName
+                        )
+                        data.teacherList.put(teacherObject.id, teacherObject)
+                        teacherObject.id
+                    }.invoke()
+
+                    val senderId = when (type) {
+                        TYPE_RECEIVED -> recipientId
+                        else -> -1
+                    }
+
+                    val receiverId = when (type) {
+                        TYPE_RECEIVED -> -1
+                        else -> recipientId
+                    }
+
+                    val notified = when (type) {
+                        Message.TYPE_SENT -> true
+                        else -> readDate > 0 || profile?.empty ?: false
+                    }
+
+                    val messageObject = Message(
+                            profileId,
+                            id,
+                            subject,
+                            null,
+                            type,
+                            senderId,
+                            -1
+                    )
+
+                    val messageRecipientObject = MessageRecipient(
+                            profileId,
+                            receiverId,
+                            -1,
+                            readDate,
+                            id
+                    )
+
+                    data.messageIgnoreList.add(messageObject)
+                    data.messageRecipientList.add(messageRecipientObject)
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_MESSAGE,
+                            id,
+                            notified,
+                            notified,
+                            sentDate
+                    ))
+                }
+
+                when (type) {
+                    TYPE_RECEIVED -> data.setSyncNext(ENDPOINT_LIBRUS_MESSAGES_RECEIVED, SYNC_ALWAYS)
+                    Message.TYPE_SENT -> data.setSyncNext(ENDPOINT_LIBRUS_MESSAGES_SENT, DAY, DRAWER_ITEM_MESSAGES)
+                }
+                onSuccess()
+            }
+        } else {
+            data.error(TAG, ERROR_NOT_IMPLEMENTED)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/messages/LibrusMessagesGetMessage.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/messages/LibrusMessagesGetMessage.kt
new file mode 100644
index 00000000..83474d02
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/messages/LibrusMessagesGetMessage.kt
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-11
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.messages
+
+import android.util.Base64
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.api.v2.events.MessageGetEvent
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusMessages
+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.fixName
+import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.utils.models.Date
+import java.nio.charset.Charset
+
+class LibrusMessagesGetMessage(
+        override val data: DataLibrus,
+        private val messageObject: MessageFull,
+        val onSuccess: () -> Unit
+) : LibrusMessages(data) {
+    companion object {
+        const val TAG = "LibrusMessagesGetMessage"
+    }
+
+    init { data.profile?.also { profile ->
+        messagesGet(TAG, "GetMessage", parameters = mapOf(
+                "messageId" to messageObject.id,
+                "archive" to 0
+        )) { doc ->
+            val message = doc.select("response GetMessage data").first()
+
+            val body = Base64.decode(message.select("Message").text(), Base64.DEFAULT)
+                    .toString(Charset.defaultCharset())
+                    .replace("\n", "<br>")
+                    .replace("<!\\[CDATA\\[", "")
+                    .replace("]]>", "")
+
+            messageObject.apply {
+                this.body = body
+
+                clearAttachments()
+                message.select("attachments ArrayItem").forEach {
+                    val attachmentId = it.select("id").text().toLong()
+                    val attachmentName = it.select("filename").text()
+                    addAttachment(attachmentId, attachmentName, -1)
+                }
+            }
+
+            val messageRecipientList = mutableListOf<MessageRecipientFull>()
+
+            when (messageObject.type) {
+                TYPE_RECEIVED -> {
+                    val senderLoginId = message.select("senderId").text()
+                    data.teacherList.singleOrNull { it.id == messageObject.senderId }?.loginId = senderLoginId
+
+                    val readDateText = message.select("readDate").text()
+                    val readDate = when (readDateText.isNotEmpty()) {
+                        true -> Date.fromIso(readDateText)
+                        else -> 0
+                    }
+
+                    val messageRecipientObject = MessageRecipientFull(
+                            profileId,
+                            -1,
+                            -1,
+                            readDate,
+                            messageObject.id
+                    )
+
+                    messageRecipientObject.fullName = profile.accountNameLong ?: profile.studentNameLong
+
+                    messageRecipientList.add(messageRecipientObject)
+                }
+
+                TYPE_SENT -> {
+
+                    message.select("receivers ArrayItem").forEach { receiver ->
+                        val receiverFirstName = receiver.select("firstName").text().fixName()
+                        val receiverLastName = receiver.select("lastName").text().fixName()
+                        val receiverLoginId = receiver.select("receiverId").text()
+
+                        val teacher = data.teacherList.singleOrNull { it.name == receiverFirstName && it.surname == receiverLastName }
+                        val receiverId = teacher?.id ?: -1
+                        teacher?.loginId = receiverLoginId
+
+                        val readDateText = message.select("readed").text()
+                        val readDate = when (readDateText.isNotEmpty()) {
+                            true -> Date.fromIso(readDateText)
+                            else -> 0
+                        }
+
+                        val messageRecipientObject = MessageRecipientFull(
+                                profileId,
+                                receiverId,
+                                -1,
+                                readDate,
+                                messageObject.id
+                        )
+
+                        messageRecipientObject.fullName = "$receiverFirstName $receiverLastName"
+
+                        messageRecipientList.add(messageRecipientObject)
+                    }
+                }
+            }
+
+            if (!messageObject.seen) {
+                data.messageMetadataList.add(Metadata(
+                        messageObject.profileId,
+                        Metadata.TYPE_MESSAGE,
+                        messageObject.id,
+                        true,
+                        true,
+                        messageObject.addedDate
+                ))
+            }
+
+            messageObject.recipients = messageRecipientList
+            data.messageRecipientList.addAll(messageRecipientList)
+            data.messageList.add(messageObject)
+
+            EventBus.getDefault().postSticky(MessageGetEvent(messageObject))
+            onSuccess()
+        }
+    } ?: onSuccess()}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/messages/LibrusMessagesTemplate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/messages/LibrusMessagesTemplate.kt
new file mode 100644
index 00000000..f2a84d68
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/messages/LibrusMessagesTemplate.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-25
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.messages
+
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusMessages
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+
+class LibrusMessagesTemplate(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusMessages(data) {
+    companion object {
+        const val TAG = "LibrusMessages"
+    }
+
+    init {
+        /* messagesGet(TAG, "") { doc ->
+
+            data.setSyncNext(ENDPOINT_LIBRUS_MESSAGES_, SYNC_ALWAYS)
+            onSuccess()
+        } */
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/synergia/LibrusSynergiaHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/synergia/LibrusSynergiaHomework.kt
new file mode 100644
index 00000000..5e423215
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/synergia/LibrusSynergiaHomework.kt
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-22.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.synergia
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.HOUR
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOMEWORK
+import pl.szczodrzynski.edziennik.api.v2.POST
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusSynergia
+import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+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.singleOrNull
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class LibrusSynergiaHomework(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusSynergia(data) {
+    companion object {
+        const val TAG = "LibrusSynergiaHomework"
+    }
+
+    init {
+        synergiaGet(TAG, "moje_zadania", method = POST, parameters = mapOf(
+                "dataOd" to
+                        if (data.profile?.empty != false)
+                            profile!!.getSemesterStart(1).stringY_m_d
+                        else
+                            Date.getToday().stringY_m_d,
+                "dataDo" to profile!!.getSemesterEnd(profile?.currentSemester ?: 2).stringY_m_d,
+                "przedmiot" to -1
+
+        )) { text ->
+            val doc = Jsoup.parse(text)
+
+            doc.select("table.myHomeworkTable > tbody").firstOrNull()?.also { homeworkTable ->
+                val homeworkElements = homeworkTable.children()
+
+                val graphElements = doc.select("table[border].center td[align=left] tbody").first().children()
+
+                homeworkElements.forEachIndexed { i, el ->
+                    val elements = el.children()
+
+                    val subjectName = elements[0].text().trim()
+                    val subjectId = data.subjectList.singleOrNull { it.longName == subjectName }?.id
+                            ?: -1
+                    val teacherName = elements[1].text().trim()
+                    val teacherId = data.teacherList.singleOrNull { teacherName == it.fullName }?.id
+                            ?: -1
+                    val topic = elements[2].text().trim()
+                    val addedDate = Date.fromY_m_d(elements[4].text().trim()).inMillis
+                    val eventDate = Date.fromY_m_d(elements[6].text().trim())
+                    val id = "/podglad/([0-9]+)'".toRegex().find(
+                            elements[9].select("input").attr("onclick")
+                    )?.get(1)?.toLong() ?: return@forEachIndexed
+
+                    val lessons = data.db.timetableDao().getForDateNow(profileId, eventDate)
+                    val startTime = lessons.firstOrNull { it.subjectId == subjectId }?.startTime
+
+                    val moreInfo = graphElements[2 * i + 1].select("td[title]")
+                            .attr("title").trim()
+                    val description = "Treść: (.*)".toRegex(RegexOption.DOT_MATCHES_ALL).find(moreInfo)
+                            ?.get(1)?.replace("<br.*/>".toRegex(), "\n")?.trim()
+
+                    val seen = when (profile?.empty) {
+                        true -> true
+                        else -> eventDate < Date.getToday()
+                    }
+
+                    val eventObject = Event(
+                            profileId,
+                            id,
+                            eventDate,
+                            startTime,
+                            "$topic\n$description",
+                            -1,
+                            Event.TYPE_HOMEWORK,
+                            false,
+                            teacherId,
+                            subjectId,
+                            data.teamClass?.id ?: -1
+                    )
+
+                    data.eventList.add(eventObject)
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_HOMEWORK,
+                            id,
+                            seen,
+                            seen,
+                            addedDate
+                    ))
+                }
+            }
+
+            data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK))
+
+            // because this requires a synergia login (2 more requests) sync this every two hours or if explicit :D
+            data.setSyncNext(ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK, 2 * HOUR, DRAWER_ITEM_HOMEWORK)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/synergia/LibrusSynergiaInfo.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/synergia/LibrusSynergiaInfo.kt
new file mode 100644
index 00000000..7777cf6a
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/synergia/LibrusSynergiaInfo.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-23
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.synergia
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.MONTH
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_SYNERGIA_INFO
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusSynergia
+
+class LibrusSynergiaInfo(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusSynergia(data) {
+    companion object {
+        const val TAG = "LibrusSynergiaInfo"
+    }
+
+    init {
+        synergiaGet(TAG, "informacja") { text ->
+            val doc = Jsoup.parse(text)
+
+            doc.select("table.form tbody").firstOrNull()?.children()?.also { info ->
+                val studentNumber = info[2].select("td").text().trim().toIntOrNull()
+
+                studentNumber?.also {
+                    data.profile?.studentNumber = it
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_SYNERGIA_INFO, MONTH)
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/synergia/LibrusSynergiaMarkAllAnnouncementsAsRead.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/synergia/LibrusSynergiaMarkAllAnnouncementsAsRead.kt
new file mode 100644
index 00000000..5976954a
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/synergia/LibrusSynergiaMarkAllAnnouncementsAsRead.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-26
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.synergia
+
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusSynergia
+
+class LibrusSynergiaMarkAllAnnouncementsAsRead(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusSynergia(data) {
+    companion object {
+        const val TAG = "LibrusSynergiaMarkAllAnnouncementsAsRead"
+    }
+
+    init {
+        synergiaGet(TAG, "ogloszenia") {
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/synergia/LibrusSynergiaTemplate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/synergia/LibrusSynergiaTemplate.kt
new file mode 100644
index 00000000..1cc0097e
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/synergia/LibrusSynergiaTemplate.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-23
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.synergia
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusSynergia
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+
+class LibrusSynergiaTemplate(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusSynergia(data) {
+    companion object {
+        const val TAG = "LibrusSynergia"
+    }
+
+    init {
+        /* synergiaGet(TAG, "") { text ->
+            val doc = Jsoup.parse(text)
+
+            data.setSyncNext(ENDPOINT_LIBRUS_SYNERGIA_, SYNC_ALWAYS)
+            onSuccess()
+        } */
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/firstlogin/LibrusFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/firstlogin/LibrusFirstLogin.kt
new file mode 100644
index 00000000..41d77921
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/firstlogin/LibrusFirstLogin.kt
@@ -0,0 +1,92 @@
+package pl.szczodrzynski.edziennik.api.v2.librus.firstlogin
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.ERROR_NO_STUDENTS_IN_ACCOUNT
+import pl.szczodrzynski.edziennik.api.v2.FAKE_LIBRUS_ACCOUNTS
+import pl.szczodrzynski.edziennik.api.v2.LIBRUS_ACCOUNTS_URL
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_MODE_LIBRUS_EMAIL
+import pl.szczodrzynski.edziennik.api.v2.events.FirstLoginFinishedEvent
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusPortal
+import pl.szczodrzynski.edziennik.api.v2.librus.login.LibrusLoginApi
+import pl.szczodrzynski.edziennik.api.v2.librus.login.LibrusLoginPortal
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.AppError.CODE_LIBRUS_DISCONNECTED
+import pl.szczodrzynski.edziennik.data.api.AppError.CODE_SYNERGIA_NOT_ACTIVATED
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+
+class LibrusFirstLogin(val data: DataLibrus, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "LibrusFirstLogin"
+    }
+
+    private val portal = LibrusPortal(data)
+    private val api = LibrusApi(data)
+    private val profileList = mutableListOf<Profile>()
+
+    init {
+        if (data.loginStore.mode == LOGIN_MODE_LIBRUS_EMAIL) {
+            // email login: use Portal for account list
+            LibrusLoginPortal(data) {
+                portal.portalGet(TAG, if (data.fakeLogin) FAKE_LIBRUS_ACCOUNTS else LIBRUS_ACCOUNTS_URL) { json, response ->
+                    val accounts = json.getJsonArray("accounts")
+
+                    if (accounts == null || accounts.size() < 1) {
+                        data.error(ApiError(TAG, ERROR_NO_STUDENTS_IN_ACCOUNT)
+                                .withResponse(response)
+                                .withApiResponse(json))
+                        return@portalGet
+                    }
+                    val accountDataTime = json.getLong("lastModification")
+
+                    for (accountEl in accounts) {
+                        val account = accountEl.asJsonObject
+
+                        val state = account.getString("state")
+                        when (state) {
+                            "requiring_an_action" -> CODE_LIBRUS_DISCONNECTED
+                            "need-activation" -> CODE_SYNERGIA_NOT_ACTIVATED
+                            else -> null
+                        }?.let { errorCode ->
+                            data.error(ApiError(TAG, errorCode)
+                                    .withApiResponse(json)
+                                    .withResponse(response))
+                            return@portalGet
+                        }
+
+                        val id = account.getInt("id") ?: continue
+                        val login = account.getString("login") ?: continue
+                        val token = account.getString("accessToken") ?: continue
+                        val tokenTime = (accountDataTime ?: 0) + DAY
+                        val name = account.getString("studentName")?.fixName() ?: ""
+
+                        val profile = Profile()
+                        profile.studentNameLong = name
+                        profile.studentNameShort = name.getShortName()
+                        profile.name = profile.studentNameLong
+                        profile.subname = data.portalEmail
+                        profile.empty = true
+                        profile.putStudentData("accountId", id)
+                        profile.putStudentData("accountLogin", login)
+                        profile.putStudentData("accountToken", token)
+                        profile.putStudentData("accountTokenTime", tokenTime)
+                        profileList.add(profile)
+                    }
+
+                    EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore))
+                    onSuccess()
+                }
+            }
+        }
+        else {
+            // synergia or JST login: use Api for account info
+            LibrusLoginApi(data) {
+                api.apiGet(TAG, "Me") { json ->
+
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/LibrusLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/LibrusLogin.kt
new file mode 100644
index 00000000..cfcd6fd6
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/LibrusLogin.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.login
+
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_LIBRUS_API
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_LIBRUS_MESSAGES
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_LIBRUS_PORTAL
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_LIBRUS_SYNERGIA
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class LibrusLogin(val data: DataLibrus, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "LibrusLogin"
+    }
+
+    private var cancelled = false
+
+    init {
+        nextLoginMethod(onSuccess)
+    }
+
+    private fun nextLoginMethod(onSuccess: () -> Unit) {
+        if (data.targetLoginMethodIds.isEmpty()) {
+            onSuccess()
+            return
+        }
+        if (cancelled) {
+            onSuccess()
+            return
+        }
+        useLoginMethod(data.targetLoginMethodIds.removeAt(0)) { usedMethodId ->
+            data.progress(data.progressStep)
+            if (usedMethodId != -1)
+                data.loginMethods.add(usedMethodId)
+            nextLoginMethod(onSuccess)
+        }
+    }
+
+    private fun useLoginMethod(loginMethodId: Int, onSuccess: (usedMethodId: Int) -> Unit) {
+        // this should never be true
+        if (data.loginMethods.contains(loginMethodId)) {
+            onSuccess(-1)
+            return
+        }
+        Utils.d(TAG, "Using login method $loginMethodId")
+        when (loginMethodId) {
+            LOGIN_METHOD_LIBRUS_PORTAL -> {
+                data.startProgress(R.string.edziennik_progress_login_librus_portal)
+                LibrusLoginPortal(data) { onSuccess(loginMethodId) }
+            }
+            LOGIN_METHOD_LIBRUS_API -> {
+                data.startProgress(R.string.edziennik_progress_login_librus_api)
+                LibrusLoginApi(data) { onSuccess(loginMethodId) }
+            }
+            LOGIN_METHOD_LIBRUS_SYNERGIA -> {
+                data.startProgress(R.string.edziennik_progress_login_librus_synergia)
+                LibrusLoginSynergia(data) { onSuccess(loginMethodId) }
+            }
+            LOGIN_METHOD_LIBRUS_MESSAGES -> {
+                data.startProgress(R.string.edziennik_progress_login_librus_messages)
+                LibrusLoginMessages(data) { onSuccess(loginMethodId) }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/LibrusLoginApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/LibrusLoginApi.kt
new file mode 100644
index 00000000..8b4e0542
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/LibrusLoginApi.kt
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-20.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.login
+
+import com.google.gson.JsonObject
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.body.MediaTypeUtils
+import im.wangchao.mhttp.callback.JsonCallbackHandler
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.getInt
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.getUnixDate
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import java.net.HttpURLConnection.*
+
+class LibrusLoginApi {
+    companion object {
+        private const val TAG = "LoginLibrusApi"
+    }
+
+    private lateinit var data: DataLibrus
+    private lateinit var onSuccess: () -> Unit
+
+    /* do NOT move this to primary constructor */
+    constructor(data: DataLibrus, onSuccess: () -> Unit) {
+        this.data = data
+        this.onSuccess = onSuccess
+
+        if (data.loginStore.mode == LOGIN_MODE_LIBRUS_EMAIL && data.profile == null) {
+            data.error(ApiError(TAG, ERROR_PROFILE_MISSING))
+            return
+        }
+
+        if (data.isApiLoginValid()) {
+            onSuccess()
+        }
+        else {
+            when (data.loginStore.mode) {
+                LOGIN_MODE_LIBRUS_EMAIL -> loginWithPortal()
+                LOGIN_MODE_LIBRUS_SYNERGIA -> loginWithSynergia()
+                LOGIN_MODE_LIBRUS_JST -> loginWithJst()
+                else -> {
+                    data.error(ApiError(TAG, ERROR_INVALID_LOGIN_MODE))
+                }
+            }
+        }
+    }
+
+    private fun loginWithPortal() {
+        if (!data.loginMethods.contains(LOGIN_METHOD_LIBRUS_PORTAL)) {
+            data.error(ApiError(TAG, ERROR_LOGIN_METHOD_NOT_SATISFIED))
+            return
+        }
+        SynergiaTokenExtractor(data) {
+            onSuccess()
+        }
+    }
+
+    private fun copyFromLoginStore() {
+        data.loginStore.data?.apply {
+            if (has("accountLogin")) {
+                data.apiLogin = getString("accountLogin")
+                remove("accountLogin")
+            }
+            if (has("accountPassword")) {
+                data.apiPassword = getString("accountPassword")
+                remove("accountPassword")
+            }
+            if (has("accountCode")) {
+                data.apiCode = getString("accountCode")
+                remove("accountCode")
+            }
+            if (has("accountPin")) {
+                data.apiPin = getString("accountPin")
+                remove("accountPin")
+            }
+        }
+    }
+
+    private fun loginWithSynergia() {
+        copyFromLoginStore()
+        if (data.apiRefreshToken != null) {
+            // refresh a Synergia token
+            synergiaRefreshToken()
+        }
+        else if (data.apiLogin != null && data.apiPassword != null) {
+            synergiaGetToken()
+        }
+        else {
+            // cannot log in: token expired, no login data present
+            data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+        }
+    }
+
+    private fun loginWithJst() {
+        copyFromLoginStore()
+
+        if (data.apiRefreshToken != null) {
+            // refresh a JST token
+            jstRefreshToken()
+        }
+        else if (data.apiCode != null && data.apiPin != null) {
+            // get a JST token from Code and PIN
+            jstGetToken()
+        }
+        else {
+            // cannot log in: token expired, no login data present
+            data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+        }
+    }
+
+    private val tokenCallback = object : JsonCallbackHandler() {
+        override fun onSuccess(json: JsonObject?, response: Response?) {
+            if (response?.code() == HTTP_UNAVAILABLE) {
+                data.error(ApiError(TAG, ERROR_LIBRUS_API_MAINTENANCE)
+                        .withApiResponse(json)
+                        .withResponse(response))
+                return
+            }
+
+            if (json == null) {
+                data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                        .withResponse(response))
+                return
+            }
+            if (response?.code() != 200) json.getString("error")?.let { error ->
+                when (error) {
+                    "librus_captcha_needed" -> ERROR_LOGIN_LIBRUS_API_CAPTCHA_NEEDED
+                    "connection_problems" -> ERROR_LOGIN_LIBRUS_API_CONNECTION_PROBLEMS
+                    "invalid_client" -> ERROR_LOGIN_LIBRUS_API_INVALID_CLIENT
+                    "librus_reg_accept_needed" -> ERROR_LOGIN_LIBRUS_API_REG_ACCEPT_NEEDED
+                    "librus_change_password_error" -> ERROR_LOGIN_LIBRUS_API_CHANGE_PASSWORD_ERROR
+                    "librus_password_change_required" -> ERROR_LOGIN_LIBRUS_API_PASSWORD_CHANGE_REQUIRED
+                    "invalid_grant" -> ERROR_LOGIN_LIBRUS_API_INVALID_LOGIN
+                    else -> ERROR_LOGIN_LIBRUS_API_OTHER
+                }.let { errorCode ->
+                    data.error(ApiError(TAG, errorCode)
+                            .withApiResponse(json)
+                            .withResponse(response))
+                    return
+                }
+            }
+
+            try {
+                data.apiAccessToken = json.getString("access_token")
+                data.apiRefreshToken = json.getString("refresh_token")
+                data.apiTokenExpiryTime = response.getUnixDate() + json.getInt("expires_in", 86400)
+                onSuccess()
+            } catch (e: NullPointerException) {
+                data.error(ApiError(TAG, EXCEPTION_LOGIN_LIBRUS_API_TOKEN)
+                        .withResponse(response)
+                        .withThrowable(e)
+                        .withApiResponse(json))
+            }
+        }
+
+        override fun onFailure(response: Response?, throwable: Throwable?) {
+            data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                    .withResponse(response)
+                    .withThrowable(throwable))
+        }
+    }
+
+    private fun synergiaGetToken() {
+        d(TAG, "Request: Librus/Login/Api - $LIBRUS_API_TOKEN_URL")
+
+        Request.builder()
+                .url(LIBRUS_API_TOKEN_URL)
+                .userAgent(LIBRUS_USER_AGENT)
+                .addParameter("grant_type", "password")
+                .addParameter("username", data.apiLogin)
+                .addParameter("password", data.apiPassword)
+                .addParameter("librus_long_term_token", "1")
+                .addParameter("librus_rules_accepted", "1")
+                .addHeader("Authorization", "Basic $LIBRUS_API_AUTHORIZATION")
+                .contentType(MediaTypeUtils.APPLICATION_FORM)
+                .post()
+                .allowErrorCode(HTTP_BAD_REQUEST)
+                .allowErrorCode(HTTP_UNAUTHORIZED)
+                .allowErrorCode(HTTP_UNAVAILABLE)
+                .callback(tokenCallback)
+                .build()
+                .enqueue()
+    }
+    private fun synergiaRefreshToken() {
+        d(TAG, "Request: Librus/Login/Api - $LIBRUS_API_TOKEN_URL")
+
+        Request.builder()
+                .url(LIBRUS_API_TOKEN_URL)
+                .userAgent(LIBRUS_USER_AGENT)
+                .addParameter("grant_type", "refresh_token")
+                .addParameter("refresh_token", data.apiRefreshToken)
+                .addParameter("librus_long_term_token", "1")
+                .addParameter("librus_rules_accepted", "1")
+                .addHeader("Authorization", "Basic $LIBRUS_API_AUTHORIZATION")
+                .contentType(MediaTypeUtils.APPLICATION_FORM)
+                .post()
+                .allowErrorCode(HTTP_BAD_REQUEST)
+                .allowErrorCode(HTTP_UNAUTHORIZED)
+                .callback(tokenCallback)
+                .build()
+                .enqueue()
+    }
+    private fun jstGetToken() {
+        d(TAG, "Request: Librus/Login/Api - $LIBRUS_API_TOKEN_JST_URL")
+
+        Request.builder()
+                .url(LIBRUS_API_TOKEN_JST_URL)
+                .userAgent(LIBRUS_USER_AGENT)
+                .addParameter("grant_type", "implicit_grant")
+                .addParameter("client_id", LIBRUS_API_CLIENT_ID_JST)
+                .addParameter("secret", LIBRUS_API_SECRET_JST)
+                .addParameter("code", data.apiCode)
+                .addParameter("pin", data.apiPin)
+                .addParameter("librus_rules_accepted", "1")
+                .addParameter("librus_mobile_rules_accepted", "1")
+                .addParameter("librus_long_term_token", "1")
+                .contentType(MediaTypeUtils.APPLICATION_FORM)
+                .post()
+                .allowErrorCode(HTTP_BAD_REQUEST)
+                .allowErrorCode(HTTP_UNAUTHORIZED)
+                .callback(tokenCallback)
+                .build()
+                .enqueue()
+    }
+    private fun jstRefreshToken() {
+        d(TAG, "Request: Librus/Login/Api - $LIBRUS_API_TOKEN_JST_URL")
+
+        Request.builder()
+                .url(LIBRUS_API_TOKEN_JST_URL)
+                .userAgent(LIBRUS_USER_AGENT)
+                .addParameter("grant_type", "refresh_token")
+                .addParameter("client_id", LIBRUS_API_CLIENT_ID_JST)
+                .addParameter("refresh_token", data.apiRefreshToken)
+                .addParameter("librus_long_term_token", "1")
+                .addParameter("mobile_app_accept_rules", "1")
+                .addParameter("synergy_accept_rules", "1")
+                .contentType(MediaTypeUtils.APPLICATION_FORM)
+                .post()
+                .allowErrorCode(HTTP_BAD_REQUEST)
+                .allowErrorCode(HTTP_UNAUTHORIZED)
+                .callback(tokenCallback)
+                .build()
+                .enqueue()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/LibrusLoginMessages.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/LibrusLoginMessages.kt
new file mode 100644
index 00000000..91eeab95
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/LibrusLoginMessages.kt
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-20.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.login
+
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.body.MediaTypeUtils
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import okhttp3.Cookie
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.getUnixDate
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import java.io.StringWriter
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.transform.OutputKeys
+import javax.xml.transform.TransformerFactory
+import javax.xml.transform.dom.DOMSource
+import javax.xml.transform.stream.StreamResult
+
+class LibrusLoginMessages(val data: DataLibrus, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "LoginLibrusMessages"
+    }
+
+    private val callback by lazy { object : TextCallbackHandler() {
+        override fun onSuccess(text: String?, response: Response?) {
+            val location = response?.headers()?.get("Location")
+            when {
+                location?.contains("MultiDomainLogon") == true -> loginWithSynergia(location)
+                location?.contains("AutoLogon") == true -> {
+                    saveSessionId(response, text)
+                    onSuccess()
+                }
+
+                text?.contains("<status>ok</status>") == true -> {
+                    saveSessionId(response, text)
+                    onSuccess()
+                }
+                text?.contains("<message>Niepoprawny login i/lub hasło.</message>") == true -> data.error(TAG, ERROR_LOGIN_LIBRUS_MESSAGES_INVALID_LOGIN, response, text)
+                text?.contains("stop.png") == true -> data.error(TAG, ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED, response, text)
+                text?.contains("eAccessDeny") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED, response, text)
+                text?.contains("OffLine") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_MAINTENANCE, response, text)
+                text?.contains("<status>error</status>") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ERROR, response, text)
+                text?.contains("<type>eVarWhitThisNameNotExists</type>") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED, response, text)
+                text?.contains("<error>") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_OTHER, response, text)
+            }
+        }
+
+        override fun onFailure(response: Response?, throwable: Throwable?) {
+            data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                    .withResponse(response)
+                    .withThrowable(throwable))
+        }
+    }}
+
+    init { run {
+        if (data.profile == null) {
+            data.error(ApiError(TAG, ERROR_PROFILE_MISSING))
+            return@run
+        }
+
+        if (data.isMessagesLoginValid()) {
+            data.app.cookieJar.saveFromResponse(null, listOf(
+                    Cookie.Builder()
+                            .name("DZIENNIKSID")
+                            .value(data.messagesSessionId!!)
+                            .domain("wiadomosci.librus.pl")
+                            .secure().httpOnly().build()
+            ))
+            onSuccess()
+        }
+        else {
+            data.app.cookieJar.clearForDomain("wiadomosci.librus.pl")
+            if (data.loginMethods.contains(LOGIN_METHOD_LIBRUS_SYNERGIA)) {
+                loginWithSynergia()
+            }
+            else if (data.apiLogin != null && data.apiPassword != null) {
+                loginWithCredentials()
+            }
+            else {
+                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            }
+        }
+    }}
+
+    /**
+     * XML (Flash messages website) login method. Uses a Synergia login and password.
+     */
+    private fun loginWithCredentials() {
+        d(TAG, "Request: Librus/Login/Messages - $LIBRUS_MESSAGES_URL/Login")
+
+        val docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder()
+        val doc = docBuilder.newDocument()
+        val serviceElement = doc.createElement("service")
+        val headerElement = doc.createElement("header")
+        val dataElement = doc.createElement("data")
+        val loginElement = doc.createElement("login")
+        loginElement.appendChild(doc.createTextNode(data.apiLogin))
+        dataElement.appendChild(loginElement)
+        val passwordElement = doc.createElement("password")
+        passwordElement.appendChild(doc.createTextNode(data.apiPassword))
+        dataElement.appendChild(passwordElement)
+        val keyStrokeElement = doc.createElement("KeyStroke")
+        val keysElement = doc.createElement("Keys")
+        val upElement = doc.createElement("Up")
+        keysElement.appendChild(upElement)
+        val downElement = doc.createElement("Down")
+        keysElement.appendChild(downElement)
+        keyStrokeElement.appendChild(keysElement)
+        dataElement.appendChild(keyStrokeElement)
+        serviceElement.appendChild(headerElement)
+        serviceElement.appendChild(dataElement)
+        doc.appendChild(serviceElement)
+        val transformer = TransformerFactory.newInstance().newTransformer()
+        transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes")
+        val stringWriter = StringWriter()
+        transformer.transform(DOMSource(doc), StreamResult(stringWriter))
+        val requestXml = stringWriter.toString()
+
+        Request.builder()
+                .url("$LIBRUS_MESSAGES_URL/Login")
+                .userAgent(SYNERGIA_USER_AGENT)
+                .setTextBody(requestXml, MediaTypeUtils.APPLICATION_XML)
+                .post()
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+
+    /**
+     * A login method using the Synergia website (/wiadomosci2 Auto Login).
+     */
+    private fun loginWithSynergia(url: String = "https://synergia.librus.pl/wiadomosci2") {
+        d(TAG, "Request: Librus/Login/Messages - $url")
+
+        Request.builder()
+                .url(url)
+                .userAgent(SYNERGIA_USER_AGENT)
+                .get()
+                .callback(callback)
+                .withClient(data.app.httpLazy)
+                .build()
+                .enqueue()
+    }
+
+    private fun saveSessionId(response: Response?, text: String?) {
+        var sessionId = data.app.cookieJar.getCookie("wiadomosci.librus.pl", "DZIENNIKSID")
+        sessionId = sessionId?.replace("-MAINT", "") // dunno what's this
+        sessionId = sessionId?.replace("MAINT", "") // dunno what's this
+        if (sessionId == null) {
+            data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_MESSAGES_NO_SESSION_ID)
+                    .withResponse(response)
+                    .withApiResponse(text))
+            return
+        }
+        data.messagesSessionId = sessionId
+        data.messagesSessionIdExpiryTime = response.getUnixDate() + 45 * 60 /* 45min */
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/LibrusLoginPortal.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/LibrusLoginPortal.kt
new file mode 100644
index 00000000..b845ef0e
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/LibrusLoginPortal.kt
@@ -0,0 +1,225 @@
+package pl.szczodrzynski.edziennik.api.v2.librus.login
+
+import android.util.Pair
+import com.google.gson.JsonObject
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.body.MediaTypeUtils
+import im.wangchao.mhttp.callback.JsonCallbackHandler
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.getInt
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.getUnixDate
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
+import java.util.*
+import java.util.regex.Pattern
+
+class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "LoginLibrusPortal"
+    }
+
+    init { run {
+        if (data.loginStore.mode != LOGIN_MODE_LIBRUS_EMAIL) {
+            data.error(ApiError(TAG, ERROR_INVALID_LOGIN_MODE))
+            return@run
+        }
+        if (data.portalEmail == null || data.portalPassword == null) {
+            data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            return@run
+        }
+
+        // succeed having a non-expired access token and a refresh token
+        if (data.isPortalLoginValid()) {
+            onSuccess()
+        }
+        else if (data.portalRefreshToken != null) {
+            data.app.cookieJar.clearForDomain("portal.librus.pl")
+            accessToken(null, data.portalRefreshToken)
+        }
+        else {
+            data.app.cookieJar.clearForDomain("portal.librus.pl")
+            authorize(if (data.fakeLogin) FAKE_LIBRUS_AUTHORIZE else LIBRUS_AUTHORIZE_URL)
+        }
+    }}
+
+    private fun authorize(url: String?) {
+        d(TAG, "Request: Librus/Login/Portal - $url")
+
+        Request.builder()
+                .url(url)
+                .userAgent(LIBRUS_USER_AGENT)
+                .withClient(data.app.httpLazy)
+                .callback(object : TextCallbackHandler() {
+                    override fun onSuccess(json: String, response: Response) {
+                        val location = response.headers().get("Location")
+                        if (location != null) {
+                            val authMatcher = Pattern.compile("http://localhost/bar\\?code=([A-z0-9]+?)$", Pattern.DOTALL or Pattern.MULTILINE).matcher(location)
+                            if (authMatcher.find()) {
+                                accessToken(authMatcher.group(1), null)
+                            } else {
+                                authorize(location)
+                            }
+                        } else {
+                            val csrfMatcher = Pattern.compile("name=\"csrf-token\" content=\"([A-z0-9=+/\\-_]+?)\"", Pattern.DOTALL).matcher(json)
+                            if (csrfMatcher.find()) {
+                                login(csrfMatcher.group(1))
+                            } else {
+                                data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_PORTAL_CSRF_MISSING)
+                                        .withResponse(response)
+                                        .withApiResponse(json))
+                            }
+                        }
+                    }
+
+                    override fun onFailure(response: Response, throwable: Throwable) {
+                        data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                                .withResponse(response)
+                                .withThrowable(throwable))
+                    }
+                })
+                .build()
+                .enqueue()
+    }
+
+    private fun login(csrfToken: String) {
+        d(TAG, "Request: Librus/Login/Portal - ${if (data.fakeLogin) FAKE_LIBRUS_LOGIN else LIBRUS_LOGIN_URL}")
+
+        Request.builder()
+                .url(if (data.fakeLogin) FAKE_LIBRUS_LOGIN else LIBRUS_LOGIN_URL)
+                .userAgent(LIBRUS_USER_AGENT)
+                .addParameter("email", data.portalEmail)
+                .addParameter("password", data.portalPassword)
+                .addHeader("X-CSRF-TOKEN", csrfToken)
+                .contentType(MediaTypeUtils.APPLICATION_JSON)
+                .post()
+                .callback(object : JsonCallbackHandler() {
+                    override fun onSuccess(json: JsonObject?, response: Response) {
+                        val location = response.headers()?.get("Location")
+                        if (location == "http://localhost/bar?command=close") {
+                            data.error(ApiError(TAG, ERROR_LIBRUS_PORTAL_MAINTENANCE)
+                                    .withApiResponse(json)
+                                    .withResponse(response))
+                            return
+                        }
+
+                        if (json == null) {
+                            if (response.parserErrorBody?.contains("wciąż nieaktywne") == true) {
+                                data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_PORTAL_NOT_ACTIVATED)
+                                        .withResponse(response))
+                                return
+                            }
+                            data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                                    .withResponse(response))
+                            return
+                        }
+                        if (json.get("errors") != null) {
+                            data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_PORTAL_ACTION_ERROR)
+                                    .withResponse(response)
+                                    .withApiResponse(json))
+                            return
+                        }
+                        authorize(json.getString("redirect", LIBRUS_AUTHORIZE_URL))
+                    }
+
+                    override fun onFailure(response: Response, throwable: Throwable) {
+                        if (response.code() == 403 || response.code() == 401) {
+                            data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_PORTAL_INVALID_LOGIN)
+                                    .withResponse(response)
+                                    .withThrowable(throwable))
+                            return
+                        }
+                        data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                                .withResponse(response)
+                                .withThrowable(throwable))
+                    }
+                })
+                .build()
+                .enqueue()
+    }
+
+    private var refreshTokenFailed = false
+    private fun accessToken(code: String?, refreshToken: String?) {
+        d(TAG, "Request: Librus/Login/Portal - ${if (data.fakeLogin) FAKE_LIBRUS_TOKEN else LIBRUS_TOKEN_URL}")
+
+        val onSuccess = { json: JsonObject, response: Response? ->
+            data.portalAccessToken = json.getString("access_token")
+            data.portalRefreshToken = json.getString("refresh_token")
+            data.portalTokenExpiryTime = response.getUnixDate() + json.getInt("expires_in", 86400)
+            onSuccess()
+        }
+
+        val callback = object : JsonCallbackHandler() {
+            override fun onSuccess(json: JsonObject?, response: Response?) {
+                if (json == null) {
+                    data.error(TAG, ERROR_RESPONSE_EMPTY, response)
+                    return
+                }
+                val error = if (response?.code() == 200) null else
+                    json.getString("hint")
+                error?.let { code ->
+                    when (code) {
+                        "Authorization code has expired" -> ERROR_LOGIN_LIBRUS_PORTAL_CODE_EXPIRED
+                        "Authorization code has been revoked" -> ERROR_LOGIN_LIBRUS_PORTAL_CODE_REVOKED
+                        "Cannot decrypt the refresh token" -> ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_INVALID
+                        "Token has been revoked" -> ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_REVOKED
+                        "Check the `client_id` parameter" -> ERROR_LOGIN_LIBRUS_PORTAL_NO_CLIENT_ID
+                        "Check the `code` parameter" -> ERROR_LOGIN_LIBRUS_PORTAL_NO_CODE
+                        "Check the `refresh_token` parameter" -> ERROR_LOGIN_LIBRUS_PORTAL_NO_REFRESH
+                        "Check the `redirect_uri` parameter" -> ERROR_LOGIN_LIBRUS_PORTAL_NO_REDIRECT
+                        else -> when (json.getString("error")) {
+                            "unsupported_grant_type" -> ERROR_LOGIN_LIBRUS_PORTAL_UNSUPPORTED_GRANT
+                            "invalid_client" -> ERROR_LOGIN_LIBRUS_PORTAL_INVALID_CLIENT_ID
+                            else -> ERROR_LOGIN_LIBRUS_PORTAL_OTHER
+                        }
+                    }.let { errorCode ->
+                        data.error(ApiError(TAG, errorCode)
+                                .withApiResponse(json)
+                                .withResponse(response))
+                        return
+                    }
+                }
+
+                try {
+                    onSuccess(json, response)
+                } catch (e: NullPointerException) {
+                    data.error(ApiError(TAG, EXCEPTION_LOGIN_LIBRUS_PORTAL_TOKEN)
+                            .withResponse(response)
+                            .withThrowable(e)
+                            .withApiResponse(json))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        val params = ArrayList<Pair<String, Any>>()
+        params.add(Pair("client_id", LIBRUS_CLIENT_ID))
+        if (code != null) {
+            params.add(Pair("grant_type", "authorization_code"))
+            params.add(Pair("code", code))
+            params.add(Pair("redirect_uri", LIBRUS_REDIRECT_URL))
+        } else if (refreshToken != null) {
+            params.add(Pair("grant_type", "refresh_token"))
+            params.add(Pair("refresh_token", refreshToken))
+        }
+
+        Request.builder()
+                .url(if (data.fakeLogin) FAKE_LIBRUS_TOKEN else LIBRUS_TOKEN_URL)
+                .userAgent(LIBRUS_USER_AGENT)
+                .addParams(params)
+                .post()
+                .allowErrorCode(HTTP_UNAUTHORIZED)
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/LibrusLoginSynergia.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/LibrusLoginSynergia.kt
new file mode 100644
index 00000000..73f4ec9c
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/LibrusLoginSynergia.kt
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-20.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.login
+
+import com.google.gson.JsonObject
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import okhttp3.Cookie
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.getUnixDate
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import java.net.HttpURLConnection
+
+class LibrusLoginSynergia(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        private const val TAG = "LoginLibrusSynergia"
+    }
+
+    init { run {
+        if (data.profile == null) {
+            data.error(ApiError(TAG, ERROR_PROFILE_MISSING))
+            return@run
+        }
+
+        if (data.isSynergiaLoginValid()) {
+            data.app.cookieJar.saveFromResponse(null, listOf(
+                    Cookie.Builder()
+                            .name("DZIENNIKSID")
+                            .value(data.synergiaSessionId!!)
+                            .domain("synergia.librus.pl")
+                            .secure().httpOnly().build()
+            ))
+            onSuccess()
+        }
+        else {
+            data.app.cookieJar.clearForDomain("synergia.librus.pl")
+            if (data.loginMethods.contains(LOGIN_METHOD_LIBRUS_API)) {
+                loginWithApi()
+            }
+            else if (data.apiLogin != null && data.apiPassword != null && false) {
+                loginWithCredentials()
+            }
+            else {
+                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            }
+        }
+    }}
+
+    /**
+     * HTML form-based login method. Uses a Synergia login and password.
+     */
+    private fun loginWithCredentials() {
+
+    }
+
+    /**
+     * A login method using the Synergia API (AutoLoginToken endpoint).
+     */
+    private fun loginWithApi() {
+        d(TAG, "Request: Librus/Login/Synergia - $LIBRUS_API_URL/AutoLoginToken")
+
+        val onSuccess = { json: JsonObject ->
+            loginWithToken(json.getString("Token"))
+        }
+
+        apiGet(TAG, "AutoLoginToken", POST, null, onSuccess)
+    }
+
+    private fun loginWithToken(token: String?) {
+        if (token == null) {
+            data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_SYNERGIA_NO_TOKEN))
+            return
+        }
+
+        d(TAG, "Request: Librus/Login/Synergia - " + LIBRUS_SYNERGIA_TOKEN_LOGIN_URL.replace("TOKEN", token) + "/uczen/widok/centrum_powiadomien")
+
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(json: String?, response: Response?) {
+                val location = response?.headers()?.get("Location")
+                if (location?.endsWith("przerwa_techniczna") == true) {
+                    data.error(ApiError(TAG, ERROR_LIBRUS_SYNERGIA_MAINTENANCE)
+                            .withApiResponse(json)
+                            .withResponse(response))
+                    return
+                }
+
+                if (location?.endsWith("centrum_powiadomien") == true) {
+                    val sessionId = data.app.cookieJar.getCookie("synergia.librus.pl", "DZIENNIKSID")
+                    if (sessionId == null) {
+                        data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_SYNERGIA_NO_SESSION_ID)
+                                .withResponse(response)
+                                .withApiResponse(json))
+                        return
+                    }
+                    data.synergiaSessionId = sessionId
+                    data.synergiaSessionIdExpiryTime = response.getUnixDate() + 45 * 60 /* 45min */
+                    onSuccess()
+                }
+                else {
+                    data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_SYNERGIA_TOKEN_INVALID)
+                            .withResponse(response)
+                            .withApiResponse(json))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        data.app.cookieJar.clearForDomain("synergia.librus.pl")
+        Request.builder()
+                .url(LIBRUS_SYNERGIA_TOKEN_LOGIN_URL.replace("TOKEN", token) + "/uczen/widok/centrum_powiadomien")
+                .userAgent(LIBRUS_USER_AGENT)
+                .get()
+                .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST)
+                .allowErrorCode(HttpURLConnection.HTTP_FORBIDDEN)
+                .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED)
+                .callback(callback)
+                .withClient(data.app.httpLazy)
+                .build()
+                .enqueue()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/SynergiaTokenExtractor.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/SynergiaTokenExtractor.kt
new file mode 100644
index 00000000..0d80cd65
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/login/SynergiaTokenExtractor.kt
@@ -0,0 +1,73 @@
+package pl.szczodrzynski.edziennik.api.v2.librus.login
+
+import com.google.gson.JsonObject
+import im.wangchao.mhttp.Response
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusPortal
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.utils.Utils.d
+
+class SynergiaTokenExtractor(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusPortal(data) {
+    companion object {
+        private const val TAG = "SynergiaTokenExtractor"
+    }
+
+    init { run {
+        if (data.loginStore.mode != LOGIN_MODE_LIBRUS_EMAIL) {
+            data.error(ApiError(TAG, ERROR_INVALID_LOGIN_MODE))
+            return@run
+        }
+        if (data.profile == null) {
+            data.error(ApiError(TAG, ERROR_PROFILE_MISSING))
+            return@run
+        }
+
+        if (data.apiTokenExpiryTime-30 > currentTimeUnix() && data.apiAccessToken.isNotNullNorEmpty()) {
+            onSuccess()
+        }
+        else {
+            if (!synergiaAccount()) {
+                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            }
+        }
+    }}
+
+    /**
+     * Get an Api token from the Portal account, using Portal API.
+     * If necessary, refreshes the token.
+     */
+    private fun synergiaAccount(): Boolean {
+
+        val accountLogin = data.apiLogin ?: return false
+        data.portalAccessToken ?: return false
+
+        d(TAG, "Request: Librus/SynergiaTokenExtractor - ${if (data.fakeLogin) FAKE_LIBRUS_ACCOUNT else LIBRUS_ACCOUNT_URL}$accountLogin")
+
+        val onSuccess = { json: JsonObject, response: Response? ->
+            // synergiaAccount is executed when a synergia token needs a refresh
+            val accountId = json.getInt("id")
+            val accountToken = json.getString("accessToken")
+            if (accountId == null || accountToken == null) {
+                data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_PORTAL_SYNERGIA_TOKEN_MISSING)
+                        .withResponse(response)
+                        .withApiResponse(json))
+            }
+            else {
+                data.apiAccessToken = accountToken
+                data.apiTokenExpiryTime = response.getUnixDate() + 6 * 60 * 60
+
+                // TODO remove this
+                data.profile?.studentNameLong = json.getString("studentName")
+                val nameParts = json.getString("studentName")?.split(" ")
+                data.profile?.studentNameShort = nameParts?.get(0) + " " + nameParts?.get(1)?.get(0)
+
+                onSuccess()
+            }
+        }
+
+        portalGet(TAG, (if (data.fakeLogin) FAKE_LIBRUS_ACCOUNT else LIBRUS_ACCOUNT_URL)+accountLogin, onSuccess = onSuccess)
+        return true
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/DataMobidziennik.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/DataMobidziennik.kt
new file mode 100644
index 00000000..d012186f
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/DataMobidziennik.kt
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-6.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik
+
+import android.util.LongSparseArray
+import android.util.SparseArray
+import android.util.SparseIntArray
+import androidx.core.util.isNotEmpty
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_MOBIDZIENNIK_WEB
+import pl.szczodrzynski.edziennik.api.v2.models.Data
+import pl.szczodrzynski.edziennik.currentTimeUnix
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class DataMobidziennik(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
+
+    fun isWebLoginValid() = webSessionIdExpiryTime-30 > currentTimeUnix()
+            && webSessionValue.isNotNullNorEmpty()
+            && webSessionKey.isNotNullNorEmpty()
+            && webServerId.isNotNullNorEmpty()
+
+    override fun satisfyLoginMethods() {
+        loginMethods.clear()
+        if (isWebLoginValid()) {
+            loginMethods += LOGIN_METHOD_MOBIDZIENNIK_WEB
+        }
+    }
+
+    val teachersMap = LongSparseArray<String>()
+    val subjectsMap = LongSparseArray<String>()
+
+    val gradeAddedDates = LongSparseArray<Long>()
+    val gradeAverages = LongSparseArray<Float>()
+    val gradeColors = LongSparseArray<Int>()
+
+    private var mLoginServerName: String? = null
+    var loginServerName: String?
+        get() { mLoginServerName = mLoginServerName ?: loginStore.getLoginData("serverName", null); return mLoginServerName }
+        set(value) { loginStore.putLoginData("serverName", value); mLoginServerName = value }
+
+    private var mLoginEmail: String? = null
+    var loginEmail: String?
+        get() { mLoginEmail = mLoginEmail ?: loginStore.getLoginData("email", null); return mLoginEmail }
+        set(value) { loginStore.putLoginData("email", value); mLoginEmail = value }
+
+    private var mLoginUsername: String? = null
+    var loginUsername: String?
+        get() { mLoginUsername = mLoginUsername ?: loginStore.getLoginData("username", null); return mLoginUsername }
+        set(value) { loginStore.putLoginData("username", value); mLoginUsername = value }
+
+    private var mLoginPassword: String? = null
+    var loginPassword: String?
+        get() { mLoginPassword = mLoginPassword ?: loginStore.getLoginData("password", null); return mLoginPassword }
+        set(value) { loginStore.putLoginData("password", value); mLoginPassword = value }
+
+    private var mStudentId: Int? = null
+    var studentId: Int
+        get() { mStudentId = mStudentId ?: profile?.getStudentData("studentId", 0); return mStudentId ?: 0 }
+        set(value) { profile?.putStudentData("studentId", value) ?: return; mStudentId = value }
+
+    /*   __          __  _
+         \ \        / / | |
+          \ \  /\  / /__| |__
+           \ \/  \/ / _ \ '_ \
+            \  /\  /  __/ |_) |
+             \/  \/ \___|_._*/
+    private var mWebSessionKey: String? = null
+    var webSessionKey: String?
+        get() { mWebSessionKey = mWebSessionKey ?: loginStore.getLoginData("sessionCookie", null); return mWebSessionKey }
+        set(value) { loginStore.putLoginData("sessionCookie", value); mWebSessionKey = value }
+
+    private var mWebSessionValue: String? = null
+    var webSessionValue: String?
+        get() { mWebSessionValue = mWebSessionValue ?: loginStore.getLoginData("sessionID", null); return mWebSessionValue }
+        set(value) { loginStore.putLoginData("sessionID", value); mWebSessionValue = value }
+
+    private var mWebServerId: String? = null
+    var webServerId: String?
+        get() { mWebServerId = mWebServerId ?: loginStore.getLoginData("sessionServer", null); return mWebServerId }
+        set(value) { loginStore.putLoginData("sessionServer", value); mWebServerId = value }
+
+    private var mWebSessionIdExpiryTime: Long? = null
+    var webSessionIdExpiryTime: Long
+        get() { mWebSessionIdExpiryTime = mWebSessionIdExpiryTime ?: loginStore.getLoginData("sessionIDTime", 0L); return mWebSessionIdExpiryTime ?: 0L }
+        set(value) { loginStore.putLoginData("sessionIDTime", value); mWebSessionIdExpiryTime = value }
+
+
+    override fun saveData() {
+        super.saveData()
+        if (gradeAddedDates.isNotEmpty()) {
+            app.db.gradeDao().updateDetails(profileId, gradeAverages, gradeAddedDates, gradeColors)
+        }
+    }
+
+    val mobiLessons = mutableListOf<MobiLesson>()
+
+    data class MobiLesson(
+            var id: Long,
+            var subjectId: Long,
+            var teacherId: Long,
+            var teamId: Long,
+            var topic: String,
+            var date: Date,
+            var startTime: Time,
+            var endTime: Time,
+            var presentCount: Int,
+            var absentCount: Int,
+            var lessonNumber: Int,
+            var signed: String
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/Mobidziennik.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/Mobidziennik.kt
new file mode 100644
index 00000000..9e04dc72
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/Mobidziennik.kt
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.api.v2.CODE_INTERNAL_LIBRUS_ACCOUNT_410
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikInterface
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.MobidziennikData
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web.MobidziennikWebGetMessage
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.firstlogin.MobidziennikFirstLogin
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.login.MobidziennikLogin
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.login.MobidziennikLoginWeb
+import pl.szczodrzynski.edziennik.api.v2.mobidziennikLoginMethods
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.prepare
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.utils.Utils.d
+
+class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
+    companion object {
+        private const val TAG = "Mobidziennik"
+    }
+
+    val internalErrorList = mutableListOf<Int>()
+    val data: DataMobidziennik
+
+    init {
+        data = DataMobidziennik(app, profile, loginStore).apply {
+            callback = wrapCallback(this@Mobidziennik.callback)
+            satisfyLoginMethods()
+        }
+    }
+
+    private fun completed() {
+        data.saveData()
+        data.notifyAndSyncEvents {
+            callback.onCompleted()
+        }
+    }
+
+    /*    _______ _                     _                  _ _   _
+         |__   __| |              /\   | |                (_) | | |
+            | |  | |__   ___     /  \  | | __ _  ___  _ __ _| |_| |__  _ __ ___
+            | |  | '_ \ / _ \   / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \
+            | |  | | | |  __/  / ____ \| | (_| | (_) | |  | | |_| | | | | | | | |
+            |_|  |_| |_|\___| /_/    \_\_|\__, |\___/|_|  |_|\__|_| |_|_| |_| |_|
+                                           __/ |
+                                          |__*/
+    override fun sync(featureIds: List<Int>, viewId: Int?, arguments: JsonObject?) {
+        data.arguments = arguments
+        data.prepare(mobidziennikLoginMethods, MobidziennikFeatures, featureIds, viewId)
+        d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}")
+        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        MobidziennikLogin(data) {
+            MobidziennikData(data) {
+                completed()
+            }
+        }
+    }
+
+    override fun getMessage(message: MessageFull) {
+        MobidziennikLoginWeb(data) {
+            MobidziennikWebGetMessage(data, message) {
+                completed()
+            }
+        }
+    }
+
+    override fun markAllAnnouncementsAsRead() {
+
+    }
+
+    override fun getAttachment(messageId: Long, attachmentId: Long, attachmentName: String) {
+
+    }
+
+    override fun firstLogin() {
+        MobidziennikFirstLogin(data) {
+            completed()
+        }
+    }
+
+    override fun cancel() {
+        d(TAG, "Cancelled")
+        data.cancel()
+    }
+
+    private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
+        return object : EdziennikCallback {
+            override fun onCompleted() {
+                callback.onCompleted()
+            }
+
+            override fun onProgress(step: Float) {
+                callback.onProgress(step)
+            }
+
+            override fun onStartProgress(stringRes: Int) {
+                callback.onStartProgress(stringRes)
+            }
+
+            override fun onError(apiError: ApiError) {
+                when (apiError.errorCode) {
+                    in internalErrorList -> {
+                        // finish immediately if the same error occurs twice during the same sync
+                        callback.onError(apiError)
+                    }
+                    CODE_INTERNAL_LIBRUS_ACCOUNT_410 -> {
+                        internalErrorList.add(apiError.errorCode)
+                        loginStore.removeLoginData("refreshToken") // force a clean login
+                        //loginLibrus()
+                    }
+                    else -> callback.onError(apiError)
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/MobidziennikFeatures.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/MobidziennikFeatures.kt
new file mode 100644
index 00000000..234b41e7
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/MobidziennikFeatures.kt
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik
+
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.models.Feature
+
+const val ENDPOINT_MOBIDZIENNIK_API_MAIN                = 1000
+const val ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_INBOX      = 2011
+const val ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_SENT       = 2012
+const val ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_ALL        = 2019
+const val ENDPOINT_MOBIDZIENNIK_WEB_CALENDAR            = 2020
+const val ENDPOINT_MOBIDZIENNIK_WEB_GRADES              = 2030
+const val ENDPOINT_MOBIDZIENNIK_WEB_NOTICES             = 2040
+const val ENDPOINT_MOBIDZIENNIK_WEB_ATTENDANCE          = 2050
+const val ENDPOINT_MOBIDZIENNIK_WEB_MANUALS             = 2100
+const val ENDPOINT_MOBIDZIENNIK_WEB_ACCOUNT_EMAIL       = 2200
+const val ENDPOINT_MOBIDZIENNIK_API2_MAIN               = 3000
+
+val MobidziennikFeatures = listOf(
+        // always synced
+        Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_ALWAYS_NEEDED, listOf(
+                ENDPOINT_MOBIDZIENNIK_API_MAIN to LOGIN_METHOD_MOBIDZIENNIK_WEB,
+                ENDPOINT_MOBIDZIENNIK_WEB_ACCOUNT_EMAIL to LOGIN_METHOD_MOBIDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB)), // TODO divide features into separate view IDs (all with API_MAIN)
+
+        // push config
+        /*Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_PUSH_CONFIG, listOf(
+                ENDPOINT_MOBIDZIENNIK_API2_MAIN to LOGIN_METHOD_MOBIDZIENNIK_API2
+        ), listOf(LOGIN_METHOD_MOBIDZIENNIK_API2)).withShouldSync { data ->
+                data.app.appConfig.fcmTokens[LOGIN_TYPE_MOBIDZIENNIK]?.second?.contains(data.profileId) == false
+        },*/
+
+
+
+
+
+        /**
+         * Agenda - "API" + web scraping.
+         */
+        Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_AGENDA, listOf(
+                ENDPOINT_MOBIDZIENNIK_API_MAIN to LOGIN_METHOD_MOBIDZIENNIK_WEB,
+                ENDPOINT_MOBIDZIENNIK_WEB_CALENDAR to LOGIN_METHOD_MOBIDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB, LOGIN_METHOD_MOBIDZIENNIK_WEB)),
+        /**
+         * Grades - "API" + web scraping.
+         */
+        Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_GRADES, listOf(
+                ENDPOINT_MOBIDZIENNIK_API_MAIN to LOGIN_METHOD_MOBIDZIENNIK_WEB,
+                ENDPOINT_MOBIDZIENNIK_WEB_GRADES to LOGIN_METHOD_MOBIDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB, LOGIN_METHOD_MOBIDZIENNIK_WEB)),
+        /**
+         * Behaviour - "API" + web scraping.
+         */
+        Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_BEHAVIOUR, listOf(
+                ENDPOINT_MOBIDZIENNIK_API_MAIN to LOGIN_METHOD_MOBIDZIENNIK_WEB,
+                ENDPOINT_MOBIDZIENNIK_WEB_NOTICES to LOGIN_METHOD_MOBIDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB, LOGIN_METHOD_MOBIDZIENNIK_WEB)),
+        // attendance TODO implement website attendance scraping
+        /*Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_ATTENDANCE, listOf(
+                ENDPOINT_MOBIDZIENNIK_WEB_ATTENDANCE to LOGIN_METHOD_MOBIDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB)),*/
+
+
+
+
+
+        /**
+         * Messages inbox - using web scraper.
+         */
+        Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_MESSAGES_INBOX, listOf(
+                ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_INBOX to LOGIN_METHOD_MOBIDZIENNIK_WEB,
+                ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_ALL to LOGIN_METHOD_MOBIDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB)),
+        /**
+         * Messages sent - using web scraper.
+         */
+        Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_MESSAGES_SENT, listOf(
+                ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_SENT to LOGIN_METHOD_MOBIDZIENNIK_WEB,
+                ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_ALL to LOGIN_METHOD_MOBIDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB))
+
+        // lucky number possibilities
+        // all endpoints that may supply the lucky number
+        /*Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_LUCKY_NUMBER, listOf(
+                ENDPOINT_MOBIDZIENNIK_WEB_MANUALS to LOGIN_METHOD_MOBIDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB)).apply { priority = 10 },
+
+        Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_LUCKY_NUMBER, listOf(
+                ENDPOINT_MOBIDZIENNIK_WEB_CALENDAR to LOGIN_METHOD_MOBIDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB)).apply { priority = 3 },
+
+        Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_LUCKY_NUMBER, listOf(
+                ENDPOINT_MOBIDZIENNIK_WEB_GRADES to LOGIN_METHOD_MOBIDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB)).apply { priority = 2 },
+
+        Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_LUCKY_NUMBER, listOf(
+                ENDPOINT_MOBIDZIENNIK_WEB_NOTICES to LOGIN_METHOD_MOBIDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB)).apply { priority = 1 },
+
+        Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_LUCKY_NUMBER, listOf(
+                ENDPOINT_MOBIDZIENNIK_WEB_ATTENDANCE to LOGIN_METHOD_MOBIDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB)).apply { priority = 4 }*/
+
+)
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/MobidziennikData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/MobidziennikData.kt
new file mode 100644
index 00000000..e6f2aca5
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/MobidziennikData.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data
+
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.*
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api.MobidziennikApi
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web.MobidziennikWebCalendar
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web.MobidziennikWebGrades
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web.MobidziennikWebMessagesAll
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web.MobidziennikWebMessagesInbox
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class MobidziennikData(val data: DataMobidziennik, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "MobidziennikData"
+    }
+
+    init {
+        nextEndpoint(onSuccess)
+    }
+
+    private fun nextEndpoint(onSuccess: () -> Unit) {
+        if (data.targetEndpointIds.isEmpty()) {
+            onSuccess()
+            return
+        }
+        if (data.cancelled) {
+            onSuccess()
+            return
+        }
+        useEndpoint(data.targetEndpointIds.removeAt(0)) {
+            data.progress(data.progressStep)
+            nextEndpoint(onSuccess)
+        }
+    }
+
+    private fun useEndpoint(endpointId: Int, onSuccess: () -> Unit) {
+        Utils.d(TAG, "Using endpoint $endpointId")
+        when (endpointId) {
+            ENDPOINT_MOBIDZIENNIK_API_MAIN -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_data)
+                MobidziennikApi(data, onSuccess)
+            }
+            ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_INBOX -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
+                MobidziennikWebMessagesInbox(data) { onSuccess() }
+            }
+            ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_ALL -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_messages)
+                MobidziennikWebMessagesAll(data) { onSuccess() }
+            }
+            ENDPOINT_MOBIDZIENNIK_WEB_CALENDAR -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_calendar)
+                MobidziennikWebCalendar(data) { onSuccess() }
+            }
+            ENDPOINT_MOBIDZIENNIK_WEB_GRADES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_grades)
+                MobidziennikWebGrades(data) { onSuccess() }
+            }/*
+            ENDPOINT_MOBIDZIENNIK_WEB_NOTICES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_behaviour)
+                MobidziennikWebNotices(data) { onSuccess() }
+            }
+            ENDPOINT_MOBIDZIENNIK_WEB_ATTENDANCE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_attendance)
+                MobidziennikWebAttendance(data) { onSuccess() }
+            }
+            ENDPOINT_MOBIDZIENNIK_WEB_MANUALS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
+                MobidziennikWebManuals(data) { onSuccess() }
+            }*/
+            else -> onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/MobidziennikWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/MobidziennikWeb.kt
new file mode 100644
index 00000000..67828b73
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/MobidziennikWeb.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data
+
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import okhttp3.Cookie
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.utils.Utils.d
+
+open class MobidziennikWeb(open val data: DataMobidziennik) {
+    companion object {
+        private const val TAG = "MobidziennikWeb"
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    val profile
+        get() = data.profile
+
+    fun webGet(tag: String, endpoint: String, method: Int = GET, payload: List<Pair<String, String>>? = null, onSuccess: (text: String) -> Unit) {
+        val url = "https://${data.loginServerName}.mobidziennik.pl$endpoint"
+
+        d(tag, "Request: Mobidziennik/Web - $url")
+
+        if (data.webSessionKey == null) {
+            data.error(TAG, ERROR_MOBIDZIENNIK_WEB_NO_SESSION_KEY)
+            return
+        }
+        if (data.webSessionValue == null) {
+            data.error(TAG, ERROR_MOBIDZIENNIK_WEB_NO_SESSION_VALUE)
+            return
+        }
+        if (data.webServerId == null) {
+            data.error(TAG, ERROR_MOBIDZIENNIK_WEB_NO_SERVER_ID)
+            return
+        }
+
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                if (text.isNullOrEmpty()) {
+                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+                if (text == "Nie jestes zalogowany"
+                        || text.contains("przypomnij_haslo_email")) {
+                    data.error(ApiError(TAG, ERROR_MOBIDZIENNIK_WEB_ACCESS_DENIED)
+                            .withResponse(response))
+                    return
+                }
+
+                try {
+                    onSuccess(text)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_MOBIDZIENNIK_WEB_REQUEST)
+                            .withResponse(response)
+                            .withThrowable(e)
+                            .withApiResponse(text))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        data.app.cookieJar.saveFromResponse(null, listOf(
+                Cookie.Builder()
+                        .name(data.webSessionKey!!)
+                        .value(data.webSessionValue!!)
+                        .domain("${data.loginServerName}.mobidziennik.pl")
+                        .secure().httpOnly().build(),
+                Cookie.Builder()
+                        .name("SERVERID")
+                        .value(data.webServerId!!)
+                        .domain("${data.loginServerName}.mobidziennik.pl")
+                        .secure().httpOnly().build()
+        ))
+
+        Request.builder()
+                .url(url)
+                .userAgent(MOBIDZIENNIK_USER_AGENT)
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApi.kt
new file mode 100644
index 00000000..4a4069ed
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApi.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.ERROR_MOBIDZIENNIK_WEB_INVALID_RESPONSE
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.ENDPOINT_MOBIDZIENNIK_API_MAIN
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.MobidziennikWeb
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+
+class MobidziennikApi(override val data: DataMobidziennik,
+                      val onSuccess: () -> Unit) : MobidziennikWeb(data)  {
+    companion object {
+        private const val TAG = "MobidziennikApi"
+    }
+
+    init {
+        webGet(TAG, "/api/zrzutbazy") { text ->
+            if (!text.contains("T@B#LA")) {
+                data.error(ApiError(TAG, ERROR_MOBIDZIENNIK_WEB_INVALID_RESPONSE)
+                        .withApiResponse(text))
+                return@webGet
+            }
+
+            val tables = text.split("T@B#LA")
+            tables.forEachIndexed { index, table ->
+                val rows = table.split("\n")
+                when (index) {
+                    0 -> MobidziennikApiUsers(data, rows)
+                    3 -> MobidziennikApiDates(data, rows)
+                    4 -> MobidziennikApiSubjects(data, rows)
+                    7 -> MobidziennikApiTeams(data, rows, null)
+                    8 -> MobidziennikApiStudent(data, rows)
+                    9 -> MobidziennikApiTeams(data, null, rows)
+                    14 -> MobidziennikApiGradeCategories(data, rows)
+                    15 -> MobidziennikApiLessons(data, rows)
+                    16 -> MobidziennikApiAttendance(data, rows)
+                    17 -> MobidziennikApiNotices(data, rows)
+                    18 -> MobidziennikApiGrades(data, rows)
+                    21 -> MobidziennikApiEvents(data, rows)
+                    23 -> MobidziennikApiHomework(data, rows)
+                    24 -> MobidziennikApiTimetable(data, rows)
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_MOBIDZIENNIK_API_MAIN, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiAttendance.kt
new file mode 100644
index 00000000..a22093e7
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiAttendance.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+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
+
+class MobidziennikApiAttendance(val data: DataMobidziennik, rows: List<String>) {
+    init { run {
+        for (row in rows) {
+            if (row.isEmpty())
+                continue
+            val cols = row.split("|")
+
+            val studentId = cols[2].toInt()
+            if (studentId != data.studentId)
+                return@run
+
+            val id = cols[0].toLong()
+            val lessonId = cols[1].toLong()
+            data.mobiLessons.singleOrNull { it.id == lessonId }?.let { lesson ->
+                val type = when (cols[4]) {
+                    "2" -> TYPE_ABSENT
+                    "5" -> TYPE_ABSENT_EXCUSED
+                    "4" -> TYPE_RELEASED
+                    else -> TYPE_PRESENT
+                }
+                val semester = data.profile?.dateToSemester(lesson.date) ?: 1
+
+                val attendanceObject = Attendance(
+                        data.profileId,
+                        id,
+                        lesson.teacherId,
+                        lesson.subjectId,
+                        semester,
+                        lesson.topic,
+                        lesson.date,
+                        lesson.startTime,
+                        type)
+
+                data.attendanceList.add(attendanceObject)
+                data.metadataList.add(
+                        Metadata(
+                                data.profileId,
+                                Metadata.TYPE_ATTENDANCE,
+                                id,
+                                data.profile?.empty ?: false,
+                                data.profile?.empty ?: false,
+                                System.currentTimeMillis()
+                        ))
+            }
+        }
+    }}
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiDates.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiDates.kt
new file mode 100644
index 00000000..c74f79cd
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiDates.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class MobidziennikApiDates(val data: DataMobidziennik, rows: List<String>) {
+    init {
+        for (row in rows) {
+            if (row.isEmpty())
+                continue
+            val cols = row.split("|")
+
+            when (cols[1]) {
+                "semestr1_poczatek" -> data.profile?.dateSemester1Start = Date.fromYmd(cols[3])
+                "semestr2_poczatek" -> data.profile?.dateSemester2Start = Date.fromYmd(cols[3])
+                "koniec_roku_szkolnego" -> data.profile?.dateYearEnd = Date.fromYmd(cols[3])
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiEvents.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiEvents.kt
new file mode 100644
index 00000000..2dea973f
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiEvents.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
+
+import androidx.core.util.contains
+import pl.szczodrzynski.edziennik.api.v2.Regexes
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+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
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.*
+
+class MobidziennikApiEvents(val data: DataMobidziennik, rows: List<String>) {
+    init {
+        for (row in rows) {
+            if (row.isEmpty())
+                continue
+            val cols = row.split("|")
+
+            val teamId = cols[2].toLong()
+            if (data.teamList.contains(teamId)) {
+
+                val id = cols[0].toLong()
+                val teacherId = cols[1].toLong()
+                val subjectId = cols[3].toLong()
+                var type = Event.TYPE_DEFAULT
+                var topic = cols[5]
+                Regexes.MOBIDZIENNIK_EVENT_TYPE.find(topic)?.let {
+                    val typeText = it.groupValues[1]
+                    when (typeText) {
+                        "sprawdzian" -> type = Event.TYPE_EXAM
+                        "kartkówka" -> type = Event.TYPE_SHORT_QUIZ
+                    }
+                    topic = topic.replace("($typeText)", "").trim()
+                }
+                val eventDate = Date.fromYmd(cols[4])
+                val startTime = Time.fromYmdHm(cols[6])
+                val format = SimpleDateFormat("yyyyMMddHHmmss", Locale.US)
+                val addedDate = try {
+                    format.parse(cols[7]).time
+                } catch (e: ParseException) {
+                    e.printStackTrace()
+                    System.currentTimeMillis()
+                }
+
+
+                val eventObject = Event(
+                        data.profileId,
+                        id,
+                        eventDate,
+                        startTime,
+                        topic,
+                        -1,
+                        type,
+                        false,
+                        teacherId,
+                        subjectId,
+                        teamId)
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(
+                        Metadata(
+                                data.profileId,
+                                Metadata.TYPE_EVENT,
+                                id,
+                                data.profile?.empty ?: false,
+                                data.profile?.empty ?: false,
+                                addedDate
+                        ))
+            }
+        }
+
+        data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK))
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiGradeCategories.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiGradeCategories.kt
new file mode 100644
index 00000000..d13c8ecd
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiGradeCategories.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-7.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
+
+import android.graphics.Color
+import androidx.core.util.contains
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
+
+class MobidziennikApiGradeCategories(val data: DataMobidziennik, rows: List<String>) {
+    init {
+        for (row in rows) {
+            if (row.isEmpty())
+                continue
+            val cols = row.split("|")
+
+            val teamId = cols[1].toLong()
+            if (data.teamList.contains(teamId)) {
+
+                val id = cols[0].toLong()
+                val weight = cols[3].toFloat()
+                val color = Color.parseColor("#" + cols[6])
+                val category = cols[4]
+                val columns = cols[7].split(";")
+
+                data.gradeCategories.put(
+                        id,
+                        GradeCategory(
+                                data.profileId,
+                                id,
+                                weight,
+                                color,
+                                category
+                        ).addColumns(columns)
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiGrades.kt
new file mode 100644
index 00000000..52d100e0
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiGrades.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-8.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+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
+
+class MobidziennikApiGrades(val data: DataMobidziennik, rows: List<String>) {
+    init { run {
+        data.db.gradeDao().getDetails(
+                data.profileId,
+                data.gradeAddedDates,
+                data.gradeAverages,
+                data.gradeColors
+        )
+        var addedDate = System.currentTimeMillis()
+        for (row in rows) {
+            if (row.isEmpty())
+                continue
+            val cols = row.split("|")
+
+            val studentId = cols[1].toInt()
+            if (studentId != data.studentId)
+                return@run
+
+            val id = cols[0].toLong()
+            val categoryId = cols[6].toLongOrNull() ?: -1
+            val categoryColumn = cols[10].toIntOrNull() ?: 1
+            val name = cols[7]
+            val value = cols[11].toFloat()
+            val semester = cols[5].toInt()
+            val teacherId = cols[2].toLong()
+            val subjectId = cols[3].toLong()
+            val type = when (cols[8]) {
+                "3" -> if (semester == 1) TYPE_SEMESTER1_PROPOSED else TYPE_SEMESTER2_PROPOSED
+                "1" -> if (semester == 1) TYPE_SEMESTER1_FINAL else TYPE_SEMESTER2_FINAL
+                "4" -> TYPE_YEAR_PROPOSED
+                "2" -> TYPE_YEAR_FINAL
+                else -> TYPE_NORMAL
+            }
+
+            var weight = 0.0f
+            var category = ""
+            var description = ""
+            var color = -1
+            data.gradeCategories.get(categoryId)?.let { gradeCategory ->
+                weight = gradeCategory.weight
+                category = gradeCategory.text
+                description = gradeCategory.columns[categoryColumn-1]
+                color = gradeCategory.color
+            }
+
+            // fix for "0" value grades, so they're not counted in the average
+            if (value == 0.0f/* && data.app.appConfig.dontCountZeroToAverage*/) {
+                weight = 0.0f
+            }
+
+            val gradeObject = Grade(
+                    data.profileId,
+                    id,
+                    category,
+                    color,
+                    description,
+                    name,
+                    value,
+                    weight,
+                    semester,
+                    teacherId,
+                    subjectId)
+            gradeObject.type = type
+
+            data.gradeList.add(gradeObject)
+            data.metadataList.add(
+                    Metadata(
+                            data.profileId,
+                            Metadata.TYPE_GRADE,
+                            id,
+                            data.profile?.empty ?: false,
+                            data.profile?.empty ?: false,
+                            addedDate
+                    ))
+            addedDate++
+        }
+    }}
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiHomework.kt
new file mode 100644
index 00000000..405dc9f1
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiHomework.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
+
+import androidx.core.util.contains
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+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
+
+class MobidziennikApiHomework(val data: DataMobidziennik, rows: List<String>) {
+    init {
+        for (row in rows) {
+            if (row.isEmpty())
+                continue
+            val cols = row.split("|")
+
+            val teamId = cols[5].toLong()
+            if (data.teamList.contains(teamId)) {
+
+                val id = cols[0].toLong()
+                val teacherId = cols[7].toLong()
+                val subjectId = cols[6].toLong()
+                val topic = cols[1]
+                val eventDate = Date.fromYmd(cols[2])
+                val startTime = Time.fromYmdHm(cols[3])
+
+                val eventObject = Event(
+                        data.profileId,
+                        id,
+                        eventDate,
+                        startTime,
+                        topic,
+                        -1,
+                        Event.TYPE_HOMEWORK,
+                        false,
+                        teacherId,
+                        subjectId,
+                        teamId)
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(
+                        Metadata(
+                                data.profileId,
+                                Metadata.TYPE_HOMEWORK,
+                                id,
+                                data.profile?.empty ?: false,
+                                data.profile?.empty ?: false,
+                                System.currentTimeMillis()
+                        ))
+            }
+        }
+
+        data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK))
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiLessons.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiLessons.kt
new file mode 100644
index 00000000..ee0579c4
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiLessons.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-7.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class MobidziennikApiLessons(val data: DataMobidziennik, rows: List<String>) {
+    init {
+        data.mobiLessons.clear()
+        for (row in rows) {
+            if (row.isEmpty())
+                continue
+            val cols = row.split("|")
+
+            val id = cols[0].toLong()
+            val subjectId = cols[1].toLong()
+            val teacherId = cols[2].toLong()
+            val teamId = cols[3].toLong()
+            val topic = cols[4]
+            val date = Date.fromYmd(cols[5])
+            val startTime = Time.fromYmdHm(cols[6])
+            val endTime = Time.fromYmdHm(cols[7])
+            val presentCount = cols[8].toInt()
+            val absentCount = cols[9].toInt()
+            val lessonNumber = cols[10].toInt()
+            val signed = cols[11]
+
+            val lesson = DataMobidziennik.MobiLesson(
+                    id,
+                    subjectId,
+                    teacherId,
+                    teamId,
+                    topic,
+                    date,
+                    startTime,
+                    endTime,
+                    presentCount,
+                    absentCount,
+                    lessonNumber,
+                    signed
+            )
+            data.mobiLessons.add(lesson)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiNotices.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiNotices.kt
new file mode 100644
index 00000000..5e9a4c23
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiNotices.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+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 MobidziennikApiNotices(val data: DataMobidziennik, rows: List<String>) {
+    init { run {
+        for (row in rows) {
+            if (row.isEmpty())
+                continue
+            val cols = row.split("|")
+
+            val studentId = cols[2].toInt()
+            if (studentId != data.studentId)
+                return@run
+
+            val id = cols[0].toLong()
+            val text = cols[4]
+            val semester = cols[6].toInt()
+            val type = when (cols[3]) {
+                "0" -> Notice.TYPE_NEGATIVE
+                "1" -> Notice.TYPE_POSITIVE
+                "3" -> Notice.TYPE_NEUTRAL
+                else -> Notice.TYPE_NEUTRAL
+            }
+            val teacherId = cols[5].toLong()
+            val addedDate = Date.fromYmd(cols[7]).inMillis
+
+            val noticeObject = Notice(
+                    data.profileId,
+                    id,
+                    text,
+                    semester,
+                    type,
+                    teacherId)
+
+            data.noticeList.add(noticeObject)
+            data.metadataList.add(
+                    Metadata(
+                            data.profileId,
+                            Metadata.TYPE_NOTICE,
+                            id,
+                            data.profile?.empty ?: false,
+                            data.profile?.empty ?: false,
+                            addedDate
+                    ))
+        }
+    }}
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiStudent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiStudent.kt
new file mode 100644
index 00000000..01f7ecc4
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiStudent.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-6.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+
+class MobidziennikApiStudent(val data: DataMobidziennik, rows: List<String>) {
+    init { run {
+        if (rows.size < 2) {
+            return@run
+        }
+
+        val student1 = rows[0].split("|")
+        val student2 = rows[1].split("|")
+
+        // FROM OLD Mobidziennik API - this information seems to be unused
+        /*students.clear();
+        String[] student = table.split("\n");
+        for (int i = 0; i < student.length; i++) {
+            if (student[i].isEmpty()) {
+                continue;
+            }
+            String[] student1 = student[i].split("\\|", Integer.MAX_VALUE);
+            String[] student2 = student[++i].split("\\|", Integer.MAX_VALUE);
+            students.put(strToInt(student1[0]), new Pair<>(student1, student2));
+        }
+        Pair<String[], String[]> studentData = students.get(studentId);
+        try {
+            profile.setAttendancePercentage(Float.parseFloat(studentData.second[1]));
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }*/
+    }}
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiSubjects.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiSubjects.kt
new file mode 100644
index 00000000..541be25b
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiSubjects.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-6.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject
+
+class MobidziennikApiSubjects(val data: DataMobidziennik, rows: List<String>) {
+    init {
+        for (row in rows) {
+            if (row.isEmpty())
+                continue
+            val cols = row.split("|")
+
+            val id = cols[0].toLong()
+            val longName = cols[1].trim()
+            val shortName = cols[2].trim()
+
+            data.subjectsMap.put(id, longName)
+            data.subjectList.put(id, Subject(data.profileId, id, longName, shortName))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiTeams.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiTeams.kt
new file mode 100644
index 00000000..2d737899
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiTeams.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
+import pl.szczodrzynski.edziennik.getById
+import pl.szczodrzynski.edziennik.values
+
+class MobidziennikApiTeams(val data: DataMobidziennik, tableTeams: List<String>?, tableRelations: List<String>?) {
+    init {
+        if (tableTeams != null) {
+            for (row in tableTeams) {
+                if (row.isEmpty())
+                    continue
+                val cols = row.split("|")
+
+                val id = cols[0].toLong()
+                val name = cols[1]+cols[2]
+                val type = cols[3].toInt()
+                val code = data.loginServerName+":"+name
+                val teacherId = cols[4].toLongOrNull() ?: -1
+
+                val teamObject = Team(
+                        data.profileId,
+                        id,
+                        name,
+                        type,
+                        code,
+                        teacherId)
+                data.teamList.put(id, teamObject)
+            }
+        }
+        if (tableRelations != null) {
+            val allTeams = data.teamList.values()
+            data.teamList.clear()
+
+            for (row in tableRelations) {
+                if (row.isEmpty())
+                    continue
+                val cols = row.split("|")
+
+                val studentId = cols[1].toInt()
+                val teamId = cols[2].toLong()
+                val studentNumber = cols[4].toInt()
+
+                if (studentId != data.studentId)
+                    continue
+                val team = allTeams.getById(teamId)
+                if (team != null) {
+                    if (team.type == 1) {
+                        data.profile?.studentNumber = studentNumber
+                        data.teamClass = team
+                    }
+                    data.teamList.put(teamId, team)
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiTimetable.kt
new file mode 100644
index 00000000..e6cd4e6b
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiTimetable.kt
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
+import pl.szczodrzynski.edziennik.fixName
+import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class MobidziennikApiTimetable(val data: DataMobidziennik, rows: List<String>) {
+    init { data.profile?.also { profile ->
+        val lessons = rows.filterNot { it.isEmpty() }.map { it.split("|") }
+
+        val dataStart = Date.getToday()
+        val dataEnd = dataStart.clone().stepForward(0, 0, 7 + (6 - dataStart.weekDay))
+
+        data.toRemove.add(DataRemoveModel.Timetable.between(dataStart.clone(), dataEnd))
+
+        val dataDays = mutableListOf<Int>()
+        while (dataStart <= dataEnd) {
+            dataDays += dataStart.value
+            dataStart.stepForward(0, 0, 1)
+        }
+
+        for (lesson in lessons) {
+            val date = Date.fromYmd(lesson[2])
+            val startTime = Time.fromYmdHm(lesson[3])
+            val endTime = Time.fromYmdHm(lesson[4])
+
+            dataDays.remove(date.value)
+
+            val subjectId = data.subjectList.singleOrNull { it.longName == lesson[5] }?.id ?: -1
+            val teacherId = data.teacherList.singleOrNull { it.fullNameLastFirst == (lesson[7]+" "+lesson[6]).fixName() }?.id ?: -1
+            val teamId = data.teamList.singleOrNull { it.name == lesson[8]+lesson[9] }?.id ?: -1
+            val classroom = lesson[11]
+
+            Lesson(data.profileId, -1).also {
+                when (lesson[1]) {
+                    "plan_lekcji", "lekcja" -> {
+                        it.type = Lesson.TYPE_NORMAL
+                        it.date = date
+                        it.startTime = startTime
+                        it.endTime = endTime
+                        it.subjectId = subjectId
+                        it.teacherId = teacherId
+                        it.teamId = teamId
+                        it.classroom = classroom
+                    }
+                    "lekcja_odwolana" -> {
+                        it.type = Lesson.TYPE_CANCELLED
+                        it.date = date
+                        it.startTime = startTime
+                        it.endTime = endTime
+                        it.oldSubjectId = subjectId
+                        //it.oldTeacherId = teacherId
+                        it.oldTeamId = teamId
+                        //it.oldClassroom = classroom
+                    }
+                    "zastepstwo" -> {
+                        it.type = Lesson.TYPE_CHANGE
+                        it.date = date
+                        it.startTime = startTime
+                        it.endTime = endTime
+                        it.subjectId = subjectId
+                        it.teacherId = teacherId
+                        it.teamId = teamId
+                        it.classroom = classroom
+                    }
+                }
+
+                it.id = it.buildId()
+
+                val seen = profile.empty || date < Date.getToday()
+
+                if (it.type != Lesson.TYPE_NORMAL) {
+                    data.metadataList.add(
+                            Metadata(
+                                    data.profileId,
+                                    Metadata.TYPE_LESSON_CHANGE,
+                                    it.id,
+                                    seen,
+                                    seen,
+                                    System.currentTimeMillis()
+                            ))
+                }
+                data.lessonNewList += it
+            }
+        }
+
+        for (day in dataDays) {
+            val lessonDate = Date.fromValue(day)
+            data.lessonNewList += Lesson(data.profileId, lessonDate.value.toLong()).apply {
+                type = Lesson.TYPE_NO_LESSONS
+                date = lessonDate
+            }
+        }
+
+        /*for (lessonStr in rows) {
+            if (lessonStr.isNotEmpty()) {
+                val lesson = lessonStr.split("|")
+
+                if (lesson[0].toInt() != data.studentId)
+                    continue
+
+                if (lesson[1] == "plan_lekcji" || lesson[1] == "lekcja") {
+                    val lessonObject = Lesson(data.profileId, lesson[2], lesson[3], lesson[4])
+
+                    data.subjectList.singleOrNull { it.longName == lesson[5] }?.let {
+                        lessonObject.subjectId = it.id
+                    }
+                    data.teacherList.singleOrNull { it.fullNameLastFirst == (lesson[7]+" "+lesson[6]).fixName() }?.let {
+                        lessonObject.teacherId = it.id
+                    }
+                    data.teamList.singleOrNull { it.name == lesson[8]+lesson[9] }?.let {
+                        lessonObject.teamId = it.id
+                    }
+                    lessonObject.classroomName = lesson[11]
+                    data.lessonList.add(lessonObject)
+                }
+            }
+        }
+
+        // searching for all changes
+        for (lessonStr in rows) {
+            if (lessonStr.isNotEmpty()) {
+                val lesson = lessonStr.split("|")
+
+                if (lesson[0].toInt() != data.studentId)
+                    continue
+
+                if (lesson[1] == "zastepstwo" || lesson[1] == "lekcja_odwolana") {
+                    val lessonChange = LessonChange(data.profileId, lesson[2], lesson[3], lesson[4])
+
+                    data.subjectList.singleOrNull { it.longName == lesson[5] }?.let {
+                        lessonChange.subjectId = it.id
+                    }
+                    data.teacherList.singleOrNull { it.fullNameLastFirst == (lesson[7]+" "+lesson[6]).fixName() }?.let {
+                        lessonChange.teacherId = it.id
+                    }
+                    data.teamList.singleOrNull { it.name == lesson[8]+lesson[9] }?.let {
+                        lessonChange.teamId = it.id
+                    }
+
+                    if (lesson[1] == "zastepstwo") {
+                        lessonChange.type = LessonChange.TYPE_CHANGE
+                    }
+                    else if (lesson[1] == "lekcja_odwolana") {
+                        lessonChange.type = LessonChange.TYPE_CANCELLED
+                    }
+                    else if (lesson[1] == "lekcja") {
+                        lessonChange.type = LessonChange.TYPE_ADDED
+                    }
+                    lessonChange.classroomName = lesson[11]
+
+                    val originalLesson = lessonChange.getOriginalLesson(data.lessonList)
+
+                    if (lessonChange.type == LessonChange.TYPE_ADDED) {
+                        if (originalLesson == null) {
+                            // original lesson doesn't exist, save a new addition
+                            // TODO
+                            *//*if (!RegisterLessonChange.existsAddition(app.profile, registerLessonChange)) {
+                            app.profile.timetable.addLessonAddition(registerLessonChange);
+                        }*//*
+                        } else {
+                            // original lesson exists, so we need to compare them
+                            if (!lessonChange.matches(originalLesson)) {
+                                // the lessons are different, so it's probably a lesson change
+                                // ahhh this damn API
+                                lessonChange.type = LessonChange.TYPE_CHANGE
+                            }
+                        }
+
+                    }
+                    if (lessonChange.type != LessonChange.TYPE_ADDED) {
+                        // it's not a lesson addition
+                        data.lessonChangeList.add(lessonChange)
+                        data.metadataList.add(
+                                Metadata(
+                                        data.profileId,
+                                        Metadata.TYPE_LESSON_CHANGE,
+                                        lessonChange.id,
+                                        data.profile?.empty ?: false,
+                                        data.profile?.empty ?: false,
+                                        System.currentTimeMillis()
+                                ))
+                        if (originalLesson == null) {
+                            // there is no original lesson, so we have to add one in order to change it
+                            data.lessonList.add(Lesson.fromLessonChange(lessonChange))
+                        }
+                    }
+                }
+            }
+        }*/
+    }}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiUsers.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiUsers.kt
new file mode 100644
index 00000000..1ef8619f
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiUsers.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-6.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+import pl.szczodrzynski.edziennik.fixName
+
+class MobidziennikApiUsers(val data: DataMobidziennik, rows: List<String>) {
+    init {
+        for (row in rows) {
+            if (row.isEmpty())
+                continue
+            val cols = row.split("|")
+
+            if (cols[1] != "*")
+                continue
+
+            val id = cols[0].toLong()
+            val name = cols[4].fixName()
+            val surname = cols[5].fixName()
+
+            data.teachersMap.put(id, "$surname $name")
+            data.teacherList.put(id, Teacher(data.profileId, id, name, surname))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikLuckyNumberExtractor.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikLuckyNumberExtractor.kt
new file mode 100644
index 00000000..6ac0cdcf
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikLuckyNumberExtractor.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-10.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web
+
+import pl.szczodrzynski.edziennik.api.v2.Regexes
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+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 MobidziennikLuckyNumberExtractor(val data: DataMobidziennik, text: String) {
+    init {
+        data.profile?.luckyNumber = -1
+        data.profile?.luckyNumberDate = null
+
+        Regexes.MOBIDZIENNIK_LUCKY_NUMBER.find(text)?.let {
+            try {
+                val luckyNumber = it.groupValues[1].toInt()
+
+                val luckyNumberObject = LuckyNumber(
+                        data.profileId,
+                        Date.getToday(),
+                        luckyNumber
+                )
+
+                data.luckyNumberList.add(luckyNumberObject)
+                data.metadataList.add(
+                        Metadata(
+                                data.profileId,
+                                Metadata.TYPE_LUCKY_NUMBER,
+                                luckyNumberObject.date.value.toLong(),
+                                data.profile?.empty ?: false,
+                                data.profile?.empty ?: false,
+                                System.currentTimeMillis()
+                        ))
+            } catch (_: Exception){}
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebCalendar.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebCalendar.kt
new file mode 100644
index 00000000..2fa16345
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebCalendar.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-10.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web
+
+import com.google.gson.JsonParser
+import pl.szczodrzynski.edziennik.api.v2.Regexes
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.ENDPOINT_MOBIDZIENNIK_WEB_CALENDAR
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.MobidziennikWeb
+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.getString
+import pl.szczodrzynski.edziennik.utils.Utils.crc16
+import pl.szczodrzynski.edziennik.utils.models.Date
+import java.util.*
+
+class MobidziennikWebCalendar(override val data: DataMobidziennik,
+                      val onSuccess: () -> Unit) : MobidziennikWeb(data)  {
+    companion object {
+        private const val TAG = "MobidziennikWebCalendar"
+    }
+
+    init {
+        webGet(TAG, "/dziennik/kalendarzklasowy") { text ->
+            MobidziennikLuckyNumberExtractor(data, text)
+
+            Regexes.MOBIDZIENNIK_CLASS_CALENDAR.find(text)?.let {
+                val events = JsonParser().parse(it.groupValues[1]).asJsonArray
+                for (eventEl in events) {
+                    val event = eventEl.asJsonObject
+
+                    val idStr = event.getString("id")
+                    if (idStr?.startsWith("kalendarz;") != true) {
+                        continue
+                    }
+                    val idParts = idStr.split(";")
+                    if (idParts.size < 2) {
+                        continue
+                    }
+                    var id = idParts[2].toLongOrNull() ?: -1
+                    val studentId = idParts[1].toIntOrNull() ?: continue
+                    if (studentId != data.studentId)
+                        continue
+
+                    val dateString = event.getString("start") ?: continue
+                    val eventDate = Date.fromY_m_d(dateString)
+
+                    val eventType = when (event.getString("color")?.toLowerCase(Locale.getDefault())) {
+                        "#c54449" -> Event.TYPE_SHORT_QUIZ
+                        "#ab0001" -> Event.TYPE_EXAM
+                        "#008928" -> Event.TYPE_CLASS_EVENT
+                        "#b66000" -> Event.TYPE_EXCURSION
+                        else -> Event.TYPE_INFORMATION
+                    }
+
+                    val title = event.getString("title")
+                    val comment = event.getString("comment")
+
+                    var topic = title
+                    if (title != comment) {
+                        topic += "\n" + comment
+                    }
+
+                    if (id == -1L) {
+                        id = crc16(topic?.toByteArray()).toLong()
+                    }
+
+                    val eventObject = Event(
+                            profileId,
+                            id,
+                            eventDate, null,
+                            topic,
+                            -1,
+                            eventType,
+                            false,
+                            -1,
+                            -1,
+                            data.teamClass?.id ?: -1
+                    )
+
+                    data.eventList.add(eventObject)
+                    data.metadataList.add(
+                            Metadata(
+                                    profileId,
+                                    Metadata.TYPE_EVENT,
+                                    eventObject.id,
+                                    profile?.empty ?: false,
+                                    profile?.empty ?: false,
+                                    System.currentTimeMillis() /* no addedDate here though */
+                            ))
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_MOBIDZIENNIK_WEB_CALENDAR, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebGetMessage.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebGetMessage.kt
new file mode 100644
index 00000000..3307ee7c
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebGetMessage.kt
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-18.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web
+
+import org.greenrobot.eventbus.EventBus
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.api.v2.Regexes
+import pl.szczodrzynski.edziennik.api.v2.events.MessageGetEvent
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.MobidziennikWeb
+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.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipientFull
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.utils.Utils.monthFromName
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class MobidziennikWebGetMessage(
+        override val data: DataMobidziennik,
+        private val message: MessageFull,
+        val onSuccess: () -> Unit) : MobidziennikWeb(data)  {
+    companion object {
+        private const val TAG = "MobidziennikWebGetMessage"
+    }
+
+    init {
+        val typeUrl = if (message.type == Message.TYPE_SENT)
+            "wiadwyslana"
+        else
+            "wiadodebrana"
+        webGet(TAG, "/dziennik/$typeUrl/?id=${message.id}") { text ->
+            MobidziennikLuckyNumberExtractor(data, text)
+
+            val messageRecipientList = mutableListOf<MessageRecipientFull>()
+
+            val doc = Jsoup.parse(text)
+
+            val content = doc.select("#content").first()
+
+            val body = content.select(".wiadomosc_tresc").first()
+
+            if (message.type == TYPE_RECEIVED) {
+                var readDate = System.currentTimeMillis()
+                Regexes.MOBIDZIENNIK_MESSAGE_READ_DATE.find(body.html())?.let {
+                    val date = Date(
+                            it[3].toIntOrNull() ?: 2019,
+                            monthFromName(it[2]),
+                            it[1].toIntOrNull() ?: 1
+                    )
+                    val time = Time.fromH_m_s(
+                            it[4] // TODO blank string safety
+                    )
+                    readDate = date.combineWith(time)
+                }
+
+                val recipient = MessageRecipientFull(
+                        profileId,
+                        -1,
+                        -1,
+                        readDate,
+                        message.id
+                )
+
+                recipient.fullName = profile?.accountNameLong ?: profile?.studentNameLong
+
+                messageRecipientList.add(recipient)
+            } else {
+                message.senderId = -1
+                message.senderReplyId = -1
+
+                content.select("table.spis tr:has(td)")?.forEach { recipientEl ->
+                    val senderEl = recipientEl.select("td:eq(0)").first()
+                    val senderName = senderEl.text()
+
+                    val teacher = data.teacherList.singleOrNull { it.fullNameLastFirst == senderName }
+                    val receiverId = teacher?.id ?: -1
+
+                    var readDate = 0L
+                    val isReadEl = recipientEl.select("td:eq(2)").first()
+                    if (isReadEl.ownText() != "NIE") {
+                        val readDateEl = recipientEl.select("td:eq(3) small").first()
+                        Regexes.MOBIDZIENNIK_MESSAGE_SENT_READ_DATE.find(readDateEl.ownText())?.let {
+                            val date = Date(
+                                    it[3].toIntOrNull() ?: 2019,
+                                    monthFromName(it[2]),
+                                    it[1].toIntOrNull() ?: 1
+                            )
+                            val time = Time.fromH_m_s(
+                                    it[4] // TODO blank string safety
+                            )
+                            readDate = date.combineWith(time)
+                        }
+                    }
+
+                    val recipient = MessageRecipientFull(
+                            profileId,
+                            receiverId,
+                            -1,
+                            readDate,
+                            message.id
+                    )
+
+                    recipient.fullName = teacher?.fullName ?: "?"
+
+                    messageRecipientList.add(recipient)
+                }
+            }
+
+            // this line removes the sender and read date details
+            body.select("div").remove()
+
+            // this needs to be at the end
+            message.apply {
+                this.body = body.html()
+
+                clearAttachments()
+                content.select("ul li").map { it.select("a").first() }.forEach {
+                    val attachmentName = it.ownText()
+                    Regexes.MOBIDZIENNIK_MESSAGE_ATTACHMENT.find(it.outerHtml())?.let { match ->
+                        val attachmentId = match[1].toLong()
+                        var size = match[2].toFloatOrNull() ?: 0f
+                        when (match[3]) {
+                            "K" -> size *= 1024f
+                            "M" -> size *= 1024f * 1024f
+                            "G" -> size *= 1024f * 1024f * 1024f
+                        }
+                        message.addAttachment(attachmentId, attachmentName, size.toLong())
+                    }
+                }
+            }
+
+            if (!message.seen) { // TODO discover why this monstrosity instead of MetadataDao.setSeen
+                data.messageMetadataList.add(Metadata(
+                        message.profileId,
+                        Metadata.TYPE_MESSAGE,
+                        message.id,
+                        true,
+                        true,
+                        message.addedDate
+                ))
+            }
+
+            message.recipients = messageRecipientList
+            data.messageRecipientList.addAll(messageRecipientList)
+            data.messageList.add(message)
+
+            EventBus.getDefault().postSticky(MessageGetEvent(message))
+            onSuccess()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebGrades.kt
new file mode 100644
index 00000000..cad45ab8
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebGrades.kt
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-10.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web
+
+import android.graphics.Color
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.api.v2.Regexes
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.ENDPOINT_MOBIDZIENNIK_WEB_GRADES
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.MobidziennikWeb
+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.fixWhiteSpaces
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class MobidziennikWebGrades(override val data: DataMobidziennik,
+                              val onSuccess: () -> Unit) : MobidziennikWeb(data)  {
+    companion object {
+        private const val TAG = "MobidziennikWebGrades"
+    }
+
+    init {
+        webGet(TAG, "/dziennik/oceny?semestr=${profile?.currentSemester ?: 1}") { text ->
+            MobidziennikLuckyNumberExtractor(data, text)
+
+            val doc = Jsoup.parse(text)
+
+            val grades = doc.select("table.spis a, table.spis span, table.spis div")
+
+            var gradeCategory = ""
+            var gradeColor = -1
+            var subjectName = ""
+
+            for (e in grades) {
+                when (e.tagName()) {
+                    "div" -> {
+                        Regexes.MOBIDZIENNIK_GRADES_SUBJECT_NAME.find(e.outerHtml())?.let {
+                            subjectName = it[1]
+                        }
+                    }
+                    "span" -> {
+                        val css = e.attr("style")
+                        Regexes.MOBIDZIENNIK_GRADES_COLOR.find(css)?.let {
+                            // (#2196f3)
+                            gradeColor = Color.parseColor(it[1])
+                        }
+                        Regexes.MOBIDZIENNIK_GRADES_CATEGORY.find(e.outerHtml())?.let {
+                            // (category)
+                            gradeCategory = it[1]
+                        }
+                    }
+                    "a" -> {
+                        val gradeId = e.attr("rel").toLong()
+                        var gradeAddedDateMillis: Long = -1
+                        var gradeSemester = 1
+
+                        val html = e.html()
+                        val gradeClassAverage = Regexes.MOBIDZIENNIK_GRADES_CLASS_AVERAGE.find(html)?.let {
+                            // (4.75)
+                            it[1].toFloatOrNull()
+                        } ?: -1f
+
+                        Regexes.MOBIDZIENNIK_GRADES_ADDED_DATE.find(html)?.let {
+                            // (2) (stycznia) (2019), (12:34:56)
+                            val month = when (it[2]) {
+                                "stycznia" -> 1
+                                "lutego" -> 2
+                                "marca" -> 3
+                                "kwietnia" -> 4
+                                "maja" -> 5
+                                "czerwca" -> 6
+                                "lipca" -> 7
+                                "sierpnia" -> 8
+                                "września" -> 9
+                                "października" -> 10
+                                "listopada" -> 11
+                                "grudnia" -> 12
+                                else -> 1
+                            }
+                            val gradeAddedDate = Date(
+                                    it[3].toInt(),
+                                    month,
+                                    it[1].toInt()
+                            )
+                            val time = Time.fromH_m_s(it[4])
+                            gradeAddedDateMillis = gradeAddedDate.combineWith(time)
+                            gradeSemester = profile?.dateToSemester(gradeAddedDate) ?: 1
+                        }
+
+                        if (Regexes.MOBIDZIENNIK_GRADES_COUNT_TO_AVG.containsMatchIn(html)) {
+                            Regexes.MOBIDZIENNIK_GRADES_DETAILS.find(html)?.let { match ->
+                                val gradeName = match[1]
+                                val gradeDescription = match[2]
+                                val gradeValue = match[3].toFloatOrNull() ?: 0.0f
+                                val teacherName = match[4].fixWhiteSpaces()
+
+                                val teacherId = data.teacherList.singleOrNull { it.fullNameLastFirst == teacherName }?.id ?: -1
+                                val subjectId = data.subjectList.singleOrNull { it.longName == subjectName }?.id ?: -1
+
+                                val gradeObject = Grade(
+                                        profileId,
+                                        gradeId,
+                                        gradeCategory,
+                                        gradeColor,
+                                        "NLDŚR, $gradeDescription",
+                                        gradeName,
+                                        gradeValue,
+                                        0f,
+                                        gradeSemester,
+                                        teacherId,
+                                        subjectId
+                                )
+
+                                gradeObject.classAverage = gradeClassAverage
+
+                                data.gradeList.add(gradeObject)
+                                data.metadataList.add(
+                                        Metadata(
+                                                profileId,
+                                                Metadata.TYPE_GRADE,
+                                                gradeObject.id,
+                                                profile?.empty ?: false,
+                                                profile?.empty ?: false,
+                                                gradeAddedDateMillis
+                                        ))
+                            }
+                        } else {
+                            data.gradeAverages.put(gradeId, gradeClassAverage)
+                            data.gradeAddedDates.put(gradeId, gradeAddedDateMillis)
+                            data.gradeColors.put(gradeId, gradeColor)
+                        }
+                    }
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_MOBIDZIENNIK_WEB_GRADES, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebMessagesAll.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebMessagesAll.kt
new file mode 100644
index 00000000..7f11765e
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebMessagesAll.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_ALL
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.MobidziennikWeb
+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.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.singleOrNull
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class MobidziennikWebMessagesAll(override val data: DataMobidziennik,
+                                   val onSuccess: () -> Unit) : MobidziennikWeb(data)  {
+    companion object {
+        private const val TAG = "MobidziennikWebMessagesAll"
+    }
+
+    init {
+        webGet(TAG, "/dziennik/wyszukiwarkawiadomosci?q=+") { text ->
+            MobidziennikLuckyNumberExtractor(data, text)
+
+            val doc = Jsoup.parse(text)
+
+            val listElement = doc.getElementsByClass("spis").first()
+            if (listElement == null) {
+                data.setSyncNext(ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_ALL, 7*DAY)
+                onSuccess()
+                return@webGet
+            }
+            val list = listElement.getElementsByClass("podswietl")
+            for (item in list) {
+                val id = item.attr("rel").replace("[^\\d]".toRegex(), "").toLongOrNull() ?: continue
+
+                val subjectEl = item.select("td:eq(0) div").first()
+                val subject = subjectEl.text()
+
+                val addedDateEl = item.select("td:eq(1)").first()
+                val addedDate = Date.fromIsoHm(addedDateEl.text())
+
+                val typeEl = item.select("td:eq(2) img").first()
+                var type = TYPE_RECEIVED
+                if (typeEl.outerHtml().contains("mail_send.png"))
+                    type = TYPE_SENT
+
+                val senderEl = item.select("td:eq(3) div").first()
+                var senderId: Long = -1
+
+                if (type == TYPE_RECEIVED) {
+                    // search sender teacher
+                    val senderName = senderEl.text()
+                    senderId = data.teacherList.singleOrNull { it.fullNameLastFirst == senderName }?.id ?: -1
+                    data.messageRecipientList.add(MessageRecipient(profileId, -1, id))
+                } else {
+                    // TYPE_SENT, so multiple recipients possible
+                    val recipientNames = senderEl.text().split(", ")
+                    for (recipientName in recipientNames) {
+                        val recipientId = data.teacherList.singleOrNull { it.fullNameLastFirst == recipientName }?.id ?: -1
+                        data.messageRecipientIgnoreList.add(MessageRecipient(profileId, recipientId, id))
+                    }
+                }
+
+                val message = Message(
+                        profileId,
+                        id,
+                        subject,
+                        null,
+                        type,
+                        senderId,
+                        -1
+                )
+
+                data.messageIgnoreList.add(message)
+                data.metadataList.add(Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, true, true, addedDate))
+            }
+
+            // sync every 7 days as we probably don't except more than
+            // 30 received messages during a week, without any normal sync
+            data.setSyncNext(ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_ALL, 7*DAY)
+            onSuccess()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebMessagesInbox.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebMessagesInbox.kt
new file mode 100644
index 00000000..6a23596b
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebMessagesInbox.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_INBOX
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.MobidziennikWeb
+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.MessageRecipient
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class MobidziennikWebMessagesInbox(override val data: DataMobidziennik,
+                              val onSuccess: () -> Unit) : MobidziennikWeb(data)  {
+    companion object {
+        private const val TAG = "MobidziennikWebMessagesInbox"
+    }
+
+    init {
+        webGet(TAG, "/dziennik/wiadomosci") { text ->
+            MobidziennikLuckyNumberExtractor(data, text)
+
+            if (text.contains("Brak wiadomości odebranych.")) {
+                data.setSyncNext(ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_INBOX, SYNC_ALWAYS)
+                onSuccess()
+                return@webGet
+            }
+
+            val doc = Jsoup.parse(text)
+
+            val list = doc.getElementsByClass("spis").first().getElementsByClass("podswietl")
+            for (item in list) {
+                val id = item.attr("rel").toLongOrNull() ?: continue
+
+                val subjectEl = item.select("td:eq(0)").first()
+                var hasAttachments = false
+                if (subjectEl.getElementsByTag("a").size != 0) {
+                    hasAttachments = true
+                }
+                val subject = subjectEl.ownText()
+
+                val addedDateEl = item.select("td:eq(1) small").first()
+                val addedDate = Date.fromIsoHm(addedDateEl.text())
+
+                val senderEl = item.select("td:eq(2)").first()
+                val senderName = senderEl.ownText()
+                val senderId = data.teacherList.singleOrNull { it.fullNameLastFirst == senderName }?.id ?: -1
+                data.messageRecipientIgnoreList.add(MessageRecipient(profileId, -1, id))
+
+                val isRead = item.select("td:eq(3) span").first().hasClass("wiadomosc_przeczytana")
+
+                val message = Message(
+                        profileId,
+                        id,
+                        subject,
+                        null,
+                        Message.TYPE_RECEIVED,
+                        senderId,
+                        -1
+                )
+
+                if (hasAttachments)
+                    message.setHasAttachments()
+
+                data.messageIgnoreList.add(message)
+                data.messageMetadataList.add(
+                        Metadata(
+                                profileId,
+                                Metadata.TYPE_MESSAGE,
+                                message.id,
+                                isRead,
+                                isRead || profile?.empty ?: false,
+                                addedDate
+                        ))
+            }
+
+            data.setSyncNext(ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_INBOX, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebNotices.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebNotices.kt
new file mode 100644
index 00000000..ab7d8760
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebNotices.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web
+
+import com.google.gson.JsonParser
+import pl.szczodrzynski.edziennik.api.v2.Regexes
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.ENDPOINT_MOBIDZIENNIK_WEB_CALENDAR
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.ENDPOINT_MOBIDZIENNIK_WEB_NOTICES
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.MobidziennikWeb
+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.getString
+import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.models.Date
+import java.util.*
+
+class MobidziennikWebNotices(override val data: DataMobidziennik,
+                              val onSuccess: () -> Unit) : MobidziennikWeb(data)  {
+    companion object {
+        private const val TAG = "MobidziennikWebNotices"
+    }
+
+    init {
+        // TODO this does no longer work: Mobidziennik changed their mobile page in 2019.09
+        data.setSyncNext(ENDPOINT_MOBIDZIENNIK_WEB_NOTICES, SYNC_ALWAYS)
+        onSuccess()
+        /*webGet(TAG, "/mobile/zachowanie") { text ->
+            MobidziennikLuckyNumberExtractor(data, text)
+
+            data.setSyncNext(ENDPOINT_MOBIDZIENNIK_WEB_NOTICES, SYNC_ALWAYS)
+            onSuccess()
+        }*/
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/firstlogin/MobidziennikFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/firstlogin/MobidziennikFirstLogin.kt
new file mode 100644
index 00000000..3742e34b
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/firstlogin/MobidziennikFirstLogin.kt
@@ -0,0 +1,60 @@
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.firstlogin
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.api.v2.events.FirstLoginFinishedEvent
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.MobidziennikWeb
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.login.MobidziennikLoginWeb
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.fixName
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class MobidziennikFirstLogin(val data: DataMobidziennik, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "MobidziennikFirstLogin"
+    }
+
+    private val web = MobidziennikWeb(data)
+    private val profileList = mutableListOf<Profile>()
+
+    init {
+        MobidziennikLoginWeb(data) {
+            web.webGet(TAG, "/api/zrzutbazy") { text ->
+                val tables = text.split("T@B#LA")
+
+                val accountNameLong = run {
+                    tables[0]
+                            .split("\n")
+                            .map { it.split("|") }
+                            .singleOrNull { it.getOrNull(1) != "*" }
+                            ?.let {
+                                "${it[4]} ${it[5]}".fixName()
+                            }
+                }
+
+                tables[8].split("\n").forEach { student ->
+                    if (student.isEmpty())
+                        return@forEach
+                    val student1 = student.split("|")
+                    if (student1.size == 2)
+                        return@forEach
+
+                    val today = Date.getToday()
+                    val profile = Profile()
+                    profile.studentNameLong = "${student1[2]} ${student1[4]}".fixName()
+                    profile.studentNameShort = "${student1[2]} ${student1[4][0]}.".fixName()
+                    profile.accountNameLong = if (accountNameLong == profile.studentNameLong) null else accountNameLong
+                    profile.studentSchoolYear = "${today.year}/${today.year+1}"
+                    profile.name = profile.studentNameLong
+                    profile.subname = data.loginUsername
+                    profile.empty = true
+                    profile.putStudentData("studentId", student1[0].toInt())
+                    profileList.add(profile)
+                }
+
+                EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore))
+                onSuccess()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/login/MobidziennikLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/login/MobidziennikLogin.kt
new file mode 100644
index 00000000..95e6cd95
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/login/MobidziennikLogin.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.login
+
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_MOBIDZIENNIK_API2
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_MOBIDZIENNIK_WEB
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class MobidziennikLogin(val data: DataMobidziennik, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "MobidziennikLogin"
+    }
+
+    private var cancelled = false
+
+    init {
+        nextLoginMethod(onSuccess)
+    }
+
+    private fun nextLoginMethod(onSuccess: () -> Unit) {
+        if (data.targetLoginMethodIds.isEmpty()) {
+            onSuccess()
+            return
+        }
+        if (cancelled) {
+            onSuccess()
+            return
+        }
+        useLoginMethod(data.targetLoginMethodIds.removeAt(0)) { usedMethodId ->
+            data.progress(data.progressStep)
+            if (usedMethodId != -1)
+                data.loginMethods.add(usedMethodId)
+            nextLoginMethod(onSuccess)
+        }
+    }
+
+    private fun useLoginMethod(loginMethodId: Int, onSuccess: (usedMethodId: Int) -> Unit) {
+        // this should never be true
+        if (data.loginMethods.contains(loginMethodId)) {
+            onSuccess(-1)
+            return
+        }
+        Utils.d(TAG, "Using login method $loginMethodId")
+        when (loginMethodId) {
+            LOGIN_METHOD_MOBIDZIENNIK_WEB -> {
+                data.startProgress(R.string.edziennik_progress_login_mobidziennik_web)
+                MobidziennikLoginWeb(data) { onSuccess(loginMethodId) }
+            }
+            LOGIN_METHOD_MOBIDZIENNIK_API2 -> {
+                data.startProgress(R.string.edziennik_progress_login_mobidziennik_api2)
+                //MobidziennikLoginApi2(data) { onSuccess(loginMethodId) }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/login/MobidziennikLoginWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/login/MobidziennikLoginWeb.kt
new file mode 100644
index 00000000..ccce499d
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/login/MobidziennikLoginWeb.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.mobidziennik.login
+
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.getUnixDate
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.utils.Utils.d
+
+class MobidziennikLoginWeb(val data: DataMobidziennik, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "MobidziennikLoginWeb"
+    }
+
+    init { run {
+        if (data.isWebLoginValid()) {
+            onSuccess()
+        }
+        else {
+            if (data.loginServerName.isNotNullNorEmpty() && data.loginUsername.isNotNullNorEmpty() && data.loginPassword.isNotNullNorEmpty()) {
+                data.app.cookieJar.clearForDomain(data.loginServerName + ".mobidziennik.pl")
+                loginWithCredentials()
+            }
+            else {
+                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            }
+        }
+    }}
+
+    private fun loginWithCredentials() {
+        d(TAG, "Request: Mobidziennik/Login/Web - https://${data.loginServerName}.mobidziennik.pl/api/")
+
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                if (text != "ok") {
+                    when {
+                        text == "Nie jestes zalogowany" -> ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_LOGIN
+                        text == "ifun" -> ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_DEVICE
+                        text == "stare haslo" -> ERROR_LOGIN_MOBIDZIENNIK_WEB_OLD_PASSWORD
+                        text == "Archiwum" -> ERROR_LOGIN_MOBIDZIENNIK_WEB_ARCHIVED
+                        text == "Trwają prace techniczne lub pojawił się jakiś problem" -> ERROR_LOGIN_MOBIDZIENNIK_WEB_MAINTENANCE
+                        text?.contains("Uuuups... nieprawidłowy adres") == true -> ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_ADDRESS
+                        text?.contains("przerwa techniczna") == true -> ERROR_LOGIN_MOBIDZIENNIK_WEB_MAINTENANCE
+                        else -> ERROR_LOGIN_MOBIDZIENNIK_WEB_OTHER
+                    }.let { errorCode ->
+                        data.error(ApiError(TAG, errorCode)
+                                .withApiResponse(text)
+                                .withResponse(response))
+                        return
+                    }
+                }
+
+                val cookies = data.app.cookieJar.getForDomain("${data.loginServerName}.mobidziennik.pl")
+                val cookie = cookies.singleOrNull { it.name().length > 32 }
+                val sessionKey = cookie?.name()
+                val sessionId = cookie?.value()
+                if (sessionId == null) {
+                    data.error(ApiError(TAG, ERROR_LOGIN_MOBIDZIENNIK_WEB_NO_SESSION_ID)
+                            .withResponse(response)
+                            .withApiResponse(text))
+                    return
+                }
+
+                data.webSessionKey = sessionKey
+                data.webSessionValue = sessionId
+                data.webServerId = data.app.cookieJar.getCookie("${data.loginServerName}.mobidziennik.pl", "SERVERID")
+                data.webSessionIdExpiryTime = response.getUnixDate() + 45 * 60 /* 45min */
+                onSuccess()
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+
+        Request.builder()
+                .url("https://${data.loginServerName}.mobidziennik.pl/api/")
+                .userAgent(MOBIDZIENNIK_USER_AGENT)
+                .contentType("application/x-www-form-urlencoded; charset=UTF-8")
+                .addParameter("wersja", "20")
+                .addParameter("ip", data.app.deviceId)
+                .addParameter("login", data.loginUsername)
+                .addParameter("haslo", data.loginPassword)
+                .addParameter("token", data.app.appConfig.fcmTokens[LOGIN_TYPE_MOBIDZIENNIK]?.first)
+                .post()
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/ApiError.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/ApiError.kt
new file mode 100644
index 00000000..effe2a72
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/ApiError.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-28.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.models
+
+import android.content.Context
+import com.google.gson.JsonObject
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import pl.szczodrzynski.edziennik.data.api.AppError
+
+class ApiError(val tag: String, val errorCode: Int) {
+    var profileId: Int? = null
+    var throwable: Throwable? = null
+    var apiResponse: String? = null
+    var request: Request? = null
+    var response: Response? = null
+    var isCritical = true
+
+    fun withThrowable(throwable: Throwable?): ApiError {
+        this.throwable = throwable
+        return this
+    }
+    fun withApiResponse(apiResponse: String?): ApiError {
+        this.apiResponse = apiResponse
+        return this
+    }
+    fun withApiResponse(apiResponse: JsonObject?): ApiError {
+        this.apiResponse = apiResponse?.toString()
+        return this
+    }
+    fun withRequest(request: Request?): ApiError {
+        this.request = request
+        return this
+    }
+    fun withResponse(response: Response?): ApiError {
+        this.response = response
+        this.request = response?.request()
+        return this
+    }
+
+    fun setCritical(isCritical: Boolean): ApiError {
+        this.isCritical = isCritical
+        return this
+    }
+
+    fun toAppError(): AppError {
+        return AppError(
+                tag,
+                -1,
+                errorCode, response, throwable, apiResponse
+        )
+    }
+
+    fun getStringReason(context: Context): String {
+        return context.resources.getIdentifier("error_${errorCode}_reason", "string", context.packageName).let {
+            if (it != 0)
+                context.getString(it)
+            else
+                "?"
+        }
+    }
+
+    override fun toString(): String {
+        return "ApiError(tag='$tag', errorCode=$errorCode, profileId=$profileId, throwable=$throwable, apiResponse=$apiResponse, request=$request, response=$response, isCritical=$isCritical)"
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/Data.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/Data.kt
new file mode 100644
index 00000000..e1f123fb
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/Data.kt
@@ -0,0 +1,420 @@
+package pl.szczodrzynski.edziennik.api.v2.models
+
+import android.util.LongSparseArray
+import android.util.SparseArray
+import androidx.core.util.size
+import com.google.gson.JsonObject
+import im.wangchao.mhttp.Response
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.api.v2.DataNotifications
+import pl.szczodrzynski.edziennik.api.v2.EXCEPTION_NOTIFY_AND_SYNC
+import pl.szczodrzynski.edziennik.api.v2.ServerSync
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EndpointCallback
+import pl.szczodrzynski.edziennik.data.api.AppError.*
+import pl.szczodrzynski.edziennik.data.db.AppDb
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement
+import pl.szczodrzynski.edziennik.data.db.modules.api.EndpointTimer
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceType
+import pl.szczodrzynski.edziennik.data.db.modules.classrooms.Classroom
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.events.EventType
+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.lessons.Lesson
+import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange
+import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+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.notices.Notice
+import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeType
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification
+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
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsence
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceType
+import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
+import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.toSparseArray
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.values
+import java.io.InterruptedIOException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+import javax.net.ssl.SSLException
+
+open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore) {
+    companion object {
+        private const val TAG = "Data"
+    }
+
+    var fakeLogin = false
+
+    var cancelled = false
+
+    val profileId
+        get() = profile?.id ?: -1
+
+    var arguments: JsonObject? = null
+
+    /**
+     * A callback passed to all [Feature]s and [LoginMethod]s
+     */
+    lateinit var callback: EndpointCallback
+
+    /**
+     * A list of [LoginMethod]s *already fulfilled* during this sync.
+     *
+     * A [LoginMethod] may add elements to this list only after a successful login
+     * with that method.
+     */
+    val loginMethods = mutableListOf<Int>()
+
+    /**
+     * A method which may be overridden in child Data* classes.
+     *
+     * Calling it should populate [loginMethods] with all
+     * already available login methods (e.g. a non-expired OAuth token).
+     */
+    open fun satisfyLoginMethods() {}
+
+    /**
+     * A list of Login method IDs that are still pending
+     * to run.
+     */
+    var targetLoginMethodIds = mutableListOf<Int>()
+    /**
+     * A list of endpoint IDs that are still pending
+     * to run.
+     */
+    var targetEndpointIds = mutableListOf<Int>()
+    /**
+     * A count of all network requests to do.
+     */
+    var progressCount: Int = 0
+    /**
+     * A number by which the progress will be incremented, every time
+     * a login method/endpoint finishes its job.
+     */
+    var progressStep: Float = 0f
+
+    /**
+     * A map of endpoint IDs to JSON objects, specifying their arguments bundle.
+     */
+    var endpointArgs = mutableMapOf<Int, JsonObject>()
+
+    var endpointTimers = mutableListOf<EndpointTimer>()
+
+    val notifications = mutableListOf<Notification>()
+
+    val teacherList = LongSparseArray<Teacher>()
+    val subjectList = LongSparseArray<Subject>()
+    val teamList = LongSparseArray<Team>()
+    val lessonRanges = SparseArray<LessonRange>()
+    val gradeCategories = LongSparseArray<GradeCategory>()
+
+    val classrooms = LongSparseArray<Classroom>()
+    val attendanceTypes = LongSparseArray<AttendanceType>()
+    val noticeTypes = LongSparseArray<NoticeType>()
+    val eventTypes = LongSparseArray<EventType>()
+    val teacherAbsenceTypes = LongSparseArray<TeacherAbsenceType>()
+
+    private var mTeamClass: Team? = null
+    var teamClass: Team?
+        get() {
+            if (mTeamClass == null)
+                mTeamClass = teamList.singleOrNull { it.type == Team.TYPE_CLASS }
+            return mTeamClass
+        }
+        set(value) {
+            mTeamClass = value
+        }
+
+    var toRemove = mutableListOf<DataRemoveModel>()
+
+    val lessonList = mutableListOf<Lesson>()
+    val lessonChangeList = mutableListOf<LessonChange>()
+    val lessonNewList = mutableListOf<pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson>()
+
+    val gradeList = mutableListOf<Grade>()
+
+    val eventList = mutableListOf<Event>()
+
+    val noticeList = mutableListOf<Notice>()
+
+    val attendanceList = mutableListOf<Attendance>()
+
+    val announcementList = mutableListOf<Announcement>()
+
+    val luckyNumberList = mutableListOf<LuckyNumber>()
+
+    val teacherAbsenceList = mutableListOf<TeacherAbsence>()
+
+    val messageList = mutableListOf<Message>()
+    val messageIgnoreList = mutableListOf<Message>()
+    val messageRecipientList = mutableListOf<MessageRecipient>()
+    val messageRecipientIgnoreList = mutableListOf<MessageRecipient>()
+
+    val metadataList = mutableListOf<Metadata>()
+    val messageMetadataList = mutableListOf<Metadata>()
+
+    val db: AppDb by lazy { app.db }
+
+    init {
+        if (App.devMode) {
+            fakeLogin = loginStore.hasLoginData("fakeLogin")
+        }
+        clear()
+        if (profile != null) {
+            endpointTimers = db.endpointTimerDao().getAllNow(profile.id).toMutableList()
+            db.teacherDao().getAllNow(profileId).toSparseArray(teacherList) { it.id }
+            db.subjectDao().getAllNow(profileId).toSparseArray(subjectList) { it.id }
+            db.teamDao().getAllNow(profileId).toSparseArray(teamList) { it.id }
+            db.lessonRangeDao().getAllNow(profileId).toSparseArray(lessonRanges) { it.lessonNumber }
+            db.gradeCategoryDao().getAllNow(profileId).toSparseArray(gradeCategories) { it.categoryId }
+        }
+    }
+
+    fun clear() {
+        loginMethods.clear()
+
+        toRemove.clear()
+        endpointTimers.clear()
+        teacherList.clear()
+        subjectList.clear()
+        teamList.clear()
+        lessonRanges.clear()
+        gradeCategories.clear()
+
+        classrooms.clear()
+        attendanceTypes.clear()
+        noticeTypes.clear()
+        eventTypes.clear()
+        teacherAbsenceTypes.clear()
+
+        lessonList.clear()
+        lessonChangeList.clear()
+        lessonNewList.clear()
+        gradeList.clear()
+        noticeList.clear()
+        attendanceList.clear()
+        announcementList.clear()
+        luckyNumberList.clear()
+        teacherAbsenceList.clear()
+        messageIgnoreList.clear()
+        messageRecipientList.clear()
+        messageRecipientIgnoreList.clear()
+        metadataList.clear()
+        messageMetadataList.clear()
+    }
+
+    open fun saveData() {
+        if (profile == null)
+            return // return on first login
+
+        profile.empty = false
+
+        db.profileDao().add(profile)
+        db.loginStoreDao().add(loginStore)
+
+        if (profile.id == app.profile?.id) {
+            app.profile.apply {
+                name = profile.name
+                subname = profile.subname
+                syncEnabled = profile.syncEnabled
+                loggedIn = profile.loggedIn
+                empty = profile.empty
+                archived = profile.archived
+                studentNameLong = profile.studentNameLong
+                studentNameShort = profile.studentNameShort
+                studentNumber = profile.studentNumber
+                studentData = profile.studentData
+                accountNameLong = profile.accountNameLong
+                yearAverageMode = profile.yearAverageMode
+                currentSemester = profile.currentSemester
+                attendancePercentage = profile.attendancePercentage
+                dateSemester1Start = profile.dateSemester1Start
+                dateSemester2Start = profile.dateSemester2Start
+                dateYearEnd = profile.dateYearEnd
+                luckyNumberEnabled = profile.luckyNumberEnabled
+                luckyNumber = profile.luckyNumber
+                luckyNumberDate = profile.luckyNumberDate
+                lastFullSync = profile.lastFullSync
+                lastReceiversSync = profile.lastReceiversSync
+            }
+        }
+        if (loginStore.id == app.profile?.loginStoreId) {
+            app.loginStore = loginStore.data
+            app.profile.loginStoreData = loginStore.data
+        }
+
+        // always present and not empty, during every sync
+        db.endpointTimerDao().addAll(endpointTimers)
+        db.teacherDao().clear(profileId)
+        db.teacherDao().addAll(teacherList.values())
+        db.subjectDao().clear(profileId)
+        db.subjectDao().addAll(subjectList.values())
+        db.teamDao().clear(profileId)
+        db.teamDao().addAll(teamList.values())
+        db.lessonRangeDao().clear(profileId)
+        db.lessonRangeDao().addAll(lessonRanges.values())
+        db.gradeCategoryDao().clear(profileId)
+        db.gradeCategoryDao().addAll(gradeCategories.values())
+
+        // may be empty - extracted from DB on demand, by an endpoint
+        if (classrooms.size > 0)
+            db.classroomDao().addAll(classrooms.values())
+        if (attendanceTypes.size > 0)
+            db.attendanceTypeDao().addAll(attendanceTypes.values())
+        if (noticeTypes.size > 0)
+            db.noticeTypeDao().addAll(noticeTypes.values())
+        if (eventTypes.size > 0)
+            db.eventTypeDao().addAll(eventTypes.values())
+        if (teacherAbsenceTypes.size > 0)
+            db.teacherAbsenceTypeDao().addAll(teacherAbsenceTypes.values())
+
+        // clear DB with DataRemoveModels added by endpoints
+        for (model in toRemove) {
+            when (model) {
+                is DataRemoveModel.Timetable -> model.commit(profileId, db.timetableDao())
+                is DataRemoveModel.Grades -> model.commit(profileId, db.gradeDao())
+                is DataRemoveModel.Events -> model.commit(profileId, db.eventDao())
+            }
+        }
+
+        if (metadataList.isNotEmpty())
+            db.metadataDao().addAllIgnore(metadataList)
+        if (messageMetadataList.isNotEmpty())
+            db.metadataDao().setSeen(messageMetadataList)
+
+        // not extracted from DB - always new data
+        if (lessonList.isNotEmpty()) {
+            db.lessonDao().clear(profile.id)
+            db.lessonDao().addAll(lessonList)
+        }
+        if (lessonChangeList.isNotEmpty())
+            db.lessonChangeDao().addAll(lessonChangeList)
+        if (lessonNewList.isNotEmpty()) {
+            db.timetableDao() += lessonNewList
+        }
+        if (gradeList.isNotEmpty()) {
+            db.gradeDao().addAll(gradeList)
+        }
+        if (eventList.isNotEmpty()) {
+            db.eventDao().addAll(eventList)
+        }
+        if (noticeList.isNotEmpty()) {
+            db.noticeDao().clear(profile.id)
+            db.noticeDao().addAll(noticeList)
+        }
+        if (attendanceList.isNotEmpty())
+            db.attendanceDao().addAll(attendanceList)
+        if (announcementList.isNotEmpty())
+            db.announcementDao().addAll(announcementList)
+        if (luckyNumberList.isNotEmpty())
+            db.luckyNumberDao().addAll(luckyNumberList)
+        if (teacherAbsenceList.isNotEmpty())
+            db.teacherAbsenceDao().addAll(teacherAbsenceList)
+
+        if (messageList.isNotEmpty())
+            db.messageDao().addAll(messageList)
+        if (messageIgnoreList.isNotEmpty())
+            db.messageDao().addAllIgnore(messageIgnoreList)
+        if (messageRecipientList.isNotEmpty())
+            db.messageRecipientDao().addAll(messageRecipientList)
+        if (messageRecipientIgnoreList.isNotEmpty())
+            db.messageRecipientDao().addAllIgnore(messageRecipientIgnoreList)
+    }
+
+    fun notifyAndSyncEvents(onSuccess: () -> Unit) {
+        if (profile == null) {
+            onSuccess()
+            return
+        }
+        try {
+            DataNotifications(this)
+            ServerSync(this) {
+                db.notificationDao().addAll(notifications)
+                onSuccess()
+            }
+        } catch (e: Exception) {
+            error(ApiError(TAG, EXCEPTION_NOTIFY_AND_SYNC)
+                    .withThrowable(e))
+        }
+    }
+
+    fun setSyncNext(endpointId: Int, syncIn: Long? = null, viewId: Int? = null, syncAt: Long? = null) {
+        EndpointTimer(profile?.id ?: -1, endpointId).apply {
+            syncedNow()
+
+            if (syncIn != null) {
+                if (syncIn < 10)
+                    nextSync = syncIn
+                else
+                    syncIn(syncIn)
+            }
+            if (syncAt != null) {
+                nextSync = syncAt
+            }
+            if (viewId != null)
+                syncWhenView(viewId)
+
+            endpointTimers.add(this)
+        }
+    }
+
+    fun cancel() {
+        d("Data", "Cancelled")
+        cancelled = true
+        saveData()
+    }
+
+    fun shouldSyncLuckyNumber(): Boolean {
+        return (db.luckyNumberDao().getNearestFutureNow(profileId, Date.getToday().value) ?: -1) == -1
+    }
+
+    fun error(tag: String, errorCode: Int, response: Response? = null, throwable: Throwable? = null, apiResponse: JsonObject? = null) {
+        val code = when (throwable) {
+            is UnknownHostException, is SSLException, is InterruptedIOException -> CODE_NO_INTERNET
+            is SocketTimeoutException -> CODE_TIMEOUT
+            else -> when (response?.code()) {
+                400, 401, 424, 500, 503, 404 -> CODE_MAINTENANCE
+                else -> errorCode
+            }
+        }
+        error(ApiError(tag, code).apply {
+            profileId = profile?.id ?: -1
+        }.withResponse(response).withThrowable(throwable).withApiResponse(apiResponse))
+    }
+
+    fun error(tag: String, errorCode: Int, response: Response? = null, apiResponse: String? = null) {
+        val code = when (null) {
+            is UnknownHostException, is SSLException, is InterruptedIOException -> CODE_NO_INTERNET
+            is SocketTimeoutException -> CODE_TIMEOUT
+            else -> when (response?.code()) {
+                400, 401, 424, 500, 503, 404 -> CODE_MAINTENANCE
+                else -> errorCode
+            }
+        }
+        error(ApiError(tag, code).apply {
+            profileId = profile?.id ?: -1
+        }.withResponse(response).withApiResponse(apiResponse))
+    }
+
+    fun error(apiError: ApiError) {
+        callback.onError(apiError)
+    }
+
+    fun progress(step: Float) {
+        callback.onProgress(step)
+    }
+
+    fun startProgress(stringRes: Int) {
+        callback.onStartProgress(stringRes)
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/DataRemoveModel.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/DataRemoveModel.kt
new file mode 100644
index 00000000..984e9292
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/DataRemoveModel.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-2.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.models
+
+import pl.szczodrzynski.edziennik.data.db.modules.events.EventDao
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeDao
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.TimetableDao
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+open class DataRemoveModel {
+    class Timetable(private val dateFrom: Date?, private val dateTo: Date?) : DataRemoveModel() {
+        companion object {
+            fun from(dateFrom: Date) = Timetable(dateFrom, null)
+            fun to(dateTo: Date) = Timetable(null, dateTo)
+            fun between(dateFrom: Date, dateTo: Date) = Timetable(dateFrom, dateTo)
+        }
+
+        fun commit(profileId: Int, dao: TimetableDao) {
+            if (dateFrom != null && dateTo != null) {
+                dao.clearBetweenDates(profileId, dateFrom, dateTo)
+            } else {
+                dateFrom?.let { dateFrom -> dao.clearFromDate(profileId, dateFrom) }
+                dateTo?.let { dateTo -> dao.clearToDate(profileId, dateTo) }
+            }
+        }
+    }
+
+    class Grades(private val all: Boolean, private val semester: Int?) : DataRemoveModel() {
+        companion object {
+            fun all() = Grades(true, null)
+            fun semester(semester: Int) = Grades(false, semester)
+        }
+
+        fun commit(profileId: Int, dao: GradeDao) {
+            if (all) {
+                dao.clear(profileId)
+            }
+            semester?.let { dao.clearForSemester(profileId, it) }
+        }
+    }
+
+    class Events(private val type: Int?, private val exceptType: Int?) : DataRemoveModel() {
+        companion object {
+            fun futureExceptType(exceptType: Int) = Events(null, exceptType)
+            fun futureWithType(type: Int) = Events(type, null)
+        }
+
+        fun commit(profileId: Int, dao: EventDao) {
+            type?.let { dao.removeFutureWithType(profileId, Date.getToday(), it) }
+            exceptType?.let { dao.removeFutureExceptType(profileId, Date.getToday(), it) }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/Feature.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/Feature.kt
new file mode 100644
index 00000000..380c34ad
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/Feature.kt
@@ -0,0 +1,33 @@
+package pl.szczodrzynski.edziennik.api.v2.models
+
+/**
+ * A Endpoint descriptor class.
+ *
+ * The API runs appropriate endpoints in order to fulfill its
+ * feature list.
+ * An endpoint may have its [LoginMethod] dependencies which will be
+ * satisfied by the API before the [endpointClass]'s constructor is invoked.
+ *
+ * @param loginType type of the e-register this endpoint handles
+ * @param featureId a feature ID
+ * @param endpointIds a [List] of [Feature]s that satisfy this feature ID
+ * @param requiredLoginMethod a required login method, which will have to be executed before this endpoint.
+ */
+data class Feature(
+        val loginType: Int,
+        val featureId: Int,
+        val endpointIds: List<Pair<Int, Int>>,
+        val requiredLoginMethods: List<Int>
+) {
+    var priority = endpointIds.size
+    fun withPriority(priority: Int): Feature {
+        this.priority = priority
+        return this
+    }
+
+    var shouldSync: ((Data) -> Boolean)? = null
+    fun withShouldSync(shouldSync: ((Data) -> Boolean)?): Feature {
+        this.shouldSync = shouldSync
+        return this
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/LoginMethod.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/LoginMethod.kt
new file mode 100644
index 00000000..95559feb
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/LoginMethod.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-9-20.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.models
+
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_NOT_NEEDED
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+
+/**
+ * A Login Method descriptor class.
+ *
+ * This is used by the API to satisfy all [Feature]s' dependencies.
+ * A login method may have its own dependencies which need to be
+ * satisfied before the [loginMethodClass]'s constructor is invoked.
+ *
+ * @param loginType type of the e-register this login method handles
+ * @param loginMethodId a unique ID of this login method
+ * @param loginMethodClass a [Class] which constructor will be invoked when a log in is needed
+ * @param requiredLoginMethod a required login method (which will be called before this). May differ depending on the [Profile] and/or [LoginStore].
+ */
+class LoginMethod(
+        val loginType: Int,
+        val loginMethodId: Int,
+        val loginMethodClass: Class<*>,
+        private var mIsPossible: ((profile: Profile?, loginStore: LoginStore) -> Boolean)? = null,
+        private var mRequiredLoginMethod: ((profile: Profile?, loginStore: LoginStore) -> Int)? = null
+) {
+
+    fun withIsPossible(isPossible: (profile: Profile?, loginStore: LoginStore) -> Boolean): LoginMethod {
+        this.mIsPossible = isPossible
+        return this
+    }
+    fun withRequiredLoginMethod(requiredLoginMethod: (profile: Profile?, loginStore: LoginStore) -> Int): LoginMethod {
+        this.mRequiredLoginMethod = requiredLoginMethod
+        return this
+    }
+
+    fun isPossible(profile: Profile?, loginStore: LoginStore): Boolean {
+        return mIsPossible?.invoke(profile, loginStore) ?: false
+    }
+    fun requiredLoginMethod(profile: Profile?, loginStore: LoginStore): Int {
+        return mRequiredLoginMethod?.invoke(profile, loginStore) ?: LOGIN_METHOD_NOT_NEEDED
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/DataTemplate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/DataTemplate.kt
new file mode 100644
index 00000000..8715d09f
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/DataTemplate.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.template
+
+import okhttp3.Cookie
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_TEMPLATE_API
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_TEMPLATE_WEB
+import pl.szczodrzynski.edziennik.api.v2.models.Data
+import pl.szczodrzynski.edziennik.currentTimeUnix
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+
+/**
+ * Use http://patorjk.com/software/taag/#p=display&f=Big for the ascii art
+ *
+ * Use https://codepen.io/kubasz/pen/RwwwbGN to easily generate the student data getters/setters
+ */
+class DataTemplate(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
+
+    fun isWebLoginValid() = webExpiryTime-30 > currentTimeUnix() && webCookie.isNotNullNorEmpty()
+    fun isApiLoginValid() = apiExpiryTime-30 > currentTimeUnix() && apiToken.isNotNullNorEmpty()
+
+    override fun satisfyLoginMethods() {
+        loginMethods.clear()
+        if (isWebLoginValid()) {
+            loginMethods += LOGIN_METHOD_TEMPLATE_WEB
+            app.cookieJar.saveFromResponse(null, listOf(
+                    Cookie.Builder()
+                            .name("AuthCookie")
+                            .value(webCookie!!)
+                            .domain("eregister.example.com")
+                            .secure().httpOnly().build()
+            ))
+        }
+        if (isApiLoginValid())
+            loginMethods += LOGIN_METHOD_TEMPLATE_API
+    }
+
+    /*   __          __  _
+         \ \        / / | |
+          \ \  /\  / /__| |__
+           \ \/  \/ / _ \ '_ \
+            \  /\  /  __/ |_) |
+             \/  \/ \___|_._*/
+    private var mWebCookie: String? = null
+    var webCookie: String?
+        get() { mWebCookie = mWebCookie ?: profile?.getStudentData("webCookie", null); return mWebCookie }
+        set(value) { profile?.putStudentData("webCookie", value) ?: return; mWebCookie = value }
+
+    private var mWebExpiryTime: Long? = null
+    var webExpiryTime: Long
+        get() { mWebExpiryTime = mWebExpiryTime ?: profile?.getStudentData("webExpiryTime", 0L); return mWebExpiryTime ?: 0L }
+        set(value) { profile?.putStudentData("webExpiryTime", value) ?: return; mWebExpiryTime = value }
+
+    /*                   _
+             /\         (_)
+            /  \   _ __  _
+           / /\ \ | '_ \| |
+          / ____ \| |_) | |
+         /_/    \_\ .__/|_|
+                  | |
+                  |*/
+    private var mApiToken: String? = null
+    var apiToken: String?
+        get() { mApiToken = mApiToken ?: profile?.getStudentData("apiToken", null); return mApiToken }
+        set(value) { profile?.putStudentData("apiToken", value) ?: return; mApiToken = value }
+
+    private var mApiExpiryTime: Long? = null
+    var apiExpiryTime: Long
+        get() { mApiExpiryTime = mApiExpiryTime ?: profile?.getStudentData("apiExpiryTime", 0L); return mApiExpiryTime ?: 0L }
+        set(value) { profile?.putStudentData("apiExpiryTime", value) ?: return; mApiExpiryTime = value }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/Template.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/Template.kt
new file mode 100644
index 00000000..508fe8f7
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/Template.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.template
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.api.v2.CODE_INTERNAL_LIBRUS_ACCOUNT_410
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikInterface
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.prepare
+import pl.szczodrzynski.edziennik.api.v2.template.data.TemplateData
+import pl.szczodrzynski.edziennik.api.v2.template.firstlogin.TemplateFirstLogin
+import pl.szczodrzynski.edziennik.api.v2.template.login.TemplateLogin
+import pl.szczodrzynski.edziennik.api.v2.templateLoginMethods
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.utils.Utils.d
+
+class Template(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
+    companion object {
+        private const val TAG = "Template"
+    }
+
+    val internalErrorList = mutableListOf<Int>()
+    val data: DataTemplate
+
+    init {
+        data = DataTemplate(app, profile, loginStore).apply {
+            callback = wrapCallback(this@Template.callback)
+            satisfyLoginMethods()
+        }
+    }
+
+    private fun completed() {
+        data.saveData()
+        data.notifyAndSyncEvents {
+            callback.onCompleted()
+        }
+    }
+
+    /*    _______ _                     _                  _ _   _
+         |__   __| |              /\   | |                (_) | | |
+            | |  | |__   ___     /  \  | | __ _  ___  _ __ _| |_| |__  _ __ ___
+            | |  | '_ \ / _ \   / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \
+            | |  | | | |  __/  / ____ \| | (_| | (_) | |  | | |_| | | | | | | | |
+            |_|  |_| |_|\___| /_/    \_\_|\__, |\___/|_|  |_|\__|_| |_|_| |_| |_|
+                                           __/ |
+                                          |__*/
+    override fun sync(featureIds: List<Int>, viewId: Int?, arguments: JsonObject?) {
+        data.arguments = arguments
+        data.prepare(templateLoginMethods, TemplateFeatures, featureIds, viewId)
+        d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}")
+        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        TemplateLogin(data) {
+            TemplateData(data) {
+                completed()
+            }
+        }
+    }
+
+    override fun getMessage(message: MessageFull) {
+
+    }
+
+    override fun markAllAnnouncementsAsRead() {
+
+    }
+
+    override fun getAttachment(messageId: Long, attachmentId: Long, attachmentName: String) {
+
+    }
+
+    override fun firstLogin() {
+        TemplateFirstLogin(data) {
+            completed()
+        }
+    }
+
+    override fun cancel() {
+        d(TAG, "Cancelled")
+        data.cancel()
+    }
+
+    private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
+        return object : EdziennikCallback {
+            override fun onCompleted() {
+                callback.onCompleted()
+            }
+
+            override fun onProgress(step: Float) {
+                callback.onProgress(step)
+            }
+
+            override fun onStartProgress(stringRes: Int) {
+                callback.onStartProgress(stringRes)
+            }
+
+            override fun onError(apiError: ApiError) {
+                when (apiError.errorCode) {
+                    in internalErrorList -> {
+                        // finish immediately if the same error occurs twice during the same sync
+                        callback.onError(apiError)
+                    }
+                    CODE_INTERNAL_LIBRUS_ACCOUNT_410 -> {
+                        internalErrorList.add(apiError.errorCode)
+                        loginStore.removeLoginData("refreshToken") // force a clean login
+                        //loginLibrus()
+                    }
+                    else -> callback.onError(apiError)
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/TemplateFeatures.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/TemplateFeatures.kt
new file mode 100644
index 00000000..b643f74d
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/TemplateFeatures.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.template
+
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.models.Feature
+
+const val ENDPOINT_TEMPLATE_WEB_SAMPLE                  = 9991
+const val ENDPOINT_TEMPLATE_WEB_SAMPLE_2                = 9992
+const val ENDPOINT_TEMPLATE_API_SAMPLE                  = 9993
+
+val TemplateFeatures = listOf(
+        Feature(LOGIN_TYPE_TEMPLATE, FEATURE_STUDENT_INFO, listOf(
+                ENDPOINT_TEMPLATE_WEB_SAMPLE to LOGIN_METHOD_TEMPLATE_WEB
+        ), listOf(LOGIN_METHOD_TEMPLATE_WEB)),
+        Feature(LOGIN_TYPE_TEMPLATE, FEATURE_SCHOOL_INFO, listOf(
+                ENDPOINT_TEMPLATE_WEB_SAMPLE_2 to LOGIN_METHOD_TEMPLATE_WEB
+        ), listOf(LOGIN_METHOD_TEMPLATE_WEB)),
+        Feature(LOGIN_TYPE_TEMPLATE, FEATURE_GRADES, listOf(
+                ENDPOINT_TEMPLATE_API_SAMPLE to LOGIN_METHOD_TEMPLATE_API
+        ), listOf(LOGIN_METHOD_TEMPLATE_API))
+)
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/TemplateApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/TemplateApi.kt
new file mode 100644
index 00000000..9021b2db
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/TemplateApi.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.template.data
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.api.v2.ERROR_TEMPLATE_WEB_OTHER
+import pl.szczodrzynski.edziennik.api.v2.GET
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.template.DataTemplate
+import pl.szczodrzynski.edziennik.currentTimeUnix
+
+open class TemplateApi(open val data: DataTemplate) {
+    companion object {
+        private const val TAG = "TemplateApi"
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    val profile
+        get() = data.profile
+
+    /**
+     * This will be used by all TemplateApi* endpoints.
+     *
+     * You can customize this method's parameters to best fit the implemented e-register.
+     * Just make sure that [tag] and [onSuccess] is present.
+     */
+    fun apiGet(tag: String, endpoint: String, method: Int = GET, payload: JsonObject? = null, onSuccess: (json: JsonObject?) -> Unit) {
+        val json = JsonObject()
+        json.addProperty("foo", "bar")
+        json.addProperty("sample", "text")
+
+        if (currentTimeUnix() % 4L == 0L) {
+            // let's set a 20% chance of error, just as a test
+            data.error(ApiError(tag, ERROR_TEMPLATE_WEB_OTHER)
+                    .withApiResponse("404 Not Found - this is the text returned by the API"))
+            return
+        }
+
+        onSuccess(json)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/TemplateData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/TemplateData.kt
new file mode 100644
index 00000000..494ea1d9
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/TemplateData.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.template.data
+
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.template.DataTemplate
+import pl.szczodrzynski.edziennik.api.v2.template.ENDPOINT_TEMPLATE_API_SAMPLE
+import pl.szczodrzynski.edziennik.api.v2.template.ENDPOINT_TEMPLATE_WEB_SAMPLE
+import pl.szczodrzynski.edziennik.api.v2.template.ENDPOINT_TEMPLATE_WEB_SAMPLE_2
+import pl.szczodrzynski.edziennik.api.v2.template.data.api.TemplateApiSample
+import pl.szczodrzynski.edziennik.api.v2.template.data.web.TemplateWebSample
+import pl.szczodrzynski.edziennik.api.v2.template.data.web.TemplateWebSample2
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class TemplateData(val data: DataTemplate, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "TemplateData"
+    }
+
+    init {
+        nextEndpoint(onSuccess)
+    }
+
+    private fun nextEndpoint(onSuccess: () -> Unit) {
+        if (data.targetEndpointIds.isEmpty()) {
+            onSuccess()
+            return
+        }
+        if (data.cancelled) {
+            onSuccess()
+            return
+        }
+        useEndpoint(data.targetEndpointIds.removeAt(0)) {
+            data.progress(data.progressStep)
+            nextEndpoint(onSuccess)
+        }
+    }
+
+    private fun useEndpoint(endpointId: Int, onSuccess: () -> Unit) {
+        Utils.d(TAG, "Using endpoint $endpointId")
+        when (endpointId) {
+            ENDPOINT_TEMPLATE_WEB_SAMPLE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_student_info)
+                TemplateWebSample(data) { onSuccess() }
+            }
+            ENDPOINT_TEMPLATE_WEB_SAMPLE_2 -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_school_info)
+                TemplateWebSample2(data) { onSuccess() }
+            }
+            ENDPOINT_TEMPLATE_API_SAMPLE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_grades)
+                TemplateApiSample(data) { onSuccess() }
+            }
+            else -> onSuccess()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/TemplateWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/TemplateWeb.kt
new file mode 100644
index 00000000..8e7f79c7
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/TemplateWeb.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.template.data
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.api.v2.ERROR_TEMPLATE_WEB_OTHER
+import pl.szczodrzynski.edziennik.api.v2.GET
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.template.DataTemplate
+import pl.szczodrzynski.edziennik.currentTimeUnix
+
+open class TemplateWeb(open val data: DataTemplate) {
+    companion object {
+        private const val TAG = "TemplateWeb"
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    val profile
+        get() = data.profile
+
+    /**
+     * This will be used by all TemplateWeb* endpoints.
+     *
+     * You can customize this method's parameters to best fit the implemented e-register.
+     * Just make sure that [tag] and [onSuccess] is present.
+     */
+    fun webGet(tag: String, endpoint: String, method: Int = GET, payload: JsonObject? = null, onSuccess: (json: JsonObject?) -> Unit) {
+        val json = JsonObject()
+        json.addProperty("foo", "bar")
+        json.addProperty("sample", "text")
+
+        if (currentTimeUnix() % 4L == 0L) {
+            // let's set a 20% chance of error, just as a test
+            data.error(ApiError(tag, ERROR_TEMPLATE_WEB_OTHER)
+                    .withApiResponse("404 Not Found - this is the text returned by the API"))
+            return
+        }
+
+        onSuccess(json)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/api/TemplateApiSample.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/api/TemplateApiSample.kt
new file mode 100644
index 00000000..470b81ef
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/api/TemplateApiSample.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.template.data.api
+
+import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.api.v2.template.DataTemplate
+import pl.szczodrzynski.edziennik.api.v2.template.ENDPOINT_TEMPLATE_API_SAMPLE
+import pl.szczodrzynski.edziennik.api.v2.template.data.TemplateApi
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+
+class TemplateApiSample(override val data: DataTemplate,
+                        val onSuccess: () -> Unit) : TemplateApi(data) {
+    companion object {
+        private const val TAG = "TemplateApiSample"
+    }
+
+    init {
+        apiGet(TAG, "/api/v3/getData.php") { json ->
+            // here you can access and update any fields of the `data` object
+
+            // ================
+            // schedule a sync:
+
+            // not sooner than two days later
+            data.setSyncNext(ENDPOINT_TEMPLATE_API_SAMPLE, 2 * DAY)
+            // in two days OR on explicit "grades" sync
+            data.setSyncNext(ENDPOINT_TEMPLATE_API_SAMPLE, 2 * DAY, MainActivity.DRAWER_ITEM_GRADES)
+            // only if sync is executed on Home view
+            data.setSyncNext(ENDPOINT_TEMPLATE_API_SAMPLE, syncIn = null, viewId = MainActivity.DRAWER_ITEM_HOME)
+            // always, in every sync
+            data.setSyncNext(ENDPOINT_TEMPLATE_API_SAMPLE, SYNC_ALWAYS)
+
+            onSuccess()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/web/TemplateWebSample.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/web/TemplateWebSample.kt
new file mode 100644
index 00000000..f015debd
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/web/TemplateWebSample.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.template.data.web
+
+import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_GRADES
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOME
+import pl.szczodrzynski.edziennik.api.v2.template.DataTemplate
+import pl.szczodrzynski.edziennik.api.v2.template.ENDPOINT_TEMPLATE_WEB_SAMPLE
+import pl.szczodrzynski.edziennik.api.v2.template.data.TemplateWeb
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+
+class TemplateWebSample(override val data: DataTemplate,
+                        val onSuccess: () -> Unit) : TemplateWeb(data) {
+    companion object {
+        private const val TAG = "TemplateWebSample"
+    }
+
+    init {
+        webGet(TAG, "/api/v3/getData.php") { json ->
+            // here you can access and update any fields of the `data` object
+
+            // ================
+            // schedule a sync:
+
+            // not sooner than two days later
+            data.setSyncNext(ENDPOINT_TEMPLATE_WEB_SAMPLE, 2 * DAY)
+            // in two days OR on explicit "grades" sync
+            data.setSyncNext(ENDPOINT_TEMPLATE_WEB_SAMPLE, 2 * DAY, DRAWER_ITEM_GRADES)
+            // only if sync is executed on Home view
+            data.setSyncNext(ENDPOINT_TEMPLATE_WEB_SAMPLE, syncIn = null, viewId = DRAWER_ITEM_HOME)
+            // always, in every sync
+            data.setSyncNext(ENDPOINT_TEMPLATE_WEB_SAMPLE, SYNC_ALWAYS)
+
+            onSuccess()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/web/TemplateWebSample2.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/web/TemplateWebSample2.kt
new file mode 100644
index 00000000..7a3cdb33
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/web/TemplateWebSample2.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.template.data.web
+
+import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.api.v2.template.DataTemplate
+import pl.szczodrzynski.edziennik.api.v2.template.ENDPOINT_TEMPLATE_WEB_SAMPLE_2
+import pl.szczodrzynski.edziennik.api.v2.template.data.TemplateWeb
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+
+class TemplateWebSample2(override val data: DataTemplate,
+                         val onSuccess: () -> Unit) : TemplateWeb(data) {
+    companion object {
+        private const val TAG = "TemplateWebSample2"
+    }
+
+    init {
+        webGet(TAG, "/api/v3/getData.php") { json ->
+            // here you can access and update any fields of the `data` object
+
+            // ================
+            // schedule a sync:
+
+            // not sooner than two days later
+            data.setSyncNext(ENDPOINT_TEMPLATE_WEB_SAMPLE_2, 2 * DAY)
+            // in two days OR on explicit "grades" sync
+            data.setSyncNext(ENDPOINT_TEMPLATE_WEB_SAMPLE_2, 2 * DAY, MainActivity.DRAWER_ITEM_GRADES)
+            // only if sync is executed on Home view
+            data.setSyncNext(ENDPOINT_TEMPLATE_WEB_SAMPLE_2, syncIn = null, viewId = MainActivity.DRAWER_ITEM_HOME)
+            // always, in every sync
+            data.setSyncNext(ENDPOINT_TEMPLATE_WEB_SAMPLE_2, SYNC_ALWAYS)
+
+            onSuccess()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/firstlogin/TemplateFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/firstlogin/TemplateFirstLogin.kt
new file mode 100644
index 00000000..f9430721
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/firstlogin/TemplateFirstLogin.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-27. 
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.template.firstlogin
+
+import pl.szczodrzynski.edziennik.api.v2.template.DataTemplate
+import pl.szczodrzynski.edziennik.api.v2.template.data.TemplateApi
+import pl.szczodrzynski.edziennik.api.v2.template.data.TemplateWeb
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+
+class TemplateFirstLogin(val data: DataTemplate, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "TemplateFirstLogin"
+    }
+
+    private val web = TemplateWeb(data)
+    private val api = TemplateApi(data)
+    private val profileList = mutableListOf<Profile>()
+
+    init {
+        /*TemplateLoginWeb(data) {
+            web.webGet(TAG, "get all accounts") { text ->
+                //val accounts = json.getJsonArray("accounts")
+
+                EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore))
+                onSuccess()
+            }
+        }*/
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/login/TemplateLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/login/TemplateLogin.kt
new file mode 100644
index 00000000..82937c4a
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/login/TemplateLogin.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.template.login
+
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_TEMPLATE_API
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_TEMPLATE_WEB
+import pl.szczodrzynski.edziennik.api.v2.template.DataTemplate
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class TemplateLogin(val data: DataTemplate, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "TemplateLogin"
+    }
+
+    private var cancelled = false
+
+    init {
+        nextLoginMethod(onSuccess)
+    }
+
+    private fun nextLoginMethod(onSuccess: () -> Unit) {
+        if (data.targetLoginMethodIds.isEmpty()) {
+            onSuccess()
+            return
+        }
+        if (cancelled) {
+            onSuccess()
+            return
+        }
+        useLoginMethod(data.targetLoginMethodIds.removeAt(0)) { usedMethodId ->
+            data.progress(data.progressStep)
+            if (usedMethodId != -1)
+                data.loginMethods.add(usedMethodId)
+            nextLoginMethod(onSuccess)
+        }
+    }
+
+    private fun useLoginMethod(loginMethodId: Int, onSuccess: (usedMethodId: Int) -> Unit) {
+        // this should never be true
+        if (data.loginMethods.contains(loginMethodId)) {
+            onSuccess(-1)
+            return
+        }
+        Utils.d(TAG, "Using login method $loginMethodId")
+        when (loginMethodId) {
+            LOGIN_METHOD_TEMPLATE_WEB -> {
+                data.startProgress(R.string.edziennik_progress_login_template_web)
+                TemplateLoginWeb(data) { onSuccess(loginMethodId) }
+            }
+            LOGIN_METHOD_TEMPLATE_API -> {
+                data.startProgress(R.string.edziennik_progress_login_template_api)
+                TemplateLoginApi(data) { onSuccess(loginMethodId) }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/login/TemplateLoginApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/login/TemplateLoginApi.kt
new file mode 100644
index 00000000..ab044e5f
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/login/TemplateLoginApi.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.template.login
+
+import pl.szczodrzynski.edziennik.HOUR
+import pl.szczodrzynski.edziennik.api.v2.ERROR_LOGIN_DATA_MISSING
+import pl.szczodrzynski.edziennik.api.v2.ERROR_PROFILE_MISSING
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.template.DataTemplate
+import pl.szczodrzynski.edziennik.currentTimeUnix
+
+class TemplateLoginApi(val data: DataTemplate, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "TemplateLoginApi"
+    }
+
+    init { run {
+        if (data.profile == null) {
+            data.error(ApiError(TAG, ERROR_PROFILE_MISSING))
+            return@run
+        }
+
+        if (data.isApiLoginValid()) {
+            onSuccess()
+        }
+        else {
+            if (/*data.webLogin != null && data.webPassword != null && */true) {
+                loginWithCredentials()
+            }
+            else {
+                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            }
+        }
+    }}
+
+    fun loginWithCredentials() {
+        // succeed immediately
+
+        data.apiToken = "ThisIsAVeryLongToken"
+        data.apiExpiryTime = currentTimeUnix() + 24 * HOUR
+        onSuccess()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/login/TemplateLoginWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/login/TemplateLoginWeb.kt
new file mode 100644
index 00000000..1ab34895
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/login/TemplateLoginWeb.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.template.login
+
+import okhttp3.Cookie
+import pl.szczodrzynski.edziennik.api.v2.ERROR_LOGIN_DATA_MISSING
+import pl.szczodrzynski.edziennik.api.v2.ERROR_PROFILE_MISSING
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.template.DataTemplate
+import pl.szczodrzynski.edziennik.currentTimeUnix
+
+class TemplateLoginWeb(val data: DataTemplate, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "TemplateLoginWeb"
+    }
+
+    init { run {
+        if (data.profile == null) {
+            data.error(ApiError(TAG, ERROR_PROFILE_MISSING))
+            return@run
+        }
+
+        if (data.isWebLoginValid()) {
+            data.app.cookieJar.saveFromResponse(null, listOf(
+                    Cookie.Builder()
+                            .name("AuthCookie")
+                            .value(data.webCookie!!)
+                            .domain("eregister.example.com")
+                            .secure().httpOnly().build()
+            ))
+            onSuccess()
+        }
+        else {
+            data.app.cookieJar.clearForDomain("eregister.example.com")
+            if (/*data.webLogin != null && data.webPassword != null && */true) {
+                loginWithCredentials()
+            }
+            else {
+                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            }
+        }
+    }}
+
+    fun loginWithCredentials() {
+        // succeed immediately
+
+        data.webCookie = "ThisIsACookie"
+        data.webExpiryTime = currentTimeUnix() + 45 * 60 /* 45min */
+        onSuccess()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/DataVulcan.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/DataVulcan.kt
new file mode 100644
index 00000000..b2ac7669
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/DataVulcan.kt
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-6.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan
+
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_VULCAN_API
+import pl.szczodrzynski.edziennik.api.v2.models.Data
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+
+class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
+
+    fun isApiLoginValid() = /*apiCertificateExpiryTime-30 > currentTimeUnix()
+            &&*/ apiCertificateKey.isNotNullNorEmpty()
+            && apiCertificatePrivate.isNotNullNorEmpty()
+            && symbol.isNotNullNorEmpty()
+
+    override fun satisfyLoginMethods() {
+        loginMethods.clear()
+        if (isApiLoginValid()) {
+            loginMethods += LOGIN_METHOD_VULCAN_API
+        }
+    }
+
+    /**
+     * A UONET+ client symbol.
+     *
+     * Present in the URL: https://uonetplus-uczen.vulcan.net.pl/[symbol]/[schoolSymbol]/
+     *
+     * e.g. "poznan"
+     */
+    private var mSymbol: String? = null
+    var symbol: String?
+        get() { mSymbol = mSymbol ?: loginStore.getLoginData("deviceSymbol", null); return mSymbol }
+        set(value) { loginStore.putLoginData("deviceSymbol", value); mSymbol = value }
+
+    /**
+     * Group symbol/number of the student's school.
+     *
+     * Present in the URL: https://uonetplus-uczen.vulcan.net.pl/[symbol]/[schoolSymbol]/
+     *
+     * ListaUczniow/JednostkaSprawozdawczaSymbol, e.g. "000088"
+     */
+    private var mSchoolSymbol: String? = null
+    var schoolSymbol: String?
+        get() { mSchoolSymbol = mSchoolSymbol ?: profile?.getStudentData("schoolSymbol", null); return mSchoolSymbol }
+        set(value) { profile?.putStudentData("schoolSymbol", value) ?: return; mSchoolSymbol = value }
+
+    /**
+     * A school ID consisting of the [symbol] and [schoolSymbol].
+     *
+     * [symbol]_[schoolSymbol]
+     *
+     * e.g. "poznan_000088"
+     */
+    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 }
+
+    /**
+     * ID of the student.
+     *
+     * ListaUczniow/Id, e.g. 42632
+     */
+    private var mStudentId: Int? = null
+    var studentId: Int
+        get() { mStudentId = mStudentId ?: profile?.getStudentData("studentId", 0); return mStudentId ?: 0 }
+        set(value) { profile?.putStudentData("studentId", value) ?: return; mStudentId = value }
+
+    /**
+     * ID of the student's account.
+     *
+     * ListaUczniow/UzytkownikLoginId, e.g. 1709
+     */
+    private var mStudentLoginId: Int? = null
+    var studentLoginId: Int
+        get() { mStudentLoginId = mStudentLoginId ?: profile?.getStudentData("studentLoginId", 0); return mStudentLoginId ?: 0 }
+        set(value) { profile?.putStudentData("studentLoginId", value) ?: return; mStudentLoginId = value }
+
+    /**
+     * ID of the student's class.
+     *
+     * ListaUczniow/IdOddzial, e.g. 35
+     */
+    private var mStudentClassId: Int? = null
+    var studentClassId: Int
+        get() { mStudentClassId = mStudentClassId ?: profile?.getStudentData("studentClassId", 0); return mStudentClassId ?: 0 }
+        set(value) { profile?.putStudentData("studentClassId", value) ?: return; mStudentClassId = value }
+
+    /**
+     * ListaUczniow/IdOkresKlasyfikacyjny, e.g. 321
+     */
+    private var mStudentSemesterId: Int? = null
+    var studentSemesterId: Int
+        get() { mStudentSemesterId = mStudentSemesterId ?: profile?.getStudentData("studentSemesterId", 0); return mStudentSemesterId ?: 0 }
+        set(value) { profile?.putStudentData("studentSemesterId", value) ?: return; mStudentSemesterId = value }
+
+    /**
+     * ListaUczniow/OkresNumer, e.g. 1 or 2
+     */
+    private var mStudentSemesterNumber: Int? = null
+    var studentSemesterNumber: Int
+        get() { mStudentSemesterNumber = mStudentSemesterNumber ?: profile?.getStudentData("studentSemesterNumber", 0); return mStudentSemesterNumber ?: 0 }
+        set(value) { profile?.putStudentData("studentSemesterNumber", value) ?: return; mStudentSemesterNumber = value }
+
+    /*             _____ _____        ____
+             /\   |  __ \_   _|      |___ \
+            /  \  | |__) || |   __   ____) |
+           / /\ \ |  ___/ | |   \ \ / /__ <
+          / ____ \| |    _| |_   \ V /___) |
+         /_/    \_\_|   |_____|   \_/|___*/
+    /**
+     * A mobile API registration token.
+     *
+     * After first login only 3 first characters are stored here.
+     * This is later used to determine the API URL address.
+     */
+    private var mApiToken: String? = null
+    var apiToken: String?
+        get() { mApiToken = mApiToken ?: loginStore.getLoginData("deviceToken", null); return mApiToken }
+        set(value) { loginStore.putLoginData("deviceToken", value); mApiToken = value }
+
+    /**
+     * A mobile API registration PIN.
+     *
+     * After first login, this is removed and/or set to null.
+     */
+    private var mApiPin: String? = null
+    var apiPin: String?
+        get() { mApiPin = mApiPin ?: loginStore.getLoginData("devicePin", null); return mApiPin }
+        set(value) { loginStore.putLoginData("devicePin", value); mApiPin = value }
+
+    private var mApiCertificateKey: String? = null
+    var apiCertificateKey: String?
+        get() { mApiCertificateKey = mApiCertificateKey ?: loginStore.getLoginData("certificateKey", null); return mApiCertificateKey }
+        set(value) { loginStore.putLoginData("certificateKey", value); mApiCertificateKey = value }
+
+    private var mApiCertificatePfx: String? = null
+    var apiCertificatePfx: String?
+        get() { mApiCertificatePfx = mApiCertificatePfx ?: loginStore.getLoginData("certificatePfx", null); return mApiCertificatePfx }
+        set(value) { loginStore.putLoginData("certificatePfx", value); mApiCertificatePfx = value }
+
+    private var mApiCertificatePrivate: String? = null
+    var apiCertificatePrivate: String?
+        get() { mApiCertificatePrivate = mApiCertificatePrivate ?: loginStore.getLoginData("certificatePrivate", null); return mApiCertificatePrivate }
+        set(value) { loginStore.putLoginData("certificatePrivate", value); mApiCertificatePrivate = value }
+
+    private var mApiCertificateExpiryTime: Int? = null
+    var apiCertificateExpiryTime: Int
+        get() { mApiCertificateExpiryTime = mApiCertificateExpiryTime ?: loginStore.getLoginData("certificateExpiryTime", 0); return mApiCertificateExpiryTime ?: 0 }
+        set(value) { loginStore.putLoginData("certificateExpiryTime", value); mApiCertificateExpiryTime = value }
+
+    val apiUrl: String?
+        get() {
+            val url = when (apiToken?.substring(0, 3)) {
+                "3S1" -> "https://lekcjaplus.vulcan.net.pl"
+                "TA1" -> "https://uonetplus-komunikacja.umt.tarnow.pl"
+                "OP1" -> "https://uonetplus-komunikacja.eszkola.opolskie.pl"
+                "RZ1" -> "https://uonetplus-komunikacja.resman.pl"
+                "GD1" -> "https://uonetplus-komunikacja.edu.gdansk.pl"
+                "KA1" -> "https://uonetplus-komunikacja.mcuw.katowice.eu"
+                "KA2" -> "https://uonetplus-komunikacja-test.mcuw.katowice.eu"
+                "LU1" -> "https://uonetplus-komunikacja.edu.lublin.eu"
+                "LU2" -> "https://test-uonetplus-komunikacja.edu.lublin.eu"
+                "P03" -> "https://efeb-komunikacja-pro-efebmobile.pro.vulcan.pl"
+                "P01" -> "http://efeb-komunikacja.pro-hudson.win.vulcan.pl"
+                "P02" -> "http://efeb-komunikacja.pro-hudsonrc.win.vulcan.pl"
+                "P90" -> "http://efeb-komunikacja-pro-mwujakowska.neo.win.vulcan.pl"
+                "FK1", "FS1" -> "http://api.fakelog.cf"
+                "SZ9" -> "http://vulcan.szkolny.eu"
+                else -> null
+            }
+            return if (url != null) "$url/$symbol" else loginStore.getLoginData("apiUrl", null)
+        }
+
+    val fullApiUrl: String?
+        get() {
+            return "$apiUrl/$schoolSymbol"
+        }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/Vulcan.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/Vulcan.kt
new file mode 100644
index 00000000..36efeda8
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/Vulcan.kt
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-6. 
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.api.v2.CODE_INTERNAL_LIBRUS_ACCOUNT_410
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
+import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikInterface
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.prepare
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanData
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.api.VulcanApiMessagesChangeStatus
+import pl.szczodrzynski.edziennik.api.v2.vulcan.firstlogin.VulcanFirstLogin
+import pl.szczodrzynski.edziennik.api.v2.vulcan.login.VulcanLogin
+import pl.szczodrzynski.edziennik.api.v2.vulcan.login.VulcanLoginApi
+import pl.szczodrzynski.edziennik.api.v2.vulcanLoginMethods
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.utils.Utils.d
+
+class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
+    companion object {
+        private const val TAG = "Vulcan"
+    }
+
+    val internalErrorList = mutableListOf<Int>()
+    val data: DataVulcan
+
+    init {
+        data = DataVulcan(app, profile, loginStore).apply {
+            callback = wrapCallback(this@Vulcan.callback)
+            satisfyLoginMethods()
+        }
+    }
+
+    private fun completed() {
+        data.saveData()
+        data.notifyAndSyncEvents {
+            callback.onCompleted()
+        }
+    }
+
+    /*    _______ _                     _                  _ _   _
+         |__   __| |              /\   | |                (_) | | |
+            | |  | |__   ___     /  \  | | __ _  ___  _ __ _| |_| |__  _ __ ___
+            | |  | '_ \ / _ \   / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \
+            | |  | | | |  __/  / ____ \| | (_| | (_) | |  | | |_| | | | | | | | |
+            |_|  |_| |_|\___| /_/    \_\_|\__, |\___/|_|  |_|\__|_| |_|_| |_| |_|
+                                           __/ |
+                                          |__*/
+    override fun sync(featureIds: List<Int>, viewId: Int?, arguments: JsonObject?) {
+        data.arguments = arguments
+        data.prepare(vulcanLoginMethods, VulcanFeatures, featureIds, viewId)
+        d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}")
+        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        VulcanLogin(data) {
+            VulcanData(data) {
+                completed()
+            }
+        }
+    }
+
+    override fun getMessage(message: MessageFull) {
+        VulcanLoginApi(data) {
+            VulcanApiMessagesChangeStatus(data, message) {
+                completed()
+            }
+        }
+    }
+
+    override fun markAllAnnouncementsAsRead() {
+
+    }
+
+    override fun getAttachment(messageId: Long, attachmentId: Long, attachmentName: String) {
+        
+    }
+
+    override fun firstLogin() {
+        VulcanFirstLogin(data) {
+            completed()
+        }
+    }
+
+    override fun cancel() {
+        d(TAG, "Cancelled")
+        data.cancel()
+    }
+
+    private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
+        return object : EdziennikCallback {
+            override fun onCompleted() {
+                callback.onCompleted()
+            }
+
+            override fun onProgress(step: Float) {
+                callback.onProgress(step)
+            }
+
+            override fun onStartProgress(stringRes: Int) {
+                callback.onStartProgress(stringRes)
+            }
+
+            override fun onError(apiError: ApiError) {
+                when (apiError.errorCode) {
+                    in internalErrorList -> {
+                        // finish immediately if the same error occurs twice during the same sync
+                        callback.onError(apiError)
+                    }
+                    CODE_INTERNAL_LIBRUS_ACCOUNT_410 -> {
+                        internalErrorList.add(apiError.errorCode)
+                        loginStore.removeLoginData("refreshToken") // force a clean login
+                        //loginLibrus()
+                    }
+                    else -> callback.onError(apiError)
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/VulcanFeatures.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/VulcanFeatures.kt
new file mode 100644
index 00000000..e039609d
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/VulcanFeatures.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-6. 
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan
+
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.models.Feature
+
+const val ENDPOINT_VULCAN_API_STUDENT_LIST        = 1000
+const val ENDPOINT_VULCAN_API_DICTIONARIES        = 1010
+const val ENDPOINT_VULCAN_API_TIMETABLE           = 1020
+const val ENDPOINT_VULCAN_API_EVENTS = 1030
+const val ENDPOINT_VULCAN_API_GRADES              = 1040
+const val ENDPOINT_VULCAN_API_GRADES_SUMMARY      = 1050
+const val ENDPOINT_VULCAN_API_HOMEWORK            = 1060
+const val ENDPOINT_VULCAN_API_NOTICES             = 1070
+const val ENDPOINT_VULCAN_API_ATTENDANCE          = 1080
+const val ENDPOINT_VULCAN_API_MESSAGES_INBOX      = 1090
+const val ENDPOINT_VULCAN_API_MESSAGES_SENT       = 1100
+
+val VulcanFeatures = listOf(
+        // timetable
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_TIMETABLE, listOf(
+                ENDPOINT_VULCAN_API_TIMETABLE to LOGIN_METHOD_VULCAN_API
+        ), listOf(LOGIN_METHOD_VULCAN_API)),
+        // agenda
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_AGENDA, listOf(
+                ENDPOINT_VULCAN_API_EVENTS to LOGIN_METHOD_VULCAN_API
+        ), listOf(LOGIN_METHOD_VULCAN_API)),
+        // grades
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_GRADES, listOf(
+                ENDPOINT_VULCAN_API_GRADES to LOGIN_METHOD_VULCAN_API,
+                ENDPOINT_VULCAN_API_GRADES_SUMMARY to LOGIN_METHOD_VULCAN_API
+        ), listOf(LOGIN_METHOD_VULCAN_API)),
+        // homework
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_HOMEWORK, listOf(
+                ENDPOINT_VULCAN_API_HOMEWORK to LOGIN_METHOD_VULCAN_API
+        ), listOf(LOGIN_METHOD_VULCAN_API)),
+        // behaviour
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_BEHAVIOUR, listOf(
+                ENDPOINT_VULCAN_API_NOTICES to LOGIN_METHOD_VULCAN_API
+        ), listOf(LOGIN_METHOD_VULCAN_API)),
+        // attendance
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_ATTENDANCE, listOf(
+                ENDPOINT_VULCAN_API_ATTENDANCE to LOGIN_METHOD_VULCAN_API
+        ), listOf(LOGIN_METHOD_VULCAN_API)),
+        // messages
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_MESSAGES_INBOX, listOf(
+                ENDPOINT_VULCAN_API_MESSAGES_INBOX to LOGIN_METHOD_VULCAN_API
+        ), listOf(LOGIN_METHOD_VULCAN_API)),
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_MESSAGES_SENT, listOf(
+                ENDPOINT_VULCAN_API_MESSAGES_SENT to LOGIN_METHOD_VULCAN_API
+        ), listOf(LOGIN_METHOD_VULCAN_API)),
+
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_ALWAYS_NEEDED, listOf(
+                ENDPOINT_VULCAN_API_STUDENT_LIST to LOGIN_METHOD_VULCAN_API,
+                ENDPOINT_VULCAN_API_DICTIONARIES to LOGIN_METHOD_VULCAN_API
+        ), listOf(LOGIN_METHOD_VULCAN_API))
+        /*Feature(LOGIN_TYPE_VULCAN, FEATURE_STUDENT_INFO, listOf(
+                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
+        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_STUDENT_NUMBER, listOf(
+                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
+        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_SCHOOL_INFO, listOf(
+                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
+        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_CLASS_INFO, listOf(
+                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
+        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_TEAM_INFO, listOf(
+                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
+        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_TEACHERS, listOf(
+                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
+        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_SUBJECTS, listOf(
+                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
+        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_CLASSROOMS, listOf(
+                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
+        ), listOf(LOGIN_METHOD_VULCAN_WEB)),*/
+
+)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/VulcanApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/VulcanApi.kt
new file mode 100644
index 00000000..0345c0a0
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/VulcanApi.kt
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-19
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.data
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.JsonCallbackHandler
+import io.github.wulkanowy.signer.android.signContent
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
+import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import java.net.HttpURLConnection
+import java.util.*
+
+open class VulcanApi(open val data: DataVulcan) {
+    companion object {
+        const val TAG = "VulcanApi"
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    fun apiGet(
+            tag: String,
+            endpoint: String,
+            method: Int = POST,
+            parameters: Map<String, Any> = emptyMap(),
+            baseUrl: Boolean = false,
+            onSuccess: (json: JsonObject, response: Response?) -> Unit
+    ) {
+        val url = "${if (baseUrl) data.apiUrl else data.fullApiUrl}/$endpoint"
+
+        d(tag, "Request: Vulcan/Api - $url")
+
+        if (data.teamList.size() == 0) {
+            data.profile?.studentClassName?.also { name ->
+                val id = Utils.crc16(name.toByteArray()).toLong()
+
+                val teamObject = Team(
+                        profileId,
+                        id,
+                        name,
+                        Team.TYPE_CLASS,
+                        "${data.schoolName}:$name",
+                        -1
+                )
+                data.teamList.put(id, teamObject)
+            }
+        }
+
+        val finalPayload = JsonObject()
+        parameters.map { (name, value) ->
+            when (value) {
+                is JsonObject -> finalPayload.add(name, value)
+                is JsonArray -> finalPayload.add(name, value)
+                is String -> finalPayload.addProperty(name, value)
+                is Int -> finalPayload.addProperty(name, value)
+                is Long -> finalPayload.addProperty(name, value)
+                is Float -> finalPayload.addProperty(name, value)
+                is Char -> finalPayload.addProperty(name, value)
+            }
+        }
+        finalPayload.addProperty("RemoteMobileTimeKey", System.currentTimeMillis() / 1000)
+        finalPayload.addProperty("TimeKey", System.currentTimeMillis() / 1000 - 1)
+        finalPayload.addProperty("RequestId", UUID.randomUUID().toString())
+        finalPayload.addProperty("RemoteMobileAppVersion", VULCAN_API_APP_VERSION)
+        finalPayload.addProperty("RemoteMobileAppName", VULCAN_API_APP_NAME)
+
+        val callback = object : JsonCallbackHandler() {
+            override fun onSuccess(json: JsonObject?, response: Response?) {
+                if (json == null && response?.parserErrorBody == null) {
+                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                if (response?.code() ?: 200 != 200) {
+                    when (response?.code()) {
+                        503 -> ERROR_VULCAN_API_MAINTENANCE
+                        400 -> ERROR_VULCAN_API_BAD_REQUEST
+                        else -> ERROR_VULCAN_API_OTHER
+                    }.let { errorCode ->
+                        data.error(ApiError(tag, errorCode)
+                                .withResponse(response)
+                                .withApiResponse(json?.toString() ?: response?.parserErrorBody))
+                        return
+                    }
+                }
+
+                if (json == null) {
+                    data.error(ApiError(tag, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                try {
+                    onSuccess(json, response)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_VULCAN_API_REQUEST)
+                            .withResponse(response)
+                            .withThrowable(e)
+                            .withApiResponse(json))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url(url)
+                .userAgent(VULCAN_API_USER_AGENT)
+                .addHeader("RequestCertificateKey", data.apiCertificateKey)
+                .addHeader("RequestSignatureValue",
+                        try {
+                            signContent(
+                                    data.apiCertificatePrivate ?: "",
+                                    finalPayload.toString()
+                            )
+                        } catch (e: Exception) {e.printStackTrace();""})
+                .apply {
+                    when (method) {
+                        GET -> get()
+                        POST -> post()
+                    }
+                }
+                .setJsonBody(finalPayload)
+                .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST)
+                .allowErrorCode(HttpURLConnection.HTTP_FORBIDDEN)
+                .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED)
+                .allowErrorCode(HttpURLConnection.HTTP_UNAVAILABLE)
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/VulcanData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/VulcanData.kt
new file mode 100644
index 00000000..66936a65
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/VulcanData.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-6.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.data
+
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.vulcan.*
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.api.*
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "VulcanData"
+    }
+
+    init {
+        nextEndpoint(onSuccess)
+    }
+
+    private fun nextEndpoint(onSuccess: () -> Unit) {
+        if (data.targetEndpointIds.isEmpty()) {
+            onSuccess()
+            return
+        }
+        if (data.cancelled) {
+            onSuccess()
+            return
+        }
+        useEndpoint(data.targetEndpointIds.removeAt(0)) {
+            data.progress(data.progressStep)
+            nextEndpoint(onSuccess)
+        }
+    }
+
+    private fun useEndpoint(endpointId: Int, onSuccess: () -> Unit) {
+        Utils.d(TAG, "Using endpoint $endpointId")
+        when (endpointId) {
+            ENDPOINT_VULCAN_API_DICTIONARIES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_dictionaries)
+                VulcanApiDictionaries(data, onSuccess)
+            }
+            ENDPOINT_VULCAN_API_GRADES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_grades)
+                VulcanApiGrades(data, onSuccess)
+            }
+            ENDPOINT_VULCAN_API_GRADES_SUMMARY -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades)
+                VulcanApiProposedGrades(data, onSuccess)
+            }
+            ENDPOINT_VULCAN_API_EVENTS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_events)
+                VulcanApiEvents(data, isHomework = false, onSuccess = onSuccess)
+            }
+            ENDPOINT_VULCAN_API_HOMEWORK -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_homework)
+                VulcanApiEvents(data, isHomework = true, onSuccess = onSuccess)
+            }
+            ENDPOINT_VULCAN_API_NOTICES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_notices)
+                VulcanApiNotices(data, onSuccess)
+            }
+            ENDPOINT_VULCAN_API_ATTENDANCE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_attendance)
+                VulcanApiAttendance(data, onSuccess)
+            }
+            ENDPOINT_VULCAN_API_TIMETABLE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_timetable)
+                VulcanApiTimetable(data, onSuccess)
+            }
+            ENDPOINT_VULCAN_API_MESSAGES_INBOX -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
+                VulcanApiMessagesInbox(data, onSuccess)
+            }
+            ENDPOINT_VULCAN_API_MESSAGES_SENT -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
+                VulcanApiMessagesSent(data, onSuccess)
+            }
+            else -> onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiAttendance.kt
new file mode 100644
index 00000000..174eed18
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiAttendance.kt
@@ -0,0 +1,78 @@
+package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
+
+import androidx.core.util.isEmpty
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_ATTENDANCE
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.api.v2.vulcan.ENDPOINT_VULCAN_API_ATTENDANCE
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
+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.TYPE_PRESENT
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class VulcanApiAttendance(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
+    companion object {
+        const val TAG = "VulcanApiAttendance"
+    }
+
+    init { data.profile?.also { profile ->
+        if (data.attendanceTypes.isEmpty()) {
+            data.db.attendanceTypeDao().getAllNow(profileId).toSparseArray(data.attendanceTypes) { it.id }
+        }
+
+        val startDate: String = profile.getSemesterStart(profile.currentSemester).stringY_m_d
+        val endDate: String = profile.getSemesterEnd(profile.currentSemester).stringY_m_d
+
+        apiGet(TAG, VULCAN_API_ENDPOINT_ATTENDANCE, parameters = mapOf(
+                "DataPoczatkowa" to startDate,
+                "DataKoncowa" to endDate,
+                "IdOddzial" to data.studentClassId,
+                "IdUczen" to data.studentId,
+                "IdOkresKlasyfikacyjny" to data.studentSemesterId
+        )) { json, _ ->
+            json.getJsonObject("Data")?.getJsonArray("Frekwencje")?.forEach { attendanceEl ->
+                val attendance = attendanceEl.asJsonObject
+
+                val attendanceCategory = data.attendanceTypes.get(attendance.getLong("IdKategoria") ?: return@forEach)
+                        ?: return@forEach
+
+                val type = attendanceCategory.type
+
+                val id = (attendance.getInt("Dzien") ?: 0) + (attendance.getInt("Numer") ?: 0)
+
+                val lessonDateMillis = Date.fromY_m_d(attendance.getString("DzienTekst")).inMillis
+                val lessonDate = Date.fromMillis(lessonDateMillis)
+
+                val lessonSemester = profile.dateToSemester(lessonDate)
+
+                val attendanceObject = Attendance(
+                        profileId,
+                        id.toLong(),
+                        -1,
+                        attendance.getLong("IdPrzedmiot") ?: -1,
+                        lessonSemester,
+                        attendance.getString("PrzedmiotNazwa") + attendanceCategory.name.let { " - $it" },
+                        lessonDate,
+                        data.lessonRanges.get(attendance.getInt("Numer") ?: 0)?.startTime,
+                        type)
+
+                data.attendanceList.add(attendanceObject)
+                if (attendanceObject.type != TYPE_PRESENT) {
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_ATTENDANCE,
+                            attendanceObject.id,
+                            profile.empty,
+                            profile.empty,
+                            attendanceObject.lessonDate.combineWith(attendanceObject.startTime)
+                    ))
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_API_ATTENDANCE, SYNC_ALWAYS)
+            onSuccess()
+        }
+    } ?: onSuccess()}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiDictionaries.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiDictionaries.kt
new file mode 100644
index 00000000..376a13b1
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiDictionaries.kt
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-20
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_DICTIONARIES
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.api.v2.vulcan.ENDPOINT_VULCAN_API_DICTIONARIES
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceType
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange
+import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeType
+import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class VulcanApiDictionaries(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
+    companion object {
+        const val TAG = "VulcanApiDictionaries"
+    }
+
+    init {
+        apiGet(TAG, VULCAN_API_ENDPOINT_DICTIONARIES) { json, _ ->
+            val elements = json.getJsonObject("Data")
+
+            elements?.getJsonArray("Pracownicy")?.forEach { saveTeacher(it.asJsonObject) }
+            elements?.getJsonArray("Przedmioty")?.forEach { saveSubject(it.asJsonObject) }
+            elements?.getJsonArray("PoryLekcji")?.forEach { saveLessonRange(it.asJsonObject) }
+            elements?.getJsonArray("KategorieOcen")?.forEach { saveGradeCategory(it.asJsonObject) }
+            elements?.getJsonArray("KategorieUwag")?.forEach { saveNoticeType(it.asJsonObject) }
+            elements?.getJsonArray("KategorieFrekwencji")?.forEach { saveAttendanceType(it.asJsonObject) }
+
+            data.setSyncNext(ENDPOINT_VULCAN_API_DICTIONARIES, 4 * DAY)
+            onSuccess()
+        }
+    }
+
+    private fun saveTeacher(teacher: JsonObject) {
+        val id = teacher.getLong("Id") ?: return
+        val name = teacher.getString("Imie") ?: ""
+        val surname = teacher.getString("Nazwisko") ?: ""
+        val loginId = teacher.getString("LoginId") ?: "-1"
+
+        val teacherObject = Teacher(
+                profileId,
+                id,
+                name,
+                surname,
+                loginId
+        )
+
+        data.teacherList.put(id, teacherObject)
+    }
+
+    private fun saveSubject(subject: JsonObject) {
+        val id = subject.getLong("Id") ?: return
+        val longName = subject.getString("Nazwa") ?: ""
+        val shortName = subject.getString("Kod") ?: ""
+
+        val subjectObject = Subject(
+                profileId,
+                id,
+                longName,
+                shortName
+        )
+
+        data.subjectList.put(id, subjectObject)
+    }
+
+    private fun saveLessonRange(lessonRange: JsonObject) {
+        val lessonNumber = lessonRange.getInt("Numer") ?: return
+        val startTime = lessonRange.getString("PoczatekTekst")?.let { Time.fromH_m(it) } ?: return
+        val endTime = lessonRange.getString("KoniecTekst")?.let { Time.fromH_m(it) } ?: return
+
+        val lessonRangeObject = LessonRange(
+                profileId,
+                lessonNumber,
+                startTime,
+                endTime
+        )
+
+        data.lessonRanges.put(lessonNumber, lessonRangeObject)
+    }
+
+    private fun saveGradeCategory(gradeCategory: JsonObject) {
+        val id = gradeCategory.getLong("Id") ?: return
+        val name = gradeCategory.getString("Nazwa") ?: ""
+
+        val gradeCategoryObject = GradeCategory(
+                profileId,
+                id,
+                0.0f,
+                -1,
+                name
+        )
+
+        data.gradeCategories.put(id, gradeCategoryObject)
+    }
+
+    private fun saveNoticeType(noticeType: JsonObject) {
+        val id = noticeType.getLong("Id") ?: return
+        val name = noticeType.getString("Nazwa") ?: ""
+
+        val noticeTypeObject = NoticeType(
+                profileId,
+                id,
+                name
+        )
+
+        data.noticeTypes.put(id, noticeTypeObject)
+    }
+
+    private fun saveAttendanceType(attendanceType: JsonObject) {
+        val id = attendanceType.getLong("Id") ?: return
+        val name = attendanceType.getString("Nazwa") ?: ""
+
+        val absent = attendanceType.getBoolean("Nieobecnosc") ?: false
+        val excused = attendanceType.getBoolean("Usprawiedliwione") ?: false
+        val type = if (absent) {
+            if (excused)
+                Attendance.TYPE_ABSENT_EXCUSED
+            else
+                Attendance.TYPE_ABSENT
+        } else {
+            val belated = attendanceType.getBoolean("Spoznienie") ?: false
+            val released = attendanceType.getBoolean("Zwolnienie") ?: false
+            val present = attendanceType.getBoolean("Obecnosc") ?: true
+            if (belated)
+                if (excused)
+                    Attendance.TYPE_ABSENT_EXCUSED
+                else
+                    Attendance.TYPE_ABSENT
+            else if (released)
+                Attendance.TYPE_RELEASED
+            else if (present)
+                Attendance.TYPE_PRESENT
+            else
+                Attendance.TYPE_CUSTOM
+        }
+
+        val attendanceTypeObject = AttendanceType(
+                profileId,
+                id,
+                name,
+                type,
+                -1
+        )
+
+        data.attendanceTypes.put(id, attendanceTypeObject)
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiEvents.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiEvents.kt
new file mode 100644
index 00000000..bcd02b6a
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiEvents.kt
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-20
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_EVENTS
+import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_HOMEWORK
+import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.api.v2.vulcan.ENDPOINT_VULCAN_API_EVENTS
+import pl.szczodrzynski.edziennik.api.v2.vulcan.ENDPOINT_VULCAN_API_HOMEWORK
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
+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.getBoolean
+import pl.szczodrzynski.edziennik.getJsonArray
+import pl.szczodrzynski.edziennik.getLong
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class VulcanApiEvents(override val data: DataVulcan, private val isHomework: Boolean, val onSuccess: () -> Unit) : VulcanApi(data) {
+    companion object {
+        const val TAG = "VulcanApiEvents"
+    }
+
+    init { data.profile?.also { profile ->
+
+        val startDate: String = when (profile.empty) {
+            true -> profile.getSemesterStart(profile.currentSemester).stringY_m_d
+            else -> Date.getToday().stepForward(0, -1, 0).stringY_m_d
+        }
+        val endDate: String = profile.getSemesterEnd(profile.currentSemester).stringY_m_d
+
+        val endpoint = when (isHomework) {
+            true -> VULCAN_API_ENDPOINT_HOMEWORK
+            else -> VULCAN_API_ENDPOINT_EVENTS
+        }
+        apiGet(TAG, endpoint, parameters = mapOf(
+                "DataPoczatkowa" to startDate,
+                "DataKoncowa" to endDate,
+                "IdOddzial" to data.studentClassId,
+                "IdUczen" to data.studentId,
+                "IdOkresKlasyfikacyjny" to data.studentSemesterId
+        )) { json, _ ->
+            val events = json.getJsonArray("Data")
+
+            events?.forEach { eventEl ->
+                val event = eventEl.asJsonObject
+
+                val id = event?.getLong("Id") ?: return@forEach
+                val eventDate = Date.fromY_m_d(event.getString("DataTekst") ?: return@forEach)
+                val subjectId = event.getLong("IdPrzedmiot") ?: -1
+                val teacherId = event.getLong("IdPracownik") ?: -1
+                val startTime = data.lessonList.singleOrNull {
+                    it.weekDay == eventDate.weekDay && it.subjectId == subjectId
+                }?.startTime
+                val topic = event.getString("Opis") ?: ""
+                val type = when (isHomework) {
+                    true -> Event.TYPE_HOMEWORK
+                    else -> when (event.getBoolean("Rodzaj")) {
+                        false -> Event.TYPE_SHORT_QUIZ
+                        else -> Event.TYPE_EXAM
+                    }
+                }
+                val teamId = event.getLong("IdOddzial") ?: data.teamClass?.id ?: -1
+
+                val eventObject = Event(
+                        profileId,
+                        id,
+                        eventDate,
+                        startTime,
+                        topic,
+                        -1,
+                        type,
+                        false,
+                        teacherId,
+                        subjectId,
+                        teamId
+                )
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        if (isHomework) Metadata.TYPE_HOMEWORK else Metadata.TYPE_EVENT,
+                        id,
+                        profile.empty,
+                        profile.empty,
+                        System.currentTimeMillis()
+                ))
+            }
+
+            when (isHomework) {
+                true -> {
+                    data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK))
+                    data.setSyncNext(ENDPOINT_VULCAN_API_HOMEWORK, SYNC_ALWAYS)
+                }
+                false -> {
+                    data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK))
+                    data.setSyncNext(ENDPOINT_VULCAN_API_EVENTS, SYNC_ALWAYS)
+                }
+            }
+            onSuccess()
+        }
+    } ?: onSuccess()}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiGrades.kt
new file mode 100644
index 00000000..281713ac
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiGrades.kt
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-19
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_GRADES
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.api.v2.vulcan.ENDPOINT_VULCAN_API_GRADES
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
+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 java.text.DecimalFormat
+import kotlin.math.roundToInt
+
+class VulcanApiGrades(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
+    companion object {
+        const val TAG = "VulcanApiGrades"
+    }
+
+    init { data.profile?.also { profile ->
+
+        apiGet(TAG, VULCAN_API_ENDPOINT_GRADES, parameters = mapOf(
+                "IdUczen" to data.studentId,
+                "IdOkresKlasyfikacyjny" to data.studentSemesterId
+        )) { json, _ ->
+            val grades = json.getJsonArray("Data")
+
+            grades?.forEach { gradeEl ->
+                val grade = gradeEl.asJsonObject
+
+                val id = grade.getLong("Id") ?: return@forEach
+                val categoryId = grade.getLong("IdKategoria") ?: -1
+                val category = data.gradeCategories.singleOrNull{ it.categoryId == categoryId }?.text
+                        ?: ""
+                val teacherId = grade.getLong("IdPracownikD") ?: -1
+                val subjectId = grade.getLong("IdPrzedmiot") ?: -1
+                val description = grade.getString("Opis")
+                val comment = grade.getString("Komentarz")
+                var value = grade.getFloat("Wartosc")
+                var weight = grade.getFloat("WagaOceny") ?: 0.0f
+                val modificatorValue = grade.getFloat("WagaModyfikatora")
+                val numerator = grade.getFloat("Licznik")
+                val denominator = grade.getFloat("Mianownik")
+                val addedDate = (grade.getLong("DataModyfikacji") ?: return@forEach) * 1000
+
+                var finalDescription = ""
+
+                var name = when (numerator != null && denominator != null) {
+                    true -> {
+                        value = numerator / denominator
+                        finalDescription += DecimalFormat("#.##").format(numerator) +
+                                "/" + DecimalFormat("#.##").format(denominator)
+                        weight = 0.0f
+                        (value * 100).roundToInt().toString() + "%"
+                    }
+                    else -> {
+                        if (value != null) modificatorValue?.also { value += it }
+                        else weight = 0.0f
+
+                        grade.getString("Wpis") ?: ""
+                    }
+                }
+
+                comment?.also {
+                    if (name == "") name = it
+                    else finalDescription = (if (finalDescription == "") "" else " ") + it
+                }
+
+                description?.also {
+                    finalDescription = (if (finalDescription == "") "" else " - ") + it
+                }
+
+                val color = when (name) {
+                    "1-", "1", "1+" -> 0xffd65757
+                    "2-", "2", "2+" -> 0xff9071b3
+                    "3-", "3", "3+" -> 0xffd2ab24
+                    "4-", "4", "4+" -> 0xff50b6d6
+                    "5-", "5", "5+" -> 0xff2cbd92
+                    "6-", "6", "6+" -> 0xff91b43c
+                    else -> 0xff3D5F9C
+                }.toInt()
+
+                val gradeObject = Grade(
+                        profileId,
+                        id,
+                        category,
+                        color,
+                        finalDescription,
+                        name,
+                        value ?: 0.0f,
+                        weight,
+                        data.studentSemesterNumber,
+                        teacherId,
+                        subjectId
+                )
+
+                data.gradeList.add(gradeObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_GRADE,
+                        id,
+                        profile?.empty ?: false,
+                        profile?.empty ?: false,
+                        addedDate
+
+                ))
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_API_GRADES, SYNC_ALWAYS)
+            onSuccess()
+        }
+    } ?: onSuccess()}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiMessagesChangeStatus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiMessagesChangeStatus.kt
new file mode 100644
index 00000000..098edfb2
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiMessagesChangeStatus.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-12
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
+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.MessageRecipient
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+
+class VulcanApiMessagesChangeStatus(
+        override val data: DataVulcan,
+        private val messageObject: MessageFull,
+        val onSuccess: () -> Unit
+) : VulcanApi(data) {
+    companion object {
+        const val TAG = "VulcanApiMessagesChangeStatus"
+    }
+
+    init {
+        data.profile?.also { profile ->
+            apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS, parameters = mapOf(
+                    "WiadomoscId" to messageObject.id,
+                    "FolderWiadomosci" to "Odebrane",
+                    "Status" to "Widoczna",
+                    "LoginId" to data.studentLoginId,
+                    "IdUczen" to data.studentId
+            )) { _, _ ->
+
+                if (!messageObject.seen) {
+                    data.messageMetadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_MESSAGE,
+                            messageObject.id,
+                            true,
+                            true,
+                            messageObject.addedDate
+                    ))
+                }
+
+                if (messageObject.type != TYPE_SENT) {
+                    val messageRecipientObject = MessageRecipient(
+                            profileId,
+                            -1,
+                            -1,
+                            System.currentTimeMillis(),
+                            messageObject.id
+                    )
+
+                    data.messageRecipientList.add(messageRecipientObject)
+                }
+
+                onSuccess()
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiMessagesInbox.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiMessagesInbox.kt
new file mode 100644
index 00000000..10b516a7
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiMessagesInbox.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-01
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_MESSAGES_RECEIVED
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.api.v2.vulcan.ENDPOINT_VULCAN_API_MESSAGES_INBOX
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
+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.utils.Utils
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class VulcanApiMessagesInbox(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
+    companion object {
+        const val TAG = "VulcanApiMessagesInbox"
+    }
+
+    init {
+        data.profile?.also { profile ->
+
+            val startDate: String = when (profile.empty) {
+                true -> profile.getSemesterStart(profile.currentSemester).stringY_m_d
+                else -> Date.getToday().stepForward(0, -1, 0).stringY_m_d
+            }
+            val endDate: String = profile.getSemesterEnd(profile.currentSemester).stringY_m_d
+
+            apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_RECEIVED, parameters = mapOf(
+                    "DataPoczatkowa" to startDate,
+                    "DataKoncowa" to endDate,
+                    "LoginId" to data.studentLoginId,
+                    "IdUczen" to data.studentId
+            )) { json, _ ->
+                json.getJsonArray("Data").asJsonObjectList()?.forEach { message ->
+                    val id = message.getLong("WiadomoscId") ?: return@forEach
+                    val subject = message.getString("Tytul") ?: ""
+                    val body = message.getString("Tresc") ?: ""
+
+                    val senderLoginId = message.getString("NadawcaId") ?: return@forEach
+                    val senderId = data.teacherList
+                            .singleOrNull { it.loginId == senderLoginId }?.id ?: {
+
+                        val senderName = message.getString("Nadawca") ?: ""
+
+                        senderName.getLastFirstName()?.let { (senderLastName, senderFirstName) ->
+                            val teacherObject = Teacher(
+                                    profileId,
+                                    -1 * Utils.crc16(senderName.toByteArray()).toLong(),
+                                    senderFirstName,
+                                    senderLastName,
+                                    senderLoginId
+                            )
+                            data.teacherList.put(teacherObject.id, teacherObject)
+                            teacherObject.id
+                        }
+                    }.invoke() ?: -1
+
+                    val sentDate = message.getLong("DataWyslaniaUnixEpoch")?.let { it * 1000 }
+                            ?: -1
+                    val readDate = message.getLong("DataPrzeczytaniaUnixEpoch")?.let { it * 1000 }
+                            ?: -1
+
+                    val messageObject = Message(
+                            profileId,
+                            id,
+                            subject,
+                            body,
+                            TYPE_RECEIVED,
+                            senderId,
+                            -1
+                    )
+
+                    val messageRecipientObject = MessageRecipient(
+                            profileId,
+                            -1,
+                            -1,
+                            readDate,
+                            id
+                    )
+
+                    data.messageIgnoreList.add(messageObject)
+                    data.messageRecipientList.add(messageRecipientObject)
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_MESSAGE,
+                            id,
+                            readDate > 0,
+                            readDate > 0,
+                            sentDate
+                    ))
+                }
+
+                data.setSyncNext(ENDPOINT_VULCAN_API_MESSAGES_INBOX, SYNC_ALWAYS)
+                onSuccess()
+            }
+        } ?: onSuccess()
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiMessagesSent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiMessagesSent.kt
new file mode 100644
index 00000000..87899a36
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiMessagesSent.kt
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-5
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
+import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_MESSAGES_SENT
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.api.v2.vulcan.ENDPOINT_VULCAN_API_MESSAGES_SENT
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
+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.data.db.modules.teachers.Teacher
+import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class VulcanApiMessagesSent(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
+    companion object {
+        const val TAG = "VulcanApiMessagesSent"
+    }
+
+    init {
+        data.profile?.also { profile ->
+            val startDate: Long = when (profile.empty) {
+                true -> profile.getSemesterStart(profile.currentSemester).inUnix
+                else -> Date.getToday().stepForward(0, -1, 0).inUnix
+            }
+            val endDate: Long = profile.getSemesterEnd(profile.currentSemester).inUnix
+
+            apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_SENT, parameters = mapOf(
+                    "DataPoczatkowa" to startDate,
+                    "DataKoncowa" to endDate,
+                    "LoginId" to data.studentLoginId,
+                    "IdUczen" to data.studentId
+            )) { json, _ ->
+                json.getJsonArray("Data")?.asJsonObjectList()?.forEach { message ->
+                    val id = message.getLong("WiadomoscId") ?: return@forEach
+                    val subject = message.getString("Tytul") ?: ""
+                    val body = message.getString("Tresc") ?: ""
+                    val readBy = message.getInt("Przeczytane") ?: 0
+                    val unreadBy = message.getInt("Nieprzeczytane") ?: 0
+                    val sentDate = message.getLong("DataWyslaniaUnixEpoch")?.let { it * 1000 } ?: -1
+
+                    message.getJsonArray("Adresaci")?.asJsonObjectList()
+                            ?.onEach { receiver ->
+
+                                val receiverLoginId = receiver.getString("LoginId")
+                                        ?: return@onEach
+                                val receiverId = data.teacherList.singleOrNull { it.loginId == receiverLoginId }?.id
+                                        ?: {
+                                            val receiverName = receiver.getString("Nazwa") ?: ""
+
+                                            receiverName.getLastFirstName()?.let { (receiverLastName, receiverFirstName) ->
+                                                val teacherObject = Teacher(
+                                                        profileId,
+                                                        -1 * Utils.crc16(receiverName.toByteArray()).toLong(),
+                                                        receiverFirstName,
+                                                        receiverLastName,
+                                                        receiverLoginId
+                                                )
+                                                data.teacherList.put(teacherObject.id, teacherObject)
+                                                teacherObject.id
+                                            }
+                                        }.invoke() ?: -1
+
+                                val readDate: Long = when (readBy) {
+                                    0 -> 0
+                                    else -> when (unreadBy) {
+                                        0 -> 1
+                                        else -> -1
+                                    }
+                                }
+
+                                val messageRecipientObject = MessageRecipient(
+                                        profileId,
+                                        receiverId,
+                                        -1,
+                                        readDate,
+                                        id
+                                )
+
+                                data.messageRecipientList.add(messageRecipientObject)
+                            }
+
+                    val messageObject = Message(
+                            profileId,
+                            id,
+                            subject,
+                            body,
+                            TYPE_SENT,
+                            -1,
+                            -1
+                    )
+
+                    data.messageIgnoreList.add(messageObject)
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_MESSAGE,
+                            id,
+                            true,
+                            true,
+                            sentDate
+                    ))
+                }
+
+                data.setSyncNext(ENDPOINT_VULCAN_API_MESSAGES_SENT, 1 * DAY, DRAWER_ITEM_MESSAGES)
+                onSuccess()
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiNotices.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiNotices.kt
new file mode 100644
index 00000000..6407dddd
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiNotices.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-23
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
+
+import androidx.core.util.isEmpty
+import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_NOTICES
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.api.v2.vulcan.ENDPOINT_VULCAN_API_NOTICES
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
+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.getJsonArray
+import pl.szczodrzynski.edziennik.getLong
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.toSparseArray
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class VulcanApiNotices(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
+    companion object {
+        const val TAG = "VulcanApiNotices"
+    }
+
+    init { data.profile?.also { profile ->
+        if (data.noticeTypes.isEmpty()) {
+            data.db.noticeTypeDao().getAllNow(profileId).toSparseArray(data.noticeTypes) { it.id }
+        }
+
+        apiGet(TAG, VULCAN_API_ENDPOINT_NOTICES, parameters = mapOf(
+                "IdUczen" to data.studentId,
+                "IdOkresKlasyfikacyjny" to data.studentSemesterId
+        )) { json, _ ->
+            json.getJsonArray("Data")?.forEach { noticeEl ->
+                val notice = noticeEl.asJsonObject
+
+                val id = notice.getLong("Id") ?: return@forEach
+                val text = notice.getString("TrescUwagi") ?: return@forEach
+                val teacherId = notice.getLong("IdPracownik") ?: -1
+                val addedDate = Date.fromY_m_d(notice.getString("DataWpisuTekst")).inMillis
+
+                val noticeObject = Notice(
+                        profileId,
+                        id,
+                        text,
+                        profile.currentSemester,
+                        Notice.TYPE_NEUTRAL,
+                        teacherId
+                )
+
+                data.noticeList.add(noticeObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_NOTICE,
+                        id,
+                        profile.empty,
+                        profile.empty,
+                        addedDate
+                ))
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_API_NOTICES, SYNC_ALWAYS)
+            onSuccess()
+        }
+    } ?: onSuccess()}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiProposedGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiProposedGrades.kt
new file mode 100644
index 00000000..8289a549
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiProposedGrades.kt
@@ -0,0 +1,81 @@
+package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
+
+import com.google.gson.JsonArray
+import pl.szczodrzynski.edziennik.HOUR
+import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_GRADES_PROPOSITIONS
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.api.v2.vulcan.ENDPOINT_VULCAN_API_GRADES_SUMMARY
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
+import pl.szczodrzynski.edziennik.asJsonObjectList
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.getJsonArray
+import pl.szczodrzynski.edziennik.getJsonObject
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class VulcanApiProposedGrades(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
+    companion object {
+        const val TAG = "VulcanApiProposedGrades"
+    }
+
+    init { data.profile?.also { profile ->
+
+        apiGet(TAG, VULCAN_API_ENDPOINT_GRADES_PROPOSITIONS, parameters = mapOf(
+                "IdUczen" to data.studentId,
+                "IdOkresKlasyfikacyjny" to data.studentSemesterId
+        )) { json, _ ->
+            val grades = json.getJsonObject("Data")
+
+            grades.getJsonArray("OcenyPrzewidywane")?.let {
+                processGradeList(it, isFinal = false)
+            }
+
+            grades.getJsonArray("OcenyKlasyfikacyjne")?.let {
+                processGradeList(it, isFinal = true)
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_API_GRADES_SUMMARY, 6*HOUR)
+            onSuccess()
+        }
+    } ?: onSuccess()}
+
+    private fun processGradeList(grades: JsonArray, isFinal: Boolean) {
+        grades.asJsonObjectList()?.forEach { grade ->
+            val name = grade.get("Wpis").asString
+            val value = Utils.getGradeValue(name)
+            val subjectId = grade.get("IdPrzedmiot").asLong
+
+            val id = subjectId * -100 - data.studentSemesterNumber
+
+            val color = Utils.getVulcanGradeColor(name)
+
+            val gradeObject = Grade(
+                    profileId,
+                    id,
+                    "",
+                    color,
+                    "",
+                    name,
+                    value,
+                    0f,
+                    data.studentSemesterNumber,
+                    -1,
+                    subjectId
+            )
+            if (data.studentSemesterNumber == 1) {
+                gradeObject.type = if (isFinal) Grade.TYPE_SEMESTER1_FINAL else Grade.TYPE_SEMESTER1_PROPOSED
+            } else {
+                gradeObject.type = if (isFinal) Grade.TYPE_SEMESTER2_FINAL else Grade.TYPE_SEMESTER2_PROPOSED
+            }
+            data.gradeList.add(gradeObject)
+            data.metadataList.add(Metadata(
+                    profileId,
+                    Metadata.TYPE_GRADE,
+                    gradeObject.id,
+                    data.profile?.empty ?: false,
+                    data.profile?.empty ?: false,
+                    System.currentTimeMillis()
+            ))
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiTemplate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiTemplate.kt
new file mode 100644
index 00000000..c62a0de8
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiTemplate.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-20
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
+
+class VulcanApiTemplate(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
+    companion object {
+        const val TAG = "VulcanApi"
+    }
+
+    init {
+        /* data.profile?.also { profile ->
+            apiGet(TAG, VULCAN_API_ENDPOINT_) { json, _ ->
+
+                data.setSyncNext(ENDPOINT_VULCAN_API_, SYNC_ALWAYS)
+                onSuccess()
+            }
+        } */
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiTimetable.kt
new file mode 100644
index 00000000..882f6e59
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiTimetable.kt
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-13
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
+
+import androidx.core.util.set
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.Regexes
+import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_TIMETABLE
+import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.api.v2.vulcan.ENDPOINT_VULCAN_API_TIMETABLE
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
+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.subjects.Subject
+import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
+import pl.szczodrzynski.edziennik.utils.Utils.crc16
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Week
+
+class VulcanApiTimetable(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
+    companion object {
+        const val TAG = "VulcanApiTimetable"
+    }
+
+    init { data.profile?.also { profile ->
+        val currentWeekStart = Week.getWeekStart()
+
+        if (Date.getToday().weekDay > 4) {
+            currentWeekStart.stepForward(0, 0, 7)
+        }
+
+        val getDate = data.arguments?.getString("weekStart") ?: currentWeekStart.stringY_m_d
+
+        val weekStart = Date.fromY_m_d(getDate)
+        val weekEnd = weekStart.clone().stepForward(0, 0, 6)
+
+        apiGet(TAG, VULCAN_API_ENDPOINT_TIMETABLE, parameters = mapOf(
+                "DataPoczatkowa" to weekStart.stringY_m_d,
+                "DataKoncowa" to weekEnd.stringY_m_d,
+                "IdUczen" to data.studentId,
+                "IdOddzial" to data.studentClassId,
+                "IdOkresKlasyfikacyjny" to data.studentSemesterId
+        )) { json, _ ->
+            val dates = mutableSetOf<Int>()
+            val lessons = mutableListOf<Lesson>()
+
+            json.getJsonArray("Data")?.asJsonObjectList()?.forEach { lesson ->
+                if (lesson.getBoolean("PlanUcznia") != true)
+                    return@forEach
+                val lessonDate = Date.fromY_m_d(lesson.getString("DzienTekst"))
+                val lessonNumber = lesson.getInt("NumerLekcji")
+                val lessonRange = data.lessonRanges.singleOrNull { it.lessonNumber == lessonNumber }
+                val startTime = lessonRange?.startTime
+                val endTime = lessonRange?.endTime
+                val teacherId = lesson.getLong("IdPracownik")
+                val classroom = lesson.getString("Sala")
+
+                val oldTeacherId = lesson.getLong("IdPracownikOld")
+
+                val changeAnnotation = lesson.getString("AdnotacjaOZmianie") ?: ""
+                val type = when {
+                    changeAnnotation.startsWith("(przeniesiona z") -> Lesson.TYPE_SHIFTED_TARGET
+                    changeAnnotation.startsWith("(przeniesiona na") -> Lesson.TYPE_SHIFTED_SOURCE
+                    changeAnnotation.startsWith("(zastępstwo") -> Lesson.TYPE_CHANGE
+                    lesson.getBoolean("PrzekreslonaNazwa") == true -> Lesson.TYPE_CANCELLED
+                    else -> Lesson.TYPE_NORMAL
+                }
+
+                val teamId = lesson.getString("PodzialSkrot")?.let { teamName ->
+                    val name = "${data.teamClass?.name} $teamName"
+                    val id = name.crc16().toLong()
+                    var team = data.teamList.singleOrNull { it.name == name }
+                    if (team == null) {
+                        team = Team(
+                                profileId,
+                                id,
+                                name,
+                                Team.TYPE_VIRTUAL,
+                                "${data.schoolName}:$name",
+                                teacherId ?: oldTeacherId ?: -1
+                        )
+                        data.teamList[id] = team
+                    }
+                    team.id
+                } ?: data.studentClassId.toLong()
+
+                val subjectId = lesson.getLong("IdPrzedmiot")?.let {
+                    when (it) {
+                        0L -> {
+                            val subjectName = lesson.getString("PrzedmiotNazwa") ?: ""
+
+                            data.subjectList.singleOrNull { subject -> subject.longName == subjectName }?.id
+                                    ?: {
+                                        /**
+                                         * CREATE A NEW SUBJECT IF IT DOESN'T EXIST
+                                         */
+
+                                        val subjectObject = Subject(
+                                                profileId,
+                                                -1 * crc16(subjectName.toByteArray()).toLong(),
+                                                subjectName,
+                                                subjectName
+                                        )
+                                        data.subjectList.put(subjectObject.id, subjectObject)
+                                        subjectObject.id
+                                    }.invoke()
+                        }
+                        else -> it
+                    }
+                }
+
+                val lessonObject = Lesson(profileId, -1).apply {
+                    this.type = type
+
+                    when (type) {
+                        Lesson.TYPE_NORMAL, Lesson.TYPE_CHANGE, Lesson.TYPE_SHIFTED_TARGET -> {
+                            this.date = lessonDate
+                            this.lessonNumber = lessonNumber
+                            this.startTime = startTime
+                            this.endTime = endTime
+                            this.subjectId = subjectId
+                            this.teacherId = teacherId
+                            this.teamId = teamId
+                            this.classroom = classroom
+
+                            this.oldTeacherId = oldTeacherId
+                        }
+
+                        Lesson.TYPE_CANCELLED, Lesson.TYPE_SHIFTED_SOURCE -> {
+                            this.oldDate = lessonDate
+                            this.oldLessonNumber = lessonNumber
+                            this.oldStartTime = startTime
+                            this.oldEndTime = endTime
+                            this.oldSubjectId = subjectId
+                            this.oldTeacherId = teacherId
+                            this.oldTeamId = teamId
+                            this.oldClassroom = classroom
+                        }
+                    }
+
+                    if (type == Lesson.TYPE_SHIFTED_SOURCE || type == Lesson.TYPE_SHIFTED_TARGET) {
+                        val shift = Regexes.VULCAN_SHITFT_ANNOTATION.find(changeAnnotation)
+                        val oldLessonNumber = shift?.get(2)?.toInt()
+                        val oldLessonDate = shift?.get(3)?.let { Date.fromd_m_Y(it) }
+
+                        val oldLessonRange = data.lessonRanges.singleOrNull { it.lessonNumber == oldLessonNumber }
+                        val oldStartTime = oldLessonRange?.startTime
+                        val oldEndTime = oldLessonRange?.endTime
+
+                        when (type) {
+                            Lesson.TYPE_SHIFTED_SOURCE -> {
+                                this.lessonNumber = oldLessonNumber
+                                this.date = oldLessonDate
+                                this.startTime = oldStartTime
+                                this.endTime = oldEndTime
+                            }
+
+                            Lesson.TYPE_SHIFTED_TARGET -> {
+                                this.oldLessonNumber = oldLessonNumber
+                                this.oldDate = oldLessonDate
+                                this.oldStartTime = oldStartTime
+                                this.oldEndTime = oldEndTime
+                            }
+                        }
+                    }
+
+                    this.id = buildId()
+                }
+
+                val seen = profile.empty || lessonDate < Date.getToday()
+
+                if (type != Lesson.TYPE_NORMAL) {
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_LESSON_CHANGE,
+                            lessonObject.id,
+                            seen,
+                            seen,
+                            System.currentTimeMillis()
+                    ))
+                }
+
+                dates.add(lessonDate.value)
+                lessons.add(lessonObject)
+            }
+
+            val date: Date = weekStart.clone()
+            while (date <= weekEnd) {
+                if (!dates.contains(date.value)) {
+                    lessons.add(Lesson(profileId, date.value.toLong()).apply {
+                        this.type = Lesson.TYPE_NO_LESSONS
+                        this.date = date.clone()
+                    })
+                }
+
+                date.stepForward(0, 0, 1)
+            }
+
+            d(TAG, "Clearing lessons between ${weekStart.stringY_m_d} and ${weekEnd.stringY_m_d} - timetable downloaded for $getDate")
+
+            data.lessonNewList.addAll(lessons)
+            data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd))
+
+            data.setSyncNext(ENDPOINT_VULCAN_API_TIMETABLE, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/firstlogin/VulcanFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/firstlogin/VulcanFirstLogin.kt
new file mode 100644
index 00000000..61f38f53
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/firstlogin/VulcanFirstLogin.kt
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-19
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.firstlogin
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.ERROR_NO_STUDENTS_IN_ACCOUNT
+import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_STUDENT_LIST
+import pl.szczodrzynski.edziennik.api.v2.events.FirstLoginFinishedEvent
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
+import pl.szczodrzynski.edziennik.api.v2.vulcan.login.VulcanLoginApi
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
+    companion object {
+        const val TAG = "VulcanFirstLogin"
+    }
+
+    private val api = VulcanApi(data)
+    private val profileList = mutableListOf<Profile>()
+
+    init {
+        VulcanLoginApi(data) {
+            api.apiGet(TAG, VULCAN_API_ENDPOINT_STUDENT_LIST, baseUrl = true) { json, response ->
+                val students = json.getJsonArray("Data")
+
+                if (students == null || students.size() < 1) {
+                    data.error(ApiError(TAG, ERROR_NO_STUDENTS_IN_ACCOUNT)
+                            .withResponse(response)
+                            .withApiResponse(json))
+                    return@apiGet
+                }
+
+                students.forEach { studentEl ->
+                    val student = studentEl.asJsonObject
+
+                    val schoolSymbol = student.getString("JednostkaSprawozdawczaSymbol") ?: return@forEach
+                    val schoolName = "${data.symbol}_$schoolSymbol"
+                    val studentId = student.getInt("Id") ?: return@forEach
+                    val studentLoginId = student.getInt("UzytkownikLoginId") ?: return@forEach
+                    val studentClassId = student.getInt("IdOddzial") ?: return@forEach
+                    val studentClassName = student.getString("OkresPoziom").toString() + (student.getString("OddzialSymbol") ?: return@forEach)
+                    val studentSemesterId = student.getInt("IdOkresKlasyfikacyjny") ?: return@forEach
+                    val studentFirstName = student.getString("Imie") ?: ""
+                    val studentLastName = student.getString("Nazwisko") ?: ""
+                    val studentNameLong = "$studentFirstName $studentLastName".fixName()
+                    val studentNameShort = "$studentFirstName ${studentLastName[0]}.".fixName()
+
+                    val userLogin = student.getString("UzytkownikLogin") ?: ""
+                    val currentSemesterStartDate = student.getLong("OkresDataOd") ?: return@forEach
+                    val currentSemesterEndDate = (student.getLong("OkresDataDo")
+                            ?: return@forEach) + 86400
+                    val studentSemesterNumber = student.getInt("OkresNumer") ?: return@forEach
+
+                    val newProfile = Profile()
+                    newProfile.empty = true
+
+                    val isParent = student.getString("UzytkownikRola") == "opiekun"
+                    val userName = if (isParent)
+                        student.getString("UzytkownikNazwa")?.swapFirstLastName()?.fixName()
+                    else
+                        null
+                    newProfile.accountNameLong = userName
+                    newProfile.studentClassName = studentClassName
+                    val today = Date.getToday()
+                    newProfile.studentSchoolYear = "${today.year}/${today.year+1}"
+
+                    newProfile.putStudentData("studentId", studentId)
+                    newProfile.putStudentData("studentLoginId", studentLoginId)
+                    newProfile.putStudentData("studentClassId", studentClassId)
+                    newProfile.putStudentData("studentSemesterId", studentSemesterId)
+                    newProfile.putStudentData("schoolSymbol", schoolSymbol)
+                    newProfile.putStudentData("schoolName", schoolName)
+                    newProfile.putStudentData("currentSemesterEndDate", currentSemesterEndDate)
+                    newProfile.putStudentData("studentSemesterNumber", studentSemesterNumber)
+
+                    when (studentSemesterNumber) {
+                        1 -> {
+                            newProfile.dateSemester1Start = Date.fromMillis(currentSemesterStartDate * 1000)
+                            newProfile.dateSemester2Start = Date.fromMillis(currentSemesterEndDate * 1000)
+                        }
+                        2 -> {
+                            newProfile.dateSemester2Start = Date.fromMillis(currentSemesterStartDate * 1000)
+                            newProfile.dateYearEnd = Date.fromMillis(currentSemesterEndDate * 1000)
+                        }
+                    }
+
+                    newProfile.studentNameLong = studentNameLong
+                    newProfile.studentNameShort = studentNameShort
+                    newProfile.name = studentNameLong
+                    newProfile.subname = userLogin
+
+                    profileList.add(newProfile)
+                }
+
+                EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore))
+                onSuccess()
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/login/VulcanLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/login/VulcanLogin.kt
new file mode 100644
index 00000000..cb3db3eb
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/login/VulcanLogin.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-6. 
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.login
+
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_VULCAN_API
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class VulcanLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "VulcanLogin"
+    }
+
+    private var cancelled = false
+
+    init {
+        nextLoginMethod(onSuccess)
+    }
+
+    private fun nextLoginMethod(onSuccess: () -> Unit) {
+        if (data.targetLoginMethodIds.isEmpty()) {
+            onSuccess()
+            return
+        }
+        if (cancelled) {
+            onSuccess()
+            return
+        }
+        useLoginMethod(data.targetLoginMethodIds.removeAt(0)) { usedMethodId ->
+            data.progress(data.progressStep)
+            if (usedMethodId != -1)
+                data.loginMethods.add(usedMethodId)
+            nextLoginMethod(onSuccess)
+        }
+    }
+
+    private fun useLoginMethod(loginMethodId: Int, onSuccess: (usedMethodId: Int) -> Unit) {
+        // this should never be true
+        if (data.loginMethods.contains(loginMethodId)) {
+            onSuccess(-1)
+            return
+        }
+        Utils.d(TAG, "Using login method $loginMethodId")
+        when (loginMethodId) {
+            LOGIN_METHOD_VULCAN_API -> {
+                data.startProgress(R.string.edziennik_progress_login_vulcan_api)
+                VulcanLoginApi(data) { onSuccess(loginMethodId) }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/login/VulcanLoginApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/login/VulcanLoginApi.kt
new file mode 100644
index 00000000..8c58f760
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/login/VulcanLoginApi.kt
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-6. 
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.login
+
+import android.os.Build
+import com.google.gson.JsonObject
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.JsonCallbackHandler
+import io.github.wulkanowy.signer.android.getPrivateKeyFromCert
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.currentTimeUnix
+import pl.szczodrzynski.edziennik.getJsonObject
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import java.net.HttpURLConnection.HTTP_BAD_REQUEST
+import java.util.*
+import java.util.regex.Pattern
+
+class VulcanLoginApi(val data: DataVulcan, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "VulcanLoginApi"
+    }
+
+    init { run {
+        if (data.profile != null && data.isApiLoginValid()) {
+            onSuccess()
+        }
+        else {
+            if (data.apiCertificatePfx.isNotNullNorEmpty()) {
+                try {
+                    data.apiCertificatePrivate = getPrivateKeyFromCert(
+                            if (data.apiToken?.get(0) == 'F') VULCAN_API_PASSWORD_FAKELOG else VULCAN_API_PASSWORD,
+                            data.apiCertificatePfx ?: ""
+                    )
+                    data.loginStore.removeLoginData("certificatePfx")
+                } catch (e: Throwable) {
+                    e.printStackTrace()
+                } finally {
+                    onSuccess()
+                    return@run
+                }
+            }
+            if (data.symbol.isNotNullNorEmpty() && data.apiToken.isNotNullNorEmpty() && data.apiPin.isNotNullNorEmpty()) {
+                loginWithToken()
+            }
+            else {
+                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            }
+        }
+    }}
+
+    private fun loginWithToken() {
+        d(TAG, "Request: Vulcan/Login/Api - ${data.apiUrl}/$VULCAN_API_ENDPOINT_CERTIFICATE")
+
+        val callback = object : JsonCallbackHandler() {
+            override fun onSuccess(json: JsonObject?, response: Response?) {
+                if (json == null) {
+                    if (response?.code() == HTTP_BAD_REQUEST) {
+                        data.error(TAG, ERROR_LOGIN_VULCAN_INVALID_SYMBOL, response)
+                        return
+                    }
+                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                var tokenStatus = json.getString("TokenStatus")
+                if (tokenStatus == "Null" || tokenStatus == "CertGenerated")
+                    tokenStatus = null
+                val error = tokenStatus ?: json.getString("Message")
+                error?.let { code ->
+                    when (code) {
+                        "TokenNotFound" -> ERROR_LOGIN_VULCAN_INVALID_TOKEN
+                        "TokenDead" -> ERROR_LOGIN_VULCAN_EXPIRED_TOKEN
+                        "WrongPIN" -> {
+                            Pattern.compile("Liczba pozostałych prób: ([0-9])", Pattern.DOTALL).matcher(tokenStatus).let { matcher ->
+                                if (matcher.matches())
+                                    ERROR_LOGIN_VULCAN_INVALID_PIN + 1 + matcher.group(1).toInt()
+                                else
+                                    ERROR_LOGIN_VULCAN_INVALID_PIN
+                            }
+                        }
+                        "Broken" -> ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING
+                        "OnlyKindergarten" -> ERROR_LOGIN_VULCAN_ONLY_KINDERGARTEN
+                        "NoPupils" -> ERROR_LOGIN_VULCAN_NO_PUPILS
+                        else -> ERROR_LOGIN_VULCAN_OTHER
+                    }.let { errorCode ->
+                        data.error(ApiError(TAG, errorCode)
+                                .withApiResponse(json)
+                                .withResponse(response))
+                        return
+                    }
+                }
+
+                val cert = json.getJsonObject("TokenCert")
+                if (cert == null) {
+                    data.error(ApiError(TAG, ERROR_LOGIN_VULCAN_OTHER)
+                            .withApiResponse(json)
+                            .withResponse(response))
+                    return
+                }
+
+                data.apiCertificateKey = cert.getString("CertyfikatKlucz")
+                data.apiCertificatePfx = cert.getString("CertyfikatPfx")
+                data.apiCertificateExpiryTime = 1598832000
+                data.apiToken = data.apiToken?.substring(0, 3)
+                data.apiCertificatePrivate = getPrivateKeyFromCert(
+                        if (data.apiToken?.get(0) == 'F') VULCAN_API_PASSWORD_FAKELOG else VULCAN_API_PASSWORD,
+                        data.apiCertificatePfx ?: ""
+                )
+                data.loginStore.removeLoginData("certificatePfx")
+                data.loginStore.removeLoginData("devicePin")
+                onSuccess()
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url("${data.apiUrl}/$VULCAN_API_ENDPOINT_CERTIFICATE")
+                .userAgent(VULCAN_API_USER_AGENT)
+                .addHeader("RequestMobileType", "RegisterDevice")
+                .addParameter("PIN", data.apiPin)
+                .addParameter("TokenKey", data.apiToken)
+                .addParameter("DeviceId", UUID.randomUUID().toString())
+                .addParameter("DeviceName", VULCAN_API_DEVICE_NAME)
+                .addParameter("DeviceNameUser", "")
+                .addParameter("DeviceDescription", "")
+                .addParameter("DeviceSystemType", "Android")
+                .addParameter("DeviceSystemVersion", Build.VERSION.RELEASE)
+                .addParameter("RemoteMobileTimeKey", currentTimeUnix())
+                .addParameter("TimeKey", currentTimeUnix() - 1)
+                .addParameter("RequestId", UUID.randomUUID().toString())
+                .addParameter("AppVersion", VULCAN_API_APP_VERSION)
+                .addParameter("RemoteMobileAppVersion", VULCAN_API_APP_VERSION)
+                .addParameter("RemoteMobileAppName", VULCAN_API_APP_NAME)
+                .postJson()
+                .allowErrorCode(HTTP_BAD_REQUEST)
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/AppError.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/AppError.java
index ea72e969..440bc0bb 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/AppError.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/AppError.java
@@ -47,11 +47,10 @@ public class AppError {
     public static final int CODE_LIBRUS_DISCONNECTED = 31;
     public static final int CODE_PROFILE_ARCHIVED = 30;
 
+
     public static final int CODE_INTERNAL_MISSING_DATA = 100;
     // internal errors - not for user's information.
     // these error codes are processed in API main classes
-    public static final int CODE_INTERNAL_LIBRUS_ACCOUNT_410 = 120;
-    public static final int CODE_INTERNAL_LIBRUS_ACCOUNT_410_ = 120;
 
     public String TAG;
     public int line;
@@ -86,10 +85,10 @@ public class AppError {
         this(TAG, line, errorCode, null, null, null, throwable, apiResponse);
     }
     public AppError(String TAG, int line, int errorCode, Throwable throwable, JsonObject apiResponse) {
-        this(TAG, line, errorCode, null, null, null, throwable, apiResponse.toString());
+        this(TAG, line, errorCode, null, null, null, throwable, apiResponse == null ? null : apiResponse.toString());
     }
     public AppError(String TAG, int line, int errorCode, String errorText, Response response, JsonObject apiResponse) {
-        this(TAG, line, errorCode, errorText, response, response == null ? null : response.request(), null, apiResponse.toString());
+        this(TAG, line, errorCode, errorText, response, response == null ? null : response.request(), null, apiResponse == null ? null : apiResponse.toString());
     }
     public AppError(String TAG, int line, int errorCode, String errorText, Response response, String apiResponse) {
         this(TAG, line, errorCode, errorText, response, response == null ? null : response.request(), null, apiResponse);
@@ -98,7 +97,7 @@ public class AppError {
         this(TAG, line, errorCode, errorText, null, null, null, apiResponse);
     }
     public AppError(String TAG, int line, int errorCode, String errorText, JsonObject apiResponse) {
-        this(TAG, line, errorCode, errorText, null, null, null, apiResponse.toString());
+        this(TAG, line, errorCode, errorText, null, null, null, apiResponse == null ? null : apiResponse.toString());
     }
     public AppError(String TAG, int line, int errorCode, String errorText) {
         this(TAG, line, errorCode, errorText, null, null, null, null);
@@ -107,7 +106,7 @@ public class AppError {
         this(TAG, line, errorCode, null, null, null, null, apiResponse.toString());
     }
     public AppError(String TAG, int line, int errorCode, Response response, Throwable throwable, JsonObject apiResponse) {
-        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), throwable, apiResponse.toString());
+        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), throwable, apiResponse == null ? null : apiResponse.toString());
     }
     public AppError(String TAG, int line, int errorCode, Response response, Throwable throwable, String apiResponse) {
         this(TAG, line, errorCode, null, response, response == null ? null : response.request(), throwable, apiResponse);
@@ -116,7 +115,7 @@ public class AppError {
         this(TAG, line, errorCode, null, response, response == null ? null : response.request(), null, apiResponse);
     }
     public AppError(String TAG, int line, int errorCode, Response response, JsonObject apiResponse) {
-        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), null, apiResponse.toString());
+        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), null, apiResponse == null ? null : apiResponse.toString());
     }
 
     public String getDetails(Context context) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Edziennik.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Edziennik.java
deleted file mode 100644
index 99ab1a4b..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Edziennik.java
+++ /dev/null
@@ -1,1171 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api;
-
-import android.app.Activity;
-import android.appwidget.AppWidgetManager;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
-import android.text.Html;
-import android.util.Base64;
-import android.util.Log;
-import android.webkit.CookieManager;
-import android.webkit.CookieSyncManager;
-import android.webkit.WebView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-
-import com.afollestad.materialdialogs.DialogAction;
-import com.afollestad.materialdialogs.MaterialDialog;
-import com.danimahardhika.cafebar.CafeBar;
-import com.google.android.gms.common.util.ArrayUtils;
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.mikepenz.iconics.IconicsDrawable;
-import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.BuildConfig;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.WidgetTimetable;
-import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface;
-import pl.szczodrzynski.edziennik.data.api.interfaces.SyncCallback;
-import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementFull;
-import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance;
-import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceFull;
-import pl.szczodrzynski.edziennik.data.db.modules.events.Event;
-import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull;
-import pl.szczodrzynski.edziennik.data.db.modules.events.EventType;
-import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeFull;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull;
-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.metadata.Metadata;
-import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice;
-import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeFull;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
-import pl.szczodrzynski.edziennik.data.db.modules.teams.Team;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.Notification;
-import pl.szczodrzynski.edziennik.network.ServerRequest;
-import pl.szczodrzynski.edziennik.sync.SyncJob;
-import pl.szczodrzynski.edziennik.utils.Themes;
-import pl.szczodrzynski.edziennik.widgets.luckynumber.WidgetLuckyNumber;
-import pl.szczodrzynski.edziennik.widgets.notifications.WidgetNotifications;
-
-import static android.content.Context.CLIPBOARD_SERVICE;
-import static com.mikepenz.iconics.utils.IconicsConvertersKt.colorInt;
-import static com.mikepenz.iconics.utils.IconicsConvertersKt.sizeDp;
-import static pl.szczodrzynski.edziennik.App.APP_URL;
-import static pl.szczodrzynski.edziennik.MainActivity.DRAWER_ITEM_HOME;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_OK;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_OTHER;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_PROFILE_ARCHIVED;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_PROFILE_NOT_FOUND;
-import static pl.szczodrzynski.edziennik.data.api.AppError.stringErrorCode;
-import static pl.szczodrzynski.edziennik.data.api.AppError.stringErrorType;
-import static pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface.FEATURE_AGENDA;
-import static pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface.FEATURE_ALL;
-import static pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface.FEATURE_ANNOUNCEMENTS;
-import static pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface.FEATURE_ATTENDANCE;
-import static pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface.FEATURE_GRADES;
-import static pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface.FEATURE_HOMEWORK;
-import static pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface.FEATURE_MESSAGES_INBOX;
-import static pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface.FEATURE_MESSAGES_OUTBOX;
-import static pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface.FEATURE_NOTICES;
-import static pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface.FEATURE_TIMETABLE;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_HOMEWORK;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER1_FINAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER1_PROPOSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER2_FINAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER2_PROPOSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_YEAR_FINAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_YEAR_PROPOSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_IUCZNIOWIE;
-import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_LIBRUS;
-import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_MOBIDZIENNIK;
-import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_VULCAN;
-import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.REGISTRATION_ENABLED;
-import static pl.szczodrzynski.edziennik.sync.SyncService.PROFILE_MAX_PROGRESS;
-import static pl.szczodrzynski.edziennik.utils.Utils.d;
-import static pl.szczodrzynski.edziennik.utils.Utils.ns;
-
-public class Edziennik {
-    //public static final int CODE_NULL = 0;
-    private App app;
-
-    private static final String TAG = "Edziennik";
-    private static boolean registerEmpty;
-    public static int oldLuckyNumber;
-
-    public static EdziennikInterface getApi(App app, int loginType) {
-        switch (loginType) {
-            default:
-            case LOGIN_TYPE_MOBIDZIENNIK:
-                return app.apiMobidziennik;
-            case LOGIN_TYPE_LIBRUS:
-                return app.apiLibrus;
-            case LOGIN_TYPE_IUCZNIOWIE:
-                return app.apiIuczniowie;
-            case LOGIN_TYPE_VULCAN:
-                return app.apiVulcan;
-        }
-    }
-
-    public Edziennik(App app) {
-        this.app = app;
-    }
-
-    @SuppressWarnings("deprecation")
-    public static void clearCookies(Context context, String url) {
-        //Log.d(TAG, "Cookies: " + yahooCookies);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-            //Log.d(TAG, "Using clearCookies code for API >=" + String.valueOf(Build.VERSION_CODES.LOLLIPOP_MR1));
-            CookieManager.getInstance().removeAllCookies(null);
-            CookieManager.getInstance().flush();
-        } else {
-            //Log.d(TAG, "Using clearCookies code for API <" + String.valueOf(Build.VERSION_CODES.LOLLIPOP_MR1));
-            CookieSyncManager cookieSyncManager = CookieSyncManager.createInstance(context);
-            cookieSyncManager.startSync();
-            CookieManager cookieManager = CookieManager.getInstance();
-            cookieManager.removeAllCookie();
-            cookieManager.removeSessionCookie();
-            cookieSyncManager.stopSync();
-            cookieSyncManager.sync();
-        }
-    }
-
-    public void initMessagesWebView(WebView webView, App app, boolean fullVersion, boolean clearCookies) {
-        if (!app.profile.getEmpty() && app.profile.getLoginStoreType() == LoginStore.LOGIN_TYPE_MOBIDZIENNIK) {
-            String url;
-            if (fullVersion) {
-                url = "https://" + app.profile.getLoginData("serverName", "") + ".mobidziennik.pl/mobile/wiadomosci";
-            } else {
-                url = "https://" + app.profile.getLoginData("serverName", "") + ".mobidziennik.pl/api/";
-            }
-
-            String str1 = "login=" + app.profile.getLoginData("username", "") + "&haslo=" + app.profile.getLoginData("password", "");
-
-            if (!fullVersion) {
-                str1 += "&ip=" + app.deviceId + "&wersja=20&token=&webview_wiadomosci=1";
-            }
-
-
-            if (-1L != -1L) {
-                str1 += "&id_wiadomosci=" + -1L;
-            }
-
-            if (clearCookies)
-                clearCookies(app, "https://" + app.profile.getLoginData("serverName", "") + ".mobidziennik.pl");
-
-            //Toast.makeText(app, "URL "+url, Toast.LENGTH_SHORT).show();
-            webView.postUrl(url, str1.getBytes());
-        } else if (!app.profile.getEmpty() && app.profile.getLoginStoreType() == LoginStore.LOGIN_TYPE_IUCZNIOWIE) {
-            String url = "https://iuczniowie.progman.pl/idziennik/mod_panelRodzica/Komunikator.aspx";
-            webView.loadUrl(url);
-            /*
-            if (app.profile.loginServerName.equals("") || app.profile.loginUsername.equals("") || app.profile.loginPassword.equals("")) {
-                webView.loadData("<h3>"+app.getString(R.string.api_error_code_invalid_login)+"</h3>", "text/html", "UTF-8");
-                return;
-            }
-
-            if (app.appConfig.deviceId == null || app.appConfig.deviceId.equals("")) {
-                app.appConfig.deviceId = Settings.Secure.getString(app.getContentResolver(), Settings.Secure.ANDROID_ID);
-                app.appConfig.savePending = true;
-            }
-
-            //Ion.getDefault(app.getContext()).getCookieMiddleware().getCookieStore().removeAll(); // TODO remove only cookies for this domain
-            String finalLoginServerName = app.profile.loginServerName;
-            String finalLoginUsername = app.profile.loginUsername;
-            String finalLoginPassword = app.profile.loginPassword;
-            Ion.with(app.getContext())
-                    .load("https://iuczniowie.progman.pl/idziennik/login.aspx")
-                    .setTimeout(REQUEST_TIMEOUT)
-                    .setHeader("User-Agent", Iuczniowie.userAgent)
-                    //.setHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
-                    .asString()
-                    .setCallback((e, result) -> {
-                        if (e instanceof java.util.concurrent.TimeoutException) {
-                            webView.loadData("<h3>"+app.getString(R.string.api_error_code_timeout)+"</h3>", "text/html", "UTF-8");
-                            return;
-                        }
-                        app.profile.loggedIn = (result != null && result.equals("ok"));
-                        if (result == null || result.equals("")) { // for safety
-                            webView.loadData("<h3>"+app.getString(R.string.api_error_code_no_internet)+"</h3>", "text/html", "UTF-8");
-                            return;
-                        }
-                        if (clearCookies)
-                            clearCookies(app, "https://iuczniowie.progman.pl");
-
-                        String post = "";
-                        try {
-                            post += "ctl00$ContentPlaceHolder$nazwaPrzegladarki="+URLEncoder.encode(Iuczniowie.userAgent, "UTF-8");
-                            post += "ctl00$ContentPlaceHolder$NazwaSzkoly="+finalLoginServerName;
-                            post += "ctl00$ContentPlaceHolder$UserName="+URLEncoder.encode(finalLoginUsername, "UTF-8");
-                            post += "ctl00$ContentPlaceHolder$Password="+URLEncoder.encode(finalLoginPassword, "UTF-8");
-                            post += "ctl00$ContentPlaceHolder$Logowanie=Zaloguj";
-                        } catch (UnsupportedEncodingException e1) {
-                            e1.printStackTrace();
-                        }
-
-                        webView.getSettings().setUserAgentString(Iuczniowie.userAgent);
-
-                    });*/
-        } else if (app.profile.getEmpty()) {
-            webView.loadData("<h3>" + app.getString(R.string.sync_error_invalid_login) + "</h3>", "text/html", "UTF-8");
-        } else {
-            webView.loadData("<h3>" + app.getString(R.string.settings_register_login_not_implemented_text) + "</h3>", "text/html", "UTF-8");
-        }
-    }
-
-
-
-    /*    _____                                                        _______        _
-         |  __ \                               /\                     |__   __|      | |
-         | |__) | __ ___   ___ ___  ___ ___   /  \   ___ _   _ _ __   ___| | __ _ ___| | __
-         |  ___/ '__/ _ \ / __/ _ \/ __/ __| / /\ \ / __| | | | '_ \ / __| |/ _` / __| |/ /
-         | |   | | | (_) | (_|  __/\__ \__ \/ ____ \\__ \ |_| | | | | (__| | (_| \__ \   <
-         |_|   |_|  \___/ \___\___||___/___/_/    \_\___/\__, |_| |_|\___|_|\__,_|___/_|\_\
-                                                          __/ |
-                                                         |__*/
-
-    /**
-     * A task for creating notifications and downloading shared events.
-     */
-    private static class ProcessAsyncTask extends AsyncTask<Void, Void, Integer> {
-        private App app;
-        private WeakReference<Context> activityContext;
-        private SyncCallback callback;
-        private Exception e = null;
-        private String apiResponse = null;
-        private int profileId;
-        private ProfileFull profile;
-
-        public ProcessAsyncTask(App app, Context activityContext, SyncCallback callback, int profileId, ProfileFull profile) {
-            //d(TAG, "Thread/ProcessAsyncTask/constructor/"+Thread.currentThread().getName());
-            this.app = app;
-            this.activityContext = new WeakReference<>(activityContext);
-            this.callback = callback;
-            this.profileId = profileId;
-            this.profile = profile;
-        }
-
-        @Override
-        protected Integer doInBackground(Void... voids) {
-            Context activityContext = this.activityContext.get();
-            //d(TAG, "Thread/ProcessAsyncTask/doInBackground/"+Thread.currentThread().getName());
-            try {
-
-                // UPDATE FCM TOKEN IF EMPTY
-                if (app.appConfig.fcmToken == null || app.appConfig.fcmToken.equals("")) {
-                    FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(instanceIdResult -> {
-                        app.appConfig.fcmToken = instanceIdResult.getToken();
-                        app.appConfig.savePending = true;
-                    });
-                }
-
-                callback.onProgress(1);
-                if (profile.getSyncNotifications()) {
-                    new Handler(activityContext.getMainLooper()).post(() -> {
-                        callback.onActionStarted(R.string.sync_action_creating_notifications);
-                    });
-
-                    for (LessonFull change : app.db.lessonChangeDao().getNotNotifiedNow(profileId)) {
-                        String text = app.getContext().getString(R.string.notification_lesson_change_format, change.changeTypeStr(app.getContext()), change.lessonDate == null ? "" : change.lessonDate.getFormattedString(), change.subjectLongName);
-                        app.notifier.add(new Notification(app.getContext(), text)
-                                .withProfileData(profile.getId(), profile.getName())
-                                .withType(Notification.TYPE_TIMETABLE_LESSON_CHANGE)
-                                .withFragmentRedirect(MainActivity.DRAWER_ITEM_TIMETABLE)
-                                .withLongExtra("timetableDate", change.lessonDate.getValue())
-                                .withAddedDate(change.addedDate)
-                        );
-                    }
-                    for (EventFull event : app.db.eventDao().getNotNotifiedNow(profileId)) {
-                        String text;
-                        if (event.type == TYPE_HOMEWORK)
-                            text = app.getContext().getString(R.string.notification_homework_format, ns(app.getString(R.string.notification_event_no_subject), event.subjectLongName), event.eventDate.getFormattedString());
-                        else
-                            text = app.getContext().getString(R.string.notification_event_format, event.typeName, event.eventDate.getFormattedString(), ns(app.getString(R.string.notification_event_no_subject), event.subjectLongName));
-                        app.notifier.add(new Notification(app.getContext(), text)
-                                .withProfileData(profile.getId(), profile.getName())
-                                .withType(event.type == TYPE_HOMEWORK ? Notification.TYPE_NEW_HOMEWORK : Notification.TYPE_NEW_EVENT)
-                                .withFragmentRedirect(event.type == TYPE_HOMEWORK ? MainActivity.DRAWER_ITEM_HOMEWORK : MainActivity.DRAWER_ITEM_AGENDA)
-                                .withLongExtra("eventId", event.id)
-                                .withLongExtra("eventDate", event.eventDate.getValue())
-                                .withAddedDate(event.addedDate)
-                        );
-                        // student's rights abuse - disabled, because this was useless
-                        /*if (!event.addedManually && event.type == RegisterEvent.TYPE_EXAM && event.eventDate.combineWith(event.startTime) - event.addedDate < 7 * 24 * 60 * 60 * 1000) {
-                            text = app.getContext().getString(R.string.notification_abuse_format, event.typeString(app, app.profile), event.subjectLongName, event.eventDate.getFormattedString());
-                            app.notifier.add(new Notification(app.getContext(), text)
-                                    .withProfileData(profile.id, profile.name)
-                                    .withType(Notification.TYPE_GENERAL)
-                                    .withFragmentRedirect(MainActivity.DRAWER_ITEM_NOTIFICATIONS)
-                            );
-                        }*/
-                    }
-
-                    Date today = Date.getToday();
-                    int todayValue = today.getValue();
-                    profile.setCurrentSemester(profile.dateToSemester(today));
-
-                    for (GradeFull grade : app.db.gradeDao().getNotNotifiedNow(profileId)) {
-                        String gradeName = grade.name;
-                        if (grade.type == TYPE_SEMESTER1_PROPOSED
-                                || grade.type == TYPE_SEMESTER2_PROPOSED) {
-                            gradeName = (app.getString(R.string.grade_semester_proposed_format_2, grade.name));
-                        } else if (grade.type == TYPE_SEMESTER1_FINAL
-                                || grade.type == TYPE_SEMESTER2_FINAL) {
-                            gradeName = (app.getString(R.string.grade_semester_final_format_2, grade.name));
-                        } else if (grade.type == TYPE_YEAR_PROPOSED) {
-                            gradeName = (app.getString(R.string.grade_year_proposed_format_2, grade.name));
-                        } else if (grade.type == TYPE_YEAR_FINAL) {
-                            gradeName = (app.getString(R.string.grade_year_final_format_2, grade.name));
-                        }
-                        String text = app.getContext().getString(R.string.notification_grade_format, gradeName, grade.subjectLongName);
-                        app.notifier.add(new Notification(app.getContext(), text)
-                                .withProfileData(profile.getId(), profile.getName())
-                                .withType(Notification.TYPE_NEW_GRADE)
-                                .withFragmentRedirect(MainActivity.DRAWER_ITEM_GRADES)
-                                .withLongExtra("gradesSubjectId", grade.subjectId)
-                                .withAddedDate(grade.addedDate)
-                        );
-                    }
-                    for (NoticeFull notice : app.db.noticeDao().getNotNotifiedNow(profileId)) {
-                        String noticeTypeStr = (notice.type == Notice.TYPE_POSITIVE ? app.getString(R.string.notification_notice_praise) : (notice.type == Notice.TYPE_NEGATIVE ? app.getString(R.string.notification_notice_warning) : app.getString(R.string.notification_notice_new)));
-                        String text = app.getContext().getString(R.string.notification_notice_format, noticeTypeStr, notice.teacherFullName, Date.fromMillis(notice.addedDate).getFormattedString());
-                        app.notifier.add(new Notification(app.getContext(), text)
-                                .withProfileData(profile.getId(), profile.getName())
-                                .withType(Notification.TYPE_NEW_NOTICE)
-                                .withFragmentRedirect(MainActivity.DRAWER_ITEM_BEHAVIOUR)
-                                .withLongExtra("noticeId", notice.id)
-                                .withAddedDate(notice.addedDate)
-                        );
-                    }
-                    for (AttendanceFull attendance : app.db.attendanceDao().getNotNotifiedNow(profileId)) {
-                        String attendanceTypeStr = app.getString(R.string.notification_type_attendance);
-                        switch (attendance.type) {
-                            case Attendance.TYPE_ABSENT:
-                                attendanceTypeStr = app.getString(R.string.notification_absence);
-                                break;
-                            case Attendance.TYPE_ABSENT_EXCUSED:
-                                attendanceTypeStr = app.getString(R.string.notification_absence_excused);
-                                break;
-                            case Attendance.TYPE_BELATED:
-                                attendanceTypeStr = app.getString(R.string.notification_belated);
-                                break;
-                            case Attendance.TYPE_BELATED_EXCUSED:
-                                attendanceTypeStr = app.getString(R.string.notification_belated_excused);
-                                break;
-                            case Attendance.TYPE_RELEASED:
-                                attendanceTypeStr = app.getString(R.string.notification_release);
-                                break;
-                        }
-                        String text = app.getContext().getString(R.string.notification_attendance_format, attendanceTypeStr, attendance.subjectLongName, attendance.lessonDate.getFormattedString());
-                        app.notifier.add(new Notification(app.getContext(), text)
-                                .withProfileData(profile.getId(), profile.getName())
-                                .withType(Notification.TYPE_NEW_ATTENDANCE)
-                                .withFragmentRedirect(MainActivity.DRAWER_ITEM_ATTENDANCE)
-                                .withLongExtra("attendanceId", attendance.id)
-                                .withAddedDate(attendance.addedDate)
-                        );
-                    }
-                    for (AnnouncementFull announcement : app.db.announcementDao().getNotNotifiedNow(profileId)) {
-                        String text = app.getContext().getString(R.string.notification_announcement_format, announcement.subject);
-                        app.notifier.add(new Notification(app.getContext(), text)
-                                .withProfileData(profile.getId(), profile.getName())
-                                .withType(Notification.TYPE_NEW_ANNOUNCEMENT)
-                                .withFragmentRedirect(MainActivity.DRAWER_ITEM_ANNOUNCEMENTS)
-                                .withLongExtra("announcementId", announcement.id)
-                                .withAddedDate(announcement.addedDate)
-                        );
-                    }
-                    for (MessageFull message : app.db.messageDao().getReceivedNotNotifiedNow(profileId)) {
-                        String text = app.getContext().getString(R.string.notification_message_format, message.senderFullName, message.subject);
-                        app.notifier.add(new Notification(app.getContext(), text)
-                                .withProfileData(profile.getId(), profile.getName())
-                                .withType(Notification.TYPE_NEW_MESSAGE)
-                                .withFragmentRedirect(MainActivity.DRAWER_ITEM_MESSAGES)
-                                .withLongExtra("messageType", Message.TYPE_RECEIVED)
-                                .withLongExtra("messageId", message.id)
-                                .withAddedDate(message.addedDate)
-                        );
-                    }
-
-                    if (profile.getLuckyNumber() != oldLuckyNumber
-                            && profile.getLuckyNumber() != -1
-                            && profile.getLuckyNumberDate() != null
-                            && profile.getLuckyNumberDate().getValue() >= todayValue) {
-                        String text;
-                        if (profile.getLuckyNumberDate().getValue() == todayValue) { // LN for today
-                            text = app.getString((profile.getStudentNumber() != -1 && profile.getStudentNumber() == profile.getLuckyNumber() ? R.string.notification_lucky_number_yours_format : R.string.notification_lucky_number_format), profile.getLuckyNumber());
-                        } else if (profile.getLuckyNumberDate().getValue() == todayValue + 1) { // LN for tomorrow
-                            text = app.getString((profile.getStudentNumber() != -1 && profile.getStudentNumber() == profile.getLuckyNumber() ? R.string.notification_lucky_number_yours_tomorrow_format : R.string.notification_lucky_number_tomorrow_format), profile.getLuckyNumber());
-                        } else { // LN for later
-                            text = app.getString((profile.getStudentNumber() != -1 && profile.getStudentNumber() == profile.getLuckyNumber() ? R.string.notification_lucky_number_yours_later_format : R.string.notification_lucky_number_later_format), profile.getLuckyNumberDate().getFormattedString(), profile.getLuckyNumber());
-                        }
-                        app.notifier.add(new Notification(app.getContext(), text)
-                                .withProfileData(profile.getId(), profile.getName())
-                                .withType(Notification.TYPE_LUCKY_NUMBER)
-                                .withFragmentRedirect(MainActivity.DRAWER_ITEM_HOME)
-                        );
-                        oldLuckyNumber = profile.getLuckyNumber();
-                    }
-                }
-
-
-                app.db.metadataDao().setAllNotified(profileId, true);
-                callback.onProgress(1);
-
-                // SEND WEB PUSH, if registration allowed
-                // otherwise, UNREGISTER THE USER
-                if (profile.getRegistration() == REGISTRATION_ENABLED) {
-                    new Handler(activityContext.getMainLooper()).post(() -> {
-                        callback.onActionStarted(R.string.sync_action_syncing_shared_events);
-                    });
-                    //if (profile.registrationUsername == null || profile.registrationUsername.equals("")) {
-                    //}
-                    ServerRequest syncRequest = new ServerRequest(app, app.requestScheme + APP_URL + "main.php?sync", "Edziennik/REG", profile);
-
-                    if (registerEmpty) {
-                        syncRequest.setBodyParameter("first_run", "true");
-                    }
-
-                    // ALSO SEND NEW DATA TO BROWSER *excluding* all Shared Events !!!
-                    // because they will be sent by the server, as soon as it's shared, by FCM
-
-                    if (app.appConfig.webPushEnabled) {
-                        int position = 0;
-                        for (Notification notification : app.appConfig.notifications) {
-                            //Log.d(TAG, notification.text);
-                            if (!notification.notified) {
-                                if (notification.type != Notification.TYPE_NEW_SHARED_EVENT
-                                        && notification.type != Notification.TYPE_SERVER_MESSAGE
-                                        && notification.type != Notification.TYPE_NEW_SHARED_HOMEWORK) // these are automatically sent to the browser by the server
-                                {
-                                    //Log.d(TAG, "Adding notify[" + position + "]");
-                                    syncRequest.setBodyParameter("notify[" + position + "][type]", Integer.toString(notification.type));
-                                    syncRequest.setBodyParameter("notify[" + position + "][title]", notification.title);
-                                    syncRequest.setBodyParameter("notify[" + position + "][text]", notification.text);
-                                    position++;
-                                }
-                            }
-                        }
-                    }
-
-                    callback.onProgress(1);
-
-                    if (app.appConfig.webPushEnabled || profile.getEnableSharedEvents()) {
-                        JsonObject result = syncRequest.runSync();
-                        callback.onProgress(1);
-                        //Log.d(TAG, "Executed request");
-                        if (result == null) {
-                            return AppError.CODE_APP_SERVER_ERROR;
-                        }
-                        apiResponse = result.toString();
-                        if (!result.get("success").getAsString().equals("true")) {
-                            return AppError.CODE_APP_SERVER_ERROR;
-                        }
-                        // HERE PROCESS ALL THE RECEIVED EVENTS
-                        // add them to the profile and create appropriate notifications
-                        for (JsonElement jEventEl : result.getAsJsonArray("events")) {
-                            JsonObject jEvent = jEventEl.getAsJsonObject();
-                            String teamCode = jEvent.get("team").getAsString();
-                            //d(TAG, "An event is there! "+jEvent.toString());
-                            // get the target Team from teamCode
-                            Team team = app.db.teamDao().getByCodeNow(profile.getId(), teamCode);
-                            if (team != null) {
-                                //d(TAG, "The target team is "+team.name+", ID "+team.id);
-                                // create the event from Json. Add the missing teamId and !!profileId!!
-                                Event event = app.gson.fromJson(jEvent.toString(), Event.class);
-                                // proguard. disable for Event.class
-                                if (event.eventDate == null) {
-                                    apiResponse += "\n\nEventDate == null\n" + jEvent.toString();
-                                    throw new Exception("null eventDate");
-                                }
-                                event.profileId = profile.getId();
-                                event.teamId = team.id;
-                                event.addedManually = true;
-                                //d(TAG, "Created the event! "+event);
-
-                                if (event.sharedBy != null && event.sharedBy.equals(profile.getUsernameId())) {
-                                    //d(TAG, "Shared by self! Changing name");
-                                    event.sharedBy = "self";
-                                    event.sharedByName = profile.getStudentNameLong();
-                                }
-
-                                EventType type = app.db.eventTypeDao().getByIdNow(profileId, event.type);
-
-                                //d(TAG, "Finishing adding event "+event);
-                                app.db.eventDao().add(event);
-                                Metadata metadata = new Metadata(profile.getId(), event.type == TYPE_HOMEWORK ? Metadata.TYPE_HOMEWORK : Metadata.TYPE_EVENT, event.id, registerEmpty, true, jEvent.get("addedDate").getAsLong());
-                                long metadataId = app.db.metadataDao().add(metadata);
-                                if (metadataId != -1 && !registerEmpty) {
-                                    app.notifier.add(new Notification(app.getContext(), app.getString(R.string.notification_shared_event_format, event.sharedByName, type != null ? type.name : "wydarzenie", event.eventDate == null ? "nieznana data" : event.eventDate.getFormattedString(), event.topic))
-                                            .withProfileData(profile.getId(), profile.getName())
-                                            .withType(event.type == TYPE_HOMEWORK ? Notification.TYPE_NEW_SHARED_HOMEWORK : Notification.TYPE_NEW_SHARED_EVENT)
-                                            .withFragmentRedirect(event.type == TYPE_HOMEWORK ? MainActivity.DRAWER_ITEM_HOMEWORK : MainActivity.DRAWER_ITEM_AGENDA)
-                                            .withLongExtra("eventDate", event.eventDate.getValue())
-                                    );
-                                }
-                            }
-                        }
-                        callback.onProgress(5);
-                        return CODE_OK;
-                    } else {
-                        callback.onProgress(6);
-                        return CODE_OK;
-                    }
-                } else {
-                    // the user does not want to be registered
-                    callback.onProgress(7);
-                    return CODE_OK;
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                this.e = e;
-                return null;
-            }
-            //return null;
-        }
-
-        @Override
-        protected void onPostExecute(Integer errorCode) {
-            //d(TAG, "Thread/ProcessAsyncTask/onPostExecute/"+Thread.currentThread().getName());
-            Context activityContext = this.activityContext.get();
-            app.profileSaveFull(profile);
-            if (app.profile != null && profile.getId() == app.profile.getId()) {
-                app.profile = profile;
-            }
-            if (errorCode == null) {
-                // this means an Exception was thrown
-                callback.onError(activityContext, new AppError(TAG, 513, CODE_OTHER, e, apiResponse));
-                return;
-            }
-            //Log.d(TAG, "Finishing");
-
-
-            callback.onProgress(1);
-
-            if (errorCode == CODE_OK)
-                callback.onSuccess(activityContext, profile);
-            else {
-                try {
-                    // oh that's useless
-                    throw new RuntimeException(stringErrorCode(app, errorCode, ""));
-                } catch (Exception e) {
-                    callback.onError(activityContext, new AppError(TAG, 528, errorCode, e, (String) null));
-                }
-            }
-            super.onPostExecute(errorCode);
-        }
-    }
-
-    public void notifyAndReload() {
-        app.notifier.postAll(null);
-        app.saveConfig();
-        SyncJob.schedule(app);
-        Intent i = new Intent(Intent.ACTION_MAIN)
-                .putExtra("reloadProfileId", -1);
-        app.sendBroadcast(i);
-
-        Intent intent = new Intent(app.getContext(), WidgetTimetable.class);
-        intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-        int[] ids = AppWidgetManager.getInstance(app).getAppWidgetIds(new ComponentName(app, WidgetTimetable.class));
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids);
-        app.sendBroadcast(intent);
-
-        intent = new Intent(app.getContext(), WidgetNotifications.class);
-        intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-        ids = AppWidgetManager.getInstance(app).getAppWidgetIds(new ComponentName(app, WidgetNotifications.class));
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids);
-        app.sendBroadcast(intent);
-
-        intent = new Intent(app.getContext(), WidgetLuckyNumber.class);
-        intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-        ids = AppWidgetManager.getInstance(app).getAppWidgetIds(new ComponentName(app, WidgetLuckyNumber.class));
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids);
-        app.sendBroadcast(intent);
-    }
-
-    /*     _____
-          / ____|
-         | (___  _   _ _ __   ___
-          \___ \| | | | '_ \ / __|
-          ____) | |_| | | | | (__
-         |_____/ \__, |_| |_|\___|
-                  __/ |
-                 |__*/
-    // DataCallbacks that are *not* in Edziennik.sync need to be executed on the main thread.
-    // EdziennikInterface.sync is executed on a worker thread
-    // in Edziennik.sync/newCallback methods are called on a worker thread
-
-    // callback passed to Edziennik.sync is executed on the main thread
-    // thus, callback which is in guiSync is also on the main thread
-
-    /**
-     * Sync all Edziennik data.
-     * Used in services, login form and {@code guiSync}
-     * <p>
-     * May be ran on worker thread.
-     * {@link EdziennikInterface}.sync is ran always on worker thread.
-     * Every callback is ran on the UI thread.
-     *
-     * @param app
-     * @param activityContext
-     * @param callback
-     * @param profileId
-     */
-    public void sync(@NonNull App app, @NonNull Context activityContext, @NonNull SyncCallback callback, int profileId) {
-        sync(app, activityContext, callback, profileId, (int[])null);
-    }
-    public void sync(@NonNull App app, @NonNull Context activityContext, @NonNull SyncCallback callback, int profileId, @Nullable int ... featureList) {
-        // empty: no unread notifications, all shared events (current+past)
-        // only if there is no data, and we are not logged in yet
-        SyncCallback newCallback = new SyncCallback() {
-            @Override
-            public void onLoginFirst(List<Profile> profileList, LoginStore loginStore) {
-                new Handler(activityContext.getMainLooper()).post(() -> {
-                    callback.onLoginFirst(profileList, loginStore);
-                });
-            }
-
-            @Override
-            public void onSuccess(Context activityContext, ProfileFull profileFull) {
-                new Handler(activityContext.getMainLooper()).post(() -> {
-                    new ProcessAsyncTask(app, activityContext, callback, profileId, profileFull).execute();
-                });
-            }
-
-            @Override
-            public void onError(Context activityContext, AppError error) {
-                new Handler(activityContext.getMainLooper()).post(() -> {
-                    callback.onError(activityContext, error);
-                });
-            }
-
-            @Override
-            public void onProgress(int progressStep) {
-                new Handler(activityContext.getMainLooper()).post(() -> {
-                    callback.onProgress(progressStep);
-                });
-            }
-
-            @Override
-            public void onActionStarted(int stringResId) {
-                new Handler(activityContext.getMainLooper()).post(() -> {
-                    callback.onActionStarted(stringResId);
-                });
-            }
-        };
-        AsyncTask.execute(() -> {
-            ProfileFull profile = app.db.profileDao().getByIdNow(profileId);
-            if (profile != null) {
-
-                if (profile.getArchived()) {
-                    newCallback.onError(activityContext, new AppError(TAG, 678, CODE_PROFILE_ARCHIVED, profile.getName()));
-                    return;
-                }
-                else if (profile.getDateYearEnd() != null && Date.getToday().getValue() >= profile.getDateYearEnd().getValue()) {
-                    profile.setArchived(true);
-                    app.notifier.add(new Notification(app.getContext(), app.getString(R.string.profile_auto_archiving_format, profile.getName(), profile.getDateYearEnd().getFormattedString()))
-                            .withProfileData(profile.getId(), profile.getName())
-                            .withType(Notification.TYPE_AUTO_ARCHIVING)
-                            .withFragmentRedirect(DRAWER_ITEM_HOME)
-                            .withLongExtra("autoArchiving", 1L)
-                    );
-                    app.notifier.postAll(null);
-                    app.db.profileDao().add(profile);
-                    if (App.profileId == profile.getId()) {
-                        app.profile.setArchived(true);
-                    }
-                    newCallback.onSuccess(activityContext, profile);
-                    return;
-                }
-
-                registerEmpty = profile.getEmpty();
-                oldLuckyNumber = profile.getLuckyNumber();
-                getApi(app, profile.getLoginStoreType()).syncFeature(activityContext, newCallback, profile, featureList);
-            } else {
-                new Handler(activityContext.getMainLooper()).post(() -> callback.onError(activityContext, new AppError(TAG, 609, CODE_PROFILE_NOT_FOUND, (String) null)));
-            }
-        });
-    }
-
-    /*     _____ _    _ _____
-          / ____| |  | |_   _|
-         | |  __| |  | | | |   __      ___ __ __ _ _ __  _ __   ___ _ __ ___
-         | | |_ | |  | | | |   \ \ /\ / / '__/ _` | '_ \| '_ \ / _ \ '__/ __|
-         | |__| | |__| |_| |_   \ V  V /| | | (_| | |_) | |_) |  __/ |  \__ \
-          \_____|\____/|_____|   \_/\_/ |_|  \__,_| .__/| .__/ \___|_|  |___/
-                                                  | |   | |
-                                                  |_|   |*/
-    /**
-     * Sync all Edziennik data while showing a progress dialog.
-     * A wrapper for {@code sync}
-     *
-     * Does not switch between threads.
-     * All callbacks have to be executed on the UI thread.
-     *
-     * @param app an App singleton instance
-     * @param activity a parent activity
-     * @param profileId ID of the profile to sync
-     * @param dialogTitle a title of the dialog to show
-     * @param dialogText dialog's content
-     * @param successText a toast to show on success
-     */
-    public void guiSync(@NonNull App app, @NonNull Activity activity, int profileId, @StringRes int dialogTitle, @StringRes int dialogText, @StringRes int successText) {
-        guiSync(app, activity, profileId, dialogTitle, dialogText, successText, (int[])null);
-    }
-    public void guiSync(@NonNull App app, @NonNull Activity activity, int profileId, @StringRes int dialogTitle, @StringRes int dialogText, @StringRes int successText, int ... featureList) {
-        MaterialDialog progressDialog = new MaterialDialog.Builder(activity)
-                .title(dialogTitle)
-                .content(dialogText)
-                .progress(false, PROFILE_MAX_PROGRESS, false)
-                .canceledOnTouchOutside(false)
-                .show();
-        SyncCallback guiSyncCallback = new SyncCallback() {
-            @Override
-            public void onLoginFirst(List<Profile> profileList, LoginStore loginStore) {
-
-            }
-
-            @Override
-            public void onSuccess(Context activityContext, ProfileFull profileFull) {
-                progressDialog.dismiss();
-                Toast.makeText(activityContext, successText, Toast.LENGTH_SHORT).show();
-                notifyAndReload();
-                // profiles are saved automatically, during app.saveConfig in processFinish
-                /*if (activityContext instanceof MainActivity) {
-                    //((MainActivity) activityContext).reloadCurrentFragment("GuiSync");
-                    ((MainActivity) activityContext).accountHeaderAddProfiles();
-                }*/
-            }
-
-            @Override
-            public void onError(Context activityContext, AppError error) {
-                progressDialog.dismiss();
-                guiShowErrorDialog((Activity) activityContext, error, R.string.sync_error_dialog_title);
-            }
-
-            @Override
-            public void onProgress(int progressStep) {
-                progressDialog.incrementProgress(progressStep);
-            }
-
-            @Override
-            public void onActionStarted(int stringResId) {
-                progressDialog.setContent(activity.getString(R.string.sync_action_format, activity.getString(stringResId)));
-            }
-        };
-        app.apiEdziennik.sync(app, activity, guiSyncCallback, profileId, featureList);
-    }
-    /**
-     * Sync all Edziennik data in background.
-     * A callback is executed on main thread.
-     * A wrapper for {@code sync}
-     *
-     * @param app an App singleton instance
-     * @param activity a parent activity
-     * @param profileId ID of the profile to sync
-     * @param syncCallback a callback
-     * @param feature a feature to sync
-     */
-    public void guiSyncSilent(@NonNull App app, @NonNull Activity activity, int profileId, SyncCallback syncCallback, int feature) {
-        SyncCallback guiSyncCallback = new SyncCallback() {
-            @Override
-            public void onLoginFirst(List<Profile> profileList, LoginStore loginStore) {
-
-            }
-
-            @Override
-            public void onSuccess(Context activityContext, ProfileFull profileFull) {
-                notifyAndReload();
-                syncCallback.onSuccess(activityContext, profileFull);
-            }
-
-            @Override
-            public void onError(Context activityContext, AppError error) {
-                syncCallback.onError(activityContext, error);
-            }
-
-            @Override
-            public void onProgress(int progressStep) {
-                syncCallback.onProgress(progressStep);
-            }
-
-            @Override
-            public void onActionStarted(int stringResId) {
-                syncCallback.onActionStarted(stringResId);
-            }
-        };
-        app.apiEdziennik.sync(app, activity, guiSyncCallback, profileId, feature == FEATURE_ALL ? null : new int[]{feature});
-    }
-
-    /**
-     * Show a dialog allowing the user to choose which features to sync.
-     * Handles everything including pre-selecting the features basing on the current fragment.
-     *
-     * Will execute {@code sync} after the selection is made.
-     *
-     * A normal progress dialog is shown during the sync.
-     *
-     * @param app an App singleton instance
-     * @param activity a parent activity
-     * @param profileId ID of the profile to sync
-     * @param dialogTitle a title of the dialog to show
-     * @param dialogText dialog's content
-     * @param successText a toast to show on success
-     * @param currentFeature a feature id representing the currently opened fragment or caller
-     */
-    public void guiSyncFeature(@NonNull App app,
-                               @NonNull Activity activity,
-                               int profileId,
-                               @StringRes int dialogTitle,
-                               @StringRes int dialogText,
-                               @StringRes int successText,
-                               int currentFeature) {
-
-        String[] items = new String[]{
-                app.getString(R.string.menu_timetable),
-                app.getString(R.string.menu_agenda),
-                app.getString(R.string.menu_grades),
-                app.getString(R.string.menu_homework),
-                app.getString(R.string.menu_notices),
-                app.getString(R.string.menu_attendance),
-                app.getString(R.string.title_messages_inbox_single),
-                app.getString(R.string.title_messages_sent_single),
-                app.getString(R.string.menu_announcements)
-        };
-        int[] itemsIds = new int[]{
-                FEATURE_TIMETABLE,
-                FEATURE_AGENDA,
-                FEATURE_GRADES,
-                FEATURE_HOMEWORK,
-                FEATURE_NOTICES,
-                FEATURE_ATTENDANCE,
-                FEATURE_MESSAGES_INBOX,
-                FEATURE_MESSAGES_OUTBOX,
-                FEATURE_ANNOUNCEMENTS
-        };
-        int[] selectedIndices;
-        if (currentFeature == FEATURE_ALL) {
-            selectedIndices = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8};
-        }
-        else {
-            selectedIndices = new int[]{Arrays.binarySearch(itemsIds, currentFeature)};
-        }
-
-        MaterialDialog dialog = new MaterialDialog.Builder(activity)
-                .title(R.string.sync_feature_title)
-                .content(R.string.sync_feature_text)
-                .positiveText(R.string.ok)
-                .negativeText(R.string.cancel)
-                .neutralText(R.string.sync_feature_all)
-                .items(items)
-                .itemsIds(itemsIds)
-                .itemsCallbackMultiChoice(ArrayUtils.toWrapperArray(selectedIndices), (dialog1, which, text) -> {
-                    dialog1.getActionButton(DialogAction.POSITIVE).setEnabled(which.length > 0);
-                    return true;
-                })
-                .alwaysCallMultiChoiceCallback()
-                .onPositive(((dialog1, which) -> {
-                    List<Integer> featureList = new ArrayList<>();
-                    for (int i: dialog1.getSelectedIndices()) {
-                        featureList.add(itemsIds[i]);
-                    }
-                    guiSync(app, activity, profileId, dialogTitle, dialogText, successText, ArrayUtils.toPrimitiveArray(featureList));
-                }))
-                .onNeutral(((dialog1, which) -> {
-                    guiSync(app, activity, profileId, dialogTitle, dialogText, successText);
-                }))
-                .show();
-
-
-
-    }
-
-    public void guiShowArchivedDialog(Activity activity, String profileName) {
-        new MaterialDialog.Builder(activity)
-                .title(R.string.profile_archived_dialog_title)
-                .content(activity.getString(R.string.profile_archived_dialog_text_format, profileName))
-                .positiveText(R.string.ok)
-                .onPositive(((dialog, which) -> dialog.dismiss()))
-                .autoDismiss(false)
-                .show();
-    }
-
-    /*     _____ _    _ _____
-          / ____| |  | |_   _|
-         | |  __| |  | | | |     ___ _ __ _ __ ___  _ __ ___
-         | | |_ | |  | | | |    / _ \ '__| '__/ _ \| '__/ __|
-         | |__| | |__| |_| |_  |  __/ |  | | | (_) | |  \__ \
-          \_____|\____/|_____|  \___|_|  |_|  \___/|_|  |__*/
-    /**
-     * Used for reporting an exception somewhere in the code that is not part of Edziennik APIs.
-     *
-     * @param activity a parent activity
-     * @param errorLine the line of code where the error occurred
-     * @param e an Exception object
-     */
-    public void guiReportException(Activity activity, int errorLine, Exception e) {
-        guiReportError(activity, new AppError(TAG, errorLine, CODE_OTHER, "Błąd wewnętrzny aplikacji ("+errorLine+")", null, null, e, null), null);
-    }
-
-    public void guiShowErrorDialog(Activity activity, @NonNull AppError error, @StringRes int dialogTitle) {
-        if (error.errorCode == CODE_PROFILE_ARCHIVED) {
-            guiShowArchivedDialog(activity, error.errorText);
-            return;
-        }
-        error.changeIfCodeOther();
-        new MaterialDialog.Builder(activity)
-                .title(dialogTitle)
-                .content(error.asReadableString(activity))
-                .positiveText(R.string.ok)
-                .onPositive(((dialog, which) -> dialog.dismiss()))
-                .neutralText(R.string.sync_error_dialog_report_button)
-                .onNeutral(((dialog, which) -> {
-                    guiReportError(activity, error, dialog);
-                }))
-                .autoDismiss(false)
-                .show();
-    }
-    public void guiShowErrorSnackbar(MainActivity activity, @NonNull AppError error) {
-        if (error.errorCode == CODE_PROFILE_ARCHIVED) {
-            guiShowArchivedDialog(activity, error.errorText);
-            return;
-        }
-
-        // TODO: 2019-08-28
-        IconicsDrawable icon = new IconicsDrawable(activity)
-                .icon(CommunityMaterial.Icon.cmd_alert_circle);
-        sizeDp(icon, 20);
-        colorInt(icon, Themes.INSTANCE.getPrimaryTextColor(activity));
-
-        error.changeIfCodeOther();
-        CafeBar.builder(activity)
-                .to(activity.findViewById(R.id.coordinator))
-                .content(error.asReadableString(activity))
-                .icon(icon)
-                .positiveText(R.string.more)
-                .positiveColor(0xff4caf50)
-                .negativeText(R.string.ok)
-                .negativeColor(0x66ffffff)
-                .onPositive((cafeBar -> guiReportError(activity, error, null)))
-                .onNegative((cafeBar -> cafeBar.dismiss()))
-                .autoDismiss(false)
-                .swipeToDismiss(true)
-                .floating(true)
-                .show();
-    }
-    public void guiReportError(Activity activity, AppError error, @Nullable MaterialDialog parentDialogToDisableNeutral) {
-        String errorDetails = error.getDetails(activity);
-        String htmlErrorDetails = "<small>"+errorDetails+"</small>";
-        htmlErrorDetails = htmlErrorDetails.replaceAll(activity.getPackageName(), "<font color='#4caf50'>"+activity.getPackageName()+"</font>");
-        htmlErrorDetails = htmlErrorDetails.replaceAll("\n", "<br>");
-
-        new MaterialDialog.Builder(activity)
-                .title(R.string.sync_report_dialog_title)
-                .content(Html.fromHtml(htmlErrorDetails))
-                .typeface(null, "RobotoMono-Regular.ttf")
-                .negativeText(R.string.close)
-                .onNegative(((dialog1, which1) -> dialog1.dismiss()))
-                .neutralText(R.string.copy_to_clipboard)
-                .onNeutral((dialog1, which1) -> {
-                    ClipboardManager clipboard = (ClipboardManager) activity.getSystemService(CLIPBOARD_SERVICE);
-                    if (clipboard != null) {
-                        ClipData clip = ClipData.newPlainText("Error report", errorDetails);
-                        clipboard.setPrimaryClip(clip);
-                        Toast.makeText(activity, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show();
-                    }
-                })
-                .autoDismiss(false)
-                .positiveText(R.string.sync_report_dialog_button)
-                .checkBoxPromptRes(R.string.sync_report_dialog_include_api_response, true, null)
-                .onPositive(((dialog1, which1) -> AsyncTask.execute(() -> error.getApiResponse(activity, apiResponse -> {
-                    new ServerRequest(app, app.requestScheme + APP_URL + "main.php?report", "Edziennik/Report")
-                            .setBodyParameter("base64_encoded", Base64.encodeToString(errorDetails.getBytes(), Base64.DEFAULT))
-                            .setBodyParameter("api_response", dialog1.isPromptCheckBoxChecked() ? Base64.encodeToString(apiResponse.getBytes(), Base64.DEFAULT) : "VW5jaGVja2Vk"/*Unchecked*/)
-                            .run((e, result) -> {
-                                new Handler(activity.getMainLooper()).post(() -> {
-                                    if (result != null)
-                                    {
-                                        if (result.get("success").getAsBoolean()) {
-                                            Toast.makeText(activity, activity.getString(R.string.crash_report_sent), Toast.LENGTH_SHORT).show();
-                                            dialog1.getActionButton(DialogAction.POSITIVE).setEnabled(false);
-                                            if (parentDialogToDisableNeutral != null)
-                                                parentDialogToDisableNeutral.getActionButton(DialogAction.NEUTRAL).setEnabled(false);
-                                        }
-                                        else {
-                                            Toast.makeText(activity, activity.getString(R.string.crash_report_cannot_send) + ": " + result.get("reason").getAsString(), Toast.LENGTH_LONG).show();
-                                        }
-                                    }
-                                    else
-                                    {
-                                        Toast.makeText(activity, activity.getString(R.string.crash_report_cannot_send)+" brak internetu", Toast.LENGTH_LONG).show();
-                                    }
-                                });
-                            });
-                }))))
-                .show();
-    }
-
-    /**
-     * A method that displays a dialog allowing the user to report an error that has occurred.
-     *
-     * @param activity a parent activity
-     * @param errorCode self-explanatory
-     * @param errorText additional error information, that replaces text based on {@code errorCode} if it's {@code CODE_OTHER}
-     * @param throwable a {@link Throwable} containing the error details
-     * @param apiResponse response of the Edziennik API
-     * @param parentDialogToDisableNeutral if not null, an instance of {@link MaterialDialog} in which the neutral button should be disabled after submitting an error report
-     */
-    public void guiReportError(Activity activity, int errorCode, String errorText, Throwable throwable, String apiResponse, @Nullable MaterialDialog parentDialogToDisableNeutral) {
-        // build a string containing the stack trace and the device name + user's registration data
-        String contentPlain = "Application Internal Error "+stringErrorType(errorCode)+":\n"+stringErrorCode(activity, errorCode, "")+"\n"+errorText+"\n\n";
-        contentPlain += Log.getStackTraceString(throwable);
-        String content = "<small>"+contentPlain+"</small>";
-        content = content.replaceAll(activity.getPackageName(), "<font color='#4caf50'>"+activity.getPackageName()+"</font>");
-        content = content.replaceAll("\n", "<br>");
-
-        contentPlain += "\n"+Build.MANUFACTURER+"\n"+Build.BRAND+"\n"+Build.MODEL+"\n"+Build.DEVICE+"\n";
-        if (app.profile != null && app.profile.getRegistration() == REGISTRATION_ENABLED) {
-            contentPlain += "U: "+app.profile.getUsernameId()+"\nS: "+ app.profile.getStudentNameLong() +"\nT: "+app.profile.loginStoreType()+"\n";
-        }
-        contentPlain += BuildConfig.VERSION_NAME+" "+BuildConfig.BUILD_TYPE+"\nAndroid "+Build.VERSION.RELEASE;
-
-        d(TAG, contentPlain);
-        d(TAG, apiResponse == null ? "API Response = null" : apiResponse);
-
-
-        // show a dialog containing the error details in HTML
-        String finalContentPlain = contentPlain;
-        new MaterialDialog.Builder(activity)
-                .title(R.string.sync_report_dialog_title)
-                .content(Html.fromHtml(content))
-                .typeface(null, "RobotoMono-Regular.ttf")
-                .negativeText(R.string.close)
-                .onNegative(((dialog1, which1) -> dialog1.dismiss()))
-                .neutralText(R.string.copy_to_clipboard)
-                .onNeutral((dialog1, which1) -> {
-                    ClipboardManager clipboard = (ClipboardManager) activity.getSystemService(CLIPBOARD_SERVICE);
-                    if (clipboard != null) {
-                        ClipData clip = ClipData.newPlainText("Error report", finalContentPlain);
-                        clipboard.setPrimaryClip(clip);
-                        Toast.makeText(activity, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show();
-                    }
-                })
-                .autoDismiss(false)
-                .positiveText(R.string.sync_report_dialog_button)
-                .checkBoxPromptRes(R.string.sync_report_dialog_include_api_response, true, null)
-                .onPositive(((dialog1, which1) -> {
-                    // send the error report
-                    new ServerRequest(app, app.requestScheme + APP_URL + "main.php?report", "Edziennik/Report")
-                            .setBodyParameter("base64_encoded", Base64.encodeToString(finalContentPlain.getBytes(), Base64.DEFAULT))
-                            .setBodyParameter("api_response", dialog1.isPromptCheckBoxChecked() ? apiResponse == null ? Base64.encodeToString("NULL XD".getBytes(), Base64.DEFAULT) : Base64.encodeToString(apiResponse.getBytes(), Base64.DEFAULT) : "VW5jaGVja2Vk"/*Unchecked*/)
-                            .run((e, result) -> {
-                                new Handler(Looper.getMainLooper()).post(() -> {
-                                    if (result != null)
-                                    {
-                                        if (result.get("success").getAsBoolean()) {
-                                            Toast.makeText(activity, activity.getString(R.string.crash_report_sent), Toast.LENGTH_SHORT).show();
-                                            dialog1.getActionButton(DialogAction.POSITIVE).setEnabled(false);
-                                            if (parentDialogToDisableNeutral != null)
-                                                parentDialogToDisableNeutral.getActionButton(DialogAction.NEUTRAL).setEnabled(false);
-                                        }
-                                        else {
-                                            Toast.makeText(activity, activity.getString(R.string.crash_report_cannot_send) + ": " + result.get("reason").getAsString(), Toast.LENGTH_LONG).show();
-                                        }
-                                    }
-                                    else
-                                    {
-                                        Toast.makeText(activity, activity.getString(R.string.crash_report_cannot_send)+" JsonObject equals null", Toast.LENGTH_LONG).show();
-                                    }
-                                });
-                            });
-                }))
-                .show();
-    }
-
-    /*    _____            __ _ _                                           _
-         |  __ \          / _(_) |                                         | |
-         | |__) | __ ___ | |_ _| | ___   _ __ ___ _ __ ___   _____   ____ _| |
-         |  ___/ '__/ _ \|  _| | |/ _ \ | '__/ _ \ '_ ` _ \ / _ \ \ / / _` | |
-         | |   | | | (_) | | | | |  __/ | | |  __/ | | | | | (_) \ V / (_| | |
-         |_|   |_|  \___/|_| |_|_|\___| |_|  \___|_| |_| |_|\___/ \_/ \__,_|*/
-    public void guiRemoveProfile(MainActivity activity, int profileId, String profileName) {
-        new MaterialDialog.Builder(activity)
-                .title(R.string.profile_menu_remove_confirm)
-                .content(activity.getString(R.string.profile_menu_remove_confirm_text_format, profileName, profileName))
-                .positiveText(R.string.remove)
-                .negativeText(R.string.cancel)
-                .onPositive(((dialog, which) -> {
-                    AsyncTask.execute(() -> {
-                        removeProfile(profileId);
-                        activity.runOnUiThread(() -> {
-                            //activity.drawer.loadItem(DRAWER_ITEM_HOME, null, "ProfileRemoving");
-                            //activity.recreate(DRAWER_ITEM_HOME);
-                            activity.reloadTarget();
-                            Toast.makeText(activity, "Profil został usunięty.", Toast.LENGTH_LONG).show();
-                        });
-                    });
-                }))
-                .show();
-    }
-    public void removeProfile(int profileId) {
-        Profile profileObject = app.db.profileDao().getByIdNow(profileId);
-        if (profileObject == null)
-            return;
-        app.db.announcementDao().clear(profileId);
-        app.db.attendanceDao().clear(profileId);
-        app.db.eventDao().clear(profileId);
-        app.db.eventTypeDao().clear(profileId);
-        app.db.gradeDao().clear(profileId);
-        app.db.gradeCategoryDao().clear(profileId);
-        app.db.lessonDao().clear(profileId);
-        app.db.lessonChangeDao().clear(profileId);
-        app.db.luckyNumberDao().clear(profileId);
-        app.db.noticeDao().clear(profileId);
-        app.db.subjectDao().clear(profileId);
-        app.db.teacherDao().clear(profileId);
-        app.db.teamDao().clear(profileId);
-        app.db.messageRecipientDao().clear(profileId);
-        app.db.messageDao().clear(profileId);
-
-        int loginStoreId = profileObject.getLoginStoreId();
-        List<Integer> profilesUsingLoginStore = app.db.profileDao().getIdsByLoginStoreIdNow(loginStoreId);
-        if (profilesUsingLoginStore.size() == 1) {
-            app.db.loginStoreDao().remove(loginStoreId);
-        }
-        app.db.profileDao().remove(profileId);
-        app.db.metadataDao().deleteAll(profileId);
-
-        List<Notification> toRemove = new ArrayList<>();
-        for (Notification notification: app.appConfig.notifications) {
-            if (notification.profileId == profileId) {
-                toRemove.add(notification);
-            }
-        }
-        app.appConfig.notifications.removeAll(toRemove);
-
-        app.profile = null;
-        App.profileId = -1;
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Iuczniowie.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Iuczniowie.java
deleted file mode 100644
index 33c69671..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Iuczniowie.java
+++ /dev/null
@@ -1,1710 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.os.AsyncTask;
-import android.os.Handler;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.util.Pair;
-
-import com.crashlytics.android.Crashlytics;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonNull;
-import com.google.gson.JsonObject;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import im.wangchao.mhttp.Request;
-import im.wangchao.mhttp.Response;
-import im.wangchao.mhttp.body.MediaTypeUtils;
-import im.wangchao.mhttp.callback.JsonArrayCallbackHandler;
-import im.wangchao.mhttp.callback.JsonCallbackHandler;
-import im.wangchao.mhttp.callback.TextCallbackHandler;
-import okhttp3.Cookie;
-import okhttp3.HttpUrl;
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.BuildConfig;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.interfaces.AttachmentGetCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface;
-import pl.szczodrzynski.edziennik.data.api.interfaces.LoginCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.MessageGetCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.RecipientListGetCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.SyncCallback;
-import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement;
-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.lessons.Lesson;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange;
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
-import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber;
-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.messages.MessageRecipient;
-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.notices.Notice;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
-import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject;
-import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher;
-import pl.szczodrzynski.edziennik.data.db.modules.teams.Team;
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.Endpoint;
-import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.utils.models.Week;
-
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_INVALID_LOGIN;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_INVALID_SCHOOL_NAME;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_MAINTENANCE;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_OTHER;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_ABSENT;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_ABSENT_EXCUSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_BELATED;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_PRESENT;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_RELEASED;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER1_FINAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER1_PROPOSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_YEAR_FINAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_YEAR_PROPOSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange.TYPE_CANCELLED;
-import static pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange.TYPE_CHANGE;
-import static pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_DELETED;
-import static pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED;
-import static pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT;
-import static pl.szczodrzynski.edziennik.data.db.modules.notices.Notice.TYPE_NEGATIVE;
-import static pl.szczodrzynski.edziennik.data.db.modules.notices.Notice.TYPE_NEUTRAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.notices.Notice.TYPE_POSITIVE;
-import static pl.szczodrzynski.edziennik.utils.Utils.crc16;
-import static pl.szczodrzynski.edziennik.utils.Utils.crc32;
-import static pl.szczodrzynski.edziennik.utils.Utils.d;
-import static pl.szczodrzynski.edziennik.utils.Utils.getWordGradeValue;
-
-public class Iuczniowie implements EdziennikInterface {
-    public Iuczniowie(App app) {
-        this.app = app;
-    }
-
-    private static final String TAG = "api.Iuczniowie";
-    private static String IDZIENNIK_URL = "https://iuczniowie.progman.pl/idziennik";
-    private static final String userAgent = "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36";
-
-    private App app;
-    private Context activityContext = null;
-    private SyncCallback callback = null;
-    private int profileId = -1;
-    private Profile profile = null;
-    private LoginStore loginStore = null;
-    private boolean fullSync = true;
-    private Date today = Date.getToday();
-    private List<String> targetEndpoints = new ArrayList<>();
-
-    // PROGRESS
-    private static final int PROGRESS_LOGIN = 10;
-    private int PROGRESS_COUNT = 1;
-    private int PROGRESS_STEP = (90/PROGRESS_COUNT);
-
-    private int onlyFeature = FEATURE_ALL;
-
-    private List<Team> teamList;
-    private List<Teacher> teacherList;
-    private List<Subject> subjectList;
-    private List<Lesson> lessonList;
-    private List<LessonChange> lessonChangeList;
-    private List<Grade> gradeList;
-    private List<Event> eventList;
-    private List<Notice> noticeList;
-    private List<Attendance> attendanceList;
-    private List<Announcement> announcementList;
-    private List<Message> messageList;
-    private List<MessageRecipient> messageRecipientList;
-    private List<MessageRecipient> messageRecipientIgnoreList;
-    private List<Metadata> metadataList;
-    private List<Metadata> messageMetadataList;
-
-    private static boolean fakeLogin = false;
-    private String lastLogin = "";
-    private long lastLoginTime = -1;
-    private String lastResponse = null;
-    private String loginSchoolName = null;
-    private String loginUsername = null;
-    private String loginPassword = null;
-    private String loginBearerToken = null;
-    private int loginRegisterId = -1;
-    private int loginSchoolYearId = -1;
-    private String loginStudentId = null;
-    private int teamClassId = -1;
-
-    private boolean prepare(@NonNull Context activityContext, @NonNull SyncCallback callback, int profileId, @Nullable Profile profile, @NonNull LoginStore loginStore) {
-        this.activityContext = activityContext;
-        this.callback = callback;
-        this.profileId = profileId;
-        // here we must have a login store: either with a correct ID or -1
-        // there may be no profile and that's when onLoginFirst happens
-        this.profile = profile;
-        this.loginStore = loginStore;
-        this.fullSync = profile == null || profile.getEmpty() || profile.shouldFullSync(activityContext);
-        this.today = Date.getToday();
-
-        this.loginSchoolName = loginStore.getLoginData("schoolName", "");
-        this.loginUsername = loginStore.getLoginData("username", "");
-        this.loginPassword = loginStore.getLoginData("password", "");
-        if (loginSchoolName.equals("") || loginUsername.equals("") || loginPassword.equals("")) {
-            finishWithError(new AppError(TAG, 162, CODE_INVALID_LOGIN, "Login field is empty"));
-            return false;
-        }
-        fakeLogin = BuildConfig.DEBUG && loginUsername.startsWith("FAKE");
-        IDZIENNIK_URL = fakeLogin ? "http://szkolny.eu/idziennik" : "https://iuczniowie.progman.pl/idziennik";
-
-        teamList = profileId == -1 ? new ArrayList<>() : app.db.teamDao().getAllNow(profileId);
-        teacherList = profileId == -1 ? new ArrayList<>() : app.db.teacherDao().getAllNow(profileId);
-        subjectList = profileId == -1 ? new ArrayList<>() : app.db.subjectDao().getAllNow(profileId);
-        lessonList = new ArrayList<>();
-        lessonChangeList = new ArrayList<>();
-        gradeList = new ArrayList<>();
-        eventList = new ArrayList<>();
-        noticeList = new ArrayList<>();
-        attendanceList = new ArrayList<>();
-        announcementList = new ArrayList<>();
-        messageList = new ArrayList<>();
-        messageRecipientList = new ArrayList<>();
-        messageRecipientIgnoreList = new ArrayList<>();
-        metadataList = new ArrayList<>();
-        messageMetadataList = new ArrayList<>();
-
-        return true;
-    }
-
-    @Override
-    public void sync(@NonNull Context activityContext, @NonNull SyncCallback callback, int profileId, @Nullable Profile profile, @NonNull LoginStore loginStore) {
-        if (!prepare(activityContext, callback, profileId, profile, loginStore))
-            return;
-
-        login(() -> {
-            targetEndpoints = new ArrayList<>();
-            targetEndpoints.add("LuckyNumberAndSemesterDates");
-            targetEndpoints.add("Timetable");
-            targetEndpoints.add("Grades");
-            targetEndpoints.add("PropositionGrades");
-            targetEndpoints.add("Exams");
-            targetEndpoints.add("Notices");
-            targetEndpoints.add("Announcements");
-            targetEndpoints.add("Attendance");
-            targetEndpoints.add("MessagesInbox");
-            targetEndpoints.add("MessagesOutbox");
-            targetEndpoints.add("Finish");
-            PROGRESS_COUNT = targetEndpoints.size()-1;
-            PROGRESS_STEP = (90/PROGRESS_COUNT);
-            begin();
-        });
-    }
-    @Override
-    public void syncFeature(@NonNull Context activityContext, @NonNull SyncCallback callback, @NonNull ProfileFull profile, int ... featureList) {
-        if (featureList == null) {
-            sync(activityContext, callback, profile.getId(), profile, LoginStore.fromProfileFull(profile));
-            return;
-        }
-        if (!prepare(activityContext, callback, profile.getId(), profile, LoginStore.fromProfileFull(profile)))
-            return;
-
-        login(() -> {
-            targetEndpoints = new ArrayList<>();
-            if (featureList.length == 1)
-                onlyFeature = featureList[0];
-            targetEndpoints.add("LuckyNumberAndSemesterDates");
-            for (int feature: featureList) {
-                switch (feature) {
-                    case FEATURE_TIMETABLE:
-                        targetEndpoints.add("Timetable");
-                        break;
-                    case FEATURE_AGENDA:
-                        targetEndpoints.add("Exams");
-                        break;
-                    case FEATURE_GRADES:
-                        targetEndpoints.add("Grades");
-                        targetEndpoints.add("PropositionGrades");
-                        break;
-                    case FEATURE_HOMEWORK:
-                        targetEndpoints.add("Homework");
-                        break;
-                    case FEATURE_NOTICES:
-                        targetEndpoints.add("Notices");
-                        break;
-                    case FEATURE_ATTENDANCE:
-                        targetEndpoints.add("Attendance");
-                        break;
-                    case FEATURE_MESSAGES_INBOX:
-                        targetEndpoints.add("MessagesInbox");
-                        break;
-                    case FEATURE_MESSAGES_OUTBOX:
-                        targetEndpoints.add("MessagesOutbox");
-                        break;
-                    case FEATURE_ANNOUNCEMENTS:
-                        targetEndpoints.add("Announcements");
-                        break;
-                }
-            }
-            targetEndpoints.add("Finish");
-            PROGRESS_COUNT = targetEndpoints.size()-1;
-            PROGRESS_STEP = (90/PROGRESS_COUNT);
-            begin();
-        });
-    }
-
-    private void begin() {
-        List<Cookie> cookieList = app.cookieJar.loadForRequest(HttpUrl.get(IDZIENNIK_URL));
-        for (Cookie cookie: cookieList) {
-            if (cookie.name().equalsIgnoreCase("Bearer")) {
-                loginBearerToken = cookie.value();
-            }
-        }
-        loginStudentId = profile.getStudentData("studentId", null);
-        loginSchoolYearId = profile.getStudentData("schoolYearId", -1);
-        loginRegisterId = profile.getStudentData("registerId", -1);
-
-        if (loginRegisterId == -1) {
-            finishWithError(new AppError(TAG, 212, CODE_OTHER, app.getString(R.string.error_register_id_not_found), "loginRegisterId == -1"));
-            return;
-        }
-        if (loginSchoolYearId == -1) {
-            finishWithError(new AppError(TAG, 216, CODE_OTHER, app.getString(R.string.error_school_year_not_found), "loginSchoolYearId == -1"));
-            return;
-        }
-        if (loginStudentId == null) {
-            if (lastResponse == null) {
-                lastLoginTime = -1;
-                lastLogin = "";
-                finishWithError(new AppError(TAG, 223, CODE_OTHER, app.getString(R.string.error_student_id_not_found), "loginStudentId == null && lastResponse == null"));
-                return;
-            }
-            Matcher selectMatcher = Pattern.compile("<select.*?name=\"ctl00\\$dxComboUczniowie\".*?</select>", Pattern.DOTALL).matcher(lastResponse);
-            if (!selectMatcher.find()) {
-                finishWithError(new AppError(TAG, 228, CODE_OTHER, app.getString(R.string.error_register_id_not_found), lastResponse));
-                return;
-            }
-            Matcher idMatcher = Pattern.compile("<option.*?value=\""+loginRegisterId+"\"\\sdata-id-ucznia=\"([A-z0-9]+)\".*?>.*?</option>", Pattern.DOTALL).matcher(selectMatcher.group(0));
-            while (idMatcher.find()) {
-                loginStudentId = idMatcher.group(1);
-                profile.putStudentData("studentId", loginStudentId);
-            }
-        }
-
-        this.attendanceMonth = today.month;
-        this.attendanceYear = today.year;
-        this.attendancePrevMonthChecked = false;
-        this.examsMonth = today.month;
-        this.examsYear = today.year;
-        this.examsMonthsChecked = 0;
-        this.examsNextMonthChecked = false;
-
-        callback.onProgress(PROGRESS_LOGIN);
-
-        r("get", null);
-    }
-
-    private void r(String type, String endpoint) {
-        // endpoint == null when beginning
-        if (endpoint == null)
-            endpoint = targetEndpoints.get(0);
-        int index = -1;
-        for (String request: targetEndpoints) {
-            index++;
-            if (request.equals(endpoint)) {
-                break;
-            }
-        }
-        if (type.equals("finish")) {
-            // called when finishing the action
-            callback.onProgress(PROGRESS_STEP);
-            index++;
-        }
-        d(TAG, "Called r("+type+", "+endpoint+"). Getting "+targetEndpoints.get(index));
-        switch (targetEndpoints.get(index)) {
-            case "LuckyNumberAndSemesterDates":
-                getLuckyNumberAndSemesterDates();
-                break;
-            case "Timetable":
-                getTimetable();
-                break;
-            case "Grades":
-                getGrades();
-                break;
-            case "PropositionGrades":
-                getPropositionGrades();
-                break;
-            case "Exams":
-                getExams();
-                break;
-            case "Notices":
-                getNotices();
-                break;
-            case "Announcements":
-                getAnnouncements();
-                break;
-            case "Attendance":
-                getAttendance();
-                break;
-            case "MessagesInbox":
-                getMessagesInbox();
-                break;
-            case "MessagesOutbox":
-                getMessagesOutbox();
-                break;
-            case "Finish":
-                finish();
-                break;
-        }
-    }
-    private void saveData() {
-        if (teamList.size() > 0) {
-            //app.db.teamDao().clear(profileId);
-            app.db.teamDao().addAll(teamList);
-        }
-        if (teacherList.size() > 0)
-            app.db.teacherDao().addAll(teacherList);
-        if (subjectList.size() > 0)
-            app.db.subjectDao().addAll(subjectList);
-        if (lessonList.size() > 0) {
-            app.db.lessonDao().clear(profileId);
-            app.db.lessonDao().addAll(lessonList);
-        }
-        if (lessonChangeList.size() > 0)
-            app.db.lessonChangeDao().addAll(lessonChangeList);
-        if (gradeList.size() > 0) {
-            app.db.gradeDao().clear(profileId);
-            app.db.gradeDao().addAll(gradeList);
-        }
-        if (eventList.size() > 0) {
-            app.db.eventDao().removeFuture(profileId, today);
-            app.db.eventDao().addAll(eventList);
-        }
-        if (noticeList.size() > 0) {
-            app.db.noticeDao().clear(profileId);
-            app.db.noticeDao().addAll(noticeList);
-        }
-        if (attendanceList.size() > 0)
-            app.db.attendanceDao().addAll(attendanceList);
-        if (announcementList.size() > 0)
-            app.db.announcementDao().addAll(announcementList);
-        if (messageList.size() > 0)
-            app.db.messageDao().addAllIgnore(messageList);
-        if (messageRecipientList.size() > 0)
-            app.db.messageRecipientDao().addAll(messageRecipientList);
-        if (messageRecipientIgnoreList.size() > 0)
-            app.db.messageRecipientDao().addAllIgnore(messageRecipientIgnoreList);
-        if (metadataList.size() > 0)
-            app.db.metadataDao().addAllIgnore(metadataList);
-        if (messageMetadataList.size() > 0)
-            app.db.metadataDao().setSeen(messageMetadataList);
-    }
-    private void finish() {
-        try {
-            saveData();
-        }
-        catch (Exception e) {
-            finishWithError(new AppError(TAG, 363, CODE_OTHER, app.getString(R.string.sync_error_saving_data), null, null, e, null));
-        }
-        if (fullSync) {
-            profile.setLastFullSync(System.currentTimeMillis());
-            fullSync = false;
-        }
-        profile.setEmpty(false);
-        callback.onSuccess(activityContext, new ProfileFull(profile, loginStore));
-    }
-    private void finishWithError(AppError error) {
-        try {
-            saveData();
-        }
-        catch (Exception e) {
-            Crashlytics.logException(e);
-        }
-        callback.onError(activityContext, error);
-    }
-
-    /*    _                 _
-         | |               (_)
-         | |     ___   __ _ _ _ __
-         | |    / _ \ / _` | | '_ \
-         | |___| (_) | (_| | | | | |
-         |______\___/ \__, |_|_| |_|
-                       __/ |
-                      |__*/
-    private void login(@NonNull LoginCallback loginCallback) {
-        if (lastLogin.equals(loginSchoolName +":"+ loginUsername)
-                && System.currentTimeMillis() - lastLoginTime < 5 * 60 * 1000
-                && profile != null) { // less than 5 minutes, use the already logged in account
-            loginCallback.onSuccess();
-            return;
-        }
-        app.cookieJar.clearForDomain("iuczniowie.progman.pl");
-        callback.onActionStarted(R.string.sync_action_logging_in);
-        Request.builder()
-                .url(IDZIENNIK_URL +"/login.aspx")
-                .userAgent(userAgent)
-                .callback(new TextCallbackHandler() {
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 389, CODE_OTHER, response, throwable));
-                    }
-
-                    @Override
-                    public void onSuccess(String data1, Response response1) {
-                        if (data1 == null || data1.equals("")) { // for safety
-                            finishWithError(new AppError(TAG, 395, CODE_MAINTENANCE, response1));
-                            return;
-                        }
-                        //Log.d(TAG, "r:"+data);
-                        Request.Builder builder = Request.builder()
-                                .url(IDZIENNIK_URL +"/login.aspx")
-                                .userAgent(userAgent)
-                                //.withClient(app.httpLazy)
-                                .addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/png,*/*;q=0.8")
-                                .addHeader("Cache-Control", "max-age=0")
-                                .addHeader("Origin", "https://iuczniowie.progman.pl")
-                                .addHeader("Referer", "https://iuczniowie.progman.pl/idziennik/login.aspx")
-                                .addHeader("Upgrade-Insecure-Requests", "1")
-                                .contentType(MediaTypeUtils.APPLICATION_FORM)
-                                .addParameter("ctl00$ContentPlaceHolder$nazwaPrzegladarki", userAgent)
-                                .addParameter("ctl00$ContentPlaceHolder$NazwaSzkoly", loginSchoolName)
-                                .addParameter("ctl00$ContentPlaceHolder$UserName", loginUsername)
-                                .addParameter("ctl00$ContentPlaceHolder$Password", loginPassword)
-                                .addParameter("ctl00$ContentPlaceHolder$captcha", "")
-                                .addParameter("ctl00$ContentPlaceHolder$Logowanie", "Zaloguj")
-                                .post();
-
-                        // extract hidden form fields __VIEWSTATE __VIEWSTATEGENERATOR __EVENTVALIDATION
-                        //Pattern pattern = Pattern.compile("<.+?name=\"__VIEWSTATE\".+?value=\"([A-z0-9+/=]+)\".+?name=\"__VIEWSTATEGENERATOR\".+?value=\"([A-z0-9+/=]+)\".+?name=\"__EVENTVALIDATION\".+?value=\"([A-z0-9+/=]+)\".+?>", Pattern.DOTALL);
-                        //Pattern pattern = Pattern.compile("<input type=\"hidden\"(?=[^>]* name=[\"']([^'\"]*)|)(?=[^>]* value=[\"']([^'\"]*)|)", Pattern.DOTALL);
-                        Pattern pattern = Pattern.compile("<input type=\"hidden\".+?name=\"([A-z0-9_]+)?\".+?value=\"([A-z0-9_+-/=]+)?\".+?>", Pattern.DOTALL);
-                        Matcher matcher = pattern.matcher(data1);
-                        while (matcher.find()) {
-                            //Log.d(TAG, "Match: "+matcher.group(1)+"="+matcher.group(2));
-                            builder.addParameter(matcher.group(1), matcher.group(2));
-                        }
-
-                        builder.callback(new TextCallbackHandler() {
-                            @Override
-                            public void onSuccess(String data2, Response response2) {
-                                callback.onProgress(PROGRESS_LOGIN);
-                                Pattern errorPattern = Pattern.compile("id=\"spanErrorMessage\">(.*?)</", Pattern.DOTALL);
-                                Matcher errorMatcher = errorPattern.matcher(data2);
-                                if (errorMatcher.find()) {
-                                    String error = errorMatcher.group(1);
-                                    d(TAG, errorMatcher.group(0));
-                                    if (error.equals("")) {
-                                        finishWithError(new AppError(TAG, 443, CODE_MAINTENANCE, error, response2, data2));
-                                        return;
-                                    }
-                                    if (error.contains("nieprawidłową nazwę szkoły")) {
-                                        finishWithError(new AppError(TAG, 447, CODE_INVALID_SCHOOL_NAME, error, response2, data2));
-                                        return;
-                                    }
-                                    if (error.contains("nieprawidłowy login lub hasło")) {
-                                        finishWithError(new AppError(TAG, 451, AppError.CODE_INVALID_LOGIN, error, response2, data2));
-                                        return;
-                                    }
-                                    finishWithError(new AppError(TAG, 454, CODE_OTHER, error, response2, data2));
-                                    return;
-                                }
-
-                                // a successful login
-
-                                lastLogin = loginSchoolName +":"+ loginUsername;
-                                lastLoginTime = System.currentTimeMillis();
-                                lastResponse = data2;
-
-                                // HERE we decide if it's the first login
-                                // if it is, let's search for students and return them in onLoginFirst
-                                // else, let's continue syncing having the profile object
-                                if (profile != null) {
-                                    loginRegisterId = profile.getStudentData("registerId", -1);
-                                    loginSchoolYearId = profile.getStudentData("schoolYearId", -1);
-                                    loginStudentId = profile.getStudentData("studentId", null);
-                                    Matcher selectMatcher = Pattern.compile("<select.*?name=\"ctl00\\$dxComboUczniowie\".*?</select>", Pattern.DOTALL).matcher(data2);
-                                    if (!selectMatcher.find()) {
-                                        finishWithError(new AppError(TAG, 473, CODE_OTHER, app.getString(R.string.error_register_id_not_found), response2, data2));
-                                        return;
-                                    }
-                                    Log.d(TAG, "g" + selectMatcher.group(0));
-                                    Matcher idMatcher = Pattern.compile("<option.*?value=\"([0-9]+)\".+?>(.+?)\\s(.+?)\\s*\\((.+?),\\s*(.+?)\\)</option>", Pattern.DOTALL).matcher(selectMatcher.group(0));
-                                    while (idMatcher.find()) {
-                                        if (loginRegisterId != Integer.parseInt(idMatcher.group(1)))
-                                            continue;
-                                        String teamClassName = idMatcher.group(4) + " " + idMatcher.group(5);
-                                        teamClassId = crc16(teamClassName.getBytes());
-                                        app.db.teamDao().add(new Team(
-                                                profileId,
-                                                teamClassId,
-                                                teamClassName,
-                                                1,
-                                                loginSchoolName+":"+teamClassName,
-                                                -1
-                                        ));
-                                    }
-                                    loginCallback.onSuccess();
-                                    return;
-                                }
-                                try {
-                                    Matcher yearMatcher = Pattern.compile("name=\"ctl00\\$dxComboRokSzkolny\".+?selected=\"selected\".*?value=\"([0-9]+)\"", Pattern.DOTALL).matcher(data2);
-                                    if (yearMatcher.find()) {
-                                        try {
-                                            loginSchoolYearId = Integer.parseInt(yearMatcher.group(1));
-                                        } catch (Exception ex) {
-                                            finishWithError(new AppError(TAG, 501, CODE_OTHER, response2, ex, data2));
-                                            return;
-                                        }
-                                    } else {
-                                        if (data2.contains("Hasło dostępu do systemu wygasło")) {
-                                            finishWithError(new AppError(TAG, 504, CODE_OTHER, app.getString(R.string.error_must_change_password), response2, data2));
-                                            return;
-                                        }
-                                        finishWithError(new AppError(TAG, 507, CODE_OTHER, app.getString(R.string.error_school_year_not_found), response2, data2));
-                                        return;
-                                    }
-
-                                    List<String> studentIds = new ArrayList<>();
-                                    List<Integer> registerIds = new ArrayList<>();
-                                    List<String> studentNamesLong = new ArrayList<>();
-                                    List<String> studentNamesShort = new ArrayList<>();
-                                    List<String> studentTeams = new ArrayList<>();
-
-                                    Matcher selectMatcher = Pattern.compile("<select.*?name=\"ctl00\\$dxComboUczniowie\".*?</select>", Pattern.DOTALL).matcher(data2);
-                                    if (!selectMatcher.find()) {
-                                        finishWithError(new AppError(TAG, 519, CODE_OTHER, app.getString(R.string.error_register_id_not_found), response2, data2));
-                                        return;
-                                    }
-                                    Log.d(TAG, "g" + selectMatcher.group(0));
-                                    Matcher idMatcher = Pattern.compile("<option.*?value=\"([0-9]+)\"\\sdata-id-ucznia=\"([A-z0-9]+?)\".*?>(.+?)\\s(.+?)\\s*\\((.+?),\\s*(.+?)\\)</option>", Pattern.DOTALL).matcher(selectMatcher.group(0));
-                                    while (idMatcher.find()) {
-                                        registerIds.add(Integer.parseInt(idMatcher.group(1)));
-                                        String studentId = idMatcher.group(2);
-                                        String studentFirstName = idMatcher.group(3);
-                                        String studentLastName = idMatcher.group(4);
-                                        String teamClassName = idMatcher.group(5) + " " + idMatcher.group(6);
-                                        studentIds.add(studentId);
-                                        studentNamesLong.add(studentFirstName + " " + studentLastName);
-                                        studentNamesShort.add(studentFirstName + " " + studentLastName.charAt(0) + ".");
-                                        studentTeams.add(teamClassName);
-                                    }
-                                    Collections.reverse(studentIds);
-                                    Collections.reverse(registerIds);
-                                    Collections.reverse(studentNamesLong);
-                                    Collections.reverse(studentNamesShort);
-                                    Collections.reverse(studentTeams);
-
-                                    List<Profile> profileList = new ArrayList<>();
-                                    for (int index = 0; index < registerIds.size(); index++) {
-                                        Profile newProfile = new Profile();
-                                        newProfile.setStudentNameLong(studentNamesLong.get(index));
-                                        newProfile.setStudentNameShort(studentNamesShort.get(index));
-                                        newProfile.setName(newProfile.getStudentNameLong());
-                                        newProfile.setSubname(loginUsername);
-                                        newProfile.setEmpty(true);
-                                        newProfile.setLoggedIn(true);
-                                        newProfile.putStudentData("studentId", studentIds.get(index));
-                                        newProfile.putStudentData("registerId", registerIds.get(index));
-                                        newProfile.putStudentData("schoolYearId", loginSchoolYearId);
-                                        profileList.add(newProfile);
-                                    }
-
-                                    callback.onLoginFirst(profileList, loginStore);
-                                } catch (Exception ex) {
-                                    finishWithError(new AppError(TAG, 557, CODE_OTHER, response2, ex, data2));
-                                }
-                            }
-
-                            @Override
-                            public void onFailure(Response response, Throwable throwable) {
-                                finishWithError(new AppError(TAG, 563, CODE_OTHER, response, throwable, data1));
-                            }
-                        }).build().enqueue();
-                    }
-                }).build().enqueue();
-    }
-
-    /*    _    _      _                                          _ _ _                _
-         | |  | |    | |                       ___              | | | |              | |
-         | |__| | ___| |_ __   ___ _ __ ___   ( _ )     ___ __ _| | | |__   __ _  ___| | _____
-         |  __  |/ _ \ | '_ \ / _ \ '__/ __|  / _ \/\  / __/ _` | | | '_ \ / _` |/ __| |/ / __|
-         | |  | |  __/ | |_) |  __/ |  \__ \ | (_>  < | (_| (_| | | | |_) | (_| | (__|   <\__ \
-         |_|  |_|\___|_| .__/ \___|_|  |___/  \___/\/  \___\__,_|_|_|_.__/ \__,_|\___|_|\_\___/
-                       | |
-                       |*/
-    private interface ApiRequestCallback {
-        void onSuccess(JsonObject result, Response response);
-    }
-    private void apiRequest(Request.Builder requestBuilder, ApiRequestCallback apiRequestCallback) {
-        requestBuilder.callback(new JsonCallbackHandler() {
-            @Override
-            public void onSuccess(JsonObject data, Response response) {
-                if (data == null) {
-                    finishWithError(new AppError(TAG, 578, CODE_MAINTENANCE, response));
-                    return;
-                }
-                try {
-                    apiRequestCallback.onSuccess(data, response);
-                }
-                catch (Exception e) {
-                    finishWithError(new AppError(TAG, 583, CODE_OTHER, response, e, data));
-                }
-            }
-
-            @Override
-            public void onFailure(Response response, Throwable throwable) {
-                finishWithError(new AppError(TAG, 592, CODE_OTHER, response, throwable));
-            }
-        })
-        .build()
-        .enqueue();
-    }
-    private interface ApiRequestArrayCallback {
-        void onSuccess(JsonArray result, Response response);
-    }
-    private void apiRequestArray(Request.Builder requestBuilder, ApiRequestArrayCallback apiRequestArrayCallback) {
-        requestBuilder.callback(new JsonArrayCallbackHandler() {
-            @Override
-            public void onSuccess(JsonArray data, Response response) {
-                if (data == null) {
-                    finishWithError(new AppError(TAG, 603, CODE_MAINTENANCE, response));
-                    return;
-                }
-                try {
-                    apiRequestArrayCallback.onSuccess(data, response);
-                }
-                catch (Exception e) {
-                    finishWithError(new AppError(TAG, 610, CODE_OTHER, response, e, data.toString()));
-                }
-            }
-
-            @Override
-            public void onFailure(Response response, Throwable throwable) {
-                finishWithError(new AppError(TAG, 616, CODE_OTHER, response, throwable));
-            }
-        })
-                .build()
-                .enqueue();
-    }
-
-    private Subject searchSubject(String name, long id, String shortName) {
-        Subject subject;
-        if (id == -1)
-            subject = Subject.getByName(subjectList, name);
-        else
-            subject = Subject.getById(subjectList, id);
-
-        if (subject == null) {
-            subject = new Subject(profileId, (id == -1 ? crc16(name.getBytes()) : id), name, shortName);
-            subjectList.add(subject);
-        }
-        return subject;
-    }
-
-    private Teacher searchTeacher(String firstName, String lastName) {
-        Teacher teacher = Teacher.getByFullName(teacherList, firstName+" "+lastName);
-        return validateTeacher(teacher, firstName, lastName);
-    }
-    private Teacher searchTeacher(char firstNameChar, String lastName) {
-        Teacher teacher = Teacher.getByShortName(teacherList, firstNameChar+"."+lastName);
-        return validateTeacher(teacher, String.valueOf(firstNameChar), lastName);
-    }
-    @NonNull
-    private Teacher validateTeacher(Teacher teacher, String firstName, String lastName) {
-        if (teacher == null) {
-            teacher = new Teacher(profileId, -1, firstName, lastName);
-            teacher.id = crc16(teacher.getShortName().getBytes());
-            teacherList.add(teacher);
-        }
-        if (firstName.length() > 1)
-            teacher.name = firstName;
-        teacher.surname = lastName;
-        return teacher;
-    }
-
-    private Teacher searchTeacherByLastFirst(String nameLastFirst) {
-        String[] nameParts = nameLastFirst.split(" ", Integer.MAX_VALUE);
-        if (nameParts.length == 1)
-            return searchTeacher(nameParts[0], "");
-        return searchTeacher(nameParts[1], nameParts[0]);
-    }
-    private Teacher searchTeacherByFirstLast(String nameFirstLast) {
-        String[] nameParts = nameFirstLast.split(" ", Integer.MAX_VALUE);
-        if (nameParts.length == 1)
-            return searchTeacher(nameParts[0], "");
-        return searchTeacher(nameParts[0], nameParts[1]);
-    }
-    private Teacher searchTeacherByFDotLast(String nameFDotLast) {
-        String[] nameParts = nameFDotLast.split("\\.", Integer.MAX_VALUE);
-        if (nameParts.length == 1)
-            return searchTeacher(nameParts[0], "");
-        return searchTeacher(nameParts[0].charAt(0), nameParts[1]);
-    }
-    private Teacher searchTeacherByFDotSpaceLast(String nameFDotSpaceLast) {
-        String[] nameParts = nameFDotSpaceLast.split("\\. ", Integer.MAX_VALUE);
-        if (nameParts.length == 1)
-            return searchTeacher(nameParts[0], "");
-        return searchTeacher(nameParts[0].charAt(0), nameParts[1]);
-    }
-
-    /*    _____        _          _____                            _
-         |  __ \      | |        |  __ \                          | |
-         | |  | | __ _| |_ __ _  | |__) |___  __ _ _   _  ___  ___| |_ ___
-         | |  | |/ _` | __/ _` | |  _  // _ \/ _` | | | |/ _ \/ __| __/ __|
-         | |__| | (_| | || (_| | | | \ \  __/ (_| | |_| |  __/\__ \ |_\__ \
-         |_____/ \__,_|\__\__,_| |_|  \_\___|\__, |\__,_|\___||___/\__|___/
-                                                | |
-                                                |*/
-    private void getTimetable() {
-        callback.onActionStarted(R.string.sync_action_syncing_timetable);
-        Date weekStart = Week.getWeekStart();
-        if (Date.getToday().getWeekDay() > 4) {
-            weekStart.stepForward(0, 0, 7);
-        }
-        apiRequest(Request.builder()
-                .url(IDZIENNIK_URL +"/mod_panelRodzica/plan/WS_Plan.asmx/pobierzPlanZajec")
-                .userAgent(userAgent)
-                .addParameter("idPozDziennika", loginRegisterId)
-                .addParameter("pidRokSzkolny", loginSchoolYearId)
-                .addParameter("data", weekStart.getStringY_m_d()+"T10:00:00.000Z")
-                .postJson(), (result, response) -> {
-            JsonObject data = result.getAsJsonObject("d");
-            if (data == null) {
-                finishWithError(new AppError(TAG, 697, CODE_MAINTENANCE, response, result));
-                return;
-            }
-            List<Pair<Time, Time>> lessonHours = new ArrayList<>();
-            for (JsonElement jLessonHourEl : data.getAsJsonArray("GodzinyLekcyjne")) {
-                JsonObject jLessonHour = jLessonHourEl.getAsJsonObject();
-                // jLessonHour
-                lessonHours.add(new Pair<>(Time.fromH_m(jLessonHour.get("Poczatek").getAsString()), Time.fromH_m(jLessonHour.get("Koniec").getAsString())));
-            }
-
-            for (JsonElement jLessonEl : data.getAsJsonArray("Przedmioty")) {
-                JsonObject jLesson = jLessonEl.getAsJsonObject();
-                // jLesson
-                Subject rSubject = searchSubject(jLesson.get("Nazwa").getAsString(), jLesson.get("Id").getAsInt(), jLesson.get("Skrot").getAsString());
-                Teacher rTeacher = searchTeacherByFDotLast(jLesson.get("Nauczyciel").getAsString());
-
-                int weekDay = jLesson.get("DzienTygodnia").getAsInt() - 1;
-                Pair<Time, Time> lessonHour = lessonHours.get(jLesson.get("Godzina").getAsInt());
-                if (lessonHour == null || lessonHour.first == null || lessonHour.second == null)
-                    continue;
-                Lesson lessonObject = new Lesson(
-                        profileId,
-                        weekDay,
-                        lessonHour.first,
-                        lessonHour.second
-                );
-                lessonObject.subjectId = rSubject.id;
-                lessonObject.teacherId = rTeacher.id;
-                lessonObject.teamId = teamClassId;
-                lessonObject.classroomName = jLesson.get("NazwaSali").getAsString();
-
-                lessonList.add(lessonObject);
-
-                int type = jLesson.get("TypZastepstwa").getAsInt();
-                if (type != -1) {
-                    // we have a lesson change to process
-                    LessonChange lessonChangeObject = new LessonChange(
-                            profileId,
-                            weekStart.clone().stepForward(0, 0, weekDay),
-                            lessonObject.startTime,
-                            lessonObject.endTime
-                    );
-
-                    lessonChangeObject.teamId = lessonObject.teamId;
-                    lessonChangeObject.teacherId = lessonObject.teacherId;
-                    lessonChangeObject.subjectId = lessonObject.subjectId;
-                    lessonChangeObject.classroomName = lessonObject.classroomName;
-                    switch (type) {
-                        case 0:
-                            lessonChangeObject.type = TYPE_CANCELLED;
-                            break;
-                        case 1:
-                        case 2:
-                        case 3:
-                        case 4:
-                        case 5:
-                            lessonChangeObject.type = TYPE_CHANGE;
-                            String newTeacher = jLesson.get("NauZastepujacy").getAsString();
-                            String newSubject = jLesson.get("PrzedmiotZastepujacy").getAsString();
-                            if (!newTeacher.equals("")) {
-                                lessonChangeObject.teacherId = searchTeacherByFDotLast(newTeacher).id;
-                            }
-                            if (!newSubject.equals("")) {
-                                lessonChangeObject.subjectId = searchSubject(newSubject, -1, "").id;
-                            }
-                            break;
-                    }
-
-                    lessonChangeList.add(lessonChangeObject);
-                    metadataList.add(new Metadata(profileId, Metadata.TYPE_LESSON_CHANGE, lessonChangeObject.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-                }
-            }
-            r("finish", "Timetable");
-        });
-    }
-
-    private void getGrades() {
-        callback.onActionStarted(R.string.sync_action_syncing_grades);
-        apiRequest(Request.builder()
-                .url(IDZIENNIK_URL +"/mod_panelRodzica/oceny/WS_ocenyUcznia.asmx/pobierzOcenyUcznia")
-                .userAgent(userAgent)
-                .addParameter("idPozDziennika", loginRegisterId)
-                .postJson(), (result, response) -> {
-            JsonObject data = result.getAsJsonObject("d");
-            if (data == null) {
-                finishWithError(new AppError(TAG, 782, CODE_MAINTENANCE, response, result));
-                return;
-            }
-            JsonArray jSubjects = data.getAsJsonArray("Przedmioty");
-            for (JsonElement jSubjectEl : jSubjects) {
-                JsonObject jSubject = jSubjectEl.getAsJsonObject();
-                // jSubject
-                Subject rSubject = searchSubject(jSubject.get("Przedmiot").getAsString(), jSubject.get("IdPrzedmiotu").getAsInt(), jSubject.get("Przedmiot").getAsString());
-                for (JsonElement jGradeEl : jSubject.getAsJsonArray("Oceny")) {
-                    JsonObject jGrade = jGradeEl.getAsJsonObject();
-                    // jGrade
-                    Teacher rTeacher = searchTeacherByLastFirst(jGrade.get("Wystawil").getAsString());
-
-                    boolean countToTheAverage = jGrade.get("DoSredniej").getAsBoolean();
-                    float value = jGrade.get("WartoscDoSred").getAsFloat();
-
-                    String gradeColor = jGrade.get("Kolor").getAsString();
-                    int colorInt = 0xff2196f3;
-                    if (!gradeColor.isEmpty()) {
-                        colorInt = Color.parseColor("#"+gradeColor);
-                    }
-
-                    Grade gradeObject = new Grade(
-                            profileId,
-                            jGrade.get("idK").getAsLong(),
-                            jGrade.get("Kategoria").getAsString(),
-                            colorInt,
-                            "",
-                            jGrade.get("Ocena").getAsString(),
-                            value,
-                            value > 0 && countToTheAverage ? jGrade.get("Waga").getAsFloat() : 0,
-                            jGrade.get("Semestr").getAsInt(),
-                            rTeacher.id,
-                            rSubject.id);
-
-                    switch (jGrade.get("Typ").getAsInt()) {
-                        case 0:
-                            JsonElement historyEl = jGrade.get("Historia");
-                            JsonArray history;
-                            if (historyEl instanceof JsonArray && (history = historyEl.getAsJsonArray()).size() > 0) {
-                                float sum = gradeObject.value * gradeObject.weight;
-                                float count = gradeObject.weight;
-                                for (JsonElement historyItemEl: history) {
-                                    JsonObject historyItem = historyItemEl.getAsJsonObject();
-
-                                    countToTheAverage = historyItem.get("DoSredniej").getAsBoolean();
-                                    value = historyItem.get("WartoscDoSred").getAsFloat();
-                                    float weight = historyItem.get("Waga").getAsFloat();
-
-                                    if (value > 0 && countToTheAverage) {
-                                        sum += value * weight;
-                                        count += weight;
-                                    }
-
-                                    Grade historyObject = new Grade(
-                                            profileId,
-                                            gradeObject.id * -1,
-                                            historyItem.get("Kategoria").getAsString(),
-                                            Color.parseColor("#"+historyItem.get("Kolor").getAsString()),
-                                            historyItem.get("Uzasadnienie").getAsString(),
-                                            historyItem.get("Ocena").getAsString(),
-                                            value,
-                                            value > 0 && countToTheAverage ? weight * -1 : 0,
-                                            historyItem.get("Semestr").getAsInt(),
-                                            rTeacher.id,
-                                            rSubject.id);
-                                    historyObject.parentId = gradeObject.id;
-
-                                    gradeList.add(historyObject);
-                                    metadataList.add(new Metadata(profileId, Metadata.TYPE_GRADE, historyObject.id, true, true, Date.fromY_m_d(historyItem.get("Data_wystaw").getAsString()).getInMillis()));
-                                }
-                                // update the current grade's value with an average of all historical grades and itself
-                                if (sum > 0 && count > 0) {
-                                    gradeObject.value = sum / count;
-                                }
-                                gradeObject.isImprovement = true; // gradeObject is the improved grade. Originals are historyObjects
-                            }
-                            break;
-                        case 1:
-                            gradeObject.type = TYPE_SEMESTER1_FINAL;
-                            gradeObject.name = Integer.toString((int) gradeObject.value);
-                            gradeObject.weight = 0;
-                            break;
-                        case 2:
-                            gradeObject.type = TYPE_YEAR_FINAL;
-                            gradeObject.name = Integer.toString((int) gradeObject.value);
-                            gradeObject.weight = 0;
-                            break;
-                    }
-
-                    gradeList.add(gradeObject);
-                    metadataList.add(new Metadata(profileId, Metadata.TYPE_GRADE, gradeObject.id, profile.getEmpty(), profile.getEmpty(), Date.fromY_m_d(jGrade.get("Data_wystaw").getAsString()).getInMillis()));
-                }
-            }
-            r("finish", "Grades");
-        });
-    }
-
-    private void getPropositionGrades() {
-        callback.onActionStarted(R.string.sync_action_syncing_proposition_grades);
-        apiRequest(Request.builder()
-                .url(IDZIENNIK_URL +"/mod_panelRodzica/brak_ocen/WS_BrakOcenUcznia.asmx/pobierzBrakujaceOcenyUcznia")
-                .userAgent(userAgent)
-                .addParameter("idPozDziennika", loginRegisterId)
-                .postJson(), (result, response) -> {
-            JsonObject data = result.getAsJsonObject("d");
-            if (data == null) {
-                finishWithError(new AppError(TAG, 836, CODE_MAINTENANCE, response, result));
-                return;
-            }
-            JsonArray jSubjects = data.getAsJsonArray("Przedmioty");
-            for (JsonElement jSubjectEl : jSubjects) {
-                JsonObject jSubject = jSubjectEl.getAsJsonObject();
-                // jSubject
-                Subject rSubject = searchSubject(jSubject.get("Przedmiot").getAsString(), -1, jSubject.get("Przedmiot").getAsString());
-                String semester1Proposed = jSubject.get("OcenaSem1").getAsString();
-                String semester2Proposed = jSubject.get("OcenaSem2").getAsString();
-                int semester1Value = getWordGradeValue(semester1Proposed);
-                int semester2Value = getWordGradeValue(semester2Proposed);
-                long semester1Id = rSubject.id * -100 - 1;
-                long semester2Id = rSubject.id * -100 - 2;
-
-                if (!semester1Proposed.equals("")) {
-                    Grade gradeObject = new Grade(
-                            profileId,
-                            semester1Id,
-                            "",
-                            -1,
-                            "",
-                            Integer.toString(semester1Value),
-                            semester1Value,
-                            0,
-                            1,
-                            -1,
-                            rSubject.id);
-
-                    gradeObject.type = TYPE_SEMESTER1_PROPOSED;
-
-                    gradeList.add(gradeObject);
-                    metadataList.add(new Metadata(profileId, Metadata.TYPE_GRADE, gradeObject.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-                }
-
-                if (!semester2Proposed.equals("")) {
-                    Grade gradeObject = new Grade(
-                            profileId,
-                            semester2Id,
-                            "",
-                            -1,
-                            "",
-                            Integer.toString(semester2Value),
-                            semester2Value,
-                            0,
-                            2,
-                            -1,
-                            rSubject.id);
-
-                    gradeObject.type = TYPE_YEAR_PROPOSED;
-
-                    gradeList.add(gradeObject);
-                    metadataList.add(new Metadata(profileId, Metadata.TYPE_GRADE, gradeObject.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-                }
-            }
-            r("finish", "PropositionGrades");
-        });
-    }
-
-    private int examsYear = Date.getToday().year;
-    private int examsMonth = Date.getToday().month;
-    private int examsMonthsChecked = 0;
-    private boolean examsNextMonthChecked = false; // TO DO temporary // no more // idk
-    private void getExams() {
-        callback.onActionStarted(R.string.sync_action_syncing_exams);
-        JsonObject postData = new JsonObject();
-        postData.addProperty("idP", loginRegisterId);
-        postData.addProperty("rok", examsYear);
-        postData.addProperty("miesiac", examsMonth);
-        JsonObject param = new JsonObject();
-        param.addProperty("strona", 1);
-        param.addProperty("iloscNaStrone", "99");
-        param.addProperty("iloscRekordow", -1);
-        param.addProperty("kolumnaSort", "ss.Nazwa,sp.Data_sprawdzianu");
-        param.addProperty("kierunekSort", 0);
-        param.addProperty("maxIloscZaznaczonych", 0);
-        param.addProperty("panelFiltrow", 0);
-        postData.add("param", param);
-
-        apiRequest(Request.builder()
-                .url(IDZIENNIK_URL +"/mod_panelRodzica/sprawdziany/mod_sprawdzianyPanel.asmx/pobierzListe")
-                .userAgent(userAgent)
-                .setJsonBody(postData), (result, response) -> {
-            JsonObject data = result.getAsJsonObject("d");
-            if (data == null) {
-                finishWithError(new AppError(TAG, 921, CODE_MAINTENANCE, response, result));
-                return;
-            }
-            for (JsonElement jExamEl : data.getAsJsonArray("ListK")) {
-                JsonObject jExam = jExamEl.getAsJsonObject();
-                // jExam
-                long eventId = jExam.get("_recordId").getAsLong();
-                Subject rSubject = searchSubject(jExam.get("przedmiot").getAsString(), -1, "");
-                Teacher rTeacher = searchTeacherByLastFirst(jExam.get("wpisal").getAsString());
-                Date examDate = Date.fromY_m_d(jExam.get("data").getAsString());
-                Lesson lessonObject = Lesson.getByWeekDayAndSubject(lessonList, examDate.getWeekDay(), rSubject.id);
-                Time examTime = lessonObject == null ? null : lessonObject.startTime;
-
-                int eventType = (jExam.get("rodzaj").getAsString().equals("sprawdzian/praca klasowa") ? Event.TYPE_EXAM : Event.TYPE_SHORT_QUIZ);
-                Event eventObject = new Event(
-                        profileId,
-                        eventId,
-                        examDate,
-                        examTime,
-                        jExam.get("zakres").getAsString(),
-                        -1,
-                        eventType,
-                        false,
-                        rTeacher.id,
-                        rSubject.id,
-                        teamClassId
-                );
-
-                eventList.add(eventObject);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_EVENT, eventObject.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-            }
-
-            if (profile.getEmpty() && examsMonthsChecked < 3 /* how many months backwards to check? */) {
-                examsMonthsChecked++;
-                examsMonth--;
-                if (examsMonth < 1) {
-                    examsMonth = 12;
-                    examsYear--;
-                }
-                r("get", "Exams");
-            } else if (!examsNextMonthChecked /* get also one month forward */) {
-                Date showDate = Date.getToday().stepForward(0, 1, 0);
-                examsYear = showDate.year;
-                examsMonth = showDate.month;
-                examsNextMonthChecked = true;
-                r("get", "Exams");
-            } else {
-                r("finish", "Exams");
-            }
-        });
-    }
-
-    private void getNotices() {
-        callback.onActionStarted(R.string.sync_action_syncing_notices);
-        apiRequest(Request.builder()
-                .url(IDZIENNIK_URL +"/mod_panelRodzica/uwagi/WS_uwagiUcznia.asmx/pobierzUwagiUcznia")
-                .userAgent(userAgent)
-                .addParameter("idPozDziennika", loginRegisterId)
-                .postJson(), (result, response) -> {
-            JsonObject data = result.getAsJsonObject("d");
-            if (data == null) {
-                finishWithError(new AppError(TAG, 982, CODE_MAINTENANCE, response, result));
-                return;
-            }
-            for (JsonElement jNoticeEl : data.getAsJsonArray("SUwaga")) {
-                JsonObject jNotice = jNoticeEl.getAsJsonObject();
-                // jExam
-                long noticeId = crc16(jNotice.get("id").getAsString().getBytes());
-
-                Teacher rTeacher = searchTeacherByLastFirst(jNotice.get("Nauczyciel").getAsString());
-                Date addedDate = Date.fromY_m_d(jNotice.get("Data").getAsString());
-
-                int nType = TYPE_NEUTRAL;
-                String jType = jNotice.get("Typ").getAsString();
-                if (jType.equals("n")) {
-                    nType = TYPE_NEGATIVE;
-                } else if (jType.equals("p")) {
-                    nType = TYPE_POSITIVE;
-                }
-
-                Notice noticeObject = new Notice(
-                        profileId,
-                        noticeId,
-                        jNotice.get("Tresc").getAsString(),
-                        jNotice.get("Semestr").getAsInt(),
-                        nType,
-                        rTeacher.id);
-                noticeList.add(noticeObject);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_NOTICE, noticeObject.id, profile.getEmpty(), profile.getEmpty(), addedDate.getInMillis()));
-            }
-            r("finish", "Notices");
-        });
-    }
-
-    private void getAnnouncements() {
-        callback.onActionStarted(R.string.sync_action_syncing_announcements);
-        if (loginStudentId == null) {
-            r("finish", "Announcements");
-            return;
-        }
-        JsonObject postData = new JsonObject();
-        postData.addProperty("uczenId", loginStudentId);
-        JsonObject param = new JsonObject();
-        param.add("parametryFiltrow", new JsonArray());
-        postData.add("param", param);
-
-        apiRequest(Request.builder()
-                .url(IDZIENNIK_URL +"/mod_panelRodzica/tabOgl/WS_tablicaOgloszen.asmx/GetOgloszenia")
-                .userAgent(userAgent)
-                .setJsonBody(postData), (result, response) -> {
-            JsonObject data = result.getAsJsonObject("d");
-            if (data == null) {
-                finishWithError(new AppError(TAG, 1033, CODE_MAINTENANCE, response, result));
-                return;
-            }
-            for (JsonElement jAnnouncementEl : data.getAsJsonArray("ListK")) {
-                JsonObject jAnnouncement = jAnnouncementEl.getAsJsonObject();
-                // jAnnouncement
-                long announcementId = jAnnouncement.get("Id").getAsLong();
-
-                Teacher rTeacher = searchTeacherByFirstLast(jAnnouncement.get("Autor").getAsString());
-                long addedDate = Long.parseLong(jAnnouncement.get("DataDodania").getAsString().replaceAll("[^\\d]", ""));
-                Date startDate = Date.fromMillis(Long.parseLong(jAnnouncement.get("DataWydarzenia").getAsString().replaceAll("[^\\d]", "")));
-
-                Announcement announcementObject = new Announcement(
-                        profileId,
-                        announcementId,
-                        jAnnouncement.get("Temat").getAsString(),
-                        jAnnouncement.get("Tresc").getAsString(),
-                        startDate,
-                        null,
-                        rTeacher.id
-                );
-                announcementList.add(announcementObject);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_ANNOUNCEMENT, announcementObject.id, profile.getEmpty(), profile.getEmpty(), addedDate));
-            }
-            r("finish", "Announcements");
-        });
-    }
-
-    private int attendanceYear;
-    private int attendanceMonth;
-    private boolean attendancePrevMonthChecked = false;
-    private void getAttendance() {
-        callback.onActionStarted(R.string.sync_action_syncing_attendance);
-        apiRequest(Request.builder()
-                .url(IDZIENNIK_URL +"/mod_panelRodzica/obecnosci/WS_obecnosciUcznia.asmx/pobierzObecnosciUcznia")
-                .userAgent(userAgent)
-                .addParameter("idPozDziennika", loginRegisterId)
-                .addParameter("mc", attendanceMonth)
-                .addParameter("rok", attendanceYear)
-                .addParameter("dataTygodnia", "")
-                .postJson(), (result, response) -> {
-            JsonObject data = result.getAsJsonObject("d");
-            if (data == null) {
-                finishWithError(new AppError(TAG, 1076, CODE_MAINTENANCE, response, result));
-                return;
-            }
-            for (JsonElement jAttendanceEl : data.getAsJsonArray("Obecnosci")) {
-                JsonObject jAttendance = jAttendanceEl.getAsJsonObject();
-                // jAttendance
-                int attendanceTypeIdziennik = jAttendance.get("TypObecnosci").getAsInt();
-                if (attendanceTypeIdziennik == 5 || attendanceTypeIdziennik == 7)
-                    continue;
-                Date attendanceDate = Date.fromY_m_d(jAttendance.get("Data").getAsString());
-                Time attendanceTime = Time.fromH_m(jAttendance.get("OdDoGodziny").getAsString());
-                if (attendanceDate.combineWith(attendanceTime) > System.currentTimeMillis())
-                    continue;
-
-                long attendanceId = crc16(jAttendance.get("IdLesson").getAsString().getBytes());
-                Subject rSubject = searchSubject(jAttendance.get("Przedmiot").getAsString(), jAttendance.get("IdPrzedmiot").getAsLong(), "");
-                Teacher rTeacher = searchTeacherByFDotSpaceLast(jAttendance.get("PrzedmiotNauczyciel").getAsString());
-
-                String attendanceName = "obecność";
-                int attendanceType = Attendance.TYPE_CUSTOM;
-
-                switch (attendanceTypeIdziennik) {
-                    case 1: /* nieobecność usprawiedliwiona */
-                        attendanceName = "nieobecność usprawiedliwiona";
-                        attendanceType = TYPE_ABSENT_EXCUSED;
-                        break;
-                    case 2: /* spóźnienie */
-                        attendanceName = "spóźnienie";
-                        attendanceType = TYPE_BELATED;
-                        break;
-                    case 3: /* nieobecność nieusprawiedliwiona */
-                        attendanceName = "nieobecność nieusprawiedliwiona";
-                        attendanceType = TYPE_ABSENT;
-                        break;
-                    case 4: /* zwolnienie */
-                    case 9: /* zwolniony / obecny */
-                        attendanceType = TYPE_RELEASED;
-                        if (attendanceTypeIdziennik == 4)
-                            attendanceName = "zwolnienie";
-                        if (attendanceTypeIdziennik == 9)
-                            attendanceName = "zwolnienie / obecność";
-                        break;
-                    case 0: /* obecny */
-                    case 8: /* Wycieczka */
-                        attendanceType = TYPE_PRESENT;
-                        if (attendanceTypeIdziennik == 8)
-                            attendanceName = "wycieczka";
-                        break;
-                }
-
-                int semester = profile.dateToSemester(attendanceDate);
-
-                Attendance attendanceObject = new Attendance(
-                        profileId,
-                        attendanceId,
-                        rTeacher.id,
-                        rSubject.id,
-                        semester,
-                        attendanceName,
-                        attendanceDate,
-                        attendanceTime,
-                        attendanceType
-                );
-
-                attendanceList.add(attendanceObject);
-                if (attendanceObject.type != TYPE_PRESENT) {
-                    metadataList.add(new Metadata(profileId, Metadata.TYPE_ATTENDANCE, attendanceObject.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-                }
-            }
-
-            int attendanceDateValue = attendanceYear *10000 + attendanceMonth *100;
-            if (profile.getEmpty() && attendanceDateValue > profile.getSemesterStart(1).getValue()) {
-                attendancePrevMonthChecked = true; // do not need to check prev month later
-                attendanceMonth--;
-                if (attendanceMonth < 1) {
-                    attendanceMonth = 12;
-                    attendanceYear--;
-                }
-                r("get", "Attendance");
-            } else if (!attendancePrevMonthChecked /* get also the previous month */) {
-                attendanceMonth--;
-                if (attendanceMonth < 1) {
-                    attendanceMonth = 12;
-                    attendanceYear--;
-                }
-                attendancePrevMonthChecked = true;
-                r("get", "Attendance");
-            } else {
-                r("finish", "Attendance");
-            }
-        });
-    }
-
-    private void getLuckyNumberAndSemesterDates() {
-        if (profile.getLuckyNumberDate() != null && profile.getLuckyNumber() != -1 && profile.getLuckyNumberDate().getValue() == Date.getToday().getValue()) {
-            r("finish", "LuckyNumberAndSemesterDates");
-            return;
-        }
-        if (loginBearerToken == null || loginStudentId == null) {
-            r("finish", "LuckyNumberAndSemesterDates");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_lucky_number);
-        apiRequest(Request.builder()
-                .url(IDZIENNIK_URL +"/api/Uczniowie/"+loginStudentId+"/AktualnyDziennik")
-                .header("Authorization", "Bearer "+loginBearerToken)
-                .userAgent(userAgent), (data, response) -> {
-            JsonObject settings = data.getAsJsonObject("ustawienia");
-            if (settings == null) {
-                finishWithError(new AppError(TAG, 1188, CODE_MAINTENANCE, response, data));
-                return;
-            }
-            // data, settings
-            profile.setLuckyNumber(-1);
-            profile.setLuckyNumberDate(today);
-            JsonElement luckyNumberEl = data.get("szczesliwyNumerek");
-            if (luckyNumberEl != null && !(luckyNumberEl instanceof JsonNull)) {
-                profile.setLuckyNumber(luckyNumberEl.getAsInt());
-                Time publishTime = Time.fromH_m(settings.get("godzinaPublikacjiSzczesliwegoLosu").getAsString());
-                if (Time.getNow().getValue() > publishTime.getValue()) {
-                    profile.getLuckyNumberDate().stepForward(0, 0, 1); // the lucky number is already for tomorrow
-                }
-                app.db.luckyNumberDao().add(new LuckyNumber(profileId, profile.getLuckyNumberDate(), profile.getLuckyNumber()));
-            }
-
-            profile.setDateSemester1Start(Date.fromY_m_d(settings.get("poczatekSemestru1").getAsString()));
-            profile.setDateSemester2Start(Date.fromY_m_d(settings.get("koniecSemestru1").getAsString()).stepForward(0, 0, 1));
-            profile.setDateYearEnd(Date.fromY_m_d(settings.get("koniecSemestru2").getAsString()));
-
-            r("finish", "LuckyNumberAndSemesterDates");
-        });
-    }
-
-    private void getMessagesInbox() {
-        if (loginBearerToken == null) {
-            r("finish", "MessagesInbox");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_messages);
-        apiRequestArray(Request.builder()
-                .url(IDZIENNIK_URL +"/api/Wiadomosci/Odebrane")
-                .header("Authorization", "Bearer "+loginBearerToken)
-                .userAgent(userAgent), (data, response) -> {
-            for (JsonElement jMessageEl: data) {
-                JsonObject jMessage = jMessageEl.getAsJsonObject();
-
-                String subject = jMessage.get("tytul").getAsString();
-                if (subject.contains("(") && subject.startsWith("iDziennik - "))
-                    continue;
-                if (subject.startsWith("Uwaga dla ucznia (klasa:"))
-                    continue;
-
-                String messageIdStr = jMessage.get("id").getAsString();
-                long messageId = crc32((messageIdStr+"0").getBytes());
-
-                String body = "[META:"+messageIdStr+";-1]";
-                body += jMessage.get("tresc").getAsString().replaceAll("\n", "<br>");
-
-                long readDate = jMessage.get("odczytana").getAsBoolean() ? Date.fromIso(jMessage.get("wersjaRekordu").getAsString()) : 0;
-                long sentDate = Date.fromIso(jMessage.get("dataWyslania").getAsString());
-
-                JsonObject sender = jMessage.getAsJsonObject("nadawca");
-                Teacher rTeacher = searchTeacher(sender.get("imie").getAsString(), sender.get("nazwisko").getAsString());
-                rTeacher.loginId = sender.get("id").getAsString()+":"+sender.get("usr").getAsString();
-
-                Message message = new Message(
-                        profileId,
-                        messageId,
-                        subject,
-                        body,
-                        jMessage.get("rekordUsuniety").getAsBoolean() ? TYPE_DELETED : TYPE_RECEIVED,
-                        rTeacher.id,
-                        -1
-                );
-
-                MessageRecipient messageRecipient = new MessageRecipient(
-                        profileId,
-                        -1 /* me */,
-                        -1,
-                        readDate,
-                        /*messageId*/ messageId
-                );
-
-                messageList.add(message);
-                messageRecipientList.add(messageRecipient);
-                messageMetadataList.add(new Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, readDate > 0, readDate > 0 || profile.getEmpty(), sentDate));
-            }
-
-            r("finish", "MessagesInbox");
-        });
-    }
-
-    private void getMessagesOutbox() {
-        if (loginBearerToken == null) {
-            r("finish", "MessagesOutbox");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_messages);
-        apiRequestArray(Request.builder()
-                .url(IDZIENNIK_URL +"/api/Wiadomosci/Wyslane")
-                .header("Authorization", "Bearer "+loginBearerToken)
-                .userAgent(userAgent), (data, response) -> {
-            for (JsonElement jMessageEl: data) {
-                JsonObject jMessage = jMessageEl.getAsJsonObject();
-
-                String messageIdStr = jMessage.get("id").getAsString();
-                long messageId = crc32((messageIdStr+"1").getBytes());
-
-                String subject = jMessage.get("tytul").getAsString();
-
-                String body = "[META:"+messageIdStr+";-1]";
-                body += jMessage.get("tresc").getAsString().replaceAll("\n", "<br>");
-
-                long sentDate = Date.fromIso(jMessage.get("dataWyslania").getAsString());
-
-                Message message = new Message(
-                        profileId,
-                        messageId,
-                        subject,
-                        body,
-                        TYPE_SENT,
-                        -1,
-                        -1
-                );
-
-                for (JsonElement recipientEl: jMessage.getAsJsonArray("odbiorcy")) {
-                    JsonObject recipient = recipientEl.getAsJsonObject();
-                    String firstName = recipient.get("imie").getAsString();
-                    String lastName = recipient.get("nazwisko").getAsString();
-                    if (firstName.isEmpty() || lastName.isEmpty()) {
-                        firstName = "usunięty";
-                        lastName = "użytkownik";
-                    }
-                    Teacher rTeacher = searchTeacher(firstName, lastName);
-                    rTeacher.loginId = recipient.get("id").getAsString()+":"+recipient.get("usr").getAsString();
-
-                    MessageRecipient messageRecipient = new MessageRecipient(
-                            profileId,
-                            rTeacher.id,
-                            -1,
-                            -1,
-                            /*messageId*/ messageId
-                    );
-                    messageRecipientIgnoreList.add(messageRecipient);
-                }
-
-                messageList.add(message);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, true, true, sentDate));
-            }
-
-            r("finish", "MessagesOutbox");
-        });
-    }
-
-    @Override
-    public Map<String, Endpoint> getConfigurableEndpoints(Profile profile) {
-        return null;
-    }
-
-    @Override
-    public boolean isEndpointEnabled(Profile profile, boolean defaultActive, String name) {
-        return defaultActive;
-    }
-
-    @Override
-    public void syncMessages(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile)
-    {
-    }
-
-    /*    __  __
-         |  \/  |
-         | \  / | ___  ___ ___  __ _  __ _  ___  ___
-         | |\/| |/ _ \/ __/ __|/ _` |/ _` |/ _ \/ __|
-         | |  | |  __/\__ \__ \ (_| | (_| |  __/\__ \
-         |_|  |_|\___||___/___/\__,_|\__, |\___||___/
-                                      __/ |
-                                     |__*/
-    @Override
-    public void getMessage(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull MessageFull message, @NonNull MessageGetCallback messageCallback) {
-        if (message.body == null)
-            return;
-        String messageIdStr = null;
-        long messageIdBefore = -1;
-        Matcher matcher = Pattern.compile("\\[META:([A-z0-9]+);([0-9-]+)]").matcher(message.body);
-        if (matcher.find()) {
-            messageIdStr = matcher.group(1);
-            messageIdBefore = Long.parseLong(matcher.group(2));
-        }
-        if (messageIdBefore != -1) {
-            boolean readByAll = true;
-            // load this message's recipient(s) data
-            message.recipients = app.db.messageRecipientDao().getAllByMessageId(profile.getId(), message.id);
-            for (MessageRecipientFull recipient: message.recipients) {
-                if (recipient.id == -1)
-                    recipient.fullName = profile.getStudentNameLong();
-                if (message.type == TYPE_SENT && recipient.readDate < 1)
-                    readByAll = false;
-            }
-            if (!message.seen) {
-                app.db.metadataDao().setSeen(profile.getId(), message, true);
-            }
-            if (readByAll) {
-                // if a sent msg is not read by everyone, download it again to check the read status
-                new Handler(activityContext.getMainLooper()).post(() -> messageCallback.onSuccess(message));
-                return;
-            }
-        }
-
-        if (!prepare(activityContext, errorCallback, profile.getId(), profile, LoginStore.fromProfileFull(profile)))
-            return;
-
-        String finalMessageIdStr = messageIdStr;
-        login(() -> apiRequest(Request.builder()
-                .url(IDZIENNIK_URL +"/mod_komunikator/WS_wiadomosci.asmx/PobierzWiadomosc")
-                .userAgent(userAgent)
-                .addParameter("idWiadomosci", finalMessageIdStr)
-                .addParameter("typWiadomosci", message.type == TYPE_SENT ? 1 : 0)
-                .postJson(), (result, response) -> {
-            JsonObject data = result.getAsJsonObject("d");
-            if (data == null) {
-                finishWithError(new AppError(TAG, 1418, CODE_MAINTENANCE, response, result));
-                return;
-            }
-            JsonObject jMessage = data.getAsJsonObject("Wiadomosc");
-            if (jMessage == null) {
-                finishWithError(new AppError(TAG, 1423, CODE_MAINTENANCE, response, result));
-                return;
-            }
-
-            List<MessageRecipientFull> messageRecipientList = new ArrayList<>();
-
-            long messageId = jMessage.get("_recordId").getAsLong();
-
-            message.body = message.body.replaceAll("\\[META:[A-z0-9]+;[0-9-]+]", "[META:"+ finalMessageIdStr +";"+ messageId +"]");
-
-            message.clearAttachments();
-            for (JsonElement jAttachmentEl: jMessage.getAsJsonArray("ListaZal")) {
-                JsonObject jAttachment = jAttachmentEl.getAsJsonObject();
-                message.addAttachment(jAttachment.get("Id").getAsLong(), jAttachment.get("Nazwa").getAsString(), -1);
-            }
-
-            if (message.type == TYPE_RECEIVED) {
-                MessageRecipientFull recipient = new MessageRecipientFull(profileId, -1, message.id);
-
-                String readDateStr = jMessage.get("DataOdczytania").getAsString();
-                recipient.readDate = readDateStr.isEmpty() ? System.currentTimeMillis() : Date.fromIso(readDateStr);
-
-                recipient.fullName = profile.getStudentNameLong();
-                messageRecipientList.add(recipient);
-            }
-            else if (message.type == TYPE_SENT) {
-                teacherList = app.db.teacherDao().getAllNow(profileId);
-                for (JsonElement jReceiverEl: jMessage.getAsJsonArray("ListaOdbiorcow")) {
-                    JsonObject jReceiver = jReceiverEl.getAsJsonObject();
-                    String receiverLastFirstName = jReceiver.get("NazwaOdbiorcy").getAsString();
-
-                    Teacher teacher = searchTeacherByLastFirst(receiverLastFirstName);
-
-                    MessageRecipientFull recipient = new MessageRecipientFull(profileId, teacher.id, message.id);
-
-                    recipient.readDate = jReceiver.get("Status").getAsInt();
-
-                    recipient.fullName = teacher.getFullName();
-                    messageRecipientList.add(recipient);
-                }
-            }
-
-            if (!message.seen) {
-                app.db.metadataDao().setSeen(profileId, message, true);
-            }
-            app.db.messageDao().add(message);
-            app.db.messageRecipientDao().addAll((List<MessageRecipient>)(List<?>) messageRecipientList); // not addAllIgnore
-
-            message.recipients = messageRecipientList;
-
-            new Handler(activityContext.getMainLooper()).post(() -> messageCallback.onSuccess(message));
-        }));
-    }
-
-    @Override
-    public void getAttachment(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull MessageFull message, long attachmentId, @NonNull AttachmentGetCallback attachmentCallback) {
-        if (message.body == null)
-            return;
-        if (!prepare(activityContext, errorCallback, profile.getId(), profile, LoginStore.fromProfileFull(profile)))
-            return;
-
-        login(() -> {
-            String fileName = message.attachmentNames.get(message.attachmentIds.indexOf(attachmentId));
-
-            long messageId = -1;
-            Matcher matcher = Pattern.compile("\\[META:([A-z0-9]+);([0-9-]+)]").matcher(message.body);
-            if (matcher.find()) {
-                messageId = Long.parseLong(matcher.group(2));
-            }
-
-            Request.Builder builder = Request.builder()
-                    .url("https://iuczniowie.progman.pl/idziennik/mod_komunikator/Download.ashx")
-                    .post()
-                    .contentType(MediaTypeUtils.APPLICATION_FORM)
-                    .addParameter("id", messageId)
-                    .addParameter("fileName", fileName);
-
-            new Handler(activityContext.getMainLooper()).post(() -> attachmentCallback.onSuccess(builder));
-        });
-    }
-
-    @Override
-    public void getRecipientList(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull RecipientListGetCallback recipientListGetCallback) {
-        if (!prepare(activityContext, errorCallback, profile.getId(), profile, LoginStore.fromProfileFull(profile)))
-            return;
-
-        if (System.currentTimeMillis() - profile.getLastReceiversSync() < 24 * 60 * 60 * 1000) {
-            AsyncTask.execute(() -> {
-                List<Teacher> teacherList = app.db.teacherDao().getAllNow(profileId);
-                new Handler(activityContext.getMainLooper()).post(() -> recipientListGetCallback.onSuccess(teacherList));
-            });
-            return;
-        }
-
-        login(() -> {
-            List<Cookie> cookieList = app.cookieJar.loadForRequest(HttpUrl.get(IDZIENNIK_URL));
-            for (Cookie cookie: cookieList) {
-                if (cookie.name().equalsIgnoreCase("Bearer")) {
-                    loginBearerToken = cookie.value();
-                }
-            }
-            loginStudentId = profile.getStudentData("studentId", null);// TODO: 2019-06-12 temporary duplicated token & ID extraction
-
-            apiRequestArray(Request.builder()
-                    .url(IDZIENNIK_URL + "/api/Wiadomosci/Odbiorcy?idUcznia="+loginStudentId)
-                    .header("Authorization", "Bearer " + loginBearerToken)
-                    .userAgent(userAgent), (result, response) -> {
-                teacherList = app.db.teacherDao().getAllNow(profileId);
-                for (JsonElement recipientEl: result) {
-                    JsonObject recipient = recipientEl.getAsJsonObject();
-                    String name = recipient.get("nazwaKontaktu").getAsString();
-                    String loginId = recipient.get("idUzytkownika").getAsString();
-                    JsonArray typesArray = recipient.getAsJsonArray("typOsoby");
-                    List<Integer> types = new ArrayList<>();
-                    for (JsonElement typeEl: typesArray) {
-                        types.add(typeEl.getAsInt());
-                    }
-                    String delimiter;
-                    if (types.size() == 1 && types.get(0) >= 6) /* parent or student */
-                        delimiter = " (";
-                    else
-                        delimiter = ": ";
-                    String nameFirstLast = name.substring(0, name.indexOf(delimiter));
-                    Teacher teacher = searchTeacherByFirstLast(nameFirstLast);
-                    teacher.loginId = loginId;
-                    teacher.type = 0;
-                    for (int type: types) {
-                        switch (type) {
-                            case 0:
-                                teacher.setType(Teacher.TYPE_SCHOOL_ADMIN);
-                                break;
-                            case 1:
-                                teacher.setType(Teacher.TYPE_SECRETARIAT);
-                                break;
-                            case 2:
-                                teacher.setType(Teacher.TYPE_TEACHER);
-                                teacher.typeDescription = name.substring(name.indexOf(": ")+2);
-                                break;
-                            case 3:
-                                teacher.setType(Teacher.TYPE_PRINCIPAL);
-                                break;
-                            case 4:
-                                teacher.setType(Teacher.TYPE_EDUCATOR);
-                                break;
-                            case 5:
-                                teacher.setType(Teacher.TYPE_PEDAGOGUE);
-                                break;
-                            case 6:
-                                teacher.setType(Teacher.TYPE_PARENT);
-                                teacher.typeDescription = name.substring(name.indexOf(" (")+2, name.lastIndexOf(" ("));
-                                break;
-                            case 7:
-                                teacher.setType(Teacher.TYPE_STUDENT);
-                                break;
-                        }
-                    }
-                }
-                app.db.teacherDao().addAll(teacherList);
-
-                profile.setLastReceiversSync(System.currentTimeMillis());
-                app.db.profileDao().add(profile);
-
-                new Handler(activityContext.getMainLooper()).post(() -> recipientListGetCallback.onSuccess(new ArrayList<>(teacherList)));
-            });
-        });
-    }
-
-    @Override
-    public MessagesComposeInfo getComposeInfo(@NonNull ProfileFull profile) {
-        return new MessagesComposeInfo(0, 0, 180, 1983);
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Librus.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Librus.java
deleted file mode 100644
index 5c7356e2..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Librus.java
+++ /dev/null
@@ -1,3872 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.os.AsyncTask;
-import android.os.Handler;
-import android.util.Base64;
-import android.util.Pair;
-import android.util.SparseArray;
-import android.util.SparseIntArray;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.crashlytics.android.Crashlytics;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonNull;
-import com.google.gson.JsonObject;
-import com.google.gson.reflect.TypeToken;
-
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.parser.Parser;
-import org.jsoup.select.Elements;
-
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import im.wangchao.mhttp.Request;
-import im.wangchao.mhttp.Response;
-import im.wangchao.mhttp.body.MediaTypeUtils;
-import im.wangchao.mhttp.callback.JsonCallbackHandler;
-import im.wangchao.mhttp.callback.TextCallbackHandler;
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.BuildConfig;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.interfaces.AttachmentGetCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface;
-import pl.szczodrzynski.edziennik.data.api.interfaces.LoginCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.MessageGetCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.RecipientListGetCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.SyncCallback;
-import pl.szczodrzynski.edziennik.data.api.v2.models.DataStore;
-import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement;
-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.events.EventType;
-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.lessons.Lesson;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange;
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
-import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber;
-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.messages.MessageRecipient;
-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.notices.Notice;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
-import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject;
-import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher;
-import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsence;
-import pl.szczodrzynski.edziennik.data.db.modules.teams.Team;
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.Endpoint;
-import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.utils.models.Week;
-import pl.szczodrzynski.edziennik.utils.Utils;
-
-import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
-import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
-import static java.net.HttpURLConnection.HTTP_GONE;
-import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
-import static java.net.HttpURLConnection.HTTP_OK;
-import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_INVALID_LOGIN;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_LIBRUS_DISCONNECTED;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_LIBRUS_NOT_ACTIVATED;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_MAINTENANCE;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_OTHER;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_PROFILE_NOT_FOUND;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_SYNERGIA_NOT_ACTIVATED;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_ABSENT;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_ABSENT_EXCUSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_BELATED;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_PRESENT;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_RELEASED;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_PT_MEETING;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_TEACHER_ABSENCE;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_NORMAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER1_FINAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER1_PROPOSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER2_FINAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER2_PROPOSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_YEAR_FINAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_YEAR_PROPOSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange.TYPE_CANCELLED;
-import static pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange.TYPE_CHANGE;
-import static pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED;
-import static pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT;
-import static pl.szczodrzynski.edziennik.data.db.modules.notices.Notice.TYPE_NEGATIVE;
-import static pl.szczodrzynski.edziennik.data.db.modules.notices.Notice.TYPE_NEUTRAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.notices.Notice.TYPE_POSITIVE;
-import static pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher.TYPE_EDUCATOR;
-import static pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher.TYPE_LIBRARIAN;
-import static pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher.TYPE_OTHER;
-import static pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher.TYPE_PARENTS_COUNCIL;
-import static pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher.TYPE_PEDAGOGUE;
-import static pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher.TYPE_SCHOOL_ADMIN;
-import static pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher.TYPE_SCHOOL_PARENTS_COUNCIL;
-import static pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher.TYPE_SECRETARIAT;
-import static pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher.TYPE_SUPER_ADMIN;
-import static pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher.TYPE_TEACHER;
-import static pl.szczodrzynski.edziennik.utils.Utils.bs;
-import static pl.szczodrzynski.edziennik.utils.Utils.c;
-import static pl.szczodrzynski.edziennik.utils.Utils.contains;
-import static pl.szczodrzynski.edziennik.utils.Utils.crc16;
-import static pl.szczodrzynski.edziennik.utils.Utils.d;
-import static pl.szczodrzynski.edziennik.utils.Utils.getGradeValue;
-import static pl.szczodrzynski.edziennik.utils.Utils.strToInt;
-
-public class Librus implements EdziennikInterface {
-    public Librus(App app) {
-        this.app = app;
-    }
-
-    private static final String TAG = "api.Librus";
-    private static final String CLIENT_ID = "wmSyUMo8llDAs4y9tJVYY92oyZ6h4lAt7KCuy0Gv";
-    private static final String REDIRECT_URL = "http://localhost/bar";
-    private static final String AUTHORIZE_URL = "https://portal.librus.pl/oauth2/authorize?client_id="+CLIENT_ID+"&redirect_uri="+REDIRECT_URL+"&response_type=code";
-    private static final String LOGIN_URL = "https://portal.librus.pl/rodzina/login/action";
-    private static final String TOKEN_URL = "https://portal.librus.pl/oauth2/access_token";
-    private static final String ACCOUNTS_URL = "https://portal.librus.pl/api/v2/SynergiaAccounts";
-    private static final String ACCOUNT_URL = "https://portal.librus.pl/api/v2/SynergiaAccounts/fresh/"; // + login
-    private static final String API_URL = "https://api.librus.pl/2.0/";
-    private static final String SYNERGIA_URL = "https://wiadomosci.librus.pl/module/";
-    private static final String SYNERGIA_SANDBOX_URL = "https://sandbox.librus.pl/index.php?action=";
-    private static final String userAgent = "Dalvik/2.1.0 Android LibrusMobileApp";
-    private static final String synergiaUserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) Gecko/20100101 Firefox/62.0";
-
-    private App app;
-    private Context activityContext = null;
-    private SyncCallback callback = null;
-    private int profileId = -1;
-    private Profile profile = null;
-    private LoginStore loginStore = null;
-    private boolean fullSync = true;
-    private Date today;
-    private List<String> targetEndpoints = new ArrayList<>();
-
-    // PROGRESS
-    private static final int PROGRESS_LOGIN = 10;
-    private int PROGRESS_COUNT = 1;
-    private int PROGRESS_STEP = (90/PROGRESS_COUNT);
-
-    private int onlyFeature = FEATURE_ALL;
-
-    private List<Team> teamList;
-    private List<Teacher> teacherList;
-    private List<TeacherAbsence> teacherAbsenceList;
-    private List<Subject> subjectList;
-    private List<Lesson> lessonList;
-    private List<LessonChange> lessonChangeList;
-    private List<GradeCategory> gradeCategoryList;
-    private List<Grade> gradeList;
-    private List<Event> eventList;
-    private List<EventType> eventTypeList;
-    private List<Notice> noticeList;
-    private List<Attendance> attendanceList;
-    private List<Announcement> announcementList;
-    private List<Message> messageList;
-    private List<MessageRecipient> messageRecipientList;
-    private List<MessageRecipient> messageRecipientIgnoreList;
-    private List<Metadata> metadataList;
-    private List<Metadata> messageMetadataList;
-
-    private static boolean fakeLogin = false;
-    private String librusEmail = null;
-    private String librusPassword = null;
-    private String synergiaLogin = null;
-    private String synergiaPassword = null;
-    private String synergiaLastLogin = null;
-    private long synergiaLastLoginTime = -1;
-    private boolean premium = false;
-    private boolean enableStandardGrades = true;
-    private boolean enablePointGrades = false;
-    private boolean enableDescriptiveGrades = false;
-    private boolean enableTextGrades = false;
-    private boolean enableBehaviourGrades = true;
-    private long unitId = -1;
-    private int startPointsSemester1 = 0;
-    private int startPointsSemester2 = 0;
-
-    private boolean prepare(@NonNull Context activityContext, @NonNull SyncCallback callback, int profileId, @Nullable Profile profile, @NonNull LoginStore loginStore) {
-        this.activityContext = activityContext;
-        this.callback = callback;
-        this.profileId = profileId;
-        // here we must have a login store: either with a correct ID or -1
-        // there may be no profile and that's when onLoginFirst happens
-        this.profile = profile;
-        this.loginStore = loginStore;
-        this.fullSync = profile == null || profile.getEmpty() || profile.shouldFullSync(activityContext);
-        this.today = Date.getToday();
-
-        DataStore ds = new DataStore(app.db, profileId);
-
-        this.librusEmail = loginStore.getLoginData("email", "");
-        this.librusPassword = loginStore.getLoginData("password", "");
-        if (profile == null) {
-            this.synergiaLogin = null;
-            this.synergiaPassword = null;
-        }
-        else {
-            this.synergiaLogin = profile.getStudentData("accountLogin", null);
-            this.synergiaPassword = profile.getStudentData("accountPassword", null);
-        }
-        if (librusEmail.equals("") || librusPassword.equals("")) {
-            finishWithError(new AppError(TAG, 214, AppError.CODE_INVALID_LOGIN, "Login field is empty"));
-            return false;
-        }
-        this.premium = profile != null && profile.getStudentData("isPremium", false);
-        this.failed = 0;
-        fakeLogin = BuildConfig.DEBUG && librusEmail.toLowerCase().startsWith("fake");
-        this.synergiaLastLogin = null;
-        this.synergiaLastLoginTime = -1;
-
-        this.refreshTokenFailed = false;
-
-        teamList = profileId == -1 ? new ArrayList<>() : app.db.teamDao().getAllNow(profileId);
-        teacherList = profileId == -1 ? new ArrayList<>() : app.db.teacherDao().getAllNow(profileId);
-        teacherAbsenceList = new ArrayList<>();
-        subjectList = new ArrayList<>();
-        lessonList = new ArrayList<>();
-        lessonChangeList = new ArrayList<>();
-        gradeCategoryList = new ArrayList<>();
-        gradeList = new ArrayList<>();
-        eventList = new ArrayList<>();
-        eventTypeList = new ArrayList<>();
-        noticeList = new ArrayList<>();
-        attendanceList = new ArrayList<>();
-        announcementList = new ArrayList<>();
-        messageList = new ArrayList<>();
-        messageRecipientList = new ArrayList<>();
-        messageRecipientIgnoreList = new ArrayList<>();
-        metadataList = new ArrayList<>();
-        messageMetadataList = new ArrayList<>();
-
-        return true;
-    }
-
-    @Override
-    public void sync(@NonNull Context activityContext, @NonNull SyncCallback callback, int profileId, @Nullable Profile profile, @NonNull LoginStore loginStore) {
-        if (!prepare(activityContext, callback, profileId, profile, loginStore))
-            return;
-
-        login(() -> {
-            targetEndpoints = new ArrayList<>();
-            targetEndpoints.add("Me");
-            targetEndpoints.add("Schools");
-            targetEndpoints.add("Classes");
-            targetEndpoints.add("VirtualClasses");
-            targetEndpoints.add("Units");
-            targetEndpoints.add("Users");
-            targetEndpoints.add("Subjects");
-            targetEndpoints.add("Classrooms");
-            targetEndpoints.add("Substitutions");
-            targetEndpoints.add("Timetables");
-            targetEndpoints.add("Colors");
-
-            targetEndpoints.add("SavedGradeCategories");
-            targetEndpoints.add("GradesCategories");
-            targetEndpoints.add("PointGradesCategories");
-            targetEndpoints.add("DescriptiveGradesCategories");
-            //targetEndpoints.add("TextGradesCategories");
-            targetEndpoints.add("BehaviourGradesCategories"); // TODO: 2019-04-30
-            targetEndpoints.add("SaveGradeCategories");
-
-            targetEndpoints.add("Grades");
-            targetEndpoints.add("PointGrades");
-            targetEndpoints.add("DescriptiveGrades");
-            targetEndpoints.add("TextGrades");
-            targetEndpoints.add("BehaviourGrades");
-            targetEndpoints.add("GradesComments");
-
-            targetEndpoints.add("Events");
-            targetEndpoints.add("TeacherFreeDays");
-            targetEndpoints.add("CustomTypes");
-            targetEndpoints.add("Homework");
-            targetEndpoints.add("LuckyNumbers");
-            targetEndpoints.add("Notices");
-            targetEndpoints.add("AttendanceTypes");
-            targetEndpoints.add("Attendance");
-            targetEndpoints.add("Announcements");
-            targetEndpoints.add("PtMeetings");
-
-            /*if (isEndpointEnabled(profile, true, "SchoolFreeDays"))
-                targetEndpoints.add("SchoolFreeDays");
-            if (isEndpointEnabled(profile, true, "ClassFreeDays"))
-                targetEndpoints.add("ClassFreeDays");*/
-            targetEndpoints.add("MessagesLogin");
-            targetEndpoints.add("MessagesInbox");
-            targetEndpoints.add("MessagesOutbox");
-            targetEndpoints.add("Finish");
-            PROGRESS_COUNT = targetEndpoints.size()-1;
-            PROGRESS_STEP = (90/PROGRESS_COUNT);
-            begin();
-        });
-    }
-    @Override
-    public void syncFeature(@NonNull Context activityContext, @NonNull SyncCallback callback, @NonNull ProfileFull profile, int ... featureList) {
-        if (featureList == null) {
-            sync(activityContext, callback, profile.getId(), profile, LoginStore.fromProfileFull(profile));
-            return;
-        }
-        if (!prepare(activityContext, callback, profile.getId(), profile, LoginStore.fromProfileFull(profile)))
-            return;
-
-        login(() -> {
-            targetEndpoints = new ArrayList<>();
-            if (featureList.length == 1)
-                onlyFeature = featureList[0];
-            targetEndpoints.add("Me");
-            targetEndpoints.add("Schools");
-            targetEndpoints.add("Classes");
-            targetEndpoints.add("VirtualClasses");
-            targetEndpoints.add("Units");
-            targetEndpoints.add("Users");
-            targetEndpoints.add("Subjects");
-            targetEndpoints.add("Colors");
-            boolean hasMessagesLogin = false;
-            for (int feature: featureList) {
-                switch (feature) {
-                    case FEATURE_TIMETABLE:
-                        targetEndpoints.add("Classrooms");
-                        targetEndpoints.add("Substitutions");
-                        targetEndpoints.add("Timetables");
-                        break;
-                    case FEATURE_AGENDA:
-                        targetEndpoints.add("Events");
-                        targetEndpoints.add("CustomTypes");
-                        targetEndpoints.add("PtMeetings");
-                        targetEndpoints.add("SchoolFreeDays");
-                        targetEndpoints.add("TeacherFreeDays");
-                        break;
-                    case FEATURE_GRADES:
-                        targetEndpoints.add("SavedGradeCategories");
-                        targetEndpoints.add("GradesCategories");
-                        targetEndpoints.add("PointGradesCategories");
-                        targetEndpoints.add("DescriptiveGradesCategories");
-                        //targetEndpoints.add("TextGradesCategories");
-                        targetEndpoints.add("BehaviourGradesCategories"); // TODO: 2019-04-30
-                        targetEndpoints.add("SaveGradeCategories");
-
-                        targetEndpoints.add("Grades");
-                        targetEndpoints.add("PointGrades");
-                        targetEndpoints.add("DescriptiveGrades");
-                        targetEndpoints.add("TextGrades");
-                        targetEndpoints.add("BehaviourGrades");
-
-                        targetEndpoints.add("GradesComments");
-                        break;
-                    case FEATURE_HOMEWORK:
-                        targetEndpoints.add("Homework");
-                        break;
-                    case FEATURE_NOTICES:
-                        targetEndpoints.add("Notices");
-                        break;
-                    case FEATURE_ATTENDANCE:
-                        targetEndpoints.add("AttendanceTypes");
-                        targetEndpoints.add("Attendance");
-                        break;
-                    case FEATURE_MESSAGES_INBOX:
-                        if (!hasMessagesLogin) {
-                            hasMessagesLogin = true;
-                            targetEndpoints.add("MessagesLogin");
-                        }
-                        targetEndpoints.add("MessagesInbox");
-                        break;
-                    case FEATURE_MESSAGES_OUTBOX:
-                        if (!hasMessagesLogin) {
-                            hasMessagesLogin = true;
-                            targetEndpoints.add("MessagesLogin");
-                        }
-                        targetEndpoints.add("MessagesOutbox");
-                        break;
-                    case FEATURE_ANNOUNCEMENTS:
-                        targetEndpoints.add("Announcements");
-                        break;
-                }
-            }
-            targetEndpoints.add("LuckyNumbers");
-
-            /*if (isEndpointEnabled(profile, true, "SchoolFreeDays"))
-                targetEndpoints.add("SchoolFreeDays");
-            if (isEndpointEnabled(profile, true, "ClassFreeDays"))
-                targetEndpoints.add("ClassFreeDays");*/
-            targetEndpoints.add("Finish");
-            PROGRESS_COUNT = targetEndpoints.size()-1;
-            PROGRESS_STEP = (90/PROGRESS_COUNT);
-            begin();
-        });
-    }
-
-    private void begin() {
-        if (profile == null) {
-            finishWithError(new AppError(TAG, 214, AppError.CODE_PROFILE_NOT_FOUND, "Profile == null WTF???"));
-            return;
-        }
-        String accountToken = profile.getStudentData("accountToken", null);
-        d(TAG, "Beginning account "+ profile.getStudentNameLong() +" sync with token "+accountToken+". Full sync enabled "+fullSync);
-        synergiaAccessToken = accountToken;
-
-        callback.onProgress(PROGRESS_LOGIN);
-
-        r("get", null);
-    }
-
-    private void r(String type, String endpoint) {
-        // endpoint == null when beginning
-        if (endpoint == null)
-            endpoint = targetEndpoints.get(0);
-        int index = -1;
-        for (String request: targetEndpoints) {
-            index++;
-            if (request.equals(endpoint)) {
-                break;
-            }
-        }
-        if (type.equals("finish")) {
-            // called when finishing the action
-            callback.onProgress(PROGRESS_STEP);
-            index++;
-        }
-        if (index > targetEndpoints.size()) {
-            finish();
-            return;
-        }
-        d(TAG, "Called r("+type+", "+endpoint+"). Getting "+targetEndpoints.get(index));
-        switch (targetEndpoints.get(index)) {
-            case "Me":
-                getMe();
-                break;
-            case "Schools":
-                getSchools();
-                break;
-            case "Classes":
-                getClasses();
-                break;
-            case "VirtualClasses":
-                getVirtualClasses();
-                break;
-            case "Units":
-                getUnits();
-                break;
-            case "Users":
-                getUsers();
-                break;
-            case "Subjects":
-                getSubjects();
-                break;
-            case "Classrooms":
-                getClassrooms();
-                break;
-            case "Timetables":
-                getTimetables();
-                break;
-            case "Substitutions":
-                getSubstitutions();
-                break;
-            case "Colors":
-                getColors();
-                break;
-            case "SavedGradeCategories":
-                getSavedGradeCategories();
-                break;
-            case "GradesCategories":
-                getGradesCategories();
-                break;
-            case "PointGradesCategories":
-                getPointGradesCategories();
-                break;
-            case "DescriptiveGradesCategories":
-                getDescriptiveGradesSkills();
-                break;
-            case "TextGradesCategories":
-                getTextGradesCategories();
-                break;
-            case "BehaviourGradesCategories":
-                getBehaviourGradesCategories();
-                break;
-            case "SaveGradeCategories":
-                saveGradeCategories();
-                break;
-            case "Grades":
-                getGrades();
-                break;
-            case "PointGrades":
-                getPointGrades();
-                break;
-            case "DescriptiveGrades":
-                getDescriptiveGrades();
-                break;
-            case "TextGrades":
-                getTextGrades();
-                break;
-            case "GradesComments":
-                getGradesComments();
-                break;
-            case "BehaviourGrades":
-                getBehaviourGrades();
-                break;
-            case "Events":
-                getEvents();
-                break;
-            case "CustomTypes":
-                getCustomTypes();
-                break;
-            case "Homework":
-                getHomework();
-                break;
-            case "LuckyNumbers":
-                getLuckyNumbers();
-                break;
-            case "Notices":
-                getNotices();
-                break;
-            case "AttendanceTypes":
-                getAttendanceTypes();
-                break;
-            case "Attendance":
-                getAttendance();
-                break;
-            case "Announcements":
-                getAnnouncements();
-                break;
-            case "PtMeetings":
-                getPtMeetings();
-                break;
-            case "TeacherFreeDaysTypes":
-                getTeacherFreeDaysTypes();
-                break;
-            case "TeacherFreeDays":
-                getTeacherFreeDays();
-                break;
-            case "SchoolFreeDays":
-                getSchoolFreeDays();
-                break;
-            case "MessagesLogin":
-                getMessagesLogin();
-                break;
-            case "MessagesInbox":
-                getMessagesInbox();
-                break;
-            case "MessagesOutbox":
-                getMessagesOutbox();
-                break;
-            case "Finish":
-                finish();
-                break;
-        }
-    }
-    private void saveData() {
-        if (teamList.size() > 0) {
-            //app.db.teamDao().clear(profileId);
-            app.db.teamDao().addAll(teamList);
-        }
-        if (teacherList.size() > 0 && teacherListChanged)
-            app.db.teacherDao().addAllIgnore(teacherList);
-        if (subjectList.size() > 0)
-            app.db.subjectDao().addAll(subjectList);
-        if (lessonList.size() > 0) {
-            app.db.lessonDao().clear(profileId);
-            app.db.lessonDao().addAll(lessonList);
-        }
-        if (lessonChangeList.size() > 0)
-            app.db.lessonChangeDao().addAll(lessonChangeList);
-        if (gradeCategoryList.size() > 0 && gradeCategoryListChanged)
-            app.db.gradeCategoryDao().addAll(gradeCategoryList);
-        if (gradeList.size() > 0) {
-            app.db.gradeDao().clear(profileId);
-            app.db.gradeDao().addAll(gradeList);
-        }
-        if (eventList.size() > 0) {
-            app.db.eventDao().removeFuture(profileId, Date.getToday());
-            app.db.eventDao().addAll(eventList);
-        }
-        if (eventTypeList.size() > 0)
-            app.db.eventTypeDao().addAll(eventTypeList);
-        if (teacherAbsenceList.size() > 0)
-            app.db.teacherAbsenceDao().addAll(teacherAbsenceList);
-        if (noticeList.size() > 0) {
-            app.db.noticeDao().clear(profileId);
-            app.db.noticeDao().addAll(noticeList);
-        }
-        if (attendanceList.size() > 0)
-            app.db.attendanceDao().addAll(attendanceList);
-        if (announcementList.size() > 0)
-            app.db.announcementDao().addAll(announcementList);
-        if (messageList.size() > 0)
-            app.db.messageDao().addAllIgnore(messageList);
-        if (messageRecipientList.size() > 0)
-            app.db.messageRecipientDao().addAll(messageRecipientList);
-        if (messageRecipientIgnoreList.size() > 0)
-            app.db.messageRecipientDao().addAllIgnore(messageRecipientIgnoreList);
-        if (metadataList.size() > 0)
-            app.db.metadataDao().addAllIgnore(metadataList);
-        if (messageMetadataList.size() > 0)
-            app.db.metadataDao().setSeen(messageMetadataList);
-    }
-    private void finish() {
-        try {
-            saveData();
-        }
-        catch (Exception e) {
-            finishWithError(new AppError(TAG, 480, CODE_OTHER, app.getString(R.string.sync_error_saving_data), null, null, e, null));
-        }
-        if (fullSync) {
-            profile.setLastFullSync(System.currentTimeMillis());
-            fullSync = false;
-        }
-        profile.setEmpty(false);
-        callback.onSuccess(activityContext, new ProfileFull(profile, loginStore));
-    }
-    private void finishWithError(AppError error) {
-        try {
-            saveData();
-        }
-        catch (Exception e) {
-            Crashlytics.logException(e);
-        }
-        callback.onError(activityContext, error);
-    }
-
-    /*    _                 _
-         | |               (_)
-         | |     ___   __ _ _ _ __
-         | |    / _ \ / _` | | '_ \
-         | |___| (_) | (_| | | | | |
-         |______\___/ \__, |_|_| |_|
-                       __/ |
-                      |__*/
-    public void login(@NonNull LoginCallback loginCallback)
-    {
-
-        authorizeCallback = new AuthorizeCallback() {
-            @Override
-            public void onCsrfToken(String csrfToken) {
-                d(TAG, "Found CSRF token: "+csrfToken);
-                login(csrfToken, librusEmail, librusPassword, librusLoginCallback);
-            }
-
-            @Override
-            public void onAuthorizationCode(String code) {
-                d(TAG, "Found auth code: "+code);
-                accessToken(code, null, accessTokenCallback);
-            }
-        };
-
-        librusLoginCallback = redirectUrl -> {
-            fakeAuthorize = "authorize";
-            authorize(AUTHORIZE_URL, authorizeCallback);
-        };
-
-        accessTokenCallback = new AccessTokenCallback() {
-            @Override
-            public void onSuccess(String tokenType, String accessToken, String refreshToken, int expiresIn) {
-                d(TAG, "Got tokens: "+tokenType+" "+accessToken);
-                d(TAG, "Got tokens: "+refreshToken);
-                loginStore.putLoginData("tokenType", tokenType);
-                loginStore.putLoginData("accessToken", accessToken);
-                loginStore.putLoginData("refreshToken", refreshToken);
-                loginStore.putLoginData("tokenExpiryTime", System.currentTimeMillis()/1000 + expiresIn);
-                getSynergiaToken(tokenType, accessToken, refreshToken, System.currentTimeMillis()/1000 + expiresIn);
-            }
-
-            @Override
-            public void onError() {
-                d(TAG, "Beginning login (authorize)");
-                authorize(AUTHORIZE_URL, authorizeCallback);
-            }
-        };
-
-        synergiaAccountsCallback = data -> {
-            d(TAG, "Accounts: "+data.toString());
-            JsonArray accounts = data.getAsJsonArray("accounts");
-            if (accounts.size() == 0) {
-                finishWithError(new AppError(TAG, 1237, CODE_OTHER, app.getString(R.string.sync_error_register_no_students), data));
-                return;
-            }
-            long accountDataTime;
-            List<Integer> accountIds = new ArrayList<>();
-            List<String> accountLogins = new ArrayList<>();
-            List<String> accountTokens = new ArrayList<>();
-            List<String> accountNamesLong = new ArrayList<>();
-            List<String> accountNamesShort = new ArrayList<>();
-            accountIds.clear();
-            accountLogins.clear();
-            accountTokens.clear();
-            accountNamesLong.clear();
-            accountNamesShort.clear();
-            accountDataTime = data.get("lastModification").getAsLong();
-            for (JsonElement accountEl: accounts) {
-                JsonObject account = accountEl.getAsJsonObject();
-
-                JsonElement state = account.get("state");
-                if (state != null && !(state instanceof JsonNull)) {
-                    if (state.getAsString().equals("requiring_an_action")) {
-                        finishWithError(new AppError(TAG, 694, CODE_LIBRUS_DISCONNECTED, data));
-                        return;
-                    }
-                    if (state.getAsString().equals("need-activation")) {
-                        finishWithError(new AppError(TAG, 701, CODE_SYNERGIA_NOT_ACTIVATED, data));
-                        return;
-                    }
-                }
-
-                accountIds.add(account.get("id").getAsInt());
-                accountLogins.add(account.get("login").getAsString());
-                accountTokens.add(account.get("accessToken").getAsString());
-                accountNamesLong.add(account.get("studentName").getAsString());
-                String[] nameParts = account.get("studentName").getAsString().split(" ");
-                accountNamesShort.add(nameParts[0]+" "+nameParts[1].charAt(0)+".");
-            }
-
-            List<Profile> profileList = new ArrayList<>();
-            for (int index = 0; index < accountIds.size(); index++) {
-                Profile newProfile = new Profile();
-                newProfile.setStudentNameLong(accountNamesLong.get(index));
-                newProfile.setStudentNameShort(accountNamesShort.get(index));
-                newProfile.setName(newProfile.getStudentNameLong());
-                newProfile.setSubname(librusEmail);
-                newProfile.setEmpty(true);
-                newProfile.setLoggedIn(true);
-                newProfile.putStudentData("accountId", accountIds.get(index));
-                newProfile.putStudentData("accountLogin", accountLogins.get(index));
-                newProfile.putStudentData("accountToken", accountTokens.get(index));
-                newProfile.putStudentData("accountTokenTime", accountDataTime);
-                profileList.add(newProfile);
-            }
-
-            callback.onLoginFirst(profileList, loginStore);
-        };
-
-        synergiaAccountCallback = data -> {
-            if (data == null) {
-                // 410 Gone
-                app.cookieJar.clearForDomain("portal.librus.pl");
-                authorize(AUTHORIZE_URL, authorizeCallback);
-                return;
-            }
-            if (profile == null) {
-                // this cannot be run on a fresh login
-                finishWithError(new AppError(TAG, 1290, CODE_PROFILE_NOT_FOUND, "Profile == null", data));
-                return;
-            }
-            d(TAG, "Account: "+data.toString());
-            // synergiaAccount is executed when a synergia token needs a refresh
-            JsonElement id = data.get("id");
-            JsonElement login = data.get("login");
-            JsonElement accessToken = data.get("accessToken");
-            if (id == null || login == null || accessToken == null) {
-                finishWithError(new AppError(TAG, 1284, CODE_OTHER, data));
-                return;
-            }
-            profile.putStudentData("accountId", id.getAsInt());
-            profile.putStudentData("accountLogin", login.getAsString());
-            profile.putStudentData("accountToken", accessToken.getAsString());
-            profile.putStudentData("accountTokenTime", System.currentTimeMillis() / 1000);
-            profile.setStudentNameLong(data.get("studentName").getAsString());
-            String[] nameParts = data.get("studentName").getAsString().split(" ");
-            profile.setStudentNameShort(nameParts[0] + " " + nameParts[1].charAt(0) + ".");
-            loginCallback.onSuccess();
-        };
-
-        String tokenType = loginStore.getLoginData("tokenType", "Bearer");
-        String accessToken = loginStore.getLoginData("accessToken", null);
-        String refreshToken = loginStore.getLoginData("refreshToken", null);
-        long tokenExpiryTime = loginStore.getLoginData("tokenExpiryTime", (long)0);
-        String accountToken;
-
-        if (profile != null
-                && (accountToken = profile.getStudentData("accountToken", null)) != null
-                && !accountToken.equals("")
-                && (System.currentTimeMillis() / 1000) - profile.getStudentData("accountTokenTime", (long)0) < 3 * 60 * 60) {
-            c(TAG, "synergia token should be valid");
-            loginCallback.onSuccess();
-        }
-        else {
-            getSynergiaToken(tokenType, accessToken, refreshToken, tokenExpiryTime);
-        }
-    }
-    private String synergiaAccessToken = "";
-    private void getSynergiaToken(String tokenType, String accessToken, String refreshToken, long tokenExpiryTime) {
-        c(TAG, "we have no synergia token or it expired");
-        if (!tokenType.equals("")
-                && refreshToken != null
-                && accessToken != null
-                && tokenExpiryTime-30 > System.currentTimeMillis() / 1000) {
-            c(TAG, "we have a valid librus token, so we can use the API");
-            // we have to decide whether we can already proceed getting the synergiaToken
-            // or a list of students
-            if (profile != null) {
-                app.cookieJar.clearForDomain("portal.librus.pl");
-                c(TAG, "user is logged in, refreshing synergia token");
-                d(TAG, "Librus token: "+accessToken);
-                synergiaAccount(tokenType, accessToken, profile.getStudentData("accountLogin", null), synergiaAccountCallback);
-            }
-            else {
-                // this *should* be executed only once. ever.
-                c(TAG, "user is not logged in, getting all the accounts");
-                synergiaAccounts(tokenType, accessToken, synergiaAccountsCallback);
-            }
-        } else if (refreshToken != null) {
-            c(TAG, "we don't have a valid token or it expired");
-            c(TAG, "but we have a refresh token");
-            d(TAG, "Token expired at " + tokenExpiryTime + ", " + (System.currentTimeMillis() / 1000 - tokenExpiryTime) + " seconds ago");
-            app.cookieJar.clearForDomain("portal.librus.pl");
-            accessToken(null, refreshToken, accessTokenCallback);
-        } else {
-            c(TAG, "we don't have any of the needed librus tokens");
-            c(TAG, "we need to log in and generate");
-            app.cookieJar.clearForDomain("portal.librus.pl");
-            authorize(AUTHORIZE_URL, authorizeCallback);
-        }
-    }
-    public boolean loginSynergia(@NonNull LoginCallback loginCallback)
-    {
-        if (profile == null) {
-            return false;
-        }
-        if (synergiaLogin == null || synergiaPassword == null || synergiaLogin.equals("") || synergiaPassword.equals("")) {
-            finishWithError(new AppError(TAG, 1152, CODE_INVALID_LOGIN, "Login field is empty"));
-            return false;
-        }
-        if (System.currentTimeMillis() - synergiaLastLoginTime < 10 * 60 * 1000 && synergiaLogin.equals(synergiaLastLogin)) {// 10 minutes
-            loginCallback.onSuccess();
-            return true;
-        }
-
-        String escapedPassword = synergiaPassword.replace("&", "&amp;");// TODO: 2019-05-07 check other chars to escape
-
-        String body =
-                "<service>\n" +
-                        "  <header/>\n" +
-                        "  <data>\n" +
-                        "    <login>"+synergiaLogin+"</login>\n" +
-                        "    <password>"+escapedPassword+"</password>\n" +
-                        "    <KeyStroke>\n" +
-                        "      <Keys>\n" +
-                        "        <Up/>\n" +
-                        "        <Down/>\n" +
-                        "      </Keys>\n" +
-                        "    </KeyStroke>\n" +
-                        "  </data>\n" +
-                        "</service>";
-        synergiaRequest("Login", body, data -> {
-            if (data == null) {
-                finishWithError(new AppError(TAG, 1176, AppError.CODE_MAINTENANCE, "data == null (975)"));
-                return;
-            }
-            String error = data.select("response Login status").text();
-            if (error.equals("ok")) {
-                synergiaLastLoginTime = System.currentTimeMillis();
-                synergiaLastLogin = synergiaLogin;
-                loginCallback.onSuccess();
-            }
-            else {
-                finishWithError(new AppError(TAG, 1186, CODE_INVALID_LOGIN, (Response) null, data.outerHtml()));
-            }
-        });
-        return true;
-    }
-
-    /*    _    _      _                                          _ _ _                _
-         | |  | |    | |                       ___              | | | |              | |
-         | |__| | ___| |_ __   ___ _ __ ___   ( _ )     ___ __ _| | | |__   __ _  ___| | _____
-         |  __  |/ _ \ | '_ \ / _ \ '__/ __|  / _ \/\  / __/ _` | | | '_ \ / _` |/ __| |/ / __|
-         | |  | |  __/ | |_) |  __/ |  \__ \ | (_>  < | (_| (_| | | | |_) | (_| | (__|   <\__ \
-         |_|  |_|\___|_| .__/ \___|_|  |___/  \___/\/  \___\__,_|_|_|_.__/ \__,_|\___|_|\_\___/
-                       | |
-                       |*/
-    private String fakeAuthorize = "authorize";
-    private void authorize(String url, AuthorizeCallback authorizeCallback) {
-        callback.onActionStarted(R.string.sync_action_authorizing);
-        Request.builder()
-                .url(fakeLogin ? "http://szkolny.eu/librus/"+fakeAuthorize+".php" : url)
-                .userAgent(userAgent)
-                .withClient(app.httpLazy)
-                .callback(new TextCallbackHandler() {
-                    @Override
-                    public void onSuccess(String data, Response response) {
-                        //d("headers "+response.headers().toString());
-                        String location = response.headers().get("Location");
-                        if (location != null) {
-                            Matcher authMatcher = Pattern.compile(REDIRECT_URL+"\\?code=([A-z0-9]+?)$", Pattern.DOTALL | Pattern.MULTILINE).matcher(location);
-                            if (authMatcher.find()) {
-                                authorizeCallback.onAuthorizationCode(authMatcher.group(1));
-                            }
-                            else {
-                                //callback.onError(activityContext, Edziennik.CODE_OTHER, "Auth code not found: "+location);
-                                authorize(location, authorizeCallback);
-                            }
-                        }
-                        else {
-                            Matcher csrfMatcher = Pattern.compile("name=\"csrf-token\" content=\"([A-z0-9=+/\\-_]+?)\"", Pattern.DOTALL).matcher(data);
-                            if (csrfMatcher.find()) {
-                                authorizeCallback.onCsrfToken(csrfMatcher.group(1));
-                            }
-                            else {
-                                finishWithError(new AppError(TAG, 463, CODE_OTHER, "CSRF token not found.", response, data));
-                            }
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 207, CODE_OTHER, response, throwable));
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    private void login(String csrfToken, String email, String password, LibrusLoginCallback librusLoginCallback) {
-        callback.onActionStarted(R.string.sync_action_logging_in);
-        Request.builder()
-                .url(fakeLogin ? "http://szkolny.eu/librus/login_action.php" : LOGIN_URL)
-                .userAgent(userAgent)
-                .addParameter("email", email)
-                .addParameter("password", password)
-                .addHeader("X-CSRF-TOKEN", csrfToken)
-                .contentType(MediaTypeUtils.APPLICATION_JSON)
-                .post()
-                .callback(new JsonCallbackHandler() {
-                    @Override
-                    public void onSuccess(JsonObject data, Response response) {
-                        if (data == null) {
-                            if (response.parserErrorBody != null && response.parserErrorBody.contains("link aktywacyjny")) {
-                                finishWithError(new AppError(TAG, 487, CODE_LIBRUS_NOT_ACTIVATED, response));
-                                return;
-                            }
-                            finishWithError(new AppError(TAG, 489, CODE_MAINTENANCE, response));
-                            return;
-                        }
-                        if (data.get("errors") != null) {
-                            finishWithError(new AppError(TAG, 490, CODE_OTHER, data.get("errors").getAsJsonArray().get(0).getAsString(), response, data));
-                            return;
-                        }
-                        librusLoginCallback.onLogin(data.get("redirect") != null ? data.get("redirect").getAsString() : "");
-                    }
-
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        if (response.code() == 403
-                                || response.code() == 401) {
-                            finishWithError(new AppError(TAG, 248, AppError.CODE_INVALID_LOGIN, response, throwable));
-                            return;
-                        }
-                        finishWithError(new AppError(TAG, 251, CODE_OTHER, response, throwable));
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    private boolean refreshTokenFailed = false;
-    private void accessToken(String code, String refreshToken, AccessTokenCallback accessTokenCallback) {
-        callback.onActionStarted(R.string.sync_action_getting_token);
-        List<Pair<String, Object>> params = new ArrayList<>();
-        params.add(new Pair<>("client_id", CLIENT_ID));
-        if (code != null) {
-            params.add(new Pair<>("grant_type", "authorization_code"));
-            params.add(new Pair<>("code", code));
-            params.add(new Pair<>("redirect_uri", REDIRECT_URL));
-        }
-        else if (refreshToken != null) {
-            params.add(new Pair<>("grant_type", "refresh_token"));
-            params.add(new Pair<>("refresh_token", refreshToken));
-        }
-        Request.builder()
-                .url(fakeLogin ? "http://szkolny.eu/librus/access_token.php" : TOKEN_URL)
-                .userAgent(userAgent)
-                .addParams(params)
-                .allowErrorCode(HTTP_UNAUTHORIZED)
-                .post()
-                .callback(new JsonCallbackHandler() {
-                    @Override
-                    public void onSuccess(JsonObject data, Response response) {
-                        if (data == null) {
-                            finishWithError(new AppError(TAG, 539, CODE_MAINTENANCE, response));
-                            return;
-                        }
-                        if (data.get("error") != null) {
-                            JsonElement message = data.get("message");
-                            JsonElement hint = data.get("hint");
-                            if (!refreshTokenFailed && refreshToken != null && hint != null && (hint.getAsString().equals("Token has been revoked") || hint.getAsString().equals("Token has expired"))) {
-                                c(TAG, "refreshing the token failed. Trying to log in again.");
-                                refreshTokenFailed = true;
-                                accessTokenCallback.onError();
-                                return;
-                            }
-                            String errorText = data.get("error").getAsString()+" "+(message == null ? "" : message.getAsString())+" "+(hint == null ? "" : hint.getAsString());
-                            finishWithError(new AppError(TAG, 552, CODE_OTHER, errorText, response, data));
-                            return;
-                        }
-                        try {
-                            accessTokenCallback.onSuccess(
-                                    data.get("token_type").getAsString(),
-                                    data.get("access_token").getAsString(),
-                                    data.get("refresh_token").getAsString(),
-                                    data.get("expires_in").getAsInt());
-                        }
-                        catch (NullPointerException e) {
-                            finishWithError(new AppError(TAG, 311, CODE_OTHER, response, e, data));
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 317, CODE_OTHER, response, throwable));
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    private void synergiaAccounts(String tokenType, String accessToken, SynergiaAccountsCallback synergiaAccountsCallback) {
-        callback.onActionStarted(R.string.sync_action_getting_accounts);
-        Request.builder()
-                .url(fakeLogin ? "http://szkolny.eu/librus/synergia_accounts.php" : ACCOUNTS_URL)
-                .userAgent(userAgent)
-                .addHeader("Authorization", tokenType+" "+accessToken)
-                .get()
-                .allowErrorCode(HTTP_FORBIDDEN)
-                .allowErrorCode(HTTP_UNAUTHORIZED)
-                .allowErrorCode(HTTP_BAD_REQUEST)
-                .callback(new JsonCallbackHandler() {
-                    @Override
-                    public void onSuccess(JsonObject data, Response response) {
-                        if (data == null) {
-                            finishWithError(new AppError(TAG, 590, CODE_MAINTENANCE, response));
-                            return;
-                        }
-                        if (data.get("error") != null) {
-                            JsonElement message = data.get("message");
-                            JsonElement hint = data.get("hint");
-                            String errorText = data.get("error").getAsString()+" "+(message == null ? "" : message.getAsString())+" "+(hint == null ? "" : hint.getAsString());
-                            finishWithError(new AppError(TAG, 597, CODE_OTHER, errorText, response, data));
-                            return;
-                        }
-                        try {
-                            synergiaAccountsCallback.onSuccess(data);
-                        }
-                        catch (NullPointerException e) {
-                            e.printStackTrace();
-                            finishWithError(new AppError(TAG, 358, CODE_OTHER, response, e, data));
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 364, CODE_OTHER, response, throwable));
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    private boolean error410 = false;
-
-    private void synergiaAccount(String tokenType, String accessToken, String accountLogin, SynergiaAccountCallback synergiaAccountCallback) {
-        callback.onActionStarted(R.string.sync_action_getting_account);
-        d(TAG, "Requesting "+(fakeLogin ? "http://szkolny.eu/librus/synergia_accounts_fresh.php?login="+accountLogin : ACCOUNT_URL+accountLogin));
-        if (accountLogin == null) { // just for safety
-            synergiaAccounts(tokenType, accessToken, synergiaAccountsCallback);
-            return;
-        }
-        Request.builder()
-                .url(fakeLogin ? "http://szkolny.eu/librus/synergia_accounts_fresh.php?login="+accountLogin : ACCOUNT_URL+accountLogin)
-                .userAgent(userAgent)
-                .addHeader("Authorization", tokenType+" "+accessToken)
-                .get()
-                .allowErrorCode(HTTP_NOT_FOUND)
-                .allowErrorCode(HTTP_FORBIDDEN)
-                .allowErrorCode(HTTP_UNAUTHORIZED)
-                .allowErrorCode(HTTP_BAD_REQUEST)
-                .allowErrorCode(HTTP_GONE)
-                .callback(new JsonCallbackHandler() {
-                    @Override
-                    public void onSuccess(JsonObject data, Response response) {
-                        if (data == null) {
-                            finishWithError(new AppError(TAG, 641, CODE_MAINTENANCE, response));
-                            return;
-                        }
-                        if (response.code() == 410 && !error410) {
-                            JsonElement reason = data.get("reason");
-                            if (reason != null && !(reason instanceof JsonNull) && reason.getAsString().equals("requires_an_action")) {
-                                finishWithError(new AppError(TAG, 1078, CODE_LIBRUS_DISCONNECTED, response, data));
-                                return;
-                            }
-                            error410 = true;
-                            synergiaAccountCallback.onSuccess(null);
-                            return;
-                        }
-                        if (data.get("message") != null) {
-                            String message = data.get("message").getAsString();
-                            if (message.equals("Account not found")) {
-                                finishWithError(new AppError(TAG, 651, CODE_OTHER, app.getString(R.string.sync_error_register_student_not_associated_format, profile.getStudentNameLong(), accountLogin), response, data));
-                                return;
-                            }
-                            finishWithError(new AppError(TAG, 654, CODE_OTHER, message+"\n\n"+accountLogin, response, data));
-                            return;
-                        }
-                        if (response.code() == HTTP_OK) {
-                            try {
-                                synergiaAccountCallback.onSuccess(data);
-                            } catch (NullPointerException e) {
-                                e.printStackTrace();
-                                finishWithError(new AppError(TAG, 662, CODE_OTHER, response, e, data));
-                            }
-                        }
-                        else {
-                            finishWithError(new AppError(TAG, 425, CODE_OTHER, response, data));
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 432, CODE_OTHER, response, throwable));
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    private int failed = 0;
-
-    private void apiRequest(String endpoint, ApiRequestCallback apiRequestCallback) {
-        d(TAG, "Requesting "+API_URL+endpoint);
-        Request.builder()
-                .url(fakeLogin ? "http://szkolny.eu/librus/api/"+endpoint : API_URL+endpoint)
-                .userAgent(userAgent)
-                .addHeader("Authorization", "Bearer "+synergiaAccessToken)
-                .get()
-                .allowErrorCode(HTTP_FORBIDDEN)
-                .allowErrorCode(HTTP_UNAUTHORIZED)
-                .allowErrorCode(HTTP_BAD_REQUEST)
-                .callback(new JsonCallbackHandler() {
-                    @Override
-                    public void onSuccess(JsonObject data, Response response) {
-                        if (data == null) {
-                            if (response.parserErrorBody != null && response.parserErrorBody.equals("Nieprawidłowy węzeł.")) {
-                                apiRequestCallback.onSuccess(null);
-                                return;
-                            }
-                            finishWithError(new AppError(TAG, 453, CODE_MAINTENANCE, response));
-                            return;
-                        }
-                        if (data.get("Status") != null) {
-                            JsonElement message = data.get("Message");
-                            JsonElement code = data.get("Code");
-                            d(TAG, "apiRequest Error "+data.get("Status").getAsString()+" "+(message == null ? "" : message.getAsString())+" "+(code == null ? "" : code.getAsString())+"\n\n"+response.request().url().toString());
-                            if (message != null && !(message instanceof JsonNull) && message.getAsString().equals("Student timetable is not public")) {
-                                try {
-                                    apiRequestCallback.onSuccess(null);
-                                }
-                                catch (NullPointerException e) {
-                                    e.printStackTrace();
-                                    d(TAG, "apiRequest exception "+e.getMessage());
-                                    finishWithError(new AppError(TAG, 503, CODE_OTHER, response, e, data));
-                                }
-                                return;
-                            }
-                            if (code != null
-                                    && !(code instanceof JsonNull)
-                                    && (code.getAsString().equals("LuckyNumberIsNotActive")
-                                    || code.getAsString().equals("NotesIsNotActive")
-                                    || code.getAsString().equals("AccessDeny"))
-                            ) {
-                                try {
-                                    apiRequestCallback.onSuccess(null);
-                                }
-                                catch (NullPointerException e) {
-                                    e.printStackTrace();
-                                    d(TAG, "apiRequest exception "+e.getMessage());
-                                    finishWithError(new AppError(TAG, 504, CODE_OTHER, response, e, data));
-                                }
-                                return;
-                            }
-                            String errorText = data.get("Status").getAsString()+" "+(message == null ? "" : message.getAsString())+" "+(code == null ? "" : code.getAsString());
-                            if (code != null && !(code instanceof JsonNull) && code.getAsString().equals("TokenIsExpired")) {
-                                failed++;
-                                d(TAG, "Trying to refresh synergia token, api request failed "+failed+" times now");
-                                if (failed > 1) {
-                                    d(TAG, "Giving up, failed "+failed+" times");
-                                    finishWithError(new AppError(TAG, 485, CODE_OTHER, errorText, response, data));
-                                    return;
-                                }
-                                String tokenType = loginStore.getLoginData("tokenType", "Bearer");
-                                String accessToken = loginStore.getLoginData("accessToken", null);
-                                String refreshToken = loginStore.getLoginData("refreshToken", null);
-                                long tokenExpiryTime = loginStore.getLoginData("tokenExpiryTime", (long)0);
-                                getSynergiaToken(tokenType, accessToken, refreshToken, tokenExpiryTime);
-                                return;
-                            }
-                            finishWithError(new AppError(TAG, 497, CODE_OTHER, errorText, response, data));
-                            return;
-                        }
-                        try {
-                            apiRequestCallback.onSuccess(data);
-                        }
-                        catch (NullPointerException e) {
-                            e.printStackTrace();
-                            d(TAG, "apiRequest exception "+e.getMessage());
-                            finishWithError(new AppError(TAG, 505, CODE_OTHER, response, e, data));
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        if (response.code() == 405) {
-                            // method not allowed
-                            finishWithError(new AppError(TAG, 511, CODE_OTHER, response, throwable));
-                            return;
-                        }
-                        if (response.code() == 500) {
-                            // TODO: 2019-09-10 dirty hotfix
-                            if ("Classrooms".equals(endpoint)) {
-                                apiRequestCallback.onSuccess(null);
-                                return;
-                            }
-                            finishWithError(new AppError(TAG, 516, CODE_MAINTENANCE, response, throwable));
-                            return;
-                        }
-                        finishWithError(new AppError(TAG, 520, CODE_OTHER, response, throwable));
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    private void synergiaRequest(String endpoint, String body, SynergiaRequestCallback synergiaRequestCallback) {
-        d(TAG, "Requesting "+SYNERGIA_URL+endpoint);
-        Request.builder()
-                .url(SYNERGIA_URL+endpoint)
-                .userAgent(synergiaUserAgent)
-                .setTextBody(body, MediaTypeUtils.APPLICATION_XML)
-                .callback(new TextCallbackHandler() {
-                    @Override
-                    public void onSuccess(String data, Response response) {
-                        if ((data.contains("<status>error</status>") || data.contains("<error>")) && !data.contains("Niepoprawny")) {
-                            finishWithError(new AppError(TAG, 541, AppError.CODE_MAINTENANCE, response, data));
-                            return;
-                        }
-                        synergiaRequestCallback.onSuccess(Jsoup.parse(data, "", Parser.xmlParser()));
-                    }
-
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 556, CODE_OTHER, response, throwable));
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    // CALLBACKS & INTERFACES
-    private interface AuthorizeCallback {
-        void onCsrfToken(String csrfToken);
-        void onAuthorizationCode(String code);
-    }
-    private interface LibrusLoginCallback {
-        void onLogin(String redirectUrl);
-    }
-    private interface AccessTokenCallback {
-        void onSuccess(String tokenType, String accessToken, String refreshToken, int expiresIn);
-        void onError();
-    }
-    private interface SynergiaAccountsCallback {
-        void onSuccess(JsonObject data);
-    }
-    private interface SynergiaAccountCallback {
-        void onSuccess(JsonObject data);
-    }
-    private interface ApiRequestCallback {
-        void onSuccess(JsonObject data);
-    }
-    private interface SynergiaRequestCallback {
-        void onSuccess(Document data);
-    }
-
-    private AuthorizeCallback authorizeCallback;
-    private LibrusLoginCallback librusLoginCallback;
-    private AccessTokenCallback accessTokenCallback;
-    private SynergiaAccountsCallback synergiaAccountsCallback;
-    private SynergiaAccountCallback synergiaAccountCallback;
-
-    /*    _____        _          _____                            _
-         |  __ \      | |        |  __ \                          | |
-         | |  | | __ _| |_ __ _  | |__) |___  __ _ _   _  ___  ___| |_ ___
-         | |  | |/ _` | __/ _` | |  _  // _ \/ _` | | | |/ _ \/ __| __/ __|
-         | |__| | (_| | || (_| | | | \ \  __/ (_| | |_| |  __/\__ \ |_\__ \
-         |_____/ \__,_|\__\__,_| |_|  \_\___|\__, |\__,_|\___||___/\__|___/
-                                                | |
-                                                |*/
-    private void getMe() {
-        if (!fullSync) {
-            r("finish", "Me");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_account_info);
-        apiRequest("Me", data -> {
-            JsonObject me = data.get("Me").getAsJsonObject();
-            me = me.get("Account").getAsJsonObject();
-            //d("Got School: "+school.toString());
-            try {
-                boolean premium = me.get("IsPremium").getAsBoolean();
-                boolean premiumDemo = me.get("IsPremiumDemo").getAsBoolean();
-                this.premium = premium || premiumDemo;
-                profile.putStudentData("isPremium", premium || premiumDemo);
-                r("finish", "Me");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 1316, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private Map<Integer, Pair<Time, Time>> lessonRanges = new HashMap<>();
-    private String schoolName = "";
-    private void getSchools() {
-        if (!fullSync) {
-            try {
-                lessonRanges = app.gson.fromJson(profile.getStudentData("lessonRanges", "{}"), new TypeToken<Map<Integer, Pair<Time, Time>>>() {
-                }.getType());
-                if (lessonRanges != null && lessonRanges.size() > 0) {
-                    r("finish", "Schools");
-                    return;
-                }
-            }
-            catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        lessonRanges = new HashMap<>();
-        callback.onActionStarted(R.string.sync_action_syncing_school_info);
-        apiRequest("Schools", data -> {
-            //d("Got School: "+school.toString());
-            try {
-                JsonObject school = data.get("School").getAsJsonObject();
-                int schoolId = school.get("Id").getAsInt();
-                String schoolNameLong = school.get("Name").getAsString();
-                StringBuilder schoolNameShort = new StringBuilder();
-                for (String schoolNamePart: schoolNameLong.split(" ")) {
-                    if (schoolNamePart.isEmpty())
-                        continue;
-                    schoolNameShort.append(Character.toLowerCase(schoolNamePart.charAt(0)));
-                }
-                String schoolTown = school.get("Town").getAsString();
-                schoolName = schoolId+schoolNameShort.toString()+"_"+schoolTown.toLowerCase();
-                profile.putStudentData("schoolName", schoolName);
-
-                lessonRanges.clear();
-                int index = 0;
-                for (JsonElement lessonRangeEl: school.get("LessonsRange").getAsJsonArray()) {
-                    JsonObject lr = lessonRangeEl.getAsJsonObject();
-                    JsonElement from = lr.get("From");
-                    JsonElement to = lr.get("To");
-                    if (from != null && to != null && !(from instanceof JsonNull) && !(to instanceof JsonNull)) {
-                        lessonRanges.put(index, new Pair<>(Time.fromH_m(from.getAsString()), Time.fromH_m(to.getAsString())));
-                    }
-                    index++;
-                }
-                profile.putStudentData("lessonRanges", app.gson.toJson(lessonRanges));
-                r("finish", "Schools");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 1364, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private long teamClassId = -1;
-    private void getClasses() {
-        if (!fullSync) {
-            r("finish", "Classes");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_class);
-        apiRequest("Classes", data -> {
-            //d("Got Class: "+myClass.toString());
-            try {
-                JsonObject myClass = data.get("Class").getAsJsonObject();
-                String teamName = myClass.get("Number").getAsString()
-                        + myClass.get("Symbol").getAsString();
-                teamClassId = myClass.get("Id").getAsLong();
-                teamList.add(new Team(
-                        profileId,
-                        teamClassId,
-                        teamName,
-                        1,
-                        schoolName+":"+teamName,
-                        myClass.get("ClassTutor").getAsJsonObject().get("Id").getAsLong()));
-                JsonElement semester1Begin = myClass.get("BeginSchoolYear");
-                JsonElement semester2Begin = myClass.get("EndFirstSemester");
-                JsonElement yearEnd = myClass.get("EndSchoolYear");
-                if (semester1Begin != null
-                        && semester2Begin != null
-                        && yearEnd != null
-                        && !(semester1Begin instanceof JsonNull)
-                        && !(semester2Begin instanceof JsonNull)
-                        && !(yearEnd instanceof JsonNull)) {
-                    profile.setDateSemester1Start(Date.fromY_m_d(semester1Begin.getAsString()));
-                    profile.setDateSemester2Start(Date.fromY_m_d(semester2Begin.getAsString()));
-                    profile.setDateYearEnd(Date.fromY_m_d(yearEnd.getAsString()));
-                }
-                JsonElement unit = myClass.get("Unit");
-                if (unit != null && !(unit instanceof JsonNull)) {
-                    unitId = unit.getAsJsonObject().get("Id").getAsLong();
-                    profile.putStudentData("unitId", unitId);
-                }
-                r("finish", "Classes");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 1411, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private void getVirtualClasses() {
-        if (!fullSync) {
-            r("finish", "VirtualClasses");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_teams);
-        apiRequest("VirtualClasses", data -> {
-            if (data == null) {
-                r("finish", "VirtualClasses");
-                return;
-            }
-            try {
-                JsonArray classes = data.get("VirtualClasses").getAsJsonArray();
-                for (JsonElement myClassEl: classes) {
-                    JsonObject myClass = myClassEl.getAsJsonObject();
-                    String teamName = myClass.get("Name").getAsString();
-                    long teamId = myClass.get("Id").getAsLong();
-                    long teacherId = -1;
-                    JsonElement el;
-                    if ((el = myClass.get("Teacher")) != null) {
-                        teacherId = el.getAsJsonObject().get("Id").getAsLong();
-                    }
-                    teamList.add(new Team(
-                            profileId,
-                            teamId,
-                            teamName,
-                            2,
-                            schoolName + ":" + teamName,
-                            teacherId));
-                }
-                r("finish", "VirtualClasses");
-            } catch (Exception e) {
-                finishWithError(new AppError(TAG, 1449, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private void getUnits() {
-        if (!fullSync) {
-            enableStandardGrades = profile.getStudentData("enableStandardGrades", true);
-            enablePointGrades = profile.getStudentData("enablePointGrades", false);
-            enableDescriptiveGrades = profile.getStudentData("enableDescriptiveGrades", false);
-            enableTextGrades = profile.getStudentData("enableTextGrades", false);
-            enableBehaviourGrades = profile.getStudentData("enableBehaviourGrades", true);
-            startPointsSemester1 = profile.getStudentData("startPointsSemester1", 0);
-            startPointsSemester2 = profile.getStudentData("startPointsSemester2", 0);
-            r("finish", "Units");
-            return;
-        }
-        d(TAG, "Grades settings: "+enableStandardGrades+", "+enablePointGrades+", "+enableDescriptiveGrades);
-        callback.onActionStarted(R.string.sync_action_syncing_school_info);
-        apiRequest("Units", data -> {
-            if (data == null) {
-                r("finish", "Units");
-                return;
-            }
-            JsonArray units = data.getAsJsonArray("Units");
-            try {
-                long unitId = profile.getStudentData("unitId", (long)-1);
-                enableStandardGrades = true; // once a week or two (during a full sync) force getting the standard grade list. If there aren't any, disable it again later.
-                enableBehaviourGrades = true;
-                enableTextGrades = true; // TODO: 2019-05-13 if "DescriptiveGradesEnabled" are also TextGrades
-                profile.putStudentData("enableStandardGrades", true);
-                profile.putStudentData("enableBehaviourGrades", true);
-                profile.putStudentData("enableTextGrades", true);
-                for (JsonElement unitEl: units) {
-                    JsonObject unit = unitEl.getAsJsonObject();
-
-                    if (unit.get("Id").getAsLong() == unitId) {
-                        JsonObject gradesSettings = unit.getAsJsonObject("GradesSettings");
-                        enablePointGrades = gradesSettings.get("PointGradesEnabled").getAsBoolean();
-                        enableDescriptiveGrades = gradesSettings.get("DescriptiveGradesEnabled").getAsBoolean();
-
-                        JsonObject behaviourGradesSettings = unit.getAsJsonObject("BehaviourGradesSettings");
-                        JsonObject startPoints = behaviourGradesSettings.getAsJsonObject("StartPoints");
-
-                        startPointsSemester1 = startPoints.get("Semester1").getAsInt();
-                        JsonElement startPointsSemester2El;
-                        if ((startPointsSemester2El = startPoints.get("Semester2")) != null) {
-                            startPointsSemester2 = startPointsSemester2El.getAsInt();
-                        }
-                        else {
-                            startPointsSemester2 = startPointsSemester1;
-                        }
-
-                        profile.putStudentData("enablePointGrades", enablePointGrades);
-                        profile.putStudentData("enableDescriptiveGrades", enableDescriptiveGrades);
-                        profile.putStudentData("startPointsSemester1", startPointsSemester1);
-                        profile.putStudentData("startPointsSemester2", startPointsSemester2);
-                        break;
-                    }
-                }
-                d(TAG, "Grades settings: "+enableStandardGrades+", "+enablePointGrades+", "+enableDescriptiveGrades);
-                r("finish", "Units");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 1506, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private boolean teacherListChanged = false;
-    private void getUsers() {
-        if (!fullSync) {
-            r("finish", "Users");
-            teacherList = app.db.teacherDao().getAllNow(profileId);
-            teacherListChanged = false;
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_users);
-        apiRequest("Users", data -> {
-            if (data == null) {
-                r("finish", "Users");
-                return;
-            }
-            JsonArray users = data.get("Users").getAsJsonArray();
-            //d("Got Users: "+users.toString());
-            try {
-                teacherListChanged = true;
-                for (JsonElement userEl : users) {
-                    JsonObject user = userEl.getAsJsonObject();
-                    JsonElement firstName = user.get("FirstName");
-                    JsonElement lastName = user.get("LastName");
-                    teacherList.add(new Teacher(
-                            profileId,
-                            user.get("Id").getAsLong(),
-                            firstName instanceof JsonNull ? "" : firstName.getAsString(),
-                            lastName instanceof JsonNull ? "" : lastName.getAsString()
-                    ));
-                }
-                r("finish", "Users");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 1544, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private void getSubjects() {
-        if (!fullSync) {
-            r("finish", "Subjects");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_subjects);
-        apiRequest("Subjects", data -> {
-            if (data == null) {
-                r("finish", "Subjects");
-                return;
-            }
-            JsonArray subjects = data.get("Subjects").getAsJsonArray();
-            //d("Got Subjects: "+subjects.toString());
-            try {
-                for (JsonElement subjectEl : subjects) {
-                    JsonObject subject = subjectEl.getAsJsonObject();
-                    JsonElement longName = subject.get("Name");
-                    JsonElement shortName = subject.get("Short");
-                    subjectList.add(new Subject(
-                            profileId,
-                            subject.get("Id").getAsLong(),
-                            longName instanceof JsonNull ? "" : longName.getAsString(),
-                            shortName instanceof JsonNull ? "" : shortName.getAsString()
-                    ));
-                }
-                subjectList.add(new Subject(
-                        profileId,
-                        1,
-                        "Zachowanie",
-                        "zach"
-                ));
-                r("finish", "Subjects");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 1588, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private SparseArray<String> classrooms = new SparseArray<>();
-    private void getClassrooms() {
-        //if (!fullSync)
-        //    r("finish", "Classrooms");
-        callback.onActionStarted(R.string.sync_action_syncing_classrooms);
-        apiRequest("Classrooms", data -> {
-            if (data == null) {
-                r("finish", "Classrooms");
-                return;
-            }
-            if (data.get("Classrooms") == null) {
-                r("finish", "Classrooms");
-                return;
-            }
-            JsonArray jClassrooms = data.get("Classrooms").getAsJsonArray();
-            //d("Got Classrooms: "+jClassrooms.toString());
-            classrooms.clear();
-            try {
-                for (JsonElement classroomEl : jClassrooms) {
-                    JsonObject classroom = classroomEl.getAsJsonObject();
-                    classrooms.put(classroom.get("Id").getAsInt(), classroom.get("Name").getAsString());
-                }
-                r("finish", "Classrooms");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 1617, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private void getTimetables() {
-        callback.onActionStarted(R.string.sync_action_syncing_timetable);
-        Date weekStart = Week.getWeekStart();
-        if (Date.getToday().getWeekDay() > 4) {
-            weekStart.stepForward(0, 0, 7);
-        }
-        apiRequest("Timetables?weekStart="+weekStart.getStringY_m_d(), data -> {
-            if (data == null) {
-                r("finish", "Timetables");
-                return;
-            }
-            JsonObject timetables = data.get("Timetable").getAsJsonObject();
-            try {
-                for (Map.Entry<String, JsonElement> dayEl: timetables.entrySet()) {
-                    JsonArray day = dayEl.getValue().getAsJsonArray();
-                    Date lessonDate = Date.fromY_m_d(dayEl.getKey());
-                    for (JsonElement lessonGroupEl: day) {
-                        if ((lessonGroupEl instanceof JsonArray && ((JsonArray) lessonGroupEl).size() == 0) || lessonGroupEl instanceof JsonNull || lessonGroupEl == null) {
-                            continue;
-                        }
-                        JsonArray lessonGroup = lessonGroupEl.getAsJsonArray();
-                        for (JsonElement lessonEl: lessonGroup) {
-                            if ((lessonEl instanceof JsonArray && ((JsonArray) lessonEl).size() == 0) || lessonEl instanceof JsonNull || lessonEl == null) {
-                                continue;
-                            }
-                            JsonObject lesson = lessonEl.getAsJsonObject();
-
-                            boolean substitution = false;
-                            boolean cancelled = false;
-                            JsonElement isSubstitutionClass;
-                            if ((isSubstitutionClass = lesson.get("IsSubstitutionClass")) != null) {
-                                substitution = isSubstitutionClass.getAsBoolean();
-                            }
-                            JsonElement isCanceled;
-                            if ((isCanceled = lesson.get("IsCanceled")) != null) {
-                                cancelled = isCanceled.getAsBoolean();
-                            }
-
-                            if (substitution && cancelled) {
-                                // the lesson is probably shifted. Skip this one
-                                continue;
-                            }
-
-                            Time startTime = null;
-                            Time endTime = null;
-                            try {
-                                startTime = Time.fromH_m(lesson.get(substitution && !cancelled ? "OrgHourFrom" : "HourFrom").getAsString());
-                                endTime = Time.fromH_m(lesson.get(substitution && !cancelled ? "OrgHourTo" : "HourTo").getAsString());
-                            }
-                            catch (Exception ignore) {
-                                try {
-                                    JsonElement lessonNo;
-                                    if (!((lessonNo = lesson.get("LessonNo")) instanceof JsonNull)) {
-                                        Pair<Time, Time> timePair = lessonRanges.get(strToInt(lessonNo.getAsString()));
-                                        if (timePair != null) {
-                                            startTime = timePair.first;
-                                            endTime = timePair.second;
-                                        }
-                                    }
-                                }
-                                catch (Exception ignore2) { }
-                            }
-
-
-                            Lesson lessonObject = new Lesson(
-                                    profileId,
-                                    lesson.get("DayNo").getAsInt() - 1,
-                                    startTime,
-                                    endTime
-                            );
-
-                            JsonElement subject;
-                            if ((subject = lesson.get(substitution && !cancelled ? "OrgSubject" : "Subject")) != null) {
-                                lessonObject.subjectId = subject.getAsJsonObject().get("Id").getAsLong();
-                            }
-
-                            JsonElement teacher;
-                            if ((teacher = lesson.get(substitution && !cancelled ? "OrgTeacher" : "Teacher")) != null) {
-                                lessonObject.teacherId = teacher.getAsJsonObject().get("Id").getAsLong();
-                            }
-
-                            JsonElement myClass;
-                            if ((myClass = lesson.get("Class")) != null) {
-                                lessonObject.teamId = myClass.getAsJsonObject().get("Id").getAsLong();
-                            }
-                            if (myClass == null && (myClass = lesson.get("VirtualClass")) != null) {
-                                lessonObject.teamId = myClass.getAsJsonObject().get("Id").getAsLong();
-                            }
-
-                            JsonElement classroom;
-                            JsonElement substitutionClassroom;
-                            if (substitution && !cancelled) {
-                                classroom = lesson.get("OrgClassroom");
-                                substitutionClassroom = lesson.get("Classroom");
-
-                                if (classroom != null)
-                                    lessonObject.classroomName = classrooms.get(classroom.getAsJsonObject().get("Id").getAsInt());
-
-                                if (substitutionClassroom != null) {
-                                    for (LessonChange lessonChange : lessonChangeList) {
-                                        if(lessonChange.lessonDate.compareTo(lessonDate) == 0) {
-                                            lessonChange.classroomName
-                                                    = classrooms.get(substitutionClassroom.getAsJsonObject().get("Id").getAsInt());
-                                            break;
-                                        }
-                                    }
-                                }
-                            } else {
-                                classroom = lesson.get("Classroom");
-                                if (classroom != null)
-                                    lessonObject.classroomName = classrooms.get(classroom.getAsJsonObject().get("Id").getAsInt());
-                            }
-
-                            lessonList.add(lessonObject);
-                        }
-                    }
-                }
-                r("finish", "Timetables");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 1704, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private void getSubstitutions() {
-        callback.onActionStarted(R.string.sync_action_syncing_timetable_changes);
-        apiRequest("Calendars/Substitutions", data -> {
-            if (data == null) {
-                r("finish", "Substitutions");
-                return;
-            }
-
-            JsonArray substitutions = data.get("Substitutions").getAsJsonArray();
-            try {
-                List<Long> ignoreList = new ArrayList<>();
-                for (JsonElement substitutionEl : substitutions) {
-                    JsonObject substitution = substitutionEl.getAsJsonObject();
-
-                    String str_date = substitution.get("OrgDate").getAsString();
-                    Date lessonDate = Date.fromY_m_d(str_date);
-
-                    Time startTime = Time.getNow();
-                    JsonElement lessonNo;
-                    if (!((lessonNo = substitution.get("OrgLessonNo")) instanceof JsonNull)) {
-                        Pair<Time, Time> timePair = lessonRanges.get(lessonNo.getAsInt());
-                        if (timePair != null)
-                            startTime = timePair.first;
-                    }
-
-                    JsonElement isShifted;
-                    JsonElement isCancelled;
-                    if ((isShifted = substitution.get("IsShifted")) != null && isShifted.getAsBoolean()) {
-                        // a lesson is shifted
-                        // add a TYPE_CANCELLED for the source lesson and a TYPE_CHANGE for the destination lesson
-
-                        // source lesson: cancel
-                        LessonChange lessonCancelled = new LessonChange(profileId, lessonDate, startTime, startTime.clone().stepForward(0, 45, 0));
-                        lessonCancelled.type = TYPE_CANCELLED;
-                        lessonChangeList.add(lessonCancelled);
-                        metadataList.add(new Metadata(profileId, Metadata.TYPE_LESSON_CHANGE, lessonCancelled.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-
-                        // target lesson: change
-                        startTime = Time.getNow();
-                        if (!((lessonNo = substitution.get("LessonNo")) instanceof JsonNull)) {
-                            Pair<Time, Time> timePair = lessonRanges.get(lessonNo.getAsInt());
-                            if (timePair != null)
-                                startTime = timePair.first;
-                        }
-
-                        LessonChange lessonChanged = new LessonChange(profileId, lessonDate, startTime, startTime.clone().stepForward(0, 45, 0));
-                        lessonChanged.type = TYPE_CHANGE;
-                        JsonElement subject;
-                        if ((subject = substitution.get("Subject")) != null) {
-                            lessonChanged.subjectId = subject.getAsJsonObject().get("Id").getAsLong();
-                        }
-                        JsonElement teacher;
-                        if ((teacher = substitution.get("Teacher")) != null) {
-                            lessonChanged.teacherId = teacher.getAsJsonObject().get("Id").getAsLong();
-                        }
-                        JsonElement myClass;
-                        if ((myClass = substitution.get("Class")) != null) {
-                            lessonChanged.teamId = myClass.getAsJsonObject().get("Id").getAsLong();
-                        }
-                        if (myClass == null && (myClass = substitution.get("VirtualClass")) != null) {
-                            lessonChanged.teamId = myClass.getAsJsonObject().get("Id").getAsLong();
-                        }
-                        lessonChangeList.add(lessonChanged);
-                        metadataList.add(new Metadata(profileId, Metadata.TYPE_LESSON_CHANGE, lessonChanged.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-
-                        // ignore the target lesson in further array elements - it's already changed
-                        ignoreList.add(lessonChanged.lessonDate.combineWith(lessonChanged.startTime));
-                    }
-                    else if ((isCancelled = substitution.get("IsCancelled")) != null && isCancelled.getAsBoolean()) {
-                        LessonChange lessonChange = new LessonChange(profileId, lessonDate, startTime, startTime.clone().stepForward(0, 45, 0));
-                        // if it's actually a lesson shift - ignore the target lesson cancellation
-                        if (ignoreList.size() > 0 && ignoreList.contains(lessonChange.lessonDate.combineWith(lessonChange.startTime)))
-                            continue;
-                        lessonChange.type = TYPE_CANCELLED;
-                        lessonChangeList.add(lessonChange);
-                        metadataList.add(new Metadata(profileId, Metadata.TYPE_LESSON_CHANGE, lessonChange.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-                    }
-                    else {
-                        LessonChange lessonChange = new LessonChange(profileId, lessonDate, startTime, startTime.clone().stepForward(0, 45, 0));
-
-                        lessonChange.type = TYPE_CHANGE;
-
-                        JsonElement subject;
-                        if ((subject = substitution.get("Subject")) != null) {
-                            lessonChange.subjectId = subject.getAsJsonObject().get("Id").getAsLong();
-                        }
-                        JsonElement teacher;
-                        if ((teacher = substitution.get("Teacher")) != null) {
-                            lessonChange.teacherId = teacher.getAsJsonObject().get("Id").getAsLong();
-                        }
-
-                        JsonElement myClass;
-                        if ((myClass = substitution.get("Class")) != null) {
-                            lessonChange.teamId = myClass.getAsJsonObject().get("Id").getAsLong();
-                        }
-                        if (myClass == null && (myClass = substitution.get("VirtualClass")) != null) {
-                            lessonChange.teamId = myClass.getAsJsonObject().get("Id").getAsLong();
-                        }
-
-                        lessonChangeList.add(lessonChange);
-                        metadataList.add(new Metadata(profileId, Metadata.TYPE_LESSON_CHANGE, lessonChange.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-                    }
-
-                }
-                r("finish", "Substitutions");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 1822, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private SparseIntArray colors = new SparseIntArray();
-    private void getColors() {
-        colors.put( 1, 0xFFF0E68C);
-        colors.put( 2, 0xFF87CEFA);
-        colors.put( 3, 0xFFB0C4DE);
-        colors.put( 4, 0xFFF0F8FF);
-        colors.put( 5, 0xFFF0FFFF);
-        colors.put( 6, 0xFFF5F5DC);
-        colors.put( 7, 0xFFFFEBCD);
-        colors.put( 8, 0xFFFFF8DC);
-        colors.put( 9, 0xFFA9A9A9);
-        colors.put(10, 0xFFBDB76B);
-        colors.put(11, 0xFF8FBC8F);
-        colors.put(12, 0xFFDCDCDC);
-        colors.put(13, 0xFFDAA520);
-        colors.put(14, 0xFFE6E6FA);
-        colors.put(15, 0xFFFFA07A);
-        colors.put(16, 0xFF32CD32);
-        colors.put(17, 0xFF66CDAA);
-        colors.put(18, 0xFF66CDAA);
-        colors.put(19, 0xFFC0C0C0);
-        colors.put(20, 0xFFD2B48C);
-        colors.put(21, 0xFF3333FF);
-        colors.put(22, 0xFF7B68EE);
-        colors.put(23, 0xFFBA55D3);
-        colors.put(24, 0xFFFFB6C1);
-        colors.put(25, 0xFFFF1493);
-        colors.put(26, 0xFFDC143C);
-        colors.put(27, 0xFFFF0000);
-        colors.put(28, 0xFFFF8C00);
-        colors.put(29, 0xFFFFD700);
-        colors.put(30, 0xFFADFF2F);
-        colors.put(31, 0xFF7CFC00);
-        r("finish", "Colors");
-        /*
-        apiRequest("Colors", data -> {
-            JsonArray jColors = data.get("Colors").getAsJsonArray();
-            d("Got Colors: "+jColors.toString());
-            colors.clear();
-            try {
-                for (JsonElement colorEl : jColors) {
-                    JsonObject color = colorEl.getAsJsonObject();
-                    colors.put(color.get("Id").getAsInt(), Color.parseColor("#"+color.get("RGB").getAsString()));
-                }
-            }
-            catch (Exception e) {
-                e.printStackTrace();
-            }
-            getGrades();
-        });*/
-    }
-
-    private boolean gradeCategoryListChanged = false;
-    private void getSavedGradeCategories() {
-        gradeCategoryList = app.db.gradeCategoryDao().getAllNow(profileId);
-        gradeCategoryListChanged = false;
-        r("finish", "SavedGradeCategories");
-    }
-
-    private void saveGradeCategories() {
-        r("finish", "SaveGradeCategories");
-    }
-
-    private void getGradesCategories() {
-        if (!fullSync && false) {
-            // cancel every not-full sync; no need to download categories again
-            // every full sync it'll be enabled to make sure there are no grades - by getUnits
-            r("finish", "GradesCategories");
-            return;
-        }
-        // not a full sync. Will get all grade categories. Clear the current list.
-        //gradeCategoryList.clear();
-
-        callback.onActionStarted(R.string.sync_action_syncing_grade_categories);
-        apiRequest("Grades/Categories", data -> {
-            if (data == null) {
-                r("finish", "GradesCategories");
-                return;
-            }
-            JsonArray categories = data.get("Categories").getAsJsonArray();
-            enableStandardGrades = categories.size() > 0;
-            profile.putStudentData("enableStandardGrades", enableStandardGrades);
-            if (!enableStandardGrades) {
-                r("finish", "GradesCategories");
-                return;
-            }
-            gradeCategoryListChanged = true;
-            //d("Got Grades/Categories: "+categories.toString());
-            try {
-                for (JsonElement categoryEl : categories) {
-                    JsonObject category = categoryEl.getAsJsonObject();
-                    JsonElement name = category.get("Name");
-                    JsonElement weight = category.get("Weight");
-                    JsonElement color = category.get("Color");
-                    JsonElement countToTheAverage = category.get("CountToTheAverage");
-                    int colorInt = Color.BLUE;
-                    if (!(color instanceof JsonNull) && color != null) {
-                        colorInt = colors.get(color.getAsJsonObject().get("Id").getAsInt());
-                    }
-                    boolean countToTheAverageBool = !(countToTheAverage instanceof JsonNull) && countToTheAverage != null && countToTheAverage.getAsBoolean();
-                    int weightInt = weight instanceof JsonNull || weight == null || !countToTheAverageBool ? 0 : weight.getAsInt();
-                    int categoryId = category.get("Id").getAsInt();
-                    gradeCategoryList.add(new GradeCategory(
-                            profileId,
-                            categoryId,
-                            weightInt,
-                            colorInt,
-                            name instanceof JsonNull || name == null ? "" : name.getAsString()
-                    ));
-                }
-                r("finish", "GradesCategories");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 1954, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private void getGradesComments() {
-        callback.onActionStarted(R.string.sync_action_syncing_grade_comments);
-        apiRequest("Grades/Comments", data -> {
-            if (data == null) {
-                r("finish", "GradesComments");
-                return;
-            }
-
-            JsonArray comments = data.get("Comments").getAsJsonArray();
-            for (JsonElement commentEl : comments) {
-                JsonObject comment = commentEl.getAsJsonObject();
-                long gradeId = comment.get("Grade").getAsJsonObject().get("Id").getAsLong();
-                String text = comment.get("Text").getAsString();
-
-                for (Grade grade : gradeList) {
-                    if (grade.id == gradeId) {
-                        grade.description = text;
-                        break;
-                    }
-                }
-            }
-
-            r("finish", "GradesComments");
-        });
-    }
-
-    private void getPointGradesCategories() {
-        if (!fullSync || !enablePointGrades) {
-            // cancel every not-full sync; no need to download categories again
-            // or
-            // if it's a full sync, point grades may have already been disabled in getUnits
-            r("finish", "PointGradesCategories");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_point_grade_categories);
-        apiRequest("PointGrades/Categories", data -> {
-            if (data == null) {
-                r("finish", "PointGradesCategories");
-                return;
-            }
-            JsonArray categories = data.get("Categories").getAsJsonArray();
-            enablePointGrades = categories.size() > 0;
-            profile.putStudentData("enablePointGrades", enablePointGrades);
-            if (!enablePointGrades) {
-                r("finish", "PointGradesCategories");
-                return;
-            }
-            gradeCategoryListChanged = true;
-            //d("Got Grades/Categories: "+categories.toString());
-            for (JsonElement categoryEl : categories) {
-                JsonObject category = categoryEl.getAsJsonObject();
-                JsonElement name = category.get("Name");
-                JsonElement weight = category.get("Weight");
-                JsonElement color = category.get("Color");
-                JsonElement countToTheAverage = category.get("CountToTheAverage");
-                JsonElement valueFrom = category.get("ValueFrom");
-                JsonElement valueTo = category.get("ValueTo");
-                int colorInt = Color.BLUE;
-                if (!(color instanceof JsonNull) && color != null) {
-                    colorInt = colors.get(color.getAsJsonObject().get("Id").getAsInt());
-                }
-                boolean countToTheAverageBool = !(countToTheAverage instanceof JsonNull) && countToTheAverage != null && countToTheAverage.getAsBoolean();
-                int weightInt = weight instanceof JsonNull || weight == null || !countToTheAverageBool ? 0 : weight.getAsInt();
-                int categoryId = category.get("Id").getAsInt();
-                float valueFromFloat = valueFrom.getAsFloat();
-                float valueToFloat = valueTo.getAsFloat();
-                gradeCategoryList.add(
-                        new GradeCategory(
-                                profileId,
-                                categoryId,
-                                weightInt,
-                                colorInt,
-                                name instanceof JsonNull || name == null ? "" : name.getAsString()
-                        ).setValueRange(valueFromFloat, valueToFloat)
-                );
-            }
-            r("finish", "PointGradesCategories");
-        });
-    }
-
-    private void getDescriptiveGradesSkills() {
-        if (!fullSync || !enableDescriptiveGrades) {
-            // cancel every not-full sync; no need to download categories again
-            // or
-            // if it's a full sync, descriptive grades may have already been disabled in getUnits
-            r("finish", "DescriptiveGradesCategories");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_descriptive_grade_categories);
-        apiRequest("DescriptiveTextGrades/Skills", data -> {
-            if (data == null) {
-                r("finish", "DescriptiveGradesCategories");
-                return;
-            }
-            JsonArray categories = data.get("Skills").getAsJsonArray();
-            enableDescriptiveGrades = categories.size() > 0;
-            profile.putStudentData("enableDescriptiveGrades", enableDescriptiveGrades);
-            if (!enableDescriptiveGrades) {
-                r("finish", "DescriptiveGradesCategories");
-                return;
-            }
-            gradeCategoryListChanged = true;
-            //d("Got Grades/Categories: "+categories.toString());
-            for (JsonElement categoryEl : categories) {
-                JsonObject category = categoryEl.getAsJsonObject();
-                JsonElement name = category.get("Name");
-                JsonElement color = category.get("Color");
-                int colorInt = Color.BLUE;
-                if (!(color instanceof JsonNull) && color != null) {
-                    colorInt = colors.get(color.getAsJsonObject().get("Id").getAsInt());
-                }
-                int weightInt = -1;
-                int categoryId = category.get("Id").getAsInt();
-                gradeCategoryList.add(new GradeCategory(
-                        profileId,
-                        categoryId,
-                        weightInt,
-                        colorInt,
-                        name instanceof JsonNull || name == null ? "" : name.getAsString()
-                ));
-            }
-            r("finish", "DescriptiveGradesCategories");
-        });
-    }
-
-    private void getTextGradesCategories() {
-        if (!fullSync || !enableTextGrades) {
-            // cancel every not-full sync; no need to download categories again
-            // or
-            // if it's a full sync, text grades may have already been disabled in getUnits
-            r("finish", "TextGradesCategories");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_descriptive_grade_categories);
-        apiRequest("TextGrades/Categories", data -> {
-            if (data == null) {
-                r("finish", "TextGradesCategories");
-                return;
-            }
-            JsonArray categories = data.get("Categories").getAsJsonArray();
-            enableTextGrades = categories.size() > 0;
-            profile.putStudentData("enableTextGrades", enableTextGrades);
-            if (!enableTextGrades) {
-                r("finish", "TextGradesCategories");
-                return;
-            }
-            gradeCategoryListChanged = true;
-            //d("Got Grades/Categories: "+categories.toString());
-            for (JsonElement categoryEl : categories) {
-                JsonObject category = categoryEl.getAsJsonObject();
-                JsonElement name = category.get("Name");
-                JsonElement color = category.get("Color");
-                int colorInt = Color.BLUE;
-                if (!(color instanceof JsonNull) && color != null) {
-                    colorInt = colors.get(color.getAsJsonObject().get("Id").getAsInt());
-                }
-                int weightInt = -1;
-                int categoryId = category.get("Id").getAsInt();
-                gradeCategoryList.add(new GradeCategory(
-                        profileId,
-                        categoryId,
-                        weightInt,
-                        colorInt,
-                        name instanceof JsonNull || name == null ? "" : name.getAsString()
-                ));
-            }
-            r("finish", "TextGradesCategories");
-        });
-    }
-
-    private void getBehaviourGradesCategories() {
-        if (!fullSync || !enableBehaviourGrades) {
-            // cancel every not-full sync; no need to download categories again
-            // or
-            // if it's a full sync, descriptive grades may have already been disabled in getUnits
-            r("finish", "BehaviourGradesCategories");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_behaviour_grade_categories);
-        apiRequest("BehaviourGrades/Points/Categories", data -> {
-            if (data == null) {
-                r("finish", "BehaviourGradesCategories");
-                return;
-            }
-            JsonArray categories = data.get("Categories").getAsJsonArray();
-            enableBehaviourGrades = categories.size() > 0;
-            profile.putStudentData("enableBehaviourGrades", enableBehaviourGrades);
-            if (!enableBehaviourGrades) {
-                r("finish", "BehaviourGradesCategories");
-                return;
-            }
-            gradeCategoryListChanged = true;
-            //d("Got Grades/Categories: "+categories.toString());
-            for (JsonElement categoryEl : categories) {
-                JsonObject category = categoryEl.getAsJsonObject();
-                JsonElement name = category.get("Name");
-                JsonElement valueFrom = category.get("ValueFrom");
-                JsonElement valueTo = category.get("ValueTo");
-                int colorInt = Color.BLUE;
-                int categoryId = category.get("Id").getAsInt();
-                float valueFromFloat = valueFrom.getAsFloat();
-                float valueToFloat = valueTo.getAsFloat();
-                gradeCategoryList.add(
-                        new GradeCategory(
-                                profileId,
-                                categoryId,
-                                -1,
-                                colorInt,
-                                name instanceof JsonNull || name == null ? "" : name.getAsString()
-                        ).setValueRange(valueFromFloat, valueToFloat)
-                );
-            }
-            r("finish", "BehaviourGradesCategories");
-        });
-    }
-
-    private void getGrades() {
-        d(TAG, "Grades settings: "+enableStandardGrades+", "+enablePointGrades+", "+enableDescriptiveGrades);
-        if (!enableStandardGrades && false) {
-            // cancel only if grades have been disabled before
-            // TODO do not cancel. this does not show any grades until a full sync happens. wtf
-            // in KOTLIN api, maybe this will be forced when user synchronises this feature exclusively
-            r("finish", "Grades");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_grades);
-        apiRequest("Grades", data -> {
-            if (data == null) {
-                r("finish", "Grades");
-                return;
-            }
-            JsonArray grades = data.get("Grades").getAsJsonArray();
-            enableStandardGrades = grades.size() > 0;
-            profile.putStudentData("enableStandardGrades", enableStandardGrades);
-            if (!enableStandardGrades) {
-                r("finish", "Grades");
-                return;
-            }
-            //d("Got Grades: "+grades.toString());
-            for (JsonElement gradeEl : grades) {
-                JsonObject grade = gradeEl.getAsJsonObject();
-                long id = grade.get("Id").getAsLong();
-                long teacherId = grade.get("AddedBy").getAsJsonObject().get("Id").getAsLong();
-                int semester = grade.get("Semester").getAsInt();
-                long categoryId = grade.get("Category").getAsJsonObject().get("Id").getAsLong();
-                long subjectId = grade.get("Subject").getAsJsonObject().get("Id").getAsLong();
-                String name = grade.get("Grade").getAsString();
-                float value = getGradeValue(name);
-
-                String str_date = grade.get("AddDate").getAsString();
-                long addedDate = Date.fromIso(str_date);
-
-                float weight = 0.0f;
-                String category = "";
-                int color = -1;
-                GradeCategory gradeCategory = GradeCategory.search(gradeCategoryList, categoryId);
-                if (gradeCategory != null) {
-                    weight = gradeCategory.weight;
-                    category = gradeCategory.text;
-                    color = gradeCategory.color;
-                }
-
-                if (name.equals("-") || name.equals("+") || name.equalsIgnoreCase("np") || name.equalsIgnoreCase("bz")) {
-                    // fix for + and - grades that lower the average
-                    weight = 0;
-                }
-
-                Grade gradeObject = new Grade(
-                        profileId,
-                        id,
-                        category,
-                        color,
-                        "",
-                        name,
-                        value,
-                        weight,
-                        semester,
-                        teacherId,
-                        subjectId
-                );
-
-                if (grade.get("IsConstituent").getAsBoolean()) {
-                    // normal grade
-                    gradeObject.type = TYPE_NORMAL;
-                }
-                if (grade.get("IsSemester").getAsBoolean()) {
-                    // semester final
-                    gradeObject.type = (gradeObject.semester == 1 ? TYPE_SEMESTER1_FINAL : TYPE_SEMESTER2_FINAL);
-                }
-                else if (grade.get("IsSemesterProposition").getAsBoolean()) {
-                    // semester proposed
-                    gradeObject.type = (gradeObject.semester == 1 ? TYPE_SEMESTER1_PROPOSED : TYPE_SEMESTER2_PROPOSED);
-                }
-                else if (grade.get("IsFinal").getAsBoolean()) {
-                    // year final
-                    gradeObject.type = TYPE_YEAR_FINAL;
-                }
-                else if (grade.get("IsFinalProposition").getAsBoolean()) {
-                    // year final
-                    gradeObject.type = TYPE_YEAR_PROPOSED;
-                }
-
-                JsonElement historyEl = grade.get("Improvement");
-                if (historyEl != null) {
-                    JsonObject history = historyEl.getAsJsonObject();
-                    long historicalId = history.get("Id").getAsLong();
-                    for (Grade historicalGrade: gradeList) {
-                        if (historicalGrade.id != historicalId)
-                            continue;
-                        // historicalGrade
-                        historicalGrade.parentId = gradeObject.id;
-                        if (historicalGrade.name.equals("nb")) {
-                            historicalGrade.weight = 0;
-                        }
-                        break;
-                    }
-                    gradeObject.isImprovement = true;
-                }
-
-                /*if (RegisterGradeCategory.getById(app.register, registerGrade.categoryId, -1) == null) {
-                    getGradesCategories = true;
-                }*/
-
-                gradeList.add(gradeObject);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_GRADE, gradeObject.id, profile.getEmpty(), profile.getEmpty(), addedDate));
-            }
-            r("finish", "Grades");
-        });
-    }
-
-    private void getPointGrades() {
-        d(TAG, "Grades settings: "+enableStandardGrades+", "+enablePointGrades+", "+enableDescriptiveGrades);
-        if (!enablePointGrades) {
-            // cancel only if grades have been disabled before
-            r("finish", "PointGrades");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_point_grades);
-        apiRequest("PointGrades", data -> {
-            if (data == null) {
-                r("finish", "PointGrades");
-                return;
-            }
-            JsonArray grades = data.get("Grades").getAsJsonArray();
-            enablePointGrades = grades.size() > 0;
-            profile.putStudentData("enablePointGrades", enablePointGrades);
-            if (!enablePointGrades) {
-                r("finish", "PointGrades");
-                return;
-            }
-            //d("Got Grades: "+grades.toString());
-            for (JsonElement gradeEl : grades) {
-                JsonObject grade = gradeEl.getAsJsonObject();
-                long id = grade.get("Id").getAsLong();
-                long teacherId = grade.get("AddedBy").getAsJsonObject().get("Id").getAsLong();
-                int semester = grade.get("Semester").getAsInt();
-                long categoryId = grade.get("Category").getAsJsonObject().get("Id").getAsLong();
-                long subjectId = grade.get("Subject").getAsJsonObject().get("Id").getAsLong();
-                String name = grade.get("Grade").getAsString();
-                float originalValue = grade.get("GradeValue").getAsFloat();
-
-                String str_date = grade.get("AddDate").getAsString();
-                long addedDate = Date.fromIso(str_date);
-
-                float weight = 0.0f;
-                String category = "";
-                int color = -1;
-                float value = 0.0f;
-                float maxPoints = 0.0f;
-                GradeCategory gradeCategory = GradeCategory.search(gradeCategoryList, categoryId);
-                if (gradeCategory != null) {
-                    weight = gradeCategory.weight;
-                    category = gradeCategory.text;
-                    color = gradeCategory.color;
-                    maxPoints = gradeCategory.valueTo;
-                    value = originalValue;
-                }
-
-                Grade gradeObject = new Grade(
-                        profileId,
-                        id,
-                        category,
-                        color,
-                        "",
-                        name,
-                        value,
-                        weight,
-                        semester,
-                        teacherId,
-                        subjectId
-                );
-                gradeObject.type = Grade.TYPE_POINT;
-                gradeObject.valueMax = maxPoints;
-
-                gradeList.add(gradeObject);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_GRADE, gradeObject.id, profile.getEmpty(), profile.getEmpty(), addedDate));
-            }
-            r("finish", "PointGrades");
-        });
-    }
-
-    private void getDescriptiveGrades() {
-        d(TAG, "Grades settings: "+enableStandardGrades+", "+enablePointGrades+", "+enableDescriptiveGrades);
-        if (!enableDescriptiveGrades && !enableTextGrades) {
-            // cancel only if grades have been disabled before
-            r("finish", "DescriptiveGrades");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_descriptive_grades);
-        apiRequest("BaseTextGrades", data -> {
-            if (data == null) {
-                r("finish", "DescriptiveGrades");
-                return;
-            }
-            JsonArray grades = data.get("Grades").getAsJsonArray();
-            int descriptiveGradesCount = 0;
-            int textGradesCount = 0;
-            //d("Got Grades: "+grades.toString());
-            for (JsonElement gradeEl : grades) {
-                JsonObject grade = gradeEl.getAsJsonObject();
-                long id = grade.get("Id").getAsLong();
-                long teacherId = grade.get("AddedBy").getAsJsonObject().get("Id").getAsLong();
-                int semester = grade.get("Semester").getAsInt();
-                long subjectId = grade.get("Subject").getAsJsonObject().get("Id").getAsLong();
-                String description = grade.get("Grade").getAsString();
-
-                long categoryId = -1;
-                JsonElement categoryEl = grade.get("Category");
-                JsonElement skillEl = grade.get("Skill");
-                if (categoryEl != null) {
-                    categoryId = categoryEl.getAsJsonObject().get("Id").getAsLong();
-                    textGradesCount++;
-                }
-                if (skillEl != null) {
-                    categoryId = skillEl.getAsJsonObject().get("Id").getAsLong();
-                    descriptiveGradesCount++;
-                }
-
-                String str_date = grade.get("AddDate").getAsString();
-                long addedDate = Date.fromIso(str_date);
-
-                String category = "";
-                int color = -1;
-                GradeCategory gradeCategory = GradeCategory.search(gradeCategoryList, categoryId);
-                if (gradeCategory != null) {
-                    category = gradeCategory.text;
-                    color = gradeCategory.color;
-                }
-
-                Grade gradeObject = new Grade(
-                        profileId,
-                        id,
-                        category,
-                        color,
-                        description,
-                        " ",
-                        0.0f,
-                        0,
-                        semester,
-                        teacherId,
-                        subjectId
-                );
-                gradeObject.type = Grade.TYPE_DESCRIPTIVE;
-                if (categoryEl != null) {
-                    gradeObject.type = Grade.TYPE_TEXT;
-                }
-                if (skillEl != null) {
-                    gradeObject.type = Grade.TYPE_DESCRIPTIVE;
-                }
-
-                gradeList.add(gradeObject);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_GRADE, gradeObject.id, profile.getEmpty(), profile.getEmpty(), addedDate));
-            }
-            enableDescriptiveGrades = descriptiveGradesCount > 0;
-            enableTextGrades = textGradesCount > 0;
-            profile.putStudentData("enableDescriptiveGrades", enableDescriptiveGrades);
-            profile.putStudentData("enableTextGrades", enableTextGrades);
-            r("finish", "DescriptiveGrades");
-        });
-    }
-
-    private void getTextGrades() {
-        callback.onActionStarted(R.string.sync_action_syncing_descriptive_grades);
-        apiRequest("DescriptiveGrades", data -> {
-            if (data == null) {
-                r("finish", "TextGrades");
-                return;
-            }
-            JsonArray grades = data.get("Grades").getAsJsonArray();
-            //d("Got Grades: "+grades.toString());
-            for (JsonElement gradeEl : grades) {
-                JsonObject grade = gradeEl.getAsJsonObject();
-                long id = grade.get("Id").getAsLong();
-                long teacherId = grade.get("AddedBy").getAsJsonObject().get("Id").getAsLong();
-                int semester = grade.get("Semester").getAsInt();
-                long subjectId = grade.get("Subject").getAsJsonObject().get("Id").getAsLong();
-                JsonElement map = grade.get("Map");
-                JsonElement realGrade = grade.get("RealGradeValue");
-                String description = "";
-                if (map != null) {
-                    description = map.getAsString();
-                }
-                else if (realGrade != null) {
-                    description = realGrade.getAsString();
-                }
-
-                long categoryId = -1;
-                JsonElement skillEl = grade.get("Skill");
-                if (skillEl != null) {
-                    categoryId = skillEl.getAsJsonObject().get("Id").getAsLong();
-                }
-
-                String str_date = grade.get("AddDate").getAsString();
-                long addedDate = Date.fromIso(str_date);
-
-                String category = "";
-                int color = -1;
-                GradeCategory gradeCategory = GradeCategory.search(gradeCategoryList, categoryId);
-                if (gradeCategory != null) {
-                    category = gradeCategory.text;
-                    color = gradeCategory.color;
-                }
-
-                Grade gradeObject = new Grade(
-                        profileId,
-                        id,
-                        category,
-                        color,
-                        "",
-                        description,
-                        0.0f,
-                        0,
-                        semester,
-                        teacherId,
-                        subjectId
-                );
-                gradeObject.type = Grade.TYPE_DESCRIPTIVE;
-
-                gradeList.add(gradeObject);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_GRADE, gradeObject.id, profile.getEmpty(), profile.getEmpty(), addedDate));
-            }
-            r("finish", "TextGrades");
-        });
-    }
-
-    private void getBehaviourGrades() {
-        d(TAG, "Grades settings: "+enableStandardGrades+", "+enablePointGrades+", "+enableDescriptiveGrades);
-        if (!enableBehaviourGrades) {
-            // cancel only if grades have been disabled before
-            r("finish", "BehaviourGrades");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_behaviour_grades);
-        apiRequest("BehaviourGrades/Points", data -> {
-            if (data == null) {
-                r("finish", "BehaviourGrades");
-                return;
-            }
-            JsonArray grades = data.get("Grades").getAsJsonArray();
-            enableBehaviourGrades = grades.size() > 0;
-            profile.putStudentData("enableBehaviourGrades", enableBehaviourGrades);
-            if (!enableBehaviourGrades) {
-                r("finish", "BehaviourGrades");
-                return;
-            }
-            //d("Got Grades: "+grades.toString());
-            DecimalFormat nameFormat = new DecimalFormat("#.##");
-
-            Grade gradeStartSemester1 = new Grade(
-                    profileId,
-                    -1,
-                    app.getString(R.string.grade_start_points),
-                    0xffbdbdbd,
-                    app.getString(R.string.grade_start_points_format, 1),
-                    nameFormat.format(startPointsSemester1),
-                    startPointsSemester1,
-                    -1,
-                    1,
-                    -1,
-                    1
-            );
-            gradeStartSemester1.type = Grade.TYPE_BEHAVIOUR;
-            Grade gradeStartSemester2 = new Grade(
-                    profileId,
-                    -2,
-                    app.getString(R.string.grade_start_points),
-                    0xffbdbdbd,
-                    app.getString(R.string.grade_start_points_format, 2),
-                    nameFormat.format(startPointsSemester2),
-                    startPointsSemester2,
-                    -1,
-                    2,
-                    -1,
-                    1
-            );
-            gradeStartSemester2.type = Grade.TYPE_BEHAVIOUR;
-
-            gradeList.add(gradeStartSemester1);
-            gradeList.add(gradeStartSemester2);
-            metadataList.add(new Metadata(profileId, Metadata.TYPE_GRADE, -1, true, true, profile.getSemesterStart(1).getInMillis()));
-            metadataList.add(new Metadata(profileId, Metadata.TYPE_GRADE, -2, true, true, profile.getSemesterStart(2).getInMillis()));
-
-            for (JsonElement gradeEl : grades) {
-                JsonObject grade = gradeEl.getAsJsonObject();
-                long id = grade.get("Id").getAsLong();
-                long teacherId = grade.get("AddedBy").getAsJsonObject().get("Id").getAsLong();
-                int semester = grade.get("Semester").getAsInt();
-                long categoryId = grade.get("Category").getAsJsonObject().get("Id").getAsLong();
-                long subjectId = 1;
-
-                float value = 0.0f;
-                String name = "?";
-                JsonElement nameValue;
-                if ((nameValue = grade.get("Value")) != null) {
-                    value = nameValue.getAsFloat();
-                    name = value < 0 ? nameFormat.format(value) : "+"+nameFormat.format(value);
-                }
-                else if ((nameValue = grade.get("ShortName")) != null) {
-                    name = nameValue.getAsString();
-                }
-
-                String str_date = grade.get("AddDate").getAsString();
-                long addedDate = Date.fromIso(str_date);
-
-                int color = value > 0 ? 16 : value < 0 ? 26 : 12;
-                color = colors.get(color);
-
-                String category = "";
-                float maxPoints = 0.0f;
-                GradeCategory gradeCategory = GradeCategory.search(gradeCategoryList, categoryId);
-                if (gradeCategory != null) {
-                    category = gradeCategory.text;
-                    maxPoints = gradeCategory.valueTo;
-                }
-
-                Grade gradeObject = new Grade(
-                        profileId,
-                        id,
-                        category,
-                        color,
-                        "",
-                        name,
-                        value,
-                        -1,
-                        semester,
-                        teacherId,
-                        subjectId
-                );
-                gradeObject.type = Grade.TYPE_BEHAVIOUR;
-                gradeObject.valueMax = maxPoints;
-
-                gradeList.add(gradeObject);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_GRADE, gradeObject.id, profile.getEmpty(), profile.getEmpty(), addedDate));
-            }
-            r("finish", "BehaviourGrades");
-        });
-    }
-
-    //private boolean eventTypeListChanged = false;
-    private void getEvents() {
-        //eventTypeList = app.db.eventTypeDao().getAllNow(profileId);
-       // eventTypeListChanged = false;
-        callback.onActionStarted(R.string.sync_action_syncing_events);
-        apiRequest("HomeWorks", data -> {
-            if (data == null) {
-                r("finish", "Events");
-                return;
-            }
-            JsonArray events = data.get("HomeWorks").getAsJsonArray();
-            //d("Got Grades: "+events.toString());
-            boolean getCustomTypes = false;
-            try {
-                for (JsonElement eventEl : events) {
-                    JsonObject event = eventEl.getAsJsonObject();
-
-                    JsonElement el;
-                    JsonObject obj;
-
-                    long id = event.get("Id").getAsLong();
-                    long teacherId = -1;
-                    long subjectId = -1;
-                    int type = -1;
-
-                    if ((el = event.get("CreatedBy")) != null
-                            && (obj = el.getAsJsonObject()) != null
-                            && (el = obj.get("Id")) != null) {
-                        teacherId = el.getAsLong();
-                    }
-                    if ((el = event.get("Subject")) != null
-                            && (obj = el.getAsJsonObject()) != null
-                            && (el = obj.get("Id")) != null) {
-                        subjectId = el.getAsLong();
-                    }
-                    String topic = event.get("Content").getAsString();
-
-                    if ((el = event.get("Category")) != null
-                            && (obj = el.getAsJsonObject()) != null
-                            && (el = obj.get("Id")) != null) {
-                        type = el.getAsInt();
-                    }
-                    /*EventType typeObject = app.db.eventTypeDao().getByIdNow(profileId, type);
-                    if (typeObject == null) {
-                        getCustomTypes = true;
-                    }*/
-
-                    JsonElement myClass = event.get("Class");
-                    long teamId = myClass == null ? -1 : myClass.getAsJsonObject().get("Id").getAsLong();
-
-                    String str_date = event.get("AddDate").getAsString();
-                    long addedDate = Date.fromIso(str_date);
-
-                    str_date = event.get("Date").getAsString();
-                    Date eventDate = Date.fromY_m_d(str_date);
-
-
-                    Time startTime = null;
-                    JsonElement lessonNo;
-                    JsonElement timeFrom;
-                    if (!((lessonNo = event.get("LessonNo")) instanceof JsonNull)) {
-                        Pair<Time, Time> timePair = lessonRanges.get(lessonNo.getAsInt());
-                        if(timePair != null)
-                            startTime = timePair.first;
-                    }
-                    if (startTime == null && !((timeFrom = event.get("TimeFrom")) instanceof JsonNull)) {
-                        startTime = Time.fromH_m(timeFrom.getAsString());
-                    }
-
-                    Event eventObject = new Event(
-                            profileId,
-                            id,
-                            eventDate,
-                            startTime,
-                            topic,
-                            -1,
-                            type,
-                            false,
-                            teacherId,
-                            subjectId,
-                            teamId
-                    );
-
-                    eventList.add(eventObject);
-                    metadataList.add(new Metadata(profileId, Metadata.TYPE_EVENT, eventObject.id, profile.getEmpty(), profile.getEmpty(), addedDate));
-                }
-                r("finish", "Events");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 2541, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private void getCustomTypes() {
-        if (!fullSync) {
-            r("finish", "CustomTypes");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_event_categories);
-        apiRequest("HomeWorks/Categories", data -> {
-            if (data == null) {
-                r("finish", "CustomTypes");
-                return;
-            }
-            JsonArray jCategories = data.get("Categories").getAsJsonArray();
-            //d("Got Classrooms: "+jClassrooms.toString());
-            try {
-                for (JsonElement categoryEl : jCategories) {
-                    JsonObject category = categoryEl.getAsJsonObject();
-                    eventTypeList.add(new EventType(profileId, category.get("Id").getAsInt(), category.get("Name").getAsString(), colors.get(category.get("Color").getAsJsonObject().get("Id").getAsInt())));
-                }
-                r("finish", "CustomTypes");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 2573, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private void getHomework() {
-        if (!premium) {
-            r("finish", "Homework");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_homework);
-        apiRequest("HomeWorkAssignments", data -> {
-            if (data == null) {
-                r("finish", "Homework");
-                return;
-            }
-            JsonArray homeworkList = data.get("HomeWorkAssignments").getAsJsonArray();
-            //d("Got Grades: "+events.toString());
-            try {
-                for (JsonElement homeworkEl : homeworkList) {
-                    JsonObject homework = homeworkEl.getAsJsonObject();
-
-                    JsonElement el;
-                    JsonObject obj;
-
-                    long id = homework.get("Id").getAsLong();
-                    long teacherId = -1;
-                    long subjectId = -1;
-
-                    if ((el = homework.get("Teacher")) != null
-                            && (obj = el.getAsJsonObject()) != null
-                            && (el = obj.get("Id")) != null) {
-                        teacherId = el.getAsLong();
-                    }
-
-                    String topic = "";
-                    try {
-                        topic = homework.get("Topic").getAsString() + "\n";
-                        topic += homework.get("Text").getAsString();
-                    }
-                    catch (Exception e) {
-                        e.printStackTrace();
-                    }
-
-                    String str_date = homework.get("Date").getAsString();
-                    Date addedDate = Date.fromY_m_d(str_date);
-
-                    str_date = homework.get("DueDate").getAsString();
-                    Date eventDate = Date.fromY_m_d(str_date);
-
-
-                    Time startTime = null;
-
-                    Event eventObject = new Event(
-                            profileId,
-                            id,
-                            eventDate,
-                            startTime,
-                            topic,
-                            -1,
-                            -1,
-                            false,
-                            teacherId,
-                            subjectId,
-                            -1
-                    );
-
-                    eventList.add(eventObject);
-                    metadataList.add(new Metadata(profileId, Metadata.TYPE_EVENT, eventObject.id, profile.getEmpty(), profile.getEmpty(), addedDate.getInMillis()));
-                }
-                r("finish", "Homework");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 2648, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private void getLuckyNumbers() {
-        if (!profile.getLuckyNumberEnabled() || (profile.getLuckyNumberDate() != null && profile.getLuckyNumberDate().getValue() == Date.getToday().getValue())) {
-            r("finish", "LuckyNumbers");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_lucky_number);
-        apiRequest("LuckyNumbers", data -> {
-            if (data == null) {
-                profile.setLuckyNumberEnabled(false);
-            }
-            else {
-                profile.setLuckyNumber(-1);
-                profile.setLuckyNumberDate(Date.getToday());
-                try {
-                    JsonElement luckyNumberEl = data.get("LuckyNumber");
-                    if (luckyNumberEl != null) {
-                        JsonObject luckyNumber = luckyNumberEl.getAsJsonObject();
-                        profile.setLuckyNumber(luckyNumber.get("LuckyNumber").getAsInt());
-                        profile.setLuckyNumberDate(Date.fromY_m_d(luckyNumber.get("LuckyNumberDay").getAsString()));
-                    }
-                } catch (Exception e) {
-                    finishWithError(new AppError(TAG, 2678, CODE_OTHER, e, data));
-                }
-                finally {
-                    app.db.luckyNumberDao().add(new LuckyNumber(profileId, profile.getLuckyNumberDate(), profile.getLuckyNumber()));
-                }
-            }
-            r("finish", "LuckyNumbers");
-        });
-    }
-
-    private void getNotices() {
-        callback.onActionStarted(R.string.sync_action_syncing_notices);
-        apiRequest("Notes", data -> {
-            if (data == null) {
-                r("finish", "Notices");
-                return;
-            }
-            try {
-                JsonArray jNotices = data.get("Notes").getAsJsonArray();
-
-                for (JsonElement noticeEl : jNotices) {
-                    JsonObject notice = noticeEl.getAsJsonObject();
-
-                    int type = notice.get("Positive").getAsInt();
-                    switch (type) {
-                        case 0:
-                            type = TYPE_NEGATIVE;
-                            break;
-                        case 1:
-                            type = TYPE_POSITIVE;
-                            break;
-                        case 2:
-                            type = TYPE_NEUTRAL;
-                            break;
-                    }
-
-                    long id = notice.get("Id").getAsLong();
-
-                    Date addedDate = Date.fromY_m_d(notice.get("Date").getAsString());
-
-                    int semester = profile.dateToSemester(addedDate);
-
-                    JsonElement el;
-                    JsonObject obj;
-                    long teacherId = -1;
-                    if ((el = notice.get("Teacher")) != null
-                            && (obj = el.getAsJsonObject()) != null
-                            && (el = obj.get("Id")) != null) {
-                        teacherId = el.getAsLong();
-                    }
-
-                    Notice noticeObject = new Notice(
-                            profileId,
-                            id,
-                            notice.get("Text").getAsString(),
-                            semester,
-                            type,
-                            teacherId
-                    );
-
-                    noticeList.add(noticeObject);
-                    metadataList.add(new Metadata(profileId, Metadata.TYPE_NOTICE, noticeObject.id, profile.getEmpty(), profile.getEmpty(), addedDate.getInMillis()));
-                }
-                r("finish", "Notices");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 2750, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private SparseArray<Pair<Integer, String>> attendanceTypes = new SparseArray<>();
-    private void getAttendanceTypes() {
-        callback.onActionStarted(R.string.sync_action_syncing_attendance_types);
-        apiRequest("Attendances/Types", data -> {
-            if (data == null) {
-                r("finish", "AttendanceTypes");
-                return;
-            }
-            try {
-                JsonArray jTypes = data.get("Types").getAsJsonArray();
-                for (JsonElement typeEl : jTypes) {
-                    JsonObject type = typeEl.getAsJsonObject();
-                    int id = type.get("Id").getAsInt();
-                    attendanceTypes.put(id,
-                            new Pair<>(
-                                    type.get("Standard").getAsBoolean() ? id : type.getAsJsonObject("StandardType").get("Id").getAsInt(),
-                                    type.get("Name").getAsString()
-                            )
-                    );
-                }
-                r("finish", "AttendanceTypes");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 2782, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private void getAttendance() {
-        callback.onActionStarted(R.string.sync_action_syncing_attendance);
-        apiRequest("Attendances"+(fullSync ? "" : "?dateFrom="+ Date.getToday().stepForward(0, -1, 0).getStringY_m_d()), data -> {
-            if (data == null) {
-                r("finish", "Attendance");
-                return;
-            }
-
-            try {
-                JsonArray jAttendance = data.get("Attendances").getAsJsonArray();
-
-                for (JsonElement attendanceEl : jAttendance) {
-                    JsonObject attendance = attendanceEl.getAsJsonObject();
-
-                    int type = attendance.getAsJsonObject("Type").get("Id").getAsInt();
-                    Pair<Integer, String> attendanceType;
-                    if ((attendanceType = attendanceTypes.get(type)) != null) {
-                        type = attendanceType.first;
-                    }
-                    switch (type) {
-                        case 1:
-                            type = TYPE_ABSENT;
-                            break;
-                        case 2:
-                            type = TYPE_BELATED;
-                            break;
-                        case 3:
-                            type = TYPE_ABSENT_EXCUSED;
-                            break;
-                        case 4:
-                            type = TYPE_RELEASED;
-                            break;
-                        default:
-                        case 100:
-                            type = TYPE_PRESENT;
-                            break;
-                    }
-
-                    String idStr = attendance.get("Id").getAsString();
-                    int id = strToInt(idStr.replaceAll("[^\\d.]", ""));
-
-                    long addedDate = Date.fromIso(attendance.get("AddDate").getAsString());
-
-                    Time startTime = Time.getNow();
-                    Pair<Time, Time> timePair = lessonRanges.get(attendance.get("LessonNo").getAsInt());
-                    if (timePair != null)
-                        startTime = timePair.first;
-                    Date lessonDate = Date.fromY_m_d(attendance.get("Date").getAsString());
-                    int lessonWeekDay = lessonDate.getWeekDay();
-                    long subjectId = -1;
-                    String topic = "";
-                    if (attendanceType != null) {
-                        topic = attendanceType.second;
-                    }
-
-                    for (Lesson lesson: lessonList) {
-                        if (lesson.weekDay == lessonWeekDay && lesson.startTime.getValue() == startTime.getValue()) {
-                            subjectId = lesson.subjectId;
-                        }
-                    }
-
-                    Attendance attendanceObject = new Attendance(
-                            profileId,
-                            id,
-                            attendance.getAsJsonObject("AddedBy").get("Id").getAsLong(),
-                            subjectId,
-                            attendance.get("Semester").getAsInt(),
-                            topic,
-                            lessonDate,
-                            startTime,
-                            type);
-
-                    attendanceList.add(attendanceObject);
-                    if (attendanceObject.type != TYPE_PRESENT) {
-                        metadataList.add(new Metadata(profileId, Metadata.TYPE_ATTENDANCE, attendanceObject.id, profile.getEmpty(), profile.getEmpty(), addedDate));
-                    }
-                }
-                r("finish", "Attendance");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 2872, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private void getAnnouncements() {
-        callback.onActionStarted(R.string.sync_action_syncing_announcements);
-        apiRequest("SchoolNotices", data -> {
-            if (data == null) {
-                r("finish", "Announcements");
-                return;
-            }
-            try {
-                JsonArray jAnnouncements = data.get("SchoolNotices").getAsJsonArray();
-
-                for (JsonElement announcementEl : jAnnouncements) {
-                    JsonObject announcement = announcementEl.getAsJsonObject();
-
-                    String idStr = announcement.get("Id").getAsString();
-                    long id = crc16(idStr.getBytes());
-
-                    long addedDate = Date.fromIso(announcement.get("CreationDate").getAsString());
-
-                    boolean read = announcement.get("WasRead").getAsBoolean();
-
-                    String subject = "";
-                    String text = "";
-                    Date startDate = null;
-                    Date endDate = null;
-                    try {
-                        subject = announcement.get("Subject").getAsString();
-                        text = announcement.get("Content").getAsString();
-                        startDate = Date.fromY_m_d(announcement.get("StartDate").getAsString());
-                        endDate = Date.fromY_m_d(announcement.get("EndDate").getAsString());
-                    }
-                    catch (Exception e) {
-                        e.printStackTrace();
-                    }
-
-                    JsonElement el;
-                    JsonObject obj;
-                    long teacherId = -1;
-                    if ((el = announcement.get("AddedBy")) != null
-                            && (obj = el.getAsJsonObject()) != null
-                            && (el = obj.get("Id")) != null) {
-                        teacherId = el.getAsLong();
-                    }
-
-                    Announcement announcementObject = new Announcement(
-                            profileId,
-                            id,
-                            subject,
-                            text,
-                            startDate,
-                            endDate,
-                            teacherId
-                    );
-
-                    announcementList.add(announcementObject);
-                    metadataList.add(new Metadata(profileId, Metadata.TYPE_ANNOUNCEMENT, announcementObject.id, read, read, addedDate));
-                }
-                r("finish", "Announcements");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 2944, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private void getPtMeetings() {
-        if (!fullSync) {
-            r("finish", "PtMeetings");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_pt_meetings);
-        apiRequest("ParentTeacherConferences", data -> {
-            if (data == null) {
-                r("finish", "PtMeetings");
-                return;
-            }
-            try {
-                JsonArray jMeetings = data.get("ParentTeacherConferences").getAsJsonArray();
-                for (JsonElement meetingEl: jMeetings) {
-                    JsonObject meeting = meetingEl.getAsJsonObject();
-
-                    long id = meeting.get("Id").getAsLong();
-                    Event eventObject = new Event(
-                            profileId,
-                            id,
-                            Date.fromY_m_d(meeting.get("Date").getAsString()),
-                            Time.fromH_m(meeting.get("Time").getAsString()),
-                            meeting.get("Topic").getAsString(),
-                            -1,
-                            TYPE_PT_MEETING,
-                            false,
-                            meeting.getAsJsonObject("Teacher").get("Id").getAsLong(),
-                            -1,
-                            teamClassId
-                    );
-                    eventList.add(eventObject);
-                    metadataList.add(new Metadata(profileId, Metadata.TYPE_EVENT, eventObject.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-                }
-                r("finish", "PtMeetings");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 2996, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private SparseArray<String> teacherFreeDaysTypes = new SparseArray<>();
-    private void getTeacherFreeDaysTypes() {
-        if (!fullSync) {
-            r("finish", "TeacherFreeDaysTypes");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_teacher_free_days_types);
-        apiRequest("TeacherFreeDays/Types", data -> {
-            if (data == null) {
-                r("finish", "TeacherFreeDays");
-                return;
-            }
-            try {
-                JsonArray jTypes = data.get("Types").getAsJsonArray();
-                for (JsonElement typeEl : jTypes) {
-                    JsonObject type = typeEl.getAsJsonObject();
-                    int id = type.get("Id").getAsInt();
-                    teacherFreeDaysTypes.put(id, type.get("Name").getAsString());
-                }
-                r("finish", "TeacherFreeDaysTypes");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 3019, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private void getTeacherFreeDays() {
-        callback.onActionStarted(R.string.sync_action_syncing_teacher_free_days);
-        apiRequest("TeacherFreeDays", data -> {
-            if (data == null) {
-                r("finish", "TeacherFreeDays");
-                return;
-            }
-            try {
-                JsonArray jFreeDays = data.get("TeacherFreeDays").getAsJsonArray();
-                for (JsonElement freeDayEl: jFreeDays) {
-                    JsonObject freeDay = freeDayEl.getAsJsonObject();
-
-                    long id = freeDay.get("Id").getAsLong();
-                    long teacherId = freeDay.getAsJsonObject("Teacher").get("Id").getAsLong();
-
-                    Date dateFrom = Date.fromY_m_d(freeDay.get("DateFrom").getAsString());
-                    Date dateTo = Date.fromY_m_d(freeDay.get("DateTo").getAsString());
-
-                    Time timeFrom = null;
-                    Time timeTo = null;
-
-                    if (freeDay.get("TimeFrom") != null && freeDay.get("TimeTo") != null) {
-                        timeFrom = Time.fromH_m_s(freeDay.get("TimeFrom").getAsString());
-                        timeTo = Time.fromH_m_s(freeDay.get("TimeTo").getAsString());
-                    }
-
-                    long type = freeDay.getAsJsonObject("Type").get("Id").getAsLong();
-
-                    //String topic = teacherFreeDaysTypes.get(type)+"\n"+(dateFrom.getValue() != dateTo.getValue() ? dateFrom.getFormattedString()+" - "+dateTo.getFormattedString() : "");
-
-                    TeacherAbsence teacherAbsence = new TeacherAbsence(
-                            profileId,
-                            id,
-                            teacherId,
-                            type,
-                            dateFrom,
-                            dateTo,
-                            timeFrom,
-                            timeTo
-                    );
-
-                    teacherAbsenceList.add(teacherAbsence);
-                    metadataList.add(
-                        new Metadata(
-                            profileId,
-                            Metadata.TYPE_TEACHER_ABSENCE,
-                                teacherAbsence.getId(),
-                                true,
-                                true,
-                                System.currentTimeMillis())
-                    );
-
-                }
-                r("finish", "TeacherFreeDays");
-            }
-            catch (Exception e) {
-                finishWithError(new AppError(TAG, 3069, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private void getSchoolFreeDays() {
-        callback.onActionStarted(R.string.sync_action_syncing_school_free_days);
-        apiRequest("SchoolFreeDays" + (unitId != -1 ? "?unit=" + unitId : ""), data -> {
-            if (data == null) {
-                r("finish", "SchoolFreeDays");
-                return;
-            }
-            try {
-                JsonArray jFreeDays = data.get("SchoolFreeDays").getAsJsonArray();
-
-                for (JsonElement freeDayEl: jFreeDays) {
-                    continue;
-                }
-                r("finish", "SchoolFreeDays");
-            } catch (Exception e) {
-                finishWithError(new AppError(TAG, 3069, CODE_OTHER, e, data));
-            }
-        });
-    }
-
-    private void getMessagesLogin() {
-        if (synergiaPassword == null) {
-            // skip messages
-            r("finish", "MessagesOutbox");
-            return;
-        }
-        loginSynergia(() -> {
-            r("finish", "MessagesLogin");
-        });
-    }
-
-    private void getMessagesInbox() {
-        String body =
-                "<service>\n" +
-                "  <header/>\n" +
-                "  <data>\n" +
-                "    <archive>0</archive>\n" +
-                "  </data>\n" +
-                "</service>";
-        synergiaRequest("Inbox/action/GetList", body, data -> {
-            try {
-                long startTime = System.currentTimeMillis();
-
-                for (Element e: data.select("response GetList data ArrayItem")) {
-
-                    long id = Long.parseLong(e.select("messageId").text());
-
-                    String subject = e.select("topic").text();
-
-                    String senderFirstName = e.select("senderFirstName").text();
-                    String senderLastName = e.select("senderLastName").text();
-
-                    long senderId = -1;
-
-                    for (Teacher teacher: teacherList) {
-                        if (teacher.name.equalsIgnoreCase(senderFirstName) && teacher.surname.equalsIgnoreCase(senderLastName)) {
-                            senderId = teacher.id;
-                            break;
-                        }
-                    }
-                    if (senderId == -1) {
-                        Teacher teacher = new Teacher(profileId, -1 * Utils.crc16((senderFirstName+" "+senderLastName).getBytes()), senderFirstName, senderLastName);
-                        senderId = teacher.id;
-                        teacherList.add(teacher);
-                        teacherListChanged = true;
-                    }
-
-                    long readDate = 0;
-                    long sentDate;
-
-                    String readDateStr = e.select("readDate").text();
-                    String sentDateStr = e.select("sendDate").text();
-
-                    DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US);
-                    if (!readDateStr.isEmpty()) {
-                        readDate = formatter.parse(readDateStr).getTime();
-                    }
-                    sentDate = formatter.parse(sentDateStr).getTime();
-
-                    Message message = new Message(
-                            profileId,
-                            id,
-                            subject,
-                            null,
-                            TYPE_RECEIVED,
-                            senderId,
-                            -1
-                    );
-
-                    MessageRecipient messageRecipient = new MessageRecipient(
-                            profileId,
-                            -1 /* me */,
-                            -1,
-                            readDate,
-                            /*messageId*/ id
-                    );
-
-                    if (!e.select("isAnyFileAttached").text().equals("0"))
-                        message.setHasAttachments();
-
-                    messageList.add(message);
-                    messageRecipientList.add(messageRecipient);
-                    messageMetadataList.add(new Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, readDate > 0, readDate > 0 || profile.getEmpty(), sentDate));
-                }
-
-            } catch (Exception e3) {
-                finishWithError(new AppError(TAG, 3164, CODE_OTHER, e3, data.outerHtml()));
-                return;
-            }
-
-            r("finish", "MessagesInbox");
-        });
-    }
-
-    private void getMessagesOutbox() {
-        if (!fullSync && onlyFeature != FEATURE_MESSAGES_OUTBOX && !profile.getEmpty()) {
-            // a quick sync and the profile is already synced at least once
-            r("finish", "MessagesOutbox");
-            return;
-        }
-        String body =
-                "<service>\n" +
-                        "  <header/>\n" +
-                        "  <data>\n" +
-                        "    <archive>0</archive>\n" +
-                        "  </data>\n" +
-                        "</service>";
-        synergiaRequest("Outbox/action/GetList", body, data -> {
-            try {
-                long startTime = System.currentTimeMillis();
-
-                for (Element e: data.select("response GetList data ArrayItem")) {
-
-                    long id = Long.parseLong(e.select("messageId").text());
-
-                    String subject = e.select("topic").text();
-
-                    String receiverFirstName = e.select("receiverFirstName").text();
-                    String receiverLastName = e.select("receiverLastName").text();
-
-                    long receiverId = -1;
-
-                    for (Teacher teacher: teacherList) {
-                        if (teacher.name.equalsIgnoreCase(receiverFirstName) && teacher.surname.equalsIgnoreCase(receiverLastName)) {
-                            receiverId = teacher.id;
-                            break;
-                        }
-                    }
-                    if (receiverId == -1) {
-                        Teacher teacher = new Teacher(profileId, -1 * Utils.crc16((receiverFirstName+" "+receiverLastName).getBytes()), receiverFirstName, receiverLastName);
-                        receiverId = teacher.id;
-                        teacherList.add(teacher);
-                        teacherListChanged = true;
-                    }
-
-                    long sentDate;
-
-                    String sentDateStr = e.select("sendDate").text();
-
-                    DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US);
-                    sentDate = formatter.parse(sentDateStr).getTime();
-
-                    Message message = new Message(
-                            profileId,
-                            id,
-                            subject,
-                            null,
-                            TYPE_SENT,
-                            -1,
-                            -1
-                    );
-
-                    MessageRecipient messageRecipient = new MessageRecipient(
-                            profileId,
-                            receiverId,
-                            -1,
-                            -1,
-                            /*messageId*/ id
-                    );
-
-                    if (!e.select("isAnyFileAttached").text().equals("0"))
-                        message.setHasAttachments();
-
-                    messageList.add(message);
-                    messageRecipientIgnoreList.add(messageRecipient);
-                    metadataList.add(new Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, true, true, sentDate));
-                }
-
-            } catch (Exception e3) {
-                finishWithError(new AppError(TAG, 3270, CODE_OTHER, e3, data.outerHtml()));
-                return;
-            }
-
-            r("finish", "MessagesOutbox");
-        });
-    }
-
-    @Override
-    public Map<String, Endpoint> getConfigurableEndpoints(Profile profile) {
-        Map<String, Endpoint> configurableEndpoints = new LinkedHashMap<>();
-        configurableEndpoints.put("Classrooms", new Endpoint("Classrooms",true, false, profile.getChangedEndpoints()));
-        configurableEndpoints.put("Timetables", new Endpoint("Timetables",true, false, profile.getChangedEndpoints()));
-        configurableEndpoints.put("Substitutions", new Endpoint("Substitutions",true, false, profile.getChangedEndpoints()));
-        configurableEndpoints.put("Grades", new Endpoint("Grades",true, false, profile.getChangedEndpoints()));
-        configurableEndpoints.put("PointGrades", new Endpoint("PointGrades",true, false, profile.getChangedEndpoints()));
-        configurableEndpoints.put("Events", new Endpoint("Events",true, false, profile.getChangedEndpoints()));
-        configurableEndpoints.put("Homework", new Endpoint("Homework",true, false, profile.getChangedEndpoints()));
-        configurableEndpoints.put("LuckyNumbers", new Endpoint("LuckyNumbers",true, false, profile.getChangedEndpoints()));
-        configurableEndpoints.put("Notices", new Endpoint("Notices",true, false, profile.getChangedEndpoints()));
-        configurableEndpoints.put("Attendance", new Endpoint("Attendance",true, false, profile.getChangedEndpoints()));
-        configurableEndpoints.put("Announcements", new Endpoint("Announcements",true, true, profile.getChangedEndpoints()));
-        configurableEndpoints.put("PtMeetings", new Endpoint("PtMeetings",true, true, profile.getChangedEndpoints()));
-        configurableEndpoints.put("TeacherFreeDays", new Endpoint("TeacherFreeDays",false, false, profile.getChangedEndpoints()));
-        //configurableEndpoints.put("SchoolFreeDays", new Endpoint("SchoolFreeDays",true, true, profile.changedEndpoints));
-        //configurableEndpoints.put("ClassFreeDays", new Endpoint("ClassFreeDays",true, true, profile.changedEndpoints));
-        configurableEndpoints.put("MessagesInbox", new Endpoint("MessagesInbox", true, false, profile.getChangedEndpoints()));
-        configurableEndpoints.put("MessagesOutbox", new Endpoint("MessagesOutbox", true, true, profile.getChangedEndpoints()));
-        return configurableEndpoints;
-    }
-
-    @Override
-    public boolean isEndpointEnabled(Profile profile, boolean defaultActive, String name) {
-        return defaultActive ^ contains(profile.getChangedEndpoints(), name);
-    }
-
-    @Override
-    public void syncMessages(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile)
-    {
-        if (!prepare(activityContext, errorCallback, profile.getId(), profile, LoginStore.fromProfileFull(profile)))
-            return;
-
-        login(() -> {
-            Librus.this.profile.setEmpty(true);
-            targetEndpoints = new ArrayList<>();
-            targetEndpoints.add("Users");
-            targetEndpoints.add("MessagesLogin");
-            targetEndpoints.add("MessagesInbox");
-            targetEndpoints.add("MessagesOutbox");
-            targetEndpoints.add("Finish");
-            PROGRESS_COUNT = targetEndpoints.size()-1;
-            PROGRESS_STEP = (90/PROGRESS_COUNT);
-            begin();
-        });
-    }
-
-    /*    __  __
-         |  \/  |
-         | \  / | ___  ___ ___  __ _  __ _  ___  ___
-         | |\/| |/ _ \/ __/ __|/ _` |/ _` |/ _ \/ __|
-         | |  | |  __/\__ \__ \ (_| | (_| |  __/\__ \
-         |_|  |_|\___||___/___/\__,_|\__, |\___||___/
-                                      __/ |
-                                     |__*/
-    @Override
-    public void getMessage(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull MessageFull message, @NonNull MessageGetCallback messageCallback)
-    {
-        if (message.body != null) {
-            boolean readByAll = true;
-            // load this message's recipient(s) data
-            message.recipients = app.db.messageRecipientDao().getAllByMessageId(profile.getId(), message.id);
-            for (MessageRecipientFull recipient: message.recipients) {
-                if (recipient.id == -1)
-                    recipient.fullName = profile.getStudentNameLong();
-                if (message.type == TYPE_SENT && recipient.readDate < 1)
-                    readByAll = false;
-            }
-            if (!message.seen) {
-                app.db.metadataDao().setSeen(profile.getId(), message, true);
-            }
-            if (readByAll) {
-                // if a sent msg is not read by everyone, download it again to check the read status
-                new Handler(activityContext.getMainLooper()).post(() -> {
-                    messageCallback.onSuccess(message);
-                });
-                return;
-            }
-        }
-
-        if (!prepare(activityContext, errorCallback, profile.getId(), profile, LoginStore.fromProfileFull(profile)))
-            return;
-
-        loginSynergia(() -> {
-            String requestBody =
-                    "<service>\n" +
-                            "  <header/>\n" +
-                            "  <data>\n" +
-                            "    <messageId>"+message.id+"</messageId>\n" +
-                            "    <archive>0</archive>\n" +
-                            "  </data>\n" +
-                            "</service>";
-            synergiaRequest("GetMessage", requestBody, data -> {
-
-                List<MessageRecipientFull> messageRecipientList = new ArrayList<>();
-
-                try {
-                    Element e = data.select("response GetMessage data").first();
-
-                    String body = e.select("Message").text();
-                    body = new String(Base64.decode(body, Base64.DEFAULT));
-                    body = body.replaceAll("\n", "<br>");
-                    body = body.replaceAll("<!\\[CDATA\\[", "");
-                    body = body.replaceAll("]]>", "");
-
-                    message.clearAttachments();
-                    Elements attachments = e.select("attachments ArrayItem");
-                    if (attachments != null) {
-                        for (Element attachment: attachments) {
-                            message.addAttachment(Long.parseLong(attachment.select("id").text()), attachment.select("filename").text(), -1);
-                        }
-                    }
-
-                    message.body = body;
-
-                    if (message.type == TYPE_RECEIVED) {
-                        app.db.teacherDao().updateLoginId(profileId, message.senderId, e.select("senderId").text());
-
-                        MessageRecipientFull recipient = new MessageRecipientFull(profileId, -1, message.id);
-
-                        long readDate = 0;
-                        String readDateStr = e.select("readDate").text();
-                        if (!readDateStr.isEmpty()) {
-                            DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US);
-                            readDate = formatter.parse(readDateStr).getTime();
-                        }
-                        recipient.readDate = readDate;
-
-                        recipient.fullName = profile.getStudentNameLong();
-                        messageRecipientList.add(recipient);
-
-                    }
-                    else if (message.type == TYPE_SENT) {
-                        List<Teacher> teacherList = app.db.teacherDao().getAllNow(profileId);
-                        for (Element receiver: e.select("receivers ArrayItem")) {
-                            String receiverFirstName = e.select("firstName").text();
-                            String receiverLastName = e.select("lastName").text();
-
-                            long receiverId = -1;
-
-                            for (Teacher teacher: teacherList) {
-                                if (teacher.name.equalsIgnoreCase(receiverFirstName) && teacher.surname.equalsIgnoreCase(receiverLastName)) {
-                                    receiverId = teacher.id;
-                                    break;
-                                }
-                            }
-
-                            app.db.teacherDao().updateLoginId(profileId, receiverId, receiver.select("receiverId").text());
-
-                            MessageRecipientFull recipient = new MessageRecipientFull(profileId, receiverId, message.id);
-
-                            long readDate = 0;
-                            String readDateStr = e.select("readed").text();
-                            if (!readDateStr.isEmpty()) {
-                                DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US);
-                                readDate = formatter.parse(readDateStr).getTime();
-                            }
-                            recipient.readDate = readDate;
-
-                            recipient.fullName = receiverFirstName+" "+receiverLastName;
-                            messageRecipientList.add(recipient);
-                        }
-                    }
-
-                }
-                catch (Exception e) {
-                    finishWithError(new AppError(TAG, 795, CODE_OTHER, e, data.outerHtml()));
-                    return;
-                }
-
-                if (!message.seen) {
-                    app.db.metadataDao().setSeen(profileId, message, true);
-                }
-                app.db.messageDao().add(message);
-                app.db.messageRecipientDao().addAll((List<MessageRecipient>)(List<?>) messageRecipientList); // not addAllIgnore
-
-                message.recipients = messageRecipientList;
-
-                new Handler(activityContext.getMainLooper()).post(() -> {
-                    messageCallback.onSuccess(message);
-                });
-            });
-        });
-    }
-
-    @Override
-    public void getAttachment(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull MessageFull message, long attachmentId, @NonNull AttachmentGetCallback attachmentCallback) {
-        if (!prepare(activityContext, errorCallback, profile.getId(), profile, LoginStore.fromProfileFull(profile)))
-            return;
-
-        loginSynergia(() -> {
-            String requestBody =
-                    "<service>\n" +
-                            "  <header/>\n" +
-                            "  <data>\n" +
-                            "    <fileId>"+attachmentId+"</fileId>\n" +
-                            "    <msgId>"+message.id+"</msgId>\n" +
-                            "    <archive>0</archive>\n" +
-                            "  </data>\n" +
-                            "</service>";
-            synergiaRequest("GetFileDownloadLink", requestBody, data -> {
-                String downloadLink = data.select("response GetFileDownloadLink downloadLink").text();
-                Matcher keyMatcher = Pattern.compile("singleUseKey=([0-9A-f_]+)").matcher(downloadLink);
-                if (keyMatcher.find()) {
-                    getAttachmentCheckKeyTries = 0;
-                    getAttachmentCheckKey(keyMatcher.group(1), attachmentCallback);
-                }
-                else {
-                    finishWithError(new AppError(TAG, 629, CODE_OTHER, "Błąd pobierania tokenu. Skontaktuj się z twórcą aplikacji.", data.outerHtml()));
-                }
-            });
-        });
-    }
-    private int getAttachmentCheckKeyTries = 0;
-    private void getAttachmentCheckKey(String attachmentKey, AttachmentGetCallback attachmentCallback) {
-        Request.builder()
-                .url(SYNERGIA_SANDBOX_URL+"CSCheckKey")
-                .userAgent(synergiaUserAgent)
-                .addParameter("singleUseKey", attachmentKey)
-                .post()
-                .callback(new JsonCallbackHandler() {
-                    @Override
-                    public void onSuccess(JsonObject data, Response response) {
-                        if (data == null) {
-                            finishWithError(new AppError(TAG, 645, AppError.CODE_MAINTENANCE, response));
-                            return;
-                        }
-                        try {
-                            String status = data.get("status").getAsString();
-                            if (status.equals("not_downloaded_yet")) {
-                                if (getAttachmentCheckKeyTries++ > 5) {
-                                    finishWithError(new AppError(TAG, 658, CODE_OTHER, "Załącznik niedostępny. Przekroczono czas oczekiwania.", response, data));
-                                    return;
-                                }
-                                new Handler(activityContext.getMainLooper()).postDelayed(() -> {
-                                    getAttachmentCheckKey(attachmentKey, attachmentCallback);
-                                }, 2000);
-                            }
-                            else if (status.equals("ready")) {
-                                Request.Builder builder = Request.builder()
-                                        .url(SYNERGIA_SANDBOX_URL+"CSDownload&singleUseKey="+attachmentKey);
-                                new Handler(activityContext.getMainLooper()).post(() -> {
-                                    attachmentCallback.onSuccess(builder);
-                                });
-                            }
-                            else {
-                                finishWithError(new AppError(TAG, 667, AppError.CODE_ATTACHMENT_NOT_AVAILABLE, response, data));
-                            }
-                        }
-                        catch (Exception e) {
-                            finishWithError(new AppError(TAG, 671, AppError.CODE_OTHER, response, e, data));
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 677, CODE_OTHER, response, throwable));
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    @Override
-    public void getRecipientList(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull RecipientListGetCallback recipientListGetCallback) {
-        if (!prepare(activityContext, errorCallback, profile.getId(), profile, LoginStore.fromProfileFull(profile)))
-            return;
-
-        if (System.currentTimeMillis() - profile.getLastReceiversSync() < 24 * 60 * 60 * 1000) {
-            AsyncTask.execute(() -> {
-                List<Teacher> teacherList = app.db.teacherDao().getAllNow(profileId);
-                new Handler(activityContext.getMainLooper()).post(() -> recipientListGetCallback.onSuccess(teacherList));
-            });
-            return;
-        }
-
-        loginSynergia(() -> {
-            String requestBody =
-                    "<service>\n" +
-                            "  <header/>\n" +
-                            "  <data>\n" +
-                            "    <includeClass>1</includeClass>\n" +
-                            "  </data>\n" +
-                            "</service>";
-            synergiaRequest("Receivers/action/GetTypes", requestBody, data -> {
-
-                teacherList = app.db.teacherDao().getAllNow(profileId);
-
-                for (Teacher teacher: teacherList) {
-                    teacher.typeDescription = null; // TODO: 2019-06-13 it better
-                }
-
-                Elements categories = data.select("response GetTypes data list ArrayItem");
-                for (Element category: categories) {
-                    String categoryId = category.select("id").text();
-                    String categoryName = category.select("name").text();
-                    Elements categoryList = getRecipientCategory(categoryId);
-                    if (categoryList == null)
-                        return; // the error callback is already executed
-                    for (Element item: categoryList) {
-                        if (item.select("list").size() == 1) {
-                            String className = item.select("label").text();
-                            Elements list = item.select("list ArrayItem");
-                            for (Element teacher: list) {
-                                updateTeacher(categoryId, Long.parseLong(teacher.select("id").text()), teacher.select("label").text(), categoryName, className);
-                            }
-                        }
-                        else {
-                            updateTeacher(categoryId, Long.parseLong(item.select("id").text()), item.select("label").text(), categoryName, null);
-                        }
-                    }
-                }
-
-                app.db.teacherDao().addAll(teacherList);
-
-                profile.setLastReceiversSync(System.currentTimeMillis());
-                app.db.profileDao().add(profile);
-
-                new Handler(activityContext.getMainLooper()).post(() -> recipientListGetCallback.onSuccess(new ArrayList<>(teacherList)));
-            });
-        });
-    }
-    private Elements getRecipientCategory(String categoryId) {
-        Response response = null;
-        try {
-            String endpoint = "Receivers/action/GetListForType";
-            d(TAG, "Requesting "+SYNERGIA_URL+endpoint);
-            String body =
-                    "<service>\n" +
-                            "  <header/>\n" +
-                            "  <data>\n" +
-                            "    <receiverType>"+categoryId+"</receiverType>\n" +
-                            "  </data>\n" +
-                            "</service>";
-            response = Request.builder()
-                    .url(SYNERGIA_URL+endpoint)
-                    .userAgent(synergiaUserAgent)
-                    .setTextBody(body, MediaTypeUtils.APPLICATION_XML)
-                    .build().execute();
-            if (response.code() != 200) {
-                finishWithError(new AppError(TAG, 3569, CODE_OTHER, response));
-                return null;
-            }
-            String data = new TextCallbackHandler().backgroundParser(response);
-            if (data.contains("<status>error</status>") || data.contains("<error>")) {
-                finishWithError(new AppError(TAG, 3556, AppError.CODE_MAINTENANCE, response, data));
-                return null;
-            }
-            Document doc = Jsoup.parse(data, "", Parser.xmlParser());
-            return doc.select("response GetListForType data ArrayItem");
-        } catch (Exception e) {
-            finishWithError(new AppError(TAG, 3562, CODE_OTHER, response, e));
-            return null;
-        }
-    }
-    private void updateTeacher(String category, long loginId, String nameLastFirst, String typeDescription, String className) {
-        nameLastFirst = nameLastFirst.replaceAll("\\s+", " ");
-        int type = TYPE_OTHER;
-        String position;
-        switch (category) {
-            case "tutors":
-                type = TYPE_EDUCATOR;
-                break;
-            case "teachers":
-                type = TYPE_TEACHER;
-                break;
-            case "pedagogue":
-                type = TYPE_PEDAGOGUE;
-                break;
-            case "librarian":
-                type = TYPE_LIBRARIAN;
-                break;
-            case "admin":
-                type = TYPE_SCHOOL_ADMIN;
-                break;
-            case "secretary":
-                type = TYPE_SECRETARIAT;
-                break;
-            case "sadmin":
-                type = TYPE_SUPER_ADMIN;
-                break;
-            case "parentsCouncil":
-                type = TYPE_PARENTS_COUNCIL;
-                int index = nameLastFirst.indexOf(" - ");
-                position = index == -1 ? "" : nameLastFirst.substring(index+3);
-                nameLastFirst = index == -1 ? nameLastFirst : nameLastFirst.substring(0, index);
-                typeDescription = bs(className)+bs(": ", position);
-                break;
-            case "schoolParentsCouncil":
-                type = TYPE_SCHOOL_PARENTS_COUNCIL;
-                index = nameLastFirst.indexOf(" - ");
-                position = index == -1 ? "" : nameLastFirst.substring(index+3);
-                nameLastFirst = index == -1 ? nameLastFirst : nameLastFirst.substring(0, index);
-                typeDescription = bs(position);
-                break;
-            case "contactsGroups":
-                return;
-        }
-        Teacher teacher = Teacher.getByFullNameLastFirst(teacherList, nameLastFirst);
-        if (teacher == null) {
-            String[] nameParts = nameLastFirst.split(" ", Integer.MAX_VALUE);
-            teacher = new Teacher(profileId, -1 * Utils.crc16((nameParts.length > 1 ? nameParts[1]+" "+nameParts[0] : nameParts[0]).getBytes()), nameParts.length > 1 ? nameParts[1] : "", nameParts[0]);
-            teacherList.add(teacher);
-        }
-        teacher.loginId = String.valueOf(loginId);
-        teacher.type = 0;
-        teacher.setType(type);
-        if (type == TYPE_OTHER) {
-            teacher.typeDescription = typeDescription+bs(" ", teacher.typeDescription);
-        }
-        else {
-            teacher.typeDescription = typeDescription;
-        }
-    }
-
-    @Override
-    public MessagesComposeInfo getComposeInfo(@NonNull ProfileFull profile) {
-        return new MessagesComposeInfo(0, 0, 150, 20000);
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Mobidziennik.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Mobidziennik.java
deleted file mode 100644
index 4a3d191f..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Mobidziennik.java
+++ /dev/null
@@ -1,2426 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.os.AsyncTask;
-import android.os.Handler;
-import android.text.Html;
-import android.util.Pair;
-import android.util.SparseArray;
-import android.util.SparseIntArray;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.crashlytics.android.Crashlytics;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import im.wangchao.mhttp.Request;
-import im.wangchao.mhttp.Response;
-import im.wangchao.mhttp.callback.TextCallbackHandler;
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.BuildConfig;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.interfaces.AttachmentGetCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface;
-import pl.szczodrzynski.edziennik.data.api.interfaces.LoginCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.MessageGetCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.RecipientListGetCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.SyncCallback;
-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.grades.GradeCategory;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.Lesson;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange;
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
-import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber;
-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.messages.MessageRecipient;
-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.notices.Notice;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
-import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject;
-import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher;
-import pl.szczodrzynski.edziennik.data.db.modules.teams.Team;
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.Endpoint;
-import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.utils.models.Week;
-
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_INVALID_LOGIN;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_MAINTENANCE;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_OTHER;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_ABSENT;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_ABSENT_EXCUSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_BELATED;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_CUSTOM;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_PRESENT;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_RELEASED;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_DEFAULT;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_EXAM;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_SHORT_QUIZ;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER1_FINAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER1_PROPOSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER2_FINAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER2_PROPOSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_YEAR_FINAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_YEAR_PROPOSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_MOBIDZIENNIK;
-import static pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_DELETED;
-import static pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED;
-import static pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT;
-import static pl.szczodrzynski.edziennik.utils.Utils.bs;
-import static pl.szczodrzynski.edziennik.utils.Utils.crc16;
-import static pl.szczodrzynski.edziennik.utils.Utils.d;
-import static pl.szczodrzynski.edziennik.utils.Utils.monthFromName;
-import static pl.szczodrzynski.edziennik.utils.Utils.strToInt;
-
-public class Mobidziennik implements EdziennikInterface {
-    public Mobidziennik(App app) {
-        this.app = app;
-    }
-
-    private static final String TAG = "api.Mobidziennik";
-
-    private App app;
-    private Context activityContext = null;
-    private SyncCallback callback = null;
-    private int profileId = -1;
-    private Profile profile = null;
-    private LoginStore loginStore = null;
-    private boolean fullSync = true;
-    private Date today = Date.getToday();
-    private List<String> targetEndpoints = new ArrayList<>();
-
-    // PROGRESS
-    private static final int PROGRESS_LOGIN = 10;
-    private int PROGRESS_COUNT = 1;
-    private int PROGRESS_STEP = (90/PROGRESS_COUNT);
-
-    private int onlyFeature = FEATURE_ALL;
-
-    private List<Team> teamList;
-    private List<Teacher> teacherList;
-    private List<Subject> subjectList;
-    private List<Lesson> lessonList;
-    private List<LessonChange> lessonChangeList;
-    private SparseArray<Long> gradeAddedDates;
-    private SparseArray<Float> gradeAverages;
-    private SparseIntArray gradeColors;
-    private List<Grade> gradeList;
-    private List<Event> eventList;
-    private List<Notice> noticeList;
-    private List<Attendance> attendanceList;
-    private List<Message> messageList;
-    private List<MessageRecipient> messageRecipientList;
-    private List<MessageRecipient> messageRecipientIgnoreList;
-    private List<Metadata> metadataList;
-    private List<Metadata> messageMetadataList;
-
-    private static boolean fakeLogin = false && !(BuildConfig.BUILD_TYPE.equals("release"));
-    private String lastLogin = null;
-    private long lastLoginTime = 0;
-    private String lastResponse = null;
-    private String loginServerName = null;
-    private String loginUsername = null;
-    private String loginPassword = null;
-    private int studentId = -1;
-
-    private long attendanceLastSync = 0;
-
-    private boolean prepare(@NonNull Context activityContext, @NonNull SyncCallback callback, int profileId, @Nullable Profile profile, @NonNull LoginStore loginStore) {
-        this.activityContext = activityContext;
-        this.callback = callback;
-        this.profileId = profileId;
-        // here we must have a login store: either with a correct ID or -1
-        // there may be no profile and that's when onLoginFirst happens
-        this.profile = profile;
-        this.loginStore = loginStore;
-        this.fullSync = profile == null || profile.getEmpty() || profile.shouldFullSync(activityContext);
-        this.today = Date.getToday();
-
-        this.loginServerName = loginStore.getLoginData("serverName", "");
-        this.loginUsername = loginStore.getLoginData("username", "");
-        this.loginPassword = loginStore.getLoginData("password", "");
-        if (loginServerName.equals("") || loginUsername.equals("") || loginPassword.equals("")) {
-            finishWithError(new AppError(TAG, 157, AppError.CODE_INVALID_LOGIN, "Login field is empty"));
-            return false;
-        }
-        this.studentId = profile == null ? -1 : profile.getStudentData("studentId", -1);
-        this.attendanceLastSync = profile == null ? 0 : profile.getStudentData("attendanceLastSync", (long)0);
-        fakeLogin = BuildConfig.DEBUG && loginUsername.toLowerCase().startsWith("fake");
-
-        teamList = profileId == -1 ? new ArrayList<>() : app.db.teamDao().getAllNow(profileId);
-        teacherList = profileId == -1 ? new ArrayList<>() : app.db.teacherDao().getAllNow(profileId);
-        subjectList = new ArrayList<>();
-        lessonList = new ArrayList<>();
-        lessonChangeList = new ArrayList<>();
-        gradeAddedDates = new SparseArray<>();
-        gradeAverages = new SparseArray<>();
-        gradeColors = new SparseIntArray();
-        gradeList = new ArrayList<>();
-        eventList = new ArrayList<>();
-        noticeList = new ArrayList<>();
-        attendanceList = new ArrayList<>();
-        messageList = new ArrayList<>();
-        messageRecipientList = new ArrayList<>();
-        messageRecipientIgnoreList = new ArrayList<>();
-        metadataList = new ArrayList<>();
-        messageMetadataList = new ArrayList<>();
-
-        return true;
-    }
-
-    @Override
-    public void sync(@NonNull Context activityContext, @NonNull SyncCallback callback, int profileId, @Nullable Profile profile, @NonNull LoginStore loginStore) {
-        if (!prepare(activityContext, callback, profileId, profile, loginStore))
-            return;
-
-        login(() -> {
-            targetEndpoints = new ArrayList<>();
-            targetEndpoints.add("GetData");
-            targetEndpoints.add("ProcessData");
-            targetEndpoints.add("Attendance");
-            targetEndpoints.add("ClassCalendar");
-            targetEndpoints.add("GradeDetails");
-            targetEndpoints.add("NoticeDetails");
-            targetEndpoints.add("Messages");
-            targetEndpoints.add("MessagesInbox");
-            targetEndpoints.add("Finish");
-            PROGRESS_COUNT = targetEndpoints.size()-1;
-            PROGRESS_STEP = (90/PROGRESS_COUNT);
-            begin();
-        });
-    }
-    @Override
-    public void syncFeature(@NonNull Context activityContext, @NonNull SyncCallback callback, @NonNull ProfileFull profile, @Nullable int ... featureList) {
-        if (featureList == null) {
-            sync(activityContext, callback, profile.getId(), profile, LoginStore.fromProfileFull(profile));
-            return;
-        }
-        if (!prepare(activityContext, callback, profile.getId(), profile, LoginStore.fromProfileFull(profile)))
-            return;
-
-        login(() -> {
-            targetEndpoints = new ArrayList<>();
-            if (featureList.length == 1)
-                onlyFeature = featureList[0];
-            if (featureList.length == 1 && (featureList[0] == FEATURE_MESSAGES_INBOX || featureList[0] == FEATURE_MESSAGES_OUTBOX)) {
-                teacherList = app.db.teacherDao().getAllNow(profileId);
-                for (Teacher teacher: teacherList) {
-                    teachersMap.put((int) teacher.id, teacher.getFullNameLastFirst());
-                }
-                if (featureList[0] == FEATURE_MESSAGES_INBOX) {
-                    targetEndpoints.add("MessagesInbox");
-                }
-                else {
-                    targetEndpoints.add("Messages");
-                }
-            }
-            else {
-                // this is needed for all features except messages
-                targetEndpoints.add("GetData");
-                targetEndpoints.add("ProcessData");
-                for (int feature: featureList) {
-                    switch (feature) {
-                        case FEATURE_AGENDA:
-                            targetEndpoints.add("ClassCalendar");
-                            break;
-                        case FEATURE_GRADES:
-                            targetEndpoints.add("GradeDetails");
-                            break;
-                        case FEATURE_NOTICES:
-                            targetEndpoints.add("NoticeDetails");
-                            break;
-                        case FEATURE_ATTENDANCE:
-                            targetEndpoints.add("Attendance");
-                            break;
-                        case FEATURE_MESSAGES_INBOX:
-                            targetEndpoints.add("MessagesInbox");
-                            break;
-                        case FEATURE_MESSAGES_OUTBOX:
-                            targetEndpoints.add("Messages");
-                            break;
-                    }
-                }
-            }
-            targetEndpoints.add("Finish");
-            PROGRESS_COUNT = targetEndpoints.size()-1;
-            PROGRESS_STEP = (90/PROGRESS_COUNT);
-            begin();
-        });
-    }
-
-    private void begin() {
-        callback.onProgress(PROGRESS_LOGIN);
-
-        r("get", null);
-    }
-
-    private void r(String type, String endpoint) {
-        // endpoint == null when beginning
-        if (endpoint == null)
-            endpoint = targetEndpoints.get(0);
-        int index = -1;
-        for (String request: targetEndpoints) {
-            index++;
-            if (request.equals(endpoint)) {
-                break;
-            }
-        }
-        if (type.equals("finish")) {
-            // called when finishing the action
-            callback.onProgress(PROGRESS_STEP);
-            index++;
-        }
-        d(TAG, "Called r("+type+", "+endpoint+"). Getting "+targetEndpoints.get(index));
-        switch (targetEndpoints.get(index)) {
-            case "GetData":
-                getData();
-                break;
-            case "ProcessData":
-                processData();
-                break;
-            case "ClassCalendar":
-                getClassCalendar();
-                break;
-            case "GradeDetails":
-                getGradeDetails();
-                break;
-            case "NoticeDetails":
-                getNoticeDetails();
-                break;
-            case "Attendance":
-                getAttendance();
-                break;
-            case "Messages":
-                getAllMessages();
-                break;
-            case "MessagesInbox":
-                getMessagesInbox();
-                break;
-            case "Finish":
-                finish();
-                break;
-        }
-    }
-    private void saveData() {
-        if (teamList.size() > 0) {
-            app.db.teamDao().clear(profileId);
-            app.db.teamDao().addAll(teamList);
-        }
-        if (teacherList.size() > 0)
-            app.db.teacherDao().addAllIgnore(teacherList);
-        if (subjectList.size() > 0)
-            app.db.subjectDao().addAll(subjectList);
-        if (lessonList.size() > 0) {
-            app.db.lessonDao().clear(profileId);
-            app.db.lessonDao().addAll(lessonList);
-        }
-        if (lessonChangeList.size() > 0)
-            app.db.lessonChangeDao().addAll(lessonChangeList);
-        if (gradeList.size() > 0) {
-            app.db.gradeDao().clearForSemester(profileId, profile.getCurrentSemester());
-            app.db.gradeDao().addAll(gradeList);
-            app.db.gradeDao().updateDetails(profileId, gradeAverages, gradeAddedDates, gradeColors);
-        }
-        if (eventList.size() > 0) {
-            app.db.eventDao().removeFuture(profileId, today);
-            app.db.eventDao().addAll(eventList);
-        }
-        if (noticeList.size() > 0) {
-            app.db.noticeDao().clear(profileId);
-            app.db.noticeDao().addAll(noticeList);
-        }
-        if (attendanceList.size() > 0) {
-            // clear only last two weeks
-            //app.db.attendanceDao().clearAfterDate(profileId, Date.getToday().stepForward(0, 0, -14));
-            app.db.attendanceDao().addAll(attendanceList);
-        }
-        if (messageList.size() > 0)
-            app.db.messageDao().addAllIgnore(messageList);
-        if (messageRecipientList.size() > 0)
-            app.db.messageRecipientDao().addAll(messageRecipientList);
-        if (messageRecipientIgnoreList.size() > 0)
-            app.db.messageRecipientDao().addAllIgnore(messageRecipientIgnoreList);
-        if (metadataList.size() > 0)
-            app.db.metadataDao().addAllIgnore(metadataList);
-        if (messageMetadataList.size() > 0)
-            app.db.metadataDao().setSeen(messageMetadataList);
-    }
-    private void finish() {
-        try {
-            saveData();
-        }
-        catch (Exception e) {
-            finishWithError(new AppError(TAG, 303, CODE_OTHER, app.getString(R.string.sync_error_saving_data), null, null, e, null));
-        }
-        if (fullSync) {
-            profile.setLastFullSync(System.currentTimeMillis());
-            fullSync = false;
-        }
-        profile.setEmpty(false);
-        callback.onSuccess(activityContext, new ProfileFull(profile, loginStore));
-    }
-    private void finishWithError(AppError error) {
-        try {
-            saveData();
-        }
-        catch (Exception e) {
-            Crashlytics.logException(e);
-        }
-        callback.onError(activityContext, error);
-    }
-
-    /*    _                 _
-         | |               (_)
-         | |     ___   __ _ _ _ __
-         | |    / _ \ / _` | | '_ \
-         | |___| (_) | (_| | | | | |
-         |______\___/ \__, |_|_| |_|
-                       __/ |
-                      |__*/
-    private void login(@NonNull LoginCallback loginCallback) {
-        if (System.currentTimeMillis() - lastLoginTime < 10*60*1000
-                && lastLogin.equals(loginServerName+":"+loginUsername)) {
-            loginCallback.onSuccess();
-            return;
-        }
-        app.cookieJar.clearForDomain(loginServerName+".mobidziennik.pl");
-
-        Request.builder()
-                .url(fakeLogin ? "https://szkolny.eu/mobimobi/mobi_mod_log.php" : "https://"+loginServerName+".mobidziennik.pl/api/")
-                .userAgent(System.getProperty( "http.agent" ))
-                .contentType("application/x-www-form-urlencoded; charset=UTF-8")
-                .addParameter("wersja", "20")
-                .addParameter("ip", app.deviceId)
-                .addParameter("login", loginUsername)
-                .addParameter("haslo", loginPassword)
-                .addParameter("token", app.appConfig.fcmTokens.get(LOGIN_TYPE_MOBIDZIENNIK).first)
-                .post()
-                .callback(new TextCallbackHandler() {
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 333, CODE_OTHER, response, throwable));
-                    }
-
-                    @Override
-                    public void onSuccess(String data, Response response) {
-
-                        //app.profile.loggedIn = (data != null && data.equals("ok"));
-                        if (data == null || data.equals("")) { // for safety
-                            finishWithError(new AppError(TAG, 339, CODE_MAINTENANCE, response));
-                        }
-                        else if (data.equals("Nie jestes zalogowany")) {
-                            finishWithError(new AppError(TAG, 343, AppError.CODE_INVALID_LOGIN, response, data));
-                        }
-                        else if (data.equals("ifun")) {
-                            finishWithError(new AppError(TAG, 346, AppError.CODE_INVALID_DEVICE, response, data));
-                        }
-                        else if (data.equals("stare haslo")) {
-                            finishWithError(new AppError(TAG, 349, AppError.CODE_OLD_PASSWORD, response, data));
-                        }
-                        else if (data.equals("Archiwum")) {
-                            finishWithError(new AppError(TAG, 352, AppError.CODE_ARCHIVED, response, data));
-                        }
-                        else if (data.equals("Trwają prace techniczne lub pojawił się jakiś problem")) {
-                            finishWithError(new AppError(TAG, 355, CODE_MAINTENANCE, data, response, data));
-                        }
-                        else if (data.equals("ok"))
-                        {
-                            // a successful login
-                            if (profile != null && studentId != -1) {
-                                lastLogin = loginServerName+":"+loginUsername;
-                                lastLoginTime = System.currentTimeMillis();
-                                loginCallback.onSuccess();
-                                return;
-                            }
-                            getData((data1 -> {
-                                String[] tables = data1.split("T@B#LA");
-
-                                List<Integer> studentIds = new ArrayList<>();
-                                List<String> studentNamesLong = new ArrayList<>();
-                                List<String> studentNamesShort = new ArrayList<>();
-                                String[] student = tables[8].split("\n");
-                                for (String aStudent : student) {
-                                    if (aStudent.isEmpty()) {
-                                        continue;
-                                    }
-                                    String[] student1 = aStudent.split("\\|", Integer.MAX_VALUE);
-                                    if (student1.length == 2)
-                                        continue;
-                                    studentIds.add(strToInt(student1[0]));
-                                    studentNamesLong.add(student1[2] + " " + student1[4]);
-                                    studentNamesShort.add(student1[2] + " " + student1[4].charAt(0) + ".");
-                                }
-
-                                List<Profile> profileList = new ArrayList<>();
-
-                                for (int index = 0; index < studentIds.size(); index++) {
-                                    Profile profile = new Profile();
-                                    profile.setStudentNameLong(studentNamesLong.get(index));
-                                    profile.setStudentNameShort(studentNamesShort.get(index));
-                                    profile.setName(profile.getStudentNameLong());
-                                    profile.setSubname(loginUsername);
-                                    profile.setEmpty(true);
-                                    profile.setLoggedIn(true);
-                                    profile.putStudentData("studentId", studentIds.get(index));
-                                    profileList.add(profile);
-                                }
-
-                                callback.onLoginFirst(profileList, loginStore);
-                            }));
-                        }
-                        else {
-                            if (data.contains("Uuuups... nieprawidłowy adres")) {
-                                finishWithError(new AppError(TAG, 404, AppError.CODE_INVALID_SERVER_ADDRESS, response, data));
-                                return;
-                            }
-                            finishWithError(new AppError(TAG, 407, AppError.CODE_MAINTENANCE, response, data));
-                        }
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    /*    _    _      _                                          _ _ _                _
-         | |  | |    | |                       ___              | | | |              | |
-         | |__| | ___| |_ __   ___ _ __ ___   ( _ )     ___ __ _| | | |__   __ _  ___| | _____
-         |  __  |/ _ \ | '_ \ / _ \ '__/ __|  / _ \/\  / __/ _` | | | '_ \ / _` |/ __| |/ / __|
-         | |  | |  __/ | |_) |  __/ |  \__ \ | (_>  < | (_| (_| | | | |_) | (_| | (__|   <\__ \
-         |_|  |_|\___|_| .__/ \___|_|  |___/  \___/\/  \___\__,_|_|_|_.__/ \__,_|\___|_|\_\___/
-                       | |
-                       |*/
-    private interface GetDataCallback {
-        void onSuccess(String data);
-    }
-    private void getData(GetDataCallback getDataCallback) {
-        callback.onActionStarted(R.string.sync_action_syncing);
-        Request.builder()
-                .url(fakeLogin ? "https://szkolny.eu/mobimobi/mobi_mod.php?"+System.currentTimeMillis() : "https://"+ loginServerName +".mobidziennik.pl/api/zrzutbazy")
-                .userAgent(System.getProperty( "http.agent" ))
-                .callback(new TextCallbackHandler() {
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 427, CODE_OTHER, response, throwable));
-                    }
-
-                    @Override
-                    public void onSuccess(String data, Response response) {
-                        if (data == null || data.equals("")) {
-                            finishWithError(new AppError(TAG, 432, CODE_MAINTENANCE, response));
-                            return;
-                        }
-                        if (data.equals("Nie jestes zalogowany")) {
-                            finishWithError(new AppError(TAG, 437, CODE_INVALID_LOGIN, response, data));
-                            lastLoginTime = 0;
-                            return;
-                        }
-
-                        lastResponse = data;
-
-                        getDataCallback.onSuccess(data);
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-    private void getData() {
-        getData((data -> r("finish", "GetData")));
-    }
-
-    /*    _____        _          _____                            _
-         |  __ \      | |        |  __ \                          | |
-         | |  | | __ _| |_ __ _  | |__) |___  __ _ _   _  ___  ___| |_ ___
-         | |  | |/ _` | __/ _` | |  _  // _ \/ _` | | | |/ _ \/ __| __/ __|
-         | |__| | (_| | || (_| | | | \ \  __/ (_| | |_| |  __/\__ \ |_\__ \
-         |_____/ \__,_|\__\__,_| |_|  \_\___|\__, |\__,_|\___||___/\__|___/
-                                                | |
-                                                |*/
-    private void processData() {
-        callback.onActionStarted(R.string.sync_action_processing_data);
-        String[] tables = lastResponse.split("T@B#LA");
-
-        if (studentId == -1) {
-            return;
-        }
-        try {
-            int i = 0;
-            for (String table : tables) {
-                if (i == 0) {
-                    processUsers(table);
-                }
-                if (i == 3) {
-                    processDates(table);
-                }
-                if (i == 4) {
-                    processSubjects(table);
-                }
-                if (i == 7) {
-                    processTeams(table, null);
-                }
-                if (i == 8) {
-                    processStudent(table, loginUsername);
-                }
-                if (i == 9) {
-                    processTeams(null, table);
-                }
-                if (i == 14) {
-                    processGradeCategories(table);
-                }
-                if (i == 15) {
-                    processLessons(table);
-                }
-                if (i == 16) {
-                    processAttendance(table);
-                }
-                if (i == 17) {
-                    processNotices(table);
-                }
-                if (i == 18) {
-                    processGrades(table);
-                }
-                if (i == 21) {
-                    processEvents(table);
-                }
-                if (i == 23) {
-                    processHomework(table);
-                }
-                if (i == 24) {
-                    processTimetable(table);
-                }
-                i++;
-            }
-            r("finish", "ProcessData");
-        }
-        catch (Exception e) {
-            finishWithError(new AppError(TAG, 511, CODE_OTHER, e, lastResponse));
-        }
-    }
-
-    private void getClassCalendar() {
-        callback.onActionStarted(R.string.sync_action_syncing_calendar);
-        Request.builder()
-                .url(fakeLogin ? "https://szkolny.eu/mobimobi/mobi_mod_kalendarzklasowy.php" : "https://" + loginServerName + ".mobidziennik.pl/dziennik/kalendarzklasowy")
-                .userAgent(System.getProperty("http.agent"))
-                .callback(new TextCallbackHandler() {
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 523, CODE_OTHER, response, throwable));
-                    }
-
-                    @Override
-                    public void onSuccess(String data, Response response) {
-                        // just skip any failures here
-                        if (data == null || data.equals("")) {
-                            r("finish", "ClassCalendar");
-                            return;
-                        }
-                        if (data.contains("nie-pamietam-hasla")) {
-                            r("finish", "ClassCalendar");
-                            return;
-                        }
-
-                        if (profile.getLuckyNumberEnabled()
-                                && (profile.getLuckyNumberDate() == null || profile.getLuckyNumberDate().getValue() != Date.getToday().getValue() || profile.getLuckyNumber() == -1)) {
-                            // set the current date as we checked the lucky number today
-                            profile.setLuckyNumber(-1);
-                            profile.setLuckyNumberDate(Date.getToday());
-
-                            Matcher matcher = Pattern.compile("class=\"szczesliwy_numerek\".*>0*([0-9]+)(?:/0*[0-9]+)*</a>", Pattern.DOTALL).matcher(data);
-                            if (matcher.find()) {
-                                try {
-                                    profile.setLuckyNumber(Integer.parseInt(matcher.group(1)));
-                                } catch (Exception e3) {
-                                    e3.printStackTrace();
-                                }
-                            }
-                            app.db.luckyNumberDao().add(new LuckyNumber(profileId, profile.getLuckyNumberDate(), profile.getLuckyNumber()));
-                        }
-
-                        Matcher matcher = Pattern.compile("events: (.+),$", Pattern.MULTILINE).matcher(data);
-                        if (matcher.find()) {
-                            try {
-                                //d(TAG, matcher.group(1));
-                                JsonArray events = new JsonParser().parse(matcher.group(1)).getAsJsonArray();
-                                //d(TAG, "Events size "+events.size());
-                                for (JsonElement eventEl: events) {
-                                    JsonObject event = eventEl.getAsJsonObject();
-
-                                    //d(TAG, "Event "+event.toString());
-
-                                    JsonElement idEl = event.get("id");
-                                    String idStr;
-                                    if (idEl != null && (idStr = idEl.getAsString()).startsWith("kalendarz;")) {
-                                        String[] idParts = idStr.split(";", Integer.MAX_VALUE);
-                                        if (idParts.length > 2) {
-                                            long id = idParts[2].isEmpty() ? -1 : strToInt(idParts[2]);
-                                            long targetStudentId = strToInt(idParts[1]);
-                                            if (targetStudentId != studentId)
-                                                continue;
-
-                                            // TODO null-safe getAs..()
-                                            Date eventDate = Date.fromY_m_d(event.get("start").getAsString());
-                                            //if (eventDate.getValue() < today.getValue())
-                                            //    continue;
-
-                                            String eventColor = event.get("color").getAsString();
-
-                                            int eventType = Event.TYPE_INFORMATION;
-
-                                            switch (eventColor) {
-                                                case "#C54449":
-                                                case "#c54449":
-                                                    eventType = Event.TYPE_SHORT_QUIZ;
-                                                    break;
-                                                case "#AB0001":
-                                                case "#ab0001":
-                                                    eventType = Event.TYPE_EXAM;
-                                                    break;
-                                                case "#008928":
-                                                    eventType = Event.TYPE_CLASS_EVENT;
-                                                    break;
-                                                case "#b66000":
-                                                case "#B66000":
-                                                    eventType = Event.TYPE_EXCURSION;
-                                                    break;
-                                            }
-
-                                            String title = event.get("title").getAsString();
-                                            String comment = event.get("comment").getAsString();
-
-                                            String topic = title;
-                                            if (!title.equals(comment)) {
-                                                topic += "\n"+comment;
-                                            }
-
-                                            if (id == -1) {
-                                                id = crc16(topic.getBytes());
-                                            }
-
-                                            Event eventObject = new Event(
-                                                    profileId,
-                                                    id,
-                                                    eventDate,
-                                                    null,
-                                                    topic,
-                                                    -1,
-                                                    eventType,
-                                                    false,
-                                                    -1,
-                                                    -1,
-                                                    teamClass != null ? teamClass.id : -1
-                                            );
-
-
-                                            //d(TAG, "Event "+eventObject);
-                                            eventList.add(eventObject);
-                                            metadataList.add(new Metadata(profileId, Metadata.TYPE_EVENT, eventObject.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis() /* no addedDate here though */));
-                                        }
-                                    }
-                                }
-                                r("finish", "ClassCalendar");
-                            } catch (Exception e3) {
-                                finishWithError(new AppError(TAG, 638, CODE_OTHER, response, e3, data));
-                            }
-                        }
-                        else {
-                            r("finish", "ClassCalendar");
-                        }
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    private void getGradeDetails() {
-        callback.onActionStarted(R.string.sync_action_syncing_grade_details);
-        Request.builder()
-                .url(fakeLogin ? "https://szkolny.eu/mobimobi/mobi_mod_oceny.php" : "https://" + loginServerName + ".mobidziennik.pl/dziennik/oceny?semestr="+ profile.getCurrentSemester())
-                .userAgent(System.getProperty("http.agent"))
-                .callback(new TextCallbackHandler() {
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 658, CODE_OTHER, response, throwable));
-                    }
-
-                    @Override
-                    public void onSuccess(String data, Response response) {
-                        // just skip any failures here
-                        if (data == null || data.equals("")) {
-                            r("finish", "GradeDetails");
-                            return;
-                        }
-                        if (data.contains("nie-pamietam-hasla")) {
-                            r("finish", "GradeDetails");
-                            return;
-                        }
-
-                        try {
-                            Document doc = Jsoup.parse(data);
-
-                            Elements grades = doc.select("table.spis a, table.spis span, table.spis div");
-
-                            String gradeCategory = "";
-                            int gradeColor = -1;
-                            String subjectName = "";
-
-                            for (Element e: grades) {
-                                switch (e.tagName()) {
-                                    case "div": {
-                                        //d(TAG, "Outer HTML "+e.outerHtml());
-                                        Matcher matcher = Pattern.compile("<div.*?>\\n*\\s*(.+?)\\s*\\n*(?:<.*?)??</div>", Pattern.DOTALL).matcher(e.outerHtml());
-                                        if (matcher.find()) {
-                                            subjectName = matcher.group(1);
-                                        }
-                                        break;
-                                    }
-                                    case "span": {
-                                        String css = e.attr("style");
-                                        Matcher matcher = Pattern.compile("background-color:([#A-Fa-f0-9]+);", Pattern.DOTALL).matcher(css);
-                                        if (matcher.find()) {
-                                            gradeColor = Color.parseColor(matcher.group(1));
-                                        }
-                                        matcher = Pattern.compile(">&nbsp;(.+?):</span>", Pattern.DOTALL).matcher(e.outerHtml());
-                                        if (matcher.find()) {
-                                            gradeCategory = matcher.group(1);
-                                        }
-                                        break;
-                                    }
-                                    case "a": {
-                                        int gradeId = strToInt(e.attr("rel"));
-                                        float gradeClassAverage = -1;
-                                        Date gradeAddedDate = null;
-                                        long gradeAddedDateMillis = -1;
-
-                                        String html = e.html();
-                                        Matcher matcher = Pattern.compile("Średnia ocen:.*<strong>([0-9]*\\.?[0-9]*)</strong>", Pattern.DOTALL).matcher(html);
-                                        if (matcher.find()) {
-                                            gradeClassAverage = Float.parseFloat(matcher.group(1));
-                                        }
-
-                                        matcher = Pattern.compile("Wpisano:.*<strong>.+?,\\s([0-9]+)\\s(.+?)\\s([0-9]{4}),\\sgodzina\\s([0-9:]+)</strong>", Pattern.DOTALL).matcher(html);
-                                        int month = 1;
-                                        if (matcher.find()) {
-                                            switch (matcher.group(2)) {
-                                                case "stycznia":
-                                                    month = 1;
-                                                    break;
-                                                case "lutego":
-                                                    month = 2;
-                                                    break;
-                                                case "marca":
-                                                    month = 3;
-                                                    break;
-                                                case "kwietnia":
-                                                    month = 4;
-                                                    break;
-                                                case "maja":
-                                                    month = 5;
-                                                    break;
-                                                case "czerwca":
-                                                    month = 6;
-                                                    break;
-                                                case "lipca":
-                                                    month = 7;
-                                                    break;
-                                                case "sierpnia":
-                                                    month = 8;
-                                                    break;
-                                                case "września":
-                                                    month = 9;
-                                                    break;
-                                                case "października":
-                                                    month = 10;
-                                                    break;
-                                                case "listopada":
-                                                    month = 11;
-                                                    break;
-                                                case "grudnia":
-                                                    month = 12;
-                                                    break;
-                                            }
-                                            gradeAddedDate = new Date(
-                                                    strToInt(matcher.group(3)),
-                                                    month,
-                                                    strToInt(matcher.group(1))
-                                            );
-                                            Time time = Time.fromH_m_s(
-                                                    matcher.group(4)
-                                            );
-                                            gradeAddedDateMillis = gradeAddedDate.combineWith(time);
-                                        }
-
-                                        matcher = Pattern.compile("Liczona do średniej:.*?<strong>nie<br/?></strong>", Pattern.DOTALL).matcher(html);
-                                        if (matcher.find()) {
-                                            matcher = Pattern.compile("<strong.*?>(.+?)</strong>.*?<sup>.+?</sup>.*?<small>\\((.+?)\\)</small>.*?<span>.*?Wartość oceny:.*?<strong>([0-9.]+)</strong>.*?Wpisał\\(a\\):.*?<strong>(.+?)</strong>", Pattern.DOTALL).matcher(html);
-                                            if (matcher.find()) {
-                                                String gradeName = matcher.group(1);
-                                                String gradeDescription = matcher.group(2);
-                                                float gradeValue = Float.parseFloat(matcher.group(3));
-                                                String teacherName = matcher.group(4);
-
-                                                long teacherId = -1;
-                                                long subjectId = -1;
-
-                                                //d(TAG, "Grade "+gradeName+" "+gradeCategory+" subject "+subjectName+" teacher "+teacherName);
-
-                                                if (!subjectName.equals("")) {
-                                                    int subjectIndex = -1;
-                                                    for (int i = 0; i < subjectsMap.size(); i++) {
-                                                        if (subjectsMap.valueAt(i).equals(subjectName)) {
-                                                            subjectIndex = i;
-                                                        }
-                                                    }
-                                                    //d(TAG, "subjectIndex "+subjectIndex);
-                                                    if (subjectIndex >= 0 && subjectIndex < subjectsMap.size()) {
-                                                        subjectId = subjectsMap.keyAt(subjectIndex);
-                                                    }
-                                                }
-
-                                                if (!teacherName.equals("")) {
-                                                    //d(TAG, "teacherName "+teacherName);
-                                                    int teacherIndex = -1;
-                                                    for (int i = 0; i < teachersMap.size(); i++) {
-                                                        if (teachersMap.valueAt(i).equals(teacherName)) {
-                                                            teacherIndex = i;
-                                                        }
-                                                    }
-                                                    //d(TAG, "teacherIndex "+teacherIndex);
-                                                    if (teacherIndex >= 0 && teacherIndex < teachersMap.size()) {
-                                                        teacherId = teachersMap.keyAt(teacherIndex);
-                                                    }
-                                                }
-
-                                                int semester = profile.dateToSemester(gradeAddedDate);
-
-                                                Grade gradeObject = new Grade(
-                                                        profileId,
-                                                        gradeId,
-                                                        gradeCategory,
-                                                        gradeColor,
-                                                        "NLDŚR, "+gradeDescription,
-                                                        gradeName,
-                                                        gradeValue,
-                                                        0,
-                                                        semester,
-                                                        teacherId,
-                                                        subjectId
-                                                );
-
-                                                gradeObject.classAverage = gradeClassAverage;
-
-                                                gradeList.add(gradeObject);
-                                                metadataList.add(new Metadata(profileId, Metadata.TYPE_GRADE, gradeObject.id, profile.getEmpty(), profile.getEmpty(), gradeAddedDateMillis));
-                                            }
-                                        } else {
-                                            gradeAverages.put(gradeId, gradeClassAverage);
-                                            gradeAddedDates.put(gradeId, gradeAddedDateMillis);
-                                            gradeColors.put(gradeId, gradeColor);
-                                        }
-                                        break;
-                                    }
-                                }
-                            }
-
-                            r("finish", "GradeDetails");
-                        }
-                        catch (Exception e) {
-                            finishWithError(new AppError(TAG, 852, CODE_OTHER, response, e, data));
-                        }
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    // TODO: 2019-06-04 punkty z zachowania znikają po synchronizacji 
-    private void getNoticeDetails() {
-        if (noticeList.size() == 0) {
-            r("finish", "NoticeDetails");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_notice_details);
-        Request.builder()
-                .url(fakeLogin ? "https://szkolny.eu/mobimobi/mobi_mod_zachowanie.php" : "https://" + loginServerName + ".mobidziennik.pl/mobile/zachowanie")
-                .userAgent(System.getProperty("http.agent"))
-                .callback(new TextCallbackHandler() {
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 873, CODE_OTHER, response, throwable));
-                    }
-
-                    @Override
-                    public void onSuccess(String data, Response response) {
-                        // just skip any failures here
-                        if (data == null || data.equals("")) {
-                            r("finish", "NoticeDetails");
-                            return;
-                        }
-                        if (data.contains("nie-pamietam-hasla")) {
-                            r("finish", "NoticeDetails");
-                            return;
-                        }
-
-                        Matcher matcher = Pattern.compile("(?:<span style=\"color:#[a-f0-9]+\">([0-9-.,]+)</span>.+?)?<div data-role=\"popup\" id=\"uwaga_tooltip([0-9]+)\">.+?Treść:.+?(?:Kategoria: <b>(.+?)</b>.+?)?Czas", Pattern.DOTALL).matcher(data);
-                        while (matcher.find()) {
-                            try {
-                                String pointsStr = matcher.group(1);
-                                String idStr = matcher.group(2);
-                                String categoryStr = matcher.groupCount() == 3 ? matcher.group(3) : null;
-                                float points = pointsStr == null ? 0 : Float.parseFloat(pointsStr);
-                                long id = Long.parseLong(idStr);
-                                for (Notice notice: noticeList) {
-                                    if (notice.id != id)
-                                        continue;
-                                    notice.points = points;
-                                    notice.category = categoryStr;
-                                }
-                            } catch (Exception e) {
-                                Crashlytics.logException(e);
-                                e.printStackTrace();
-                                if (onlyFeature == FEATURE_NOTICES)
-                                    finishWithError(new AppError(TAG, 880, CODE_OTHER, response, e, data));
-                                else
-                                    r("finish", "NoticeDetails");
-                                return;
-                            }
-                        }
-                        r("finish", "NoticeDetails");
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    public static class AttendanceLessonRange {
-        int weekDay;
-        int lessonNumber;
-        Time startTime;
-        Time endTime;
-        List<AttendanceLesson> lessons;
-
-        public AttendanceLessonRange(int section, int number, int lessonNumber, Time startTime, Time endTime) {
-            this.weekDay = section == 1 ? number + 4 : number;
-            this.lessonNumber = lessonNumber;
-            this.startTime = startTime;
-            this.endTime = endTime;
-            this.lessons = new ArrayList<>();
-        }
-        public void addLesson(AttendanceLesson lesson) {
-            lessons.add(lesson);
-        }
-    }
-    public static class AttendanceLesson {
-        String subjectName;
-        String topic;
-        String teamName;
-        String teacherName;
-        long lessonId;
-
-        public AttendanceLesson(String subjectName, String topic, String teamName, String teacherName, long lessonId) {
-            this.subjectName = subjectName;
-            this.topic = topic;
-            this.teamName = teamName;
-            this.teacherName = teacherName;
-            this.lessonId = lessonId;
-        }
-    }
-    private Date attendanceCheckDate = Week.getWeekStart();
-    private void getAttendance() {
-        r("finish", "Attendance");
-        // TODO: 2019-09-10 please download attendance from /dziennik/frekwencja. /mobile does not work above v13.0
-        if (true) {
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_attendance);
-        d(TAG, "Get attendance for week "+ attendanceCheckDate.getStringY_m_d());
-        Request.builder()
-                .url(fakeLogin ? "https://szkolny.eu/mobimobi/mobi_mod_frekwencja.php" : "https://" + loginServerName + ".mobidziennik.pl/mobile/frekwencja")
-                .userAgent(System.getProperty("http.agent"))
-                .addParameter("uczen", studentId)
-                .addParameter("data_poniedzialek", attendanceCheckDate.getStringY_m_d())
-                .post()
-                .callback(new TextCallbackHandler() {
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 944, CODE_OTHER, response, throwable));
-                    }
-
-                    @Override
-                    public void onSuccess(String data, Response response) {
-                        // just skip any failures here
-                        if (data == null || data.equals("")) {
-                            r("finish", "Attendance");
-                            return;
-                        }
-                        if (data.contains("nie-pamietam-hasla")) {
-                            r("finish", "Attendance");
-                            return;
-                        }
-
-                        List<AttendanceLessonRange> ranges = new ArrayList<>();
-
-                        try {
-                            Matcher matcher = Pattern.compile("<div data-role=\"popup\" id=\"popup([0-9])-([0-9])-([0-9]{1,3})\">.*?<p>([0-9]{2}):([0-9]{2}) - ([0-9]{2}):([0-9]{2}) (.+?)\\s*?<p>.*?</div>", Pattern.DOTALL).matcher(data);
-                            while (matcher.find()) {
-                                int section = strToInt(matcher.group(1));
-                                int number = strToInt(matcher.group(2));
-                                int lessonNumber = strToInt(matcher.group(3));
-                                int startHour = strToInt(matcher.group(4));
-                                int startMinute = strToInt(matcher.group(5));
-                                int endHour = strToInt(matcher.group(6));
-                                int endMinute = strToInt(matcher.group(7));
-                                String lessonsString = matcher.group(8);
-                                AttendanceLessonRange range = new AttendanceLessonRange(section, number, lessonNumber, new Time(startHour, startMinute, 0), new Time(endHour, endMinute, 0));
-                                Matcher matcher2 = Pattern.compile("<strong>(.+?) - (.+?)??</strong>.+?<small>.+?\\(([0-9]{1,2}) (.+?),\\s+(.+?), id lekcji: ([0-9]+?)\\).+?</small>", Pattern.DOTALL).matcher(lessonsString);
-                                while (matcher2.find()) {
-                                    String topic = matcher2.group(2);
-                                    topic = topic == null ? "" : Html.fromHtml(topic).toString();
-                                    if (topic.startsWith("Lekcja odwołana:"))
-                                        continue;
-                                    String teamName = matcher2.group(3)+matcher2.group(4);
-                                    boolean notFound = true;
-                                    for (Team team: teamList) {
-                                        if (teamName.equals(team.name)) {
-                                            notFound = false;
-                                            break;
-                                        }
-                                    }
-                                    if (notFound)
-                                        continue;
-                                    range.addLesson(
-                                            new AttendanceLesson(
-                                                    matcher2.group(1),
-                                                    topic,
-                                                    teamName,
-                                                    matcher2.group(5),
-                                                    strToInt(matcher2.group(6))
-                                            )
-                                    );
-                                }
-                                ranges.add(range);
-                            }
-                            matcher = Pattern.compile("<td\\s+?style=\"border-top:1px.+?>([.|sz+]+)?</td>", Pattern.DOTALL).matcher(data);
-                            int index = 0;
-                            while (matcher.find()) {
-                                int currentIndex = index++;
-                                String markers = matcher.groupCount() == 1 ? matcher.group(1) : null;
-                                if (markers == null)
-                                    continue;
-                                AttendanceLessonRange range = ranges.get(currentIndex);
-
-                                Date date = attendanceCheckDate.clone().stepForward(0, 0, range.weekDay);
-                                long addedDate = date.combineWith(range.startTime);
-
-                                int markerIndex = 0;
-                                for (char marker: markers.toCharArray()) {
-                                    int type = TYPE_CUSTOM;
-                                    switch (marker) {
-                                        case '.':
-                                            type = TYPE_PRESENT;
-                                            break;
-                                        case '|':
-                                            type = TYPE_ABSENT;
-                                            break;
-                                        case 's':
-                                            type = TYPE_BELATED;
-                                            break;
-                                        case 'z':
-                                            type = TYPE_RELEASED;
-                                            break;
-                                        case '+':
-                                            type = TYPE_ABSENT_EXCUSED;
-                                    }
-                                    AttendanceLesson lesson;
-                                    if (markerIndex >= range.lessons.size()) {
-                                        lesson = new AttendanceLesson("", "Nieznana lekcja", "???", "", addedDate);
-                                    }
-                                    else {
-                                        lesson = range.lessons.get(markerIndex);
-                                    }
-
-                                    long teacherId = -1;
-                                    long subjectId = -1;
-
-                                    int teacherIndex = -1;
-                                    for (int i = 0; i < teachersMap.size(); i++) {
-                                        if (teachersMap.valueAt(i).equals(lesson.teacherName)) {
-                                            teacherIndex = i;
-                                        }
-                                    }
-                                    if (teacherIndex >= 0 && teacherIndex < teachersMap.size()) {
-                                        teacherId = teachersMap.keyAt(teacherIndex);
-                                    }
-
-                                    int subjectIndex = -1;
-                                    for (int i = 0; i < subjectsMap.size(); i++) {
-                                        if (subjectsMap.valueAt(i).equals(lesson.subjectName)) {
-                                            subjectIndex = i;
-                                        }
-                                    }
-                                    if (subjectIndex >= 0 && subjectIndex < subjectsMap.size()) {
-                                        subjectId = subjectsMap.keyAt(subjectIndex);
-                                    }
-
-                                    Attendance attendanceObject = new Attendance(
-                                            profileId,
-                                            lesson.lessonId,
-                                            teacherId,
-                                            subjectId,
-                                            profile.dateToSemester(date),
-                                            lesson.topic,
-                                            date,
-                                            range.startTime,
-                                            type);
-                                    markerIndex++;
-                                    attendanceList.add(attendanceObject);
-                                    if (attendanceObject.type != TYPE_PRESENT) {
-                                        boolean markAsRead = onlyFeature == FEATURE_ATTENDANCE && attendanceLastSync == 0;
-                                        metadataList.add(new Metadata(profileId, Metadata.TYPE_ATTENDANCE, attendanceObject.id, profile.getEmpty() || markAsRead, profile.getEmpty() || markAsRead, addedDate));
-                                    }
-                                }
-                            }
-                        } catch (Exception e) {
-                            Crashlytics.logException(e);
-                            e.printStackTrace();
-                            if (onlyFeature == FEATURE_ATTENDANCE)
-                                finishWithError(new AppError(TAG, 955, CODE_OTHER, response, e, data));
-                            else
-                                r("finish", "Attendance");
-                            return;
-                        }
-
-                        if (onlyFeature == FEATURE_ATTENDANCE) {
-                            // syncing attendance exclusively
-                            if (attendanceLastSync == 0) {
-                                // first sync - get attendance until it's start of the school year
-                                attendanceLastSync = profile.getSemesterStart(1).getInMillis();
-                            }
-                            Date lastSyncDate = Date.fromMillis(attendanceLastSync);
-                            lastSyncDate.stepForward(0, 0, -7);
-                            if (lastSyncDate.getValue() < attendanceCheckDate.getValue()) {
-                                attendanceCheckDate.stepForward(0, 0, -7);
-                                r("get", "Attendance");
-                            }
-                            else {
-                                profile.putStudentData("attendanceLastSync", System.currentTimeMillis());
-                                r("finish", "Attendance");
-                            }
-                        }
-                        else {
-                            if (attendanceLastSync != 0) {
-                                // not a first sync
-                                Date lastSyncDate = Date.fromMillis(attendanceLastSync);
-                                lastSyncDate.stepForward(0, 0, 2);
-                                if (lastSyncDate.getValue() >= attendanceCheckDate.getValue()) {
-                                    profile.putStudentData("attendanceLastSync", System.currentTimeMillis());
-                                }
-                            }
-                            r("finish", "Attendance");
-                        }
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    private void getAllMessages() {
-        if (!fullSync && onlyFeature != FEATURE_MESSAGES_OUTBOX) {
-            r("finish", "Messages");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_messages);
-        Request.builder()
-                .url(fakeLogin ? "https://szkolny.eu/mobimobi/mobi_mod_wiadomosci_szukaj.php" : "https://" + loginServerName + ".mobidziennik.pl/dziennik/wyszukiwarkawiadomosci?q=+")
-                .userAgent(System.getProperty("http.agent"))
-                .callback(new TextCallbackHandler() {
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 1012, CODE_OTHER, response, throwable));
-                    }
-
-                    @Override
-                    public void onSuccess(String data, Response response) {
-                        // just skip any failures here
-                        if (data == null || data.equals("")) {
-                            r("finish", "GradeDetails");
-                            return;
-                        }
-                        if (data.contains("nie-pamietam-hasla")) {
-                            r("finish", "GradeDetails");
-                            return;
-                        }
-
-                        try {
-                            long startTime = System.currentTimeMillis();
-                            Document doc = Jsoup.parse(data);
-
-                            Element listElement = doc.getElementsByClass("spis").first();
-                            if (listElement == null) {
-                                r("finish", "Messages");
-                                return;
-                            }
-                            Elements list = listElement.getElementsByClass("podswietl");
-                            for (Element item: list) {
-                                long id = Long.parseLong(item.attr("rel").replaceAll("[^\\d]", "" ));
-
-                                Element subjectEl = item.select("td:eq(0) div").first();
-                                String subject = subjectEl.text();
-
-                                Element addedDateEl = item.select("td:eq(1)").first();
-                                String addedDateStr = addedDateEl.text();
-                                long addedDate = Date.fromIsoHm(addedDateStr);
-
-                                Element typeEl = item.select("td:eq(2) img").first();
-                                int type = TYPE_RECEIVED;
-                                if (typeEl.outerHtml().contains("mail_send.png"))
-                                    type = TYPE_SENT;
-
-                                Element senderEl = item.select("td:eq(3) div").first();
-                                long senderId = -1;
-                                if (type == TYPE_RECEIVED) {
-                                    String senderName = senderEl.text();
-                                    for (int i = 0; i < teachersMap.size(); i++) {
-                                        if (senderName.equals(teachersMap.valueAt(i))) {
-                                            senderId = teachersMap.keyAt(i);
-                                            break;
-                                        }
-                                    }
-                                    messageRecipientList.add(new MessageRecipient(profileId, -1, id));
-                                }
-                                else {
-                                    // TYPE_SENT, so multiple recipients possible
-                                    String[] recipientNames = senderEl.text().split(", ");
-                                    for (String recipientName: recipientNames) {
-                                        long recipientId = -1;
-                                        for (int i = 0; i < teachersMap.size(); i++) {
-                                            if (recipientName.equals(teachersMap.valueAt(i))) {
-                                                recipientId = teachersMap.keyAt(i);
-                                                break;
-                                            }
-                                        }
-                                        messageRecipientIgnoreList.add(new MessageRecipient(profileId, recipientId, id));
-                                    }
-                                }
-
-                                Message message = new Message(
-                                        profileId,
-                                        id,
-                                        subject,
-                                        null,
-                                        type,
-                                        senderId,
-                                        -1
-                                );
-
-                                messageList.add(message);
-                                metadataList.add(new Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, true, true, addedDate));
-                            }
-
-                        } catch (Exception e3) {
-                            finishWithError(new AppError(TAG, 949, CODE_OTHER, response, e3, data));
-                            return;
-                        }
-
-                        r("finish", "Messages");
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    private void getMessagesInbox() {
-        callback.onActionStarted(R.string.sync_action_syncing_messages);
-        Request.builder()
-                .url(fakeLogin ? "https://szkolny.eu/mobimobi/mobi_mod_wiadomosci.php" : "https://" + loginServerName + ".mobidziennik.pl/dziennik/wiadomosci")
-                .userAgent(System.getProperty("http.agent"))
-                .callback(new TextCallbackHandler() {
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 972, CODE_OTHER, response, throwable));
-                    }
-
-                    @Override
-                    public void onSuccess(String data, Response response) {
-                        // just skip any failures here
-                        if (data == null || data.equals("")) {
-                            r("finish", "GradeDetails");
-                            return;
-                        }
-                        if (data.contains("nie-pamietam-hasla")) {
-                            r("finish", "GradeDetails");
-                            return;
-                        }
-
-                        try {
-                            if (data.contains("Brak wiadomości odebranych.")) {
-                                r("finish", "MessagesInbox");
-                                return;
-                            }
-                            Document doc = Jsoup.parse(data);
-
-                            Elements list = doc.getElementsByClass("spis").first().getElementsByClass("podswietl");
-                            for (Element item: list) {
-                                long id = Long.parseLong(item.attr("rel"));
-
-                                Element subjectEl = item.select("td:eq(0)").first();
-                                //d(TAG, "subjectEl "+subjectEl.outerHtml());
-                                boolean hasAttachments = false;
-                                if (subjectEl.getElementsByTag("a").size() != 0) {
-                                    hasAttachments = true;
-                                }
-                                String subject = subjectEl.ownText();
-
-                                Element addedDateEl = item.select("td:eq(1) small").first();
-                                //d(TAG, "addedDateEl "+addedDateEl.outerHtml());
-                                String addedDateStr = addedDateEl.text();
-                                long addedDate = Date.fromIsoHm(addedDateStr);
-
-                                Element senderEl = item.select("td:eq(2)").first();
-                                //d(TAG, "senderEl "+senderEl.outerHtml());
-                                String senderName = senderEl.ownText();
-                                long senderId = -1;
-                                for (int i = 0; i < teachersMap.size(); i++) {
-                                    if (senderName.equals(teachersMap.valueAt(i))) {
-                                        senderId = teachersMap.keyAt(i);
-                                        break;
-                                    }
-                                }
-                                messageRecipientIgnoreList.add(new MessageRecipient(profileId, -1, id));
-
-                                boolean isRead = item.select("td:eq(3) span").first().hasClass("wiadomosc_przeczytana");
-
-                                Message message = new Message(
-                                        profileId,
-                                        id,
-                                        subject,
-                                        null,
-                                        TYPE_RECEIVED,
-                                        senderId,
-                                        -1
-                                );
-
-                                if (hasAttachments)
-                                    message.setHasAttachments();
-
-
-                                messageList.add(message);
-                                messageMetadataList.add(new Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, isRead, isRead || profile.getEmpty(), addedDate));
-                            }
-                            r("finish", "MessagesInbox");
-                        } catch (Exception e3) {
-                            finishWithError(new AppError(TAG, 1044, CODE_OTHER, response, e3, data));
-                        }
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    private SparseArray<String> teachersMap = new SparseArray<>();
-    private void processUsers(String table)
-    {
-        String[] users = table.split("\n");
-
-        //app.db.teacherDao().clear(profileId);
-        for (String userStr: users)
-        {
-            if (userStr.isEmpty()) {
-                continue;
-            }
-            String[] user = userStr.split("\\|", Integer.MAX_VALUE);
-
-            teachersMap.put(strToInt(user[0]), user[5].trim()+" "+user[4].trim());
-            teacherList.add(new Teacher(profileId, strToInt(user[0]), user[4].trim(), user[5].trim()));
-        }
-    }
-
-    private void processDates(String table)
-    {
-        String[] dates = table.split("\n");
-        for (String dateStr: dates)
-        {
-            if (dateStr.isEmpty()) {
-                continue;
-            }
-            String[] date = dateStr.split("\\|", Integer.MAX_VALUE);
-            switch (date[1]) {
-                case "semestr1_poczatek":
-                    profile.setDateSemester1Start(Date.fromYmd(date[3]));
-                    break;
-                case "semestr2_poczatek":
-                    profile.setDateSemester2Start(Date.fromYmd(date[3]));
-                    break;
-                case "koniec_roku_szkolnego":
-                    profile.setDateYearEnd(Date.fromYmd(date[3]));
-                    break;
-            }
-        }
-    }
-
-    private SparseArray<String> subjectsMap = new SparseArray<>();
-    private void processSubjects(String table)
-    {
-        String[] subjects = table.split("\n");
-
-        // because a student may no longer have a subject
-        // which he had before
-        // therefore, this subject's grades do not get deleted
-        // so we should keep the subject for correct naming
-        //app.db.subjectDao().clear(profileId);
-        for (String subjectStr: subjects)
-        {
-            if (subjectStr.isEmpty()) {
-                continue;
-            }
-            String[] subject = subjectStr.split("\\|", Integer.MAX_VALUE);
-
-            subjectsMap.put(strToInt(subject[0]), subject[1]);
-            subjectList.add(new Subject(profileId, strToInt(subject[0]), subject[1], subject[2]));
-        }
-    }
-
-    private Team teamClass = null;
-    private SparseArray<String> teamsMap = new SparseArray<>();
-    private List<Team> allTeams = new ArrayList<>();
-    private void processTeams(String tableTeams, String tableRelations)
-    {
-        if (tableTeams != null)
-        {
-            allTeams.clear();
-            String[] teams = tableTeams.split("\n");
-            for (String teamStr: teams) {
-                if (teamStr.isEmpty()) {
-                    continue;
-                }
-                String[] team = teamStr.split("\\|", Integer.MAX_VALUE);
-                Team teamObject = new Team(
-                        profileId,
-                        strToInt(team[0]),
-                        team[1]+team[2],
-                        strToInt(team[3]),
-                        loginServerName+":"+team[1]+team[2],// TODO zrobiłem to na szybko
-                        strToInt(team[4], -1));
-                allTeams.add(teamObject);
-            }
-        }
-        if (tableRelations != null)
-        {
-            app.db.teamDao().clear(profileId);
-            String[] teams = tableRelations.split("\n");
-            for (String teamStr: teams) {
-                if (teamStr.isEmpty()) {
-                    continue;
-                }
-                String[] team = teamStr.split("\\|", Integer.MAX_VALUE);
-                if (strToInt(team[1]) != studentId)
-                    continue;
-                Team teamObject = Team.getById(allTeams, strToInt(team[2]));
-                if (teamObject != null) {
-                    if (teamObject.type == 1) {
-                        profile.setStudentNumber(strToInt(team[4]));
-                        teamClass = teamObject;
-                    }
-                    teamsMap.put((int)teamObject.id, teamObject.name);
-                    teamList.add(teamObject);
-                }
-            }
-        }
-    }
-
-    private SparseArray<Pair<String[], String[]>> students = new SparseArray<>();
-    private boolean processStudent(String table, String loginUsername)
-    {
-        students.clear();
-        String[] student = table.split("\n");
-        for (int i = 0; i < student.length; i++) {
-            if (student[i].isEmpty()) {
-                continue;
-            }
-            String[] student1 = student[i].split("\\|", Integer.MAX_VALUE);
-            String[] student2 = student[++i].split("\\|", Integer.MAX_VALUE);
-            students.put(strToInt(student1[0]), new Pair<>(student1, student2));
-        }
-        Pair<String[], String[]> studentData = students.get(studentId);
-        try {
-            profile.setAttendancePercentage(Float.parseFloat(studentData.second[1]));
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-        return true;
-    }
-
-    private SparseArray<GradeCategory> gradeCategoryList = new SparseArray<>();
-    private void processGradeCategories(String table)
-    {
-        String[] gradeCategories = table.split("\n");
-
-        for (String gradeCategoryStr: gradeCategories)
-        {
-            if (gradeCategoryStr.isEmpty()) {
-                continue;
-            }
-            String[] gradeCategory = gradeCategoryStr.split("\\|", Integer.MAX_VALUE);
-            List<String> columns = new ArrayList<>();
-            Collections.addAll(columns, gradeCategory[7].split(";"));
-
-            if (teamsMap.indexOfKey(strToInt(gradeCategory[1])) >= 0) {
-                gradeCategoryList.put(
-                        Integer.parseInt(gradeCategory[0]),
-                        new GradeCategory(
-                                profileId,
-                                Integer.parseInt(gradeCategory[0]),
-                                Float.parseFloat(gradeCategory[3]),
-                                Color.parseColor("#"+gradeCategory[6]),
-                                gradeCategory[4]
-                        ).addColumns(columns)
-                );
-            }
-        }
-    }
-
-    private class MobiLesson {
-        long id;
-        int subjectId;
-        int teacherId;
-        int teamId;
-        String topic;
-        Date date;
-        Time startTime;
-        Time endTime;
-        int presentCount;
-        int absentCount;
-        int lessonNumber;
-        String signed;
-
-        MobiLesson(long id, int subjectId, int teacherId, int teamId, String topic, Date date, Time startTime, Time endTime, int presentCount, int absentCount, int lessonNumber, String signed) {
-            this.id = id;
-            this.subjectId = subjectId;
-            this.teacherId = teacherId;
-            this.teamId = teamId;
-            this.topic = topic;
-            this.date = date;
-            this.startTime = startTime;
-            this.endTime = endTime;
-            this.presentCount = presentCount;
-            this.absentCount = absentCount;
-            this.lessonNumber = lessonNumber;
-            this.signed = signed;
-        }
-    }
-
-    private List<MobiLesson> mobiLessons = new ArrayList<>();
-
-    private MobiLesson getLesson(long id) {
-        for (MobiLesson mobiLesson : mobiLessons) {
-            if (mobiLesson.id == id)
-                return mobiLesson;
-        }
-        return null;
-    }
-
-    private void processLessons(String table)
-    {
-        mobiLessons.clear();
-
-        String[] lessons2 = table.split("\n");
-        for (String lessonStr: lessons2)
-        {
-            if (lessonStr.isEmpty()) {
-                continue;
-            }
-            String[] lesson = lessonStr.split("\\|", Integer.MAX_VALUE);
-
-            MobiLesson newMobiLesson = new MobiLesson(
-                    Long.parseLong(lesson[0]),
-                    strToInt(lesson[1]),
-                    strToInt(lesson[2]),
-                    strToInt(lesson[3]),
-                    lesson[4],
-                    Date.fromYmd(lesson[5]),
-                    Time.fromYmdHm(lesson[6]),
-                    Time.fromYmdHm(lesson[7]),
-                    strToInt(lesson[8]),
-                    strToInt(lesson[9]),
-                    strToInt(lesson[10]),
-                    lesson[11]);
-            mobiLessons.add(newMobiLesson);
-        }
-    }
-
-    private void processAttendance(String table)
-    {
-        if (true)
-            return;
-        String[] attendanceList = table.split("\n");
-        for (String attendanceStr: attendanceList)
-        {
-            if (attendanceStr.isEmpty()) {
-                continue;
-            }
-            String[] attendance = attendanceStr.split("\\|", Integer.MAX_VALUE);
-
-            if (strToInt(attendance[2]) != studentId)
-                continue;
-            //RegisterAttendance oldAttendance = RegisterAttendance.getById(oldAttendances, Long.parseLong(attendance[0]));
-
-            MobiLesson mobiLesson = getLesson(Long.parseLong(attendance[1]));
-            if (mobiLesson != null) {
-                int type = TYPE_PRESENT;
-                switch (attendance[4]) {
-                    case "2":
-                        type = TYPE_ABSENT;
-                        break;
-                    case "5":
-                        type = TYPE_ABSENT_EXCUSED;
-                        break;
-                    case "4":
-                        type = TYPE_RELEASED;
-                        break;
-                }
-
-                int semester = profile.dateToSemester(mobiLesson.date);
-
-                Attendance attendanceObject = new Attendance(
-                        profileId,
-                        strToInt(attendance[0]),
-                        mobiLesson.teacherId,
-                        mobiLesson.subjectId,
-                        semester,
-                        mobiLesson.topic,
-                        mobiLesson.date,
-                        mobiLesson.startTime,
-                        type);
-                this.attendanceList.add(attendanceObject);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_ATTENDANCE, attendanceObject.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-            }
-        }
-
-    }
-
-    private void processNotices(String table)
-    {
-        String[] notices = table.split("\n");
-
-        for (String noticeStr: notices)
-        {
-            if (noticeStr.isEmpty()) {
-                continue;
-            }
-            String[] notice = noticeStr.split("\\|", Integer.MAX_VALUE);
-
-            if (strToInt(notice[2]) != studentId)
-                continue;
-
-            Notice noticeObject = new Notice(
-                    profileId,
-                    strToInt(notice[0]),
-                    notice[4],
-                    strToInt(notice[6]),
-                    (notice[3] != null ? (notice[3].equals("1") ? Notice.TYPE_POSITIVE : Notice.TYPE_NEGATIVE) : Notice.TYPE_NEUTRAL),
-                    strToInt(notice[5])
-            );
-
-            Metadata metadata = new Metadata(profileId, Metadata.TYPE_NOTICE, noticeObject.id, profile.getEmpty(), profile.getEmpty(), new Date().parseFromYmd(notice[7]).getInMillis());
-
-            noticeList.add(noticeObject);
-            metadataList.add(metadata);
-        }
-    }
-
-    private void processGrades(String table)
-    {
-        app.db.gradeDao().getDetails(profileId, gradeAddedDates, gradeAverages, gradeColors);
-
-        String[] grades = table.split("\n");
-
-        long addedDate = Date.getNowInMillis();
-        for (String gradeStr: grades)
-        {
-            if (gradeStr.isEmpty()) {
-                continue;
-            }
-            String[] grade = gradeStr.split("\\|", Integer.MAX_VALUE);
-
-            if (strToInt(grade[1]) != studentId)
-                continue;
-
-            if (grade[6].equals("")) {
-                grade[6] = "-1";
-            }
-            if (grade[10].equals("")) {
-                grade[10] = "1";
-            }
-
-            float weight = 0.0f;
-            String category = "";
-            String description = "";
-            int color = -1;
-            int categoryId = strToInt(grade[6]);
-            GradeCategory gradeCategory = gradeCategoryList.get(categoryId);
-            if (gradeCategory != null) {
-                weight = gradeCategory.weight;
-                category = gradeCategory.text;
-                description = gradeCategory.columns.get(strToInt(grade[10]) - 1);
-                color = gradeCategory.color;
-            }
-
-            Grade gradeObject = new Grade(
-                    profileId,
-                    strToInt(grade[0]),
-                    category,
-                    color,
-                    description,
-                    grade[7],
-                    Float.parseFloat(grade[11]),
-                    weight,
-                    strToInt(grade[5]),
-                    strToInt(grade[2]),
-                    strToInt(grade[3])
-            );
-
-
-            // fix for "0" value grades, so they're not counted in the average
-            if (gradeObject.value == 0.0f) {
-                gradeObject.weight = 0;
-            }
-
-            switch (grade[8]) {
-                case "3":
-                    // semester proposed
-                    gradeObject.type = (gradeObject.semester == 1 ? TYPE_SEMESTER1_PROPOSED : TYPE_SEMESTER2_PROPOSED);
-                    break;
-                case "1":
-                    // semester final
-                    gradeObject.type = (gradeObject.semester == 1 ? TYPE_SEMESTER1_FINAL : TYPE_SEMESTER2_FINAL);
-                    break;
-                case "4":
-                    // year proposed
-                    gradeObject.type = TYPE_YEAR_PROPOSED;
-                    break;
-                case "2":
-                    // year final
-                    gradeObject.type = TYPE_YEAR_FINAL;
-                    break;
-            }
-
-            Metadata metadata = new Metadata(profileId, Metadata.TYPE_GRADE, gradeObject.id, profile.getEmpty(), profile.getEmpty(), addedDate);
-            gradeList.add(gradeObject);
-            metadataList.add(metadata);
-            addedDate++; // increase the added date to sort grades as they are in the school profile
-        }
-    }
-
-    private void processEvents(String table)
-    {
-        String[] events = table.split("\n");
-        Date today = Date.getToday();
-        for (String eventStr: events)
-        {
-            if (eventStr.isEmpty()) {
-                continue;
-            }
-            String[] event = eventStr.split("\\|", Integer.MAX_VALUE);
-
-            Date eventDate = new Date().parseFromYmd(event[4]);
-            if (eventDate.getValue() < today.getValue())
-                continue;
-
-            String examType = "";
-            Pattern pattern = Pattern.compile("\\(([0-9A-ząęóżźńśłć]*?)\\)$");
-            Matcher matcher = pattern.matcher(event[5]);
-            if (matcher.find()) {
-                examType = matcher.group(1);
-            }
-
-            long addedDate = 0;
-
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss", Locale.US);
-            try {
-                addedDate = simpleDateFormat.parse(event[7]).getTime();
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-
-            int eventType = examType.equals("sprawdzian") ? TYPE_EXAM : examType.equals("kartkówka") ? TYPE_SHORT_QUIZ : TYPE_DEFAULT;
-            Event eventObject = new Event(
-                    profileId,
-                    strToInt(event[0]),
-                    eventDate,
-                    new Time().parseFromYmdHm(event[6]),
-                    event[5].replace("("+examType+")", ""),
-                    -1,
-                    eventType,
-                    false,
-                    strToInt(event[1]),
-                    strToInt(event[3]),
-                    strToInt(event[2])
-            );
-
-            if (teamsMap.indexOfKey((int)eventObject.teamId) >= 0) {
-                eventList.add(eventObject);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_EVENT, eventObject.id, profile.getEmpty(), profile.getEmpty(), addedDate));
-            }
-        }
-    }
-
-    private void processHomework(String table)
-    {
-        String[] homeworkList = table.split("\n");
-        Date today = Date.getToday();
-        for (String homeworkStr: homeworkList)
-        {
-            if (homeworkStr.isEmpty()) {
-                continue;
-            }
-            String[] homework = homeworkStr.split("\\|", Integer.MAX_VALUE);
-
-            Date eventDate = new Date().parseFromYmd(homework[2]);
-            if (eventDate.getValue() < today.getValue())
-                continue;
-
-            Event eventObject = new Event(
-                    profileId,
-                    strToInt(homework[0]),
-                    new Date().parseFromYmd(homework[2]),
-                    new Time().parseFromYmdHm(homework[3]),
-                    homework[1],
-                    -1,
-                    Event.TYPE_HOMEWORK,
-                    false,
-                    strToInt(homework[7]),
-                    strToInt(homework[6]),
-                    strToInt(homework[5])
-            );
-
-            if (teamsMap.indexOfKey((int)eventObject.teamId) >= 0) {
-                eventList.add(eventObject);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_HOMEWORK, eventObject.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-            }
-        }
-    }
-
-    private void processTimetable(String table)
-    {
-        String[] lessons = table.split("\n");
-        List<String> list = Arrays.asList(lessons);
-        //Collections.reverse(list);
-
-        // searching for all planned lessons
-        for (String lessonStr: (String[])list.toArray())
-        {
-            //Log.d(TAG, lessonStr);
-            if (!lessonStr.isEmpty())
-            {
-                String[] lesson = lessonStr.split("\\|", Integer.MAX_VALUE);
-
-                if (strToInt(lesson[0]) != studentId)
-                    continue;
-
-                if (lesson[1].equals("plan_lekcji") || lesson[1].equals("lekcja"))
-                {
-                    Lesson lessonObject = new Lesson(profileId, lesson[2], lesson[3], lesson[4]);
-
-                    for(int i = 0; i < subjectsMap.size(); i++) {
-                        int key = subjectsMap.keyAt(i);
-                        String str = subjectsMap.valueAt(i);
-                        if (lesson[5].equalsIgnoreCase(str)) {
-                            lessonObject.subjectId = key;
-                        }
-                    }
-                    for(int i = 0; i < teachersMap.size(); i++) {
-                        int key = teachersMap.keyAt(i);
-                        String str = teachersMap.valueAt(i);
-                        if ((lesson[7].trim() + " " + lesson[6].trim()).equalsIgnoreCase(str)) {
-                            lessonObject.teacherId = key;
-                        }
-                    }
-                    for(int i = 0; i < teamsMap.size(); i++) {
-                        int key = teamsMap.keyAt(i);
-                        String str = teamsMap.valueAt(i);
-                        if ((lesson[8] + lesson[9]).equalsIgnoreCase(str)) {
-                            lessonObject.teamId = key;
-                        }
-                    }
-                    lessonObject.classroomName = lesson[11];
-                    lessonList.add(lessonObject);
-                }
-            }
-        }
-
-        // searching for all changes
-        for (String lessonStr: (String[])list.toArray())
-        {
-            if (!lessonStr.isEmpty())
-            {
-                String[] lesson = lessonStr.split("\\|", Integer.MAX_VALUE);
-
-                if (strToInt(lesson[0]) != studentId)
-                    continue;
-
-                if (lesson[1].equals("zastepstwo") || lesson[1].equals("lekcja_odwolana"))
-                {
-                    LessonChange lessonChange = new LessonChange(profileId, lesson[2], lesson[3], lesson[4]);
-
-                    //Log.d(TAG, "Lekcja "+lessonStr);
-
-                    for(int i = 0; i < subjectsMap.size(); i++) {
-                        int key = subjectsMap.keyAt(i);
-                        String str = subjectsMap.valueAt(i);
-                        if (lesson[5].equalsIgnoreCase(str)) {
-                            lessonChange.subjectId = key;
-                        }
-                    }
-                    for(int i = 0; i < teachersMap.size(); i++) {
-                        int key = teachersMap.keyAt(i);
-                        String str = teachersMap.valueAt(i);
-                        if ((lesson[7].trim() + " " + lesson[6].trim()).equalsIgnoreCase(str)) {
-                            lessonChange.teacherId = key;
-                        }
-                    }
-                    for(int i = 0; i < teamsMap.size(); i++) {
-                        int key = teamsMap.keyAt(i);
-                        String str = teamsMap.valueAt(i);
-                        if ((lesson[8] + lesson[9]).equalsIgnoreCase(str)) {
-                            lessonChange.teamId = key;
-                        }
-                    }
-
-                    if (lesson[1].equals("zastepstwo")) {
-                        lessonChange.type = LessonChange.TYPE_CHANGE;
-                    }
-                    if (lesson[1].equals("lekcja_odwolana")) {
-                        lessonChange.type = LessonChange.TYPE_CANCELLED;
-                    }
-                    if (lesson[1].equals("lekcja")) {
-                        lessonChange.type = LessonChange.TYPE_ADDED;
-                    }
-                    lessonChange.classroomName = lesson[11];
-
-                    Lesson originalLesson = lessonChange.getOriginalLesson(lessonList);
-
-                    if (lessonChange.type == LessonChange.TYPE_ADDED) {
-                        if (originalLesson == null) {
-                            // original lesson doesn't exist, save a new addition
-                            // TODO
-                            /*if (!RegisterLessonChange.existsAddition(app.profile, registerLessonChange)) {
-                                app.profile.timetable.addLessonAddition(registerLessonChange);
-                            }*/
-                        }
-                        else {
-                            // original lesson exists, so we need to compare them
-                            if (!lessonChange.matches(originalLesson)) {
-                                // the lessons are different, so it's probably a lesson change
-                                // ahhh this damn API
-                                lessonChange.type = LessonChange.TYPE_CHANGE;
-                            }
-                        }
-
-                    }
-                    if (lessonChange.type != LessonChange.TYPE_ADDED) {
-                        // it's not a lesson addition
-                        lessonChangeList.add(lessonChange);
-                        metadataList.add(new Metadata(profileId, Metadata.TYPE_LESSON_CHANGE, lessonChange.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-                        if (originalLesson == null) {
-                            // there is no original lesson, so we have to add one in order to change it
-                            lessonList.add(Lesson.fromLessonChange(lessonChange));
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public Map<String, Endpoint> getConfigurableEndpoints(Profile profile) {
-        return null;
-    }
-
-    @Override
-    public boolean isEndpointEnabled(Profile profile, boolean defaultActive, String name) {
-        return defaultActive;
-    }
-
-    @Override
-    public void syncMessages(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile) {
-
-    }
-
-    /*    __  __
-         |  \/  |
-         | \  / | ___  ___ ___  __ _  __ _  ___  ___
-         | |\/| |/ _ \/ __/ __|/ _` |/ _` |/ _ \/ __|
-         | |  | |  __/\__ \__ \ (_| | (_| |  __/\__ \
-         |_|  |_|\___||___/___/\__,_|\__, |\___||___/
-                                      __/ |
-                                     |__*/
-    @Override
-    public void getMessage(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull MessageFull message, @NonNull MessageGetCallback messageCallback) {
-        if (message.body != null) {
-            boolean readByAll = true;
-            message.recipients = app.db.messageRecipientDao().getAllByMessageId(profile.getId(), message.id);
-            for (MessageRecipientFull recipient: message.recipients) {
-                if (recipient.id == -1)
-                    recipient.fullName = profile.getStudentNameLong();
-                if (message.type == TYPE_SENT && recipient.readDate < 1)
-                    readByAll = false;
-            }
-            if (!message.seen) {
-                app.db.metadataDao().setSeen(profile.getId(), message, true);
-            }
-            if (readByAll) {
-                // if a sent msg is not read by everyone, download it again to check the read status
-                new Handler(activityContext.getMainLooper()).post(() -> {
-                    messageCallback.onSuccess(message);
-                });
-                return;
-            }
-        }
-
-        if (!prepare(activityContext, errorCallback, profile.getId(), profile, LoginStore.fromProfileFull(profile)))
-            return;
-
-        login(() -> Request.builder()
-                .url("https://" + loginServerName + ".mobidziennik.pl/dziennik/"+(message.type == TYPE_RECEIVED || message.type == TYPE_DELETED ? "wiadodebrana" : "wiadwyslana")+"/?id="+message.id)
-                .userAgent(System.getProperty("http.agent"))
-                .callback(new TextCallbackHandler() {
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 1720, CODE_OTHER, response, throwable));
-                    }
-
-                    @Override
-                    public void onSuccess(String data, Response response) {
-                        if (data == null || data.equals("")) {
-                            finishWithError(new AppError(TAG, 1727, CODE_MAINTENANCE, response));
-                            return;
-                        }
-                        if (data.contains("nie-pamietam-hasla")) {
-                            lastLoginTime = 0;
-                            finishWithError(new AppError(TAG, 1732, CODE_INVALID_LOGIN, response, data));
-                            return;
-                        }
-
-                        List<MessageRecipientFull> messageRecipientList = new ArrayList<>();
-
-                        try {
-                            Document doc = Jsoup.parse(data);
-
-                            Element content = doc.select("#content").first();
-
-                            Element body = content.select(".wiadomosc_tresc").first();
-
-                            if (message.type == TYPE_RECEIVED) {
-                                MessageRecipientFull recipient = new MessageRecipientFull(profileId, -1, message.id);
-                                long readDate = System.currentTimeMillis();
-                                Matcher matcher = Pattern.compile("czas przeczytania:.+?,\\s([0-9]+)\\s(.+?)\\s([0-9]{4}),\\sgodzina\\s([0-9:]+)", Pattern.DOTALL).matcher(body.html());
-                                if (matcher.find()) {
-                                    Date date = new Date(
-                                            strToInt(matcher.group(3)),
-                                            monthFromName(matcher.group(2)),
-                                            strToInt(matcher.group(1))
-                                    );
-                                    Time time = Time.fromH_m_s(
-                                            matcher.group(4)
-                                    );
-                                    readDate = date.combineWith(time);
-                                }
-                                recipient.readDate = readDate;
-                                recipient.fullName = profile.getStudentNameLong();
-                                messageRecipientList.add(recipient);
-                            }
-                            else {
-                                message.senderId = -1;
-                                message.senderReplyId = -1;
-
-                                List<Teacher> teacherList = app.db.teacherDao().getAllNow(profileId);
-
-                                Elements recipients = content.select("table.spis tr:has(td)");
-                                for (Element recipientEl: recipients) {
-
-                                    Element senderEl = recipientEl.select("td:eq(0)").first();
-                                    Teacher teacher = null;
-                                    String senderName = senderEl.text();
-                                    for (Teacher aTeacher: teacherList) {
-                                        if (aTeacher.getFullNameLastFirst().equals(senderName)) {
-                                            teacher = aTeacher;
-                                            break;
-                                        }
-                                    }
-
-                                    long readDate = 0;
-                                    Element isReadEl = recipientEl.select("td:eq(2)").first();
-                                    if (!isReadEl.ownText().equals("NIE")) {
-                                        Element readDateEl = recipientEl.select("td:eq(3) small").first();
-                                        Matcher matcher = Pattern.compile(".+?,\\s([0-9]+)\\s(.+?)\\s([0-9]{4}),\\sgodzina\\s([0-9:]+)", Pattern.DOTALL).matcher(readDateEl.ownText());
-                                        if (matcher.find()) {
-                                            Date date = new Date(
-                                                    strToInt(matcher.group(3)),
-                                                    monthFromName(matcher.group(2)),
-                                                    strToInt(matcher.group(1))
-                                            );
-                                            Time time = Time.fromH_m_s(
-                                                    matcher.group(4)
-                                            );
-                                            readDate = date.combineWith(time);
-                                        }
-                                    }
-
-                                    MessageRecipientFull recipient = new MessageRecipientFull(profileId, teacher == null ? -1 : teacher.id, message.id);
-                                    recipient.readDate = readDate;
-                                    recipient.fullName = teacher == null ? "?" : teacher.getFullName();
-                                    messageRecipientList.add(recipient);
-                                }
-                            }
-
-                            body.select("div").remove();
-
-                            message.body = body.html();
-
-                            message.clearAttachments();
-                            Elements attachments = content.select("ul li");
-                            if (attachments != null) {
-                                //d(TAG, "attachments "+attachments.outerHtml());
-                                for (Element attachment: attachments) {
-                                    attachment = attachment.select("a").first();
-                                    //d(TAG, "attachment "+attachment.outerHtml());
-                                    String attachmentName = attachment.ownText();
-                                    long attachmentId = -1;
-                                    Matcher matcher = Pattern.compile("href=\"https://.+?\\.mobidziennik.pl/.+?&(?:amp;)?zalacznik=([0-9]+)\"(?:.+?<small.+?\\(([0-9.]+)\\s(M|K|G|)B\\))*", Pattern.DOTALL).matcher(attachment.outerHtml());
-                                    if (matcher.find()) {
-                                        attachmentId = Long.parseLong(matcher.group(1));
-                                        String size = matcher.group(2);
-                                        float attachmentSizeFloat = Float.parseFloat(size == null ? "-1" : size);
-                                        String sizeMultiplier = matcher.group(3);
-                                        switch (sizeMultiplier == null ? "" : sizeMultiplier) {
-                                            case "K":
-                                                attachmentSizeFloat *= 1024;
-                                                break;
-                                            case "M":
-                                                attachmentSizeFloat *= 1024*1024;
-                                                break;
-                                            case "G":
-                                                attachmentSizeFloat *= 1024*1024*1024;
-                                                break;
-                                        }
-                                        message.addAttachment(attachmentId, attachmentName, (long) attachmentSizeFloat);
-                                    }
-                                }
-                            }
-                        }
-                        catch (Exception e) {
-                            finishWithError(new AppError(TAG, 1841, CODE_OTHER, response, e, data));
-                            return;
-                        }
-
-                        if (!message.seen) {
-                            app.db.metadataDao().setSeen(profileId, message, true);
-                        }
-                        app.db.messageDao().add(message);
-                        app.db.messageRecipientDao().addAll((List<MessageRecipient>)(List<?>) messageRecipientList);
-
-                        message.recipients = messageRecipientList;
-
-                        new Handler(activityContext.getMainLooper()).post(() -> {
-                            messageCallback.onSuccess(message);
-                        });
-                    }
-                })
-                .build()
-                .enqueue());
-    }
-
-    @Override
-    public void getAttachment(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull MessageFull message, long attachmentId, @NonNull AttachmentGetCallback attachmentCallback) {
-        if (!prepare(activityContext, errorCallback, profile.getId(), profile, LoginStore.fromProfileFull(profile)))
-            return;
-
-        login(() -> {
-            Request.Builder builder = Request.builder()
-                    .url("https://"+loginServerName+".mobidziennik.pl/dziennik/"+(message.type == TYPE_SENT ? "wiadwyslana" : "wiadodebrana")+"/?id="+message.id+"&zalacznik="+attachmentId);
-            new Handler(activityContext.getMainLooper()).post(() -> {
-                attachmentCallback.onSuccess(builder);
-            });
-        });
-    }
-
-    @Override
-    public void getRecipientList(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull RecipientListGetCallback recipientListGetCallback) {
-        if (!prepare(activityContext, errorCallback, profile.getId(), profile, LoginStore.fromProfileFull(profile)))
-            return;
-
-        if (System.currentTimeMillis() - profile.getLastReceiversSync() < 24 * 60 * 60 * 1000) {
-            AsyncTask.execute(() -> {
-                List<Teacher> teacherList = app.db.teacherDao().getAllNow(profileId);
-                new Handler(activityContext.getMainLooper()).post(() -> recipientListGetCallback.onSuccess(teacherList));
-            });
-            return;
-        }
-
-        login(() -> {
-            Request.builder()
-                    .url("https://" + loginServerName + ".mobidziennik.pl/mobile/dodajwiadomosc")
-                    .userAgent(System.getProperty("http.agent"))
-                    .callback(new TextCallbackHandler() {
-                        @Override
-                        public void onFailure(Response response, Throwable throwable) {
-                            finishWithError(new AppError(TAG, 2289, CODE_OTHER, response, throwable));
-                        }
-
-                        @Override
-                        public void onSuccess(String data, Response response) {
-                            if (data == null || data.equals("")) {
-                                finishWithError(new AppError(TAG, 2295, CODE_MAINTENANCE, response));
-                                return;
-                            }
-                            if (data.contains("nie-pamietam-hasla")) {
-                                lastLoginTime = 0;
-                                finishWithError(new AppError(TAG, 2300, CODE_INVALID_LOGIN, response, data));
-                                return;
-                            }
-
-                            teacherList = app.db.teacherDao().getAllNow(profileId);
-
-                            for (Teacher teacher: teacherList) {
-                                teacher.typeDescription = null; // TODO: 2019-06-13 it better
-                            }
-
-                            Matcher categoryMatcher = Pattern.compile("<option value=\"(.+?)\"(?:\\sselected)?>(.+?)</option>").matcher(data);
-                            while (categoryMatcher.find()) {
-                                String categoryId = categoryMatcher.group(1);
-                                String categoryName = categoryMatcher.group(2);
-                                String categoryHtml = getRecipientCategory(categoryId);
-                                if (categoryHtml == null)
-                                    return; // the error callback is already executed
-                                Matcher teacherMatcher = Pattern.compile("<optgroup label=\"(.+?)\">(.+?)</optgroup>|<option value=\"(.+?)\">\\s?(.+?)</option>").matcher(categoryHtml);
-                                while (teacherMatcher.find()) {
-                                    if (teacherMatcher.group(1) != null) {
-                                        String className = teacherMatcher.group(1);
-                                        String listHtml = teacherMatcher.group(2);
-                                        Matcher listMatcher = Pattern.compile("<option value=\"(.+?)\">\\s?<span.+?>(.+?)</span>\\s?</option>").matcher(listHtml);
-                                        while (listMatcher.find()) {
-                                            updateTeacher(categoryId, Long.parseLong(listMatcher.group(1)), listMatcher.group(2), categoryName, className);
-                                        }
-                                    }
-                                    else {
-                                        updateTeacher(categoryId, Long.parseLong(teacherMatcher.group(3)), teacherMatcher.group(4), categoryName, null);
-                                    }
-                                }
-                            }
-                            app.db.teacherDao().addAll(teacherList);
-
-                            profile.setLastReceiversSync(System.currentTimeMillis());
-                            app.db.profileDao().add(profile);
-
-                            new Handler(activityContext.getMainLooper()).post(() -> recipientListGetCallback.onSuccess(new ArrayList<>(teacherList)));
-                        }
-                    })
-                    .build()
-                    .enqueue();
-        });
-    }
-    private String getRecipientCategory(String categoryId) {
-        Response response = null;
-        try {
-            response = Request.builder()
-                    .url("https://" + loginServerName + ".mobidziennik.pl/mobile/odbiorcyWiadomosci")
-                    .userAgent(System.getProperty("http.agent"))
-                    .addParameter("typ", categoryId)
-                    .post()
-                    .build().execute();
-            if (response.code() != 200) {
-                finishWithError(new AppError(TAG, 2349, CODE_OTHER, response));
-                return null;
-            }
-            String data = new TextCallbackHandler().backgroundParser(response);
-            if (data == null || data.equals("")) {
-                return "";
-            }
-            if (data.contains("nie-pamietam-hasla")) {
-                lastLoginTime = 0;
-                finishWithError(new AppError(TAG, 2300, CODE_INVALID_LOGIN, response, data));
-                return null;
-            }
-            return data;
-        } catch (Exception e) {
-            finishWithError(new AppError(TAG, 2355, CODE_OTHER, response, e));
-            return null;
-        }
-    }
-    private void updateTeacher(String category, long id, String nameLastFirst, String typeDescription, String className) {
-        Teacher teacher = Teacher.getById(teacherList, id);
-        if (teacher == null) {
-            String[] nameParts = nameLastFirst.split(" ", Integer.MAX_VALUE);
-            teacher = new Teacher(profileId, id, nameParts[1], nameParts[0]);
-            teacherList.add(teacher);
-        }
-        teacher.loginId = String.valueOf(id);
-        teacher.type = 0;
-        if (className != null) {
-            teacher.typeDescription = bs("", teacher.typeDescription, ", ")+className;
-        }
-        switch (category) {
-            case "1":
-                teacher.setType(Teacher.TYPE_PRINCIPAL);
-                break;
-            case "2":
-                teacher.setType(Teacher.TYPE_TEACHER);
-                break;
-            case "8":
-                teacher.setType(Teacher.TYPE_EDUCATOR);
-                break;
-            case "9":
-                teacher.setType(Teacher.TYPE_PEDAGOGUE);
-                break;
-            case "10":
-                teacher.setType(Teacher.TYPE_OTHER);
-                teacher.typeDescription = "Specjaliści";
-                break;
-            case "Administracja WizjaNet":
-                teacher.setType(Teacher.TYPE_SUPER_ADMIN);
-                break;
-            case "Administratorzy":
-                teacher.setType(Teacher.TYPE_SCHOOL_ADMIN);
-                break;
-            case "Sekretarka":
-                teacher.setType(Teacher.TYPE_SECRETARIAT);
-                break;
-            default:
-                teacher.setType(Teacher.TYPE_OTHER);
-                teacher.typeDescription = typeDescription+bs(" ", teacher.typeDescription);
-                break;
-        }
-    }
-
-    @Override
-    public MessagesComposeInfo getComposeInfo(@NonNull ProfileFull profile) {
-        return new MessagesComposeInfo(-1, profile.getStudentData("attachmentSizeLimit", 6291456L), 100, -1);
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Vulcan.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Vulcan.java
deleted file mode 100644
index 090c9393..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Vulcan.java
+++ /dev/null
@@ -1,1688 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api;
-
-import android.content.Context;
-import android.os.Build;
-import android.os.Handler;
-import android.util.Base64;
-import android.util.Pair;
-import android.util.SparseArray;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.crashlytics.android.Crashlytics;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonNull;
-import com.google.gson.JsonObject;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import im.wangchao.mhttp.Request;
-import im.wangchao.mhttp.Response;
-import im.wangchao.mhttp.callback.JsonCallbackHandler;
-import okhttp3.OkHttpClient;
-import okio.Buffer;
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.interfaces.AttachmentGetCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface;
-import pl.szczodrzynski.edziennik.data.api.interfaces.LoginCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.MessageGetCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.RecipientListGetCallback;
-import pl.szczodrzynski.edziennik.data.api.interfaces.SyncCallback;
-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.grades.GradeCategory;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.Lesson;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange;
-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.messages.MessageRecipient;
-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.notices.Notice;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
-import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject;
-import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher;
-import pl.szczodrzynski.edziennik.data.db.modules.teams.Team;
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.Endpoint;
-import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.utils.models.Week;
-import pl.szczodrzynski.edziennik.utils.Utils;
-
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_OTHER;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_ABSENT;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_ABSENT_EXCUSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_BELATED;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_BELATED_EXCUSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_PRESENT;
-import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_RELEASED;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_EXAM;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_SHORT_QUIZ;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER1_FINAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER1_PROPOSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER2_FINAL;
-import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER2_PROPOSED;
-import static pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange.TYPE_CANCELLED;
-import static pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange.TYPE_CHANGE;
-import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_VULCAN;
-import static pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED;
-import static pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT;
-import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_MESSAGE;
-import static pl.szczodrzynski.edziennik.data.db.modules.notices.Notice.TYPE_NEUTRAL;
-import static pl.szczodrzynski.edziennik.utils.Utils.c;
-import static pl.szczodrzynski.edziennik.utils.Utils.crc16;
-import static pl.szczodrzynski.edziennik.utils.Utils.d;
-import static pl.szczodrzynski.edziennik.utils.Utils.getGradeValue;
-import static pl.szczodrzynski.edziennik.utils.Utils.getVulcanGradeColor;
-import static pl.szczodrzynski.edziennik.utils.Utils.intToStr;
-
-public class Vulcan implements EdziennikInterface {
-    public Vulcan(App app) {
-        this.app = app;
-    }
-
-    private static final String TAG = "api.Vulcan";
-    private static final String MOBILE_APP_NAME = "VULCAN-Android-ModulUcznia";
-    private static final String MOBILE_APP_VERSION = "19.4.1.436";
-    private static final String ENDPOINT_CERTIFICATE = "mobile-api/Uczen.v3.UczenStart/Certyfikat";
-    private static final String ENDPOINT_STUDENT_LIST = "mobile-api/Uczen.v3.UczenStart/ListaUczniow";
-    private static final String ENDPOINT_DICTIONARIES = "mobile-api/Uczen.v3.Uczen/Slowniki";
-    private static final String ENDPOINT_TIMETABLE = "mobile-api/Uczen.v3.Uczen/PlanLekcjiZeZmianami";
-    private static final String ENDPOINT_GRADES = "mobile-api/Uczen.v3.Uczen/Oceny";
-    private static final String ENDPOINT_GRADES_PROPOSITIONS = "mobile-api/Uczen.v3.Uczen/OcenyPodsumowanie";
-    private static final String ENDPOINT_EVENTS = "mobile-api/Uczen.v3.Uczen/Sprawdziany";
-    private static final String ENDPOINT_HOMEWORK = "mobile-api/Uczen.v3.Uczen/ZadaniaDomowe";
-    private static final String ENDPOINT_NOTICES = "mobile-api/Uczen.v3.Uczen/UwagiUcznia";
-    private static final String ENDPOINT_ATTENDANCE = "mobile-api/Uczen.v3.Uczen/Frekwencje";
-    private static final String ENDPOINT_MESSAGES_RECEIVED = "mobile-api/Uczen.v3.Uczen/WiadomosciOdebrane";
-    private static final String ENDPOINT_MESSAGES_SENT = "mobile-api/Uczen.v3.Uczen/WiadomosciWyslane";
-    private static final String ENDPOINT_MESSAGES_CHANGE_STATUS = "mobile-api/Uczen.v3.Uczen/ZmienStatusWiadomosci";
-    private static final String ENDPOINT_PUSH = "mobile-api/Uczen.v3.Uczen/UstawPushToken";
-    private static final String userAgent = "MobileUserAgent";
-
-    private App app;
-    private Context activityContext = null;
-    private SyncCallback callback = null;
-    private int profileId = -1;
-    private Profile profile = null;
-    private LoginStore loginStore = null;
-    private boolean fullSync = true;
-    private Date today = Date.getToday();
-    private List<String> targetEndpoints = new ArrayList<>();
-
-    // PROGRESS
-    private static final int PROGRESS_LOGIN = 10;
-    private int PROGRESS_COUNT = 1;
-    private int PROGRESS_STEP = (90/PROGRESS_COUNT);
-
-    private int onlyFeature = FEATURE_ALL;
-
-    private List<Team> teamList;
-    private List<Teacher> teacherList;
-    private List<Subject> subjectList;
-    private List<Lesson> lessonList;
-    private List<LessonChange> lessonChangeList;
-    private List<GradeCategory> gradeCategoryList;
-    private List<Grade> gradeList;
-    private List<Event> eventList;
-    private List<Notice> noticeList;
-    private List<Attendance> attendanceList;
-    private List<Message> messageList;
-    private List<MessageRecipient> messageRecipientList;
-    private List<MessageRecipient> messageRecipientIgnoreList;
-    private List<Metadata> metadataList;
-    private List<Metadata> messageMetadataList;
-
-    private String apiUrl = null;
-    private String certificateKey = null;
-    private String certificatePfx = null;
-    private String deviceToken = null;
-    private String deviceSymbol = null;
-    private String devicePin = null;
-    /**
-     * deviceSymbol_JednostkaSprawozdawczaSymbol
-     */private String schoolName = null;
-    /**
-     * JednostkaSprawozdawczaSymbol
-     */private String schoolSymbol = null;
-    /**
-     * Id
-     */private int studentId = -1;
-    /**
-     * UzytkownikLoginId
-     */private int studentLoginId = -1;
-    /**
-     * IdOddzial
-     */private int studentClassId = -1;
-    /**
-     * IdOkresKlasyfikacyjny
-     */private int studentSemesterId = -1;
-    /**
-     * OkresNumer
-     */private int studentSemesterNumber = -1;
-    private boolean syncingSemester1 = false;
-    private OkHttpClient signingHttp = null;
-    private Date oneMonthBack = today.clone().stepForward(0, -1, 0);
-
-    /*    _____
-         |  __ \
-         | |__) | __ ___ _ __   __ _ _ __ ___
-         |  ___/ '__/ _ \ '_ \ / _` | '__/ _ \
-         | |   | | |  __/ |_) | (_| | | |  __/
-         |_|   |_|  \___| .__/ \__,_|_|  \___|
-                        | |
-                        |*/
-    private boolean prepare(@NonNull Context activityContext, @NonNull SyncCallback callback, int profileId, @Nullable Profile profile, @NonNull LoginStore loginStore) {
-        this.activityContext = activityContext;
-        this.callback = callback;
-        this.profileId = profileId;
-        // here we must have a login store: either with a correct ID or -1
-        // there may be no profile and that's when onLoginFirst happens
-        this.profile = profile;
-        this.loginStore = loginStore;
-        this.fullSync = profile == null || profile.getEmpty() || profile.shouldFullSync(activityContext);
-        this.today = Date.getToday();
-
-        if (this.signingHttp == null) {
-            this.signingHttp = this.app.http.newBuilder().addInterceptor(chain -> {
-                okhttp3.Request request = chain.request();
-                Buffer buffer = new Buffer();
-                assert request.body() != null;
-                request.body().writeTo(buffer);
-                String signature = "";
-                // cannot use Utils.exception, because we are not in the main thread here!
-                // Utils.exception would show the dialog which has to be shown in the UI thread
-                try {
-                    signature = Utils.VulcanRequestEncryptionUtils.signContent(buffer.readByteArray(), new ByteArrayInputStream(Base64.decode(this.certificatePfx, Base64.DEFAULT)));
-                } catch (IOException e) {
-                    e.printStackTrace();
-                } catch (GeneralSecurityException e) {
-                    e.printStackTrace();
-                }
-                request = request.newBuilder().addHeader("RequestSignatureValue", signature).addHeader("RequestCertificateKey", this.certificateKey).build();
-                return chain.proceed(request);
-            }).build();
-        }
-
-
-        if (certificateKey == null || certificatePfx == null || apiUrl == null) {
-            c(TAG, "first login, use TOKEN, SYMBOL, PIN");
-
-        }
-
-        teamList = profileId == -1 ? new ArrayList<>() : app.db.teamDao().getAllNow(profileId);
-        teacherList = profileId == -1 ? new ArrayList<>() : app.db.teacherDao().getAllNow(profileId);
-        subjectList = new ArrayList<>();
-        lessonList = new ArrayList<>();
-        lessonChangeList = new ArrayList<>();
-        gradeCategoryList = new ArrayList<>();
-        gradeList = new ArrayList<>();
-        eventList = new ArrayList<>();
-        noticeList = new ArrayList<>();
-        attendanceList = new ArrayList<>();
-        messageList = new ArrayList<>();
-        messageRecipientList = new ArrayList<>();
-        messageRecipientIgnoreList = new ArrayList<>();
-        metadataList = new ArrayList<>();
-        messageMetadataList = new ArrayList<>();
-
-        return true;
-    }
-
-    @Override
-    public void sync(@NonNull Context activityContext, @NonNull SyncCallback callback, int profileId, @Nullable Profile profile, @NonNull LoginStore loginStore) {
-        if (!prepare(activityContext, callback, profileId, profile, loginStore))
-            return;
-
-        login(() -> {
-            targetEndpoints = new ArrayList<>();
-            targetEndpoints.add("SetPushToken");
-            targetEndpoints.add("Dictionaries");
-            targetEndpoints.add("Timetable");
-            targetEndpoints.add("Grades");
-            targetEndpoints.add("ProposedGrades");
-            targetEndpoints.add("Events");
-            targetEndpoints.add("Homework");
-            targetEndpoints.add("Notices");
-            targetEndpoints.add("Attendance");
-            targetEndpoints.add("MessagesInbox");
-            targetEndpoints.add("MessagesOutbox");
-            targetEndpoints.add("Finish");
-            PROGRESS_COUNT = targetEndpoints.size()-1;
-            PROGRESS_STEP = (90/PROGRESS_COUNT);
-            begin();
-        });
-    }
-    @Override
-    public void syncFeature(@NonNull Context activityContext, @NonNull SyncCallback callback, @NonNull ProfileFull profile, int ... featureList) {
-        if (featureList == null) {
-            sync(activityContext, callback, profile.getId(), profile, LoginStore.fromProfileFull(profile));
-            return;
-        }
-        if (!prepare(activityContext, callback, profile.getId(), profile, LoginStore.fromProfileFull(profile)))
-            return;
-
-        login(() -> {
-            targetEndpoints = new ArrayList<>();
-            if (featureList.length == 1)
-                onlyFeature = featureList[0];
-            targetEndpoints.add("SetPushToken");
-            targetEndpoints.add("Dictionaries");
-            for (int feature: featureList) {
-                switch (feature) {
-                    case FEATURE_TIMETABLE:
-                        targetEndpoints.add("Timetable");
-                        break;
-                    case FEATURE_AGENDA:
-                        targetEndpoints.add("Events");
-                        break;
-                    case FEATURE_GRADES:
-                        targetEndpoints.add("Grades");
-                        targetEndpoints.add("ProposedGrades");
-                        break;
-                    case FEATURE_HOMEWORK:
-                        targetEndpoints.add("Homework");
-                        break;
-                    case FEATURE_NOTICES:
-                        targetEndpoints.add("Notices");
-                        break;
-                    case FEATURE_ATTENDANCE:
-                        targetEndpoints.add("Attendance");
-                        break;
-                    case FEATURE_MESSAGES_INBOX:
-                        targetEndpoints.add("MessagesInbox");
-                        break;
-                    case FEATURE_MESSAGES_OUTBOX:
-                        targetEndpoints.add("MessagesOutbox");
-                        break;
-                }
-            }
-            targetEndpoints.add("Finish");
-            PROGRESS_COUNT = targetEndpoints.size()-1;
-            PROGRESS_STEP = (90/PROGRESS_COUNT);
-            begin();
-        });
-    }
-
-    private void begin() {
-        schoolName = profile.getStudentData("schoolName", null);
-        schoolSymbol = profile.getStudentData("schoolSymbol", null);
-        studentId = profile.getStudentData("studentId", -1);
-        studentLoginId = profile.getStudentData("studentLoginId", -1);
-        studentClassId = profile.getStudentData("studentClassId", -1);
-        studentSemesterId = profile.getStudentData("studentSemesterId", -1);
-        studentSemesterNumber = profile.getStudentData("studentSemesterNumber", profile.getCurrentSemester());
-        if (profile.getEmpty() && studentSemesterNumber == 2) {
-            syncingSemester1 = true;
-            studentSemesterId -= 1;
-            studentSemesterNumber -= 1;
-        }
-        else {
-            syncingSemester1 = false;
-        }
-        d(TAG, "Syncing student "+studentId+", class "+studentClassId+", semester "+studentSemesterId);
-
-        callback.onProgress(PROGRESS_LOGIN);
-
-        r("get", null);
-    }
-
-    private void r(String type, String endpoint) {
-        // endpoint == null when beginning
-        if (endpoint == null)
-            endpoint = targetEndpoints.get(0);
-        int index = -1;
-        for (String request: targetEndpoints) {
-            index++;
-            if (request.equals(endpoint)) {
-                break;
-            }
-        }
-        if (type.equals("finish")) {
-            // called when finishing the action
-            callback.onProgress(PROGRESS_STEP);
-            index++;
-        }
-        d(TAG, "Called r("+type+", "+endpoint+"). Getting "+targetEndpoints.get(index));
-        switch (targetEndpoints.get(index)) {
-            case "SetPushToken":
-                setPushToken();
-                break;
-            case "Dictionaries":
-                getDictionaries();
-                break;
-            case "Timetable":
-                getTimetable();
-                break;
-            case "Grades":
-                getGrades();
-                break;
-            case "ProposedGrades":
-                getProposedGrades();
-                break;
-            case "Events":
-                getEvents();
-                break;
-            case "Homework":
-                getHomework();
-                break;
-            case "Notices":
-                getNotices();
-                break;
-            case "Attendance":
-                getAttendance();
-                break;
-            case "MessagesInbox":
-                getMessagesInbox();
-                break;
-            case "MessagesOutbox":
-                getMessagesOutbox();
-                break;
-            case "Finish":
-                finish();
-                break;
-        }
-    }
-    private void saveData() {
-        if (teamList.size() > 0) {
-            app.db.teamDao().addAll(teamList);
-        }
-        if (teacherList.size() > 0)
-            app.db.teacherDao().addAll(teacherList);
-        if (subjectList.size() > 0)
-            app.db.subjectDao().addAll(subjectList);
-        if (lessonList.size() > 0) {
-            app.db.lessonDao().clear(profileId);
-            app.db.lessonDao().addAll(lessonList);
-        }
-        if (lessonChangeList.size() > 0)
-            app.db.lessonChangeDao().addAll(lessonChangeList);
-        if (gradeCategoryList.size() > 0)
-            app.db.gradeCategoryDao().addAll(gradeCategoryList);
-        if (gradeList.size() > 0) {
-            app.db.gradeDao().clearForSemester(profileId, studentSemesterNumber);
-            app.db.gradeDao().addAll(gradeList);
-        }
-        if (eventList.size() > 0) {
-            app.db.eventDao().removeFuture(profileId, Date.getToday());
-            app.db.eventDao().addAll(eventList);
-        }
-        if (noticeList.size() > 0) {
-            app.db.noticeDao().clearForSemester(profileId, studentSemesterNumber);
-            app.db.noticeDao().addAll(noticeList);
-        }
-        if (attendanceList.size() > 0) {
-            app.db.attendanceDao().clearAfterDate(profileId, getCurrentSemesterStartDate());
-            app.db.attendanceDao().addAll(attendanceList);
-        }
-        if (messageList.size() > 0)
-            app.db.messageDao().addAllIgnore(messageList);
-        if (messageRecipientList.size() > 0)
-            app.db.messageRecipientDao().addAll(messageRecipientList);
-        if (messageRecipientIgnoreList.size() > 0)
-            app.db.messageRecipientDao().addAllIgnore(messageRecipientIgnoreList);
-        if (metadataList.size() > 0)
-            app.db.metadataDao().addAllIgnore(metadataList);
-        if (messageMetadataList.size() > 0)
-            app.db.metadataDao().setSeen(messageMetadataList);
-    }
-    private void finish() {
-        if (syncingSemester1) {
-            syncingSemester1 = false;
-            studentSemesterId += 1;
-            studentSemesterNumber += 1;
-            // no need to download dictionaries again
-            r("get", null);// TODO: 2019-06-04 start with Timetables or first element (if partial sync)
-            return;
-        }
-        try {
-            saveData();
-        }
-        catch (Exception e) {
-            finishWithError(new AppError(TAG, 425, CODE_OTHER, app.getString(R.string.sync_error_saving_data), null, null, e, null));
-        }
-        if (fullSync) {
-            profile.setLastFullSync(System.currentTimeMillis());
-            fullSync = false;
-        }
-        profile.setEmpty(false);
-        callback.onSuccess(activityContext, new ProfileFull(profile, loginStore));
-    }
-    private void finishWithError(AppError error) {
-        try {
-            saveData();
-        }
-        catch (Exception e) {
-            Crashlytics.logException(e);
-        }
-        callback.onError(activityContext, error);
-    }
-
-    /*    _                 _
-         | |               (_)
-         | |     ___   __ _ _ _ __
-         | |    / _ \ / _` | | '_ \
-         | |___| (_) | (_| | | | | |
-         |______\___/ \__, |_|_| |_|
-                       __/ |
-                      |__*/
-    private void login(@NonNull LoginCallback loginCallback) {
-        if (profile == null) {
-            // FIRST LOGIN
-            this.deviceToken = loginStore.getLoginData("deviceToken", null);
-            this.deviceSymbol = loginStore.getLoginData("deviceSymbol", null);
-            this.devicePin = loginStore.getLoginData("devicePin", null);
-            if (deviceToken == null || deviceSymbol == null || devicePin == null) {
-                finishWithError(new AppError(TAG, 443, AppError.CODE_INVALID_LOGIN, "Login field is empty"));
-                return;
-            }
-
-            setApiUrl(deviceToken, deviceSymbol);
-            getCertificate(deviceToken, devicePin, ((certificateKey, certificatePfx, apiUrl, userLogin, userName) -> {
-                loginStore.removeLoginData("deviceToken");
-                loginStore.removeLoginData("devicePin");
-                loginStore.putLoginData("certificateKey", certificateKey);
-                loginStore.putLoginData("certificatePfx", certificatePfx);
-                loginStore.putLoginData("apiUrl", apiUrl);
-                loginStore.putLoginData("userLogin", userLogin);
-                this.apiUrl = apiUrl;
-                this.certificateKey = certificateKey;
-                this.certificatePfx = certificatePfx;
-                this.deviceToken = null;
-                this.devicePin = null;
-
-                c(TAG, "first login. get the list of students");
-                getStudentList(usersMap -> {
-                    List<Profile> profileList = new ArrayList<>();
-                    for (int index = 0; index < usersMap.size(); index++) {
-                        JsonObject account = new ArrayList<>(usersMap.values()).get(index);
-
-                        Profile newProfile = new Profile();
-                        newProfile.setEmpty(true);
-                        newProfile.setLoggedIn(true);
-                        saveStudentData(newProfile, account);
-
-                        profileList.add(newProfile);
-                    }
-                    callback.onLoginFirst(profileList, loginStore);
-                }, false);
-
-            }));
-        }
-        else {
-            this.apiUrl = loginStore.getLoginData("apiUrl", null);
-            this.certificateKey = loginStore.getLoginData("certificateKey", null);
-            this.certificatePfx = loginStore.getLoginData("certificatePfx", null);
-            if (apiUrl == null || certificateKey == null || certificatePfx == null) {
-                finishWithError(new AppError(TAG, 489, AppError.CODE_INVALID_LOGIN, "Login field is empty"));
-                return;
-            }
-            if (profile.getStudentData("currentSemesterEndDate", System.currentTimeMillis()/*default always larger*/) < System.currentTimeMillis()/1000
-                            || (studentLoginId = profile.getStudentData("studentLoginId", -1)) == -1) {
-                // current semester is over, we need to get student data again
-                callback.onActionStarted(R.string.sync_action_getting_account);
-                getStudentList(usersMap -> {
-                    studentId = profile.getStudentData("studentId", -1);
-                    d(TAG, "Searching the student ID "+studentId);
-                    JsonObject foundUser = null;
-                    for (JsonObject user: usersMap.values()) {
-                        if (user.get("Id").getAsInt() == studentId) {
-                            foundUser = user;
-                        }
-                    }
-                    if (foundUser == null || foundUser.get("IdOkresKlasyfikacyjny").getAsInt() == 0) {
-                        d(TAG, "Not found");
-                        finishWithError(new AppError(TAG, 507, AppError.CODE_OTHER, app.getString(R.string.error_register_student_no_term), usersMap.toString()));
-                    }
-                    else {
-                        d(TAG, "Saving updated student data");
-                        saveStudentData(profile, foundUser);
-                        loginCallback.onSuccess();
-                    }
-                }, true);
-            }
-            else {
-                loginCallback.onSuccess();
-            }
-        }
-    }
-
-    /*    _    _      _                                          _ _ _                _
-         | |  | |    | |                       ___              | | | |              | |
-         | |__| | ___| |_ __   ___ _ __ ___   ( _ )     ___ __ _| | | |__   __ _  ___| | _____
-         |  __  |/ _ \ | '_ \ / _ \ '__/ __|  / _ \/\  / __/ _` | | | '_ \ / _` |/ __| |/ / __|
-         | |  | |  __/ | |_) |  __/ |  \__ \ | (_>  < | (_| (_| | | | |_) | (_| | (__|   <\__ \
-         |_|  |_|\___|_| .__/ \___|_|  |___/  \___/\/  \___\__,_|_|_|_.__/ \__,_|\___|_|\_\___/
-                       | |
-                       |*/
-    private void getCertificate(String token, String pin, CertificateCallback certificateCallback) {
-        callback.onActionStarted(R.string.sync_action_getting_certificate);
-        d(TAG, "Post JSON "+apiUrl + ENDPOINT_CERTIFICATE);
-        if (apiUrl == null) {
-            finishWithError(new AppError(TAG, 1215, AppError.CODE_INVALID_TOKEN, "Empty apiUrl(1)"));
-            return;
-        }
-        Request.builder()
-                .url(apiUrl + ENDPOINT_CERTIFICATE)
-                .userAgent(userAgent)
-                .addParameter("PIN", pin)
-                .addParameter("TokenKey", token)
-                .addParameter("AppVersion", MOBILE_APP_VERSION)
-                .addParameter("DeviceId", UUID.randomUUID().toString())
-                .addParameter("DeviceName", "Szkolny.eu "+Build.MODEL)
-                .addParameter("DeviceNameUser", "")
-                .addParameter("DeviceDescription", "")
-                .addParameter("DeviceSystemType", "Android")
-                .addParameter("DeviceSystemVersion", Build.VERSION.RELEASE)
-                .addParameter("RemoteMobileTimeKey", getUnixTime())
-                .addParameter("TimeKey", getUnixTime() - 1)
-                .addParameter("RequestId", UUID.randomUUID().toString())
-                .addParameter("RemoteMobileAppVersion", MOBILE_APP_VERSION)
-                .addParameter("RemoteMobileAppName", MOBILE_APP_NAME)
-                .postJson()
-                .addHeader("RequestMobileType", "RegisterDevice")
-                .callback(new JsonCallbackHandler() {
-                    @Override
-                    public void onSuccess(JsonObject data, Response response) {
-                        if (data == null) {
-                            finishWithError(new AppError(TAG, 1241, AppError.CODE_MAINTENANCE, response));
-                            return;
-                        }
-                        d(TAG, "Certificate data "+data.toString());
-                        boolean isError = data.get("IsError").getAsBoolean();
-                        if (isError) {
-                            JsonElement message = data.get("Message");
-                            JsonElement tokenStatus = data.get("TokenStatus");
-                            String msg = null;
-                            String tokenStatusStr = null;
-                            if (message != null) {
-                                msg = message.getAsString();
-                            }
-                            if (tokenStatus != null) {
-                                tokenStatusStr = tokenStatus.getAsString();
-                            }
-                            if ("TokenNotFound".equals(msg)) {
-                                finishWithError(new AppError(TAG, 1258, AppError.CODE_INVALID_TOKEN, response, data));
-                                return;
-                            }
-                            if ("TokenDead".equals(msg)) {
-                                finishWithError(new AppError(TAG, 1262, AppError.CODE_EXPIRED_TOKEN, response, data));
-                                return;
-                            }
-                            if ("WrongPIN".equals(tokenStatusStr)) {
-                                Matcher matcher = Pattern.compile("Liczba pozostałych prób: ([0-9])", Pattern.DOTALL).matcher(tokenStatusStr);
-                                finishWithError(new AppError(TAG, 1267, AppError.CODE_INVALID_PIN, matcher.matches() ? matcher.group(1) : "?", response, data));
-                                return;
-                            }
-                            if ("Broken".equals(tokenStatusStr)) {
-                                finishWithError(new AppError(TAG, 1262, AppError.CODE_INVALID_PIN, "0", response, data));
-                                return;
-                            }
-                            finishWithError(new AppError(TAG, 1274, AppError.CODE_OTHER, "Sprawdź wprowadzone dane.\n\nBłąd certyfikatu "+(message == null ? "" : message.getAsString()), response, data));
-                            return;
-                        }
-                        JsonElement tokenCert = data.get("TokenCert");
-                        if (tokenCert == null || tokenCert instanceof JsonNull) {
-                            finishWithError(new AppError(TAG, 1279, AppError.CODE_OTHER, "Sprawdź wprowadzone dane.\n\nCertificate error. TokenCert null", response, data));
-                            return;
-                        }
-                        data = tokenCert.getAsJsonObject();
-                        try {
-                            certificateCallback.onSuccess(
-                                    data.get("CertyfikatKlucz").getAsString(),
-                                    data.get("CertyfikatPfx").getAsString(),
-                                    data.get("AdresBazowyRestApi").getAsString(),
-                                    data.get("UzytkownikLogin").getAsString(),
-                                    data.get("UzytkownikNazwa").getAsString()
-                            );
-                        }
-                        catch (Exception e) {
-                            finishWithError(new AppError(TAG, 1293, AppError.CODE_OTHER, response, e, data));
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        if (response.code() == 400) {
-                            finishWithError(new AppError(TAG, 1300, AppError.CODE_INVALID_SYMBOL, response, throwable));
-                            return;
-                        }
-                        finishWithError(new AppError(TAG, 1303, AppError.CODE_OTHER, response, throwable));
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    private void apiRequest(String endpoint, JsonObject payload, ApiRequestCallback apiRequestCallback) {
-        d(TAG, "API request "+apiUrl + endpoint);
-        if (apiUrl == null) {
-            finishWithError(new AppError(TAG, 1313, AppError.CODE_OTHER, app.getString(R.string.sync_error_no_api_url), "Empty apiUrl(2)"));
-            return;
-        }
-        if (payload == null)
-            payload = new JsonObject();
-        payload.addProperty("RemoteMobileTimeKey", getUnixTime());
-        payload.addProperty("TimeKey", getUnixTime() - 1);
-        payload.addProperty("RequestId", UUID.randomUUID().toString());
-        payload.addProperty("RemoteMobileAppVersion", MOBILE_APP_VERSION);
-        payload.addProperty("RemoteMobileAppName", MOBILE_APP_NAME);
-        Request.builder()
-                .url(apiUrl + endpoint)
-                .userAgent(userAgent)
-                .withClient(signingHttp)
-                .setJsonBody(payload)
-                .callback(new JsonCallbackHandler() {
-                    @Override
-                    public void onSuccess(JsonObject data, Response response) {
-                        if (data == null) {
-                            finishWithError(new AppError(TAG, 1332, AppError.CODE_MAINTENANCE, response));
-                            return;
-                        }
-                        try {
-                            apiRequestCallback.onSuccess(data);
-                        }
-                        catch (Exception e) {
-                            finishWithError(new AppError(TAG, 1339, AppError.CODE_OTHER, response, e, data));
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Response response, Throwable throwable) {
-                        finishWithError(new AppError(TAG, 1345, AppError.CODE_OTHER, response, throwable));
-                    }
-                })
-                .build()
-                .enqueue();
-    }
-
-    private void getStudentList(StudentListCallback studentListCallback, boolean reportStudentsWithNoSemester) {
-        apiRequest(ENDPOINT_STUDENT_LIST, null, data -> {
-            d(TAG, "Got: " + data.toString());
-            JsonElement listEl = data.get("Data");
-            JsonArray accountList;
-            if (listEl == null || listEl instanceof JsonNull || (accountList = listEl.getAsJsonArray()).size() == 0) {
-                finishWithError(new AppError(TAG, 1369, AppError.CODE_OTHER, app.getString(R.string.sync_error_register_no_students), data));
-                return;
-            }
-            LinkedHashMap<String, JsonObject> usersMap = new LinkedHashMap<>();
-            for (JsonElement userEl : accountList) {
-                JsonObject user = userEl.getAsJsonObject();
-                if (reportStudentsWithNoSemester || (user != null && user.get("IdOkresKlasyfikacyjny").getAsInt() != 0)) {
-                    usersMap.put(user.get("Imie").getAsString() + " " + user.get("Nazwisko").getAsString() + " " + (user.get("OddzialKod") instanceof JsonNull ? "" : user.get("OddzialKod").getAsString()), user);
-                } else if (accountList.size() == 1) {
-                    finishWithError(new AppError(TAG, 1377, AppError.CODE_OTHER, app.getString(R.string.error_register_student_no_term), data));
-                    return;
-                }
-            }
-            studentListCallback.onSuccess(usersMap);
-        });
-    }
-
-    private void saveStudentData(Profile targetProfile, JsonObject account) {
-        String firstName = account.get("Imie").getAsString();
-        String lastName = account.get("Nazwisko").getAsString();
-        schoolName = loginStore.getLoginData("deviceSymbol", getSymbolFromApiUrl())+"_"+account.get("JednostkaSprawozdawczaSymbol").getAsString();
-        schoolSymbol = account.get("JednostkaSprawozdawczaSymbol").getAsString();
-        studentId = account.get("Id").getAsInt();
-        studentLoginId = account.get("UzytkownikLoginId").getAsInt();
-        studentClassId = account.get("IdOddzial").getAsInt();
-        studentSemesterId = account.get("IdOkresKlasyfikacyjny").getAsInt();
-        String studentClassName = account.get("OkresPoziom").getAsInt()+account.get("OddzialSymbol").getAsString();
-        targetProfile.putStudentData("userName", account.get("UzytkownikNazwa").getAsString());
-        targetProfile.putStudentData("schoolName", schoolName);
-        targetProfile.putStudentData("schoolSymbol", schoolSymbol);
-        targetProfile.putStudentData("studentId", studentId);
-        targetProfile.putStudentData("studentLoginId", studentLoginId);
-        targetProfile.putStudentData("studentClassId", studentClassId);
-        targetProfile.putStudentData("studentClassName", studentClassName);
-        targetProfile.putStudentData("studentSemesterId", studentSemesterId);
-        targetProfile.putStudentData("currentSemesterEndDate", account.get("OkresDataDo").getAsInt()+86400);
-        targetProfile.putStudentData("studentSemesterNumber", account.get("OkresNumer").getAsInt());
-        targetProfile.setCurrentSemester(account.get("OkresNumer").getAsInt());
-        if (targetProfile.getCurrentSemester() == 1) {
-            targetProfile.setDateSemester1Start(Date.fromMillis((long) account.get("OkresDataOd").getAsInt() * 1000));
-            targetProfile.setDateSemester2Start(Date.fromMillis(((long) account.get("OkresDataDo").getAsInt() + 86400) * 1000));
-        }
-        else if (targetProfile.getCurrentSemester() == 2) {
-            targetProfile.setDateSemester2Start(Date.fromMillis((long) account.get("OkresDataOd").getAsInt() * 1000));
-            targetProfile.setDateYearEnd(Date.fromMillis(((long) account.get("OkresDataDo").getAsInt() + 86400) * 1000));
-        }
-        //db.teamDao().add(new Team(profileId, studentClassId, account.get("OddzialKod").getAsString(), 1, -1));
-        targetProfile.setStudentNameLong(firstName + " " + lastName);
-        targetProfile.setStudentNameShort(firstName + " " + lastName.charAt(0) + ".");
-        if (targetProfile.getName() == null || targetProfile.getName().equals("")) {
-            targetProfile.setName(targetProfile.getStudentNameLong());
-        }
-        targetProfile.setSubname(account.get("UzytkownikLogin").getAsString());
-    }
-
-    private Team searchTeam(String name, String code, long teacherId) {
-        Team team;
-        team = Team.getByName(teamList, name);
-
-        if (team == null) {
-            team = new Team(profileId, crc16(name.getBytes()), name, 2, code, teacherId);
-            teamList.add(team);
-        }
-        else {
-            team.teacherId = teacherId;
-        }
-        return team;
-    }
-
-    public interface CertificateCallback {
-        void onSuccess(String certificateKey, String certificatePfx, String apiUrl, String userLogin, String userName);
-    }
-    private interface StudentListCallback {
-        void onSuccess(LinkedHashMap<String, JsonObject> usersMap);
-    }
-    private interface ApiRequestCallback {
-        void onSuccess(JsonObject data);
-    }
-
-    private String getSymbolFromApiUrl() {
-        String[] parts = apiUrl.split("/");
-        return parts[parts.length - 2];
-    }
-
-    private String getClassTeamName() {
-        if (teamList.size() == 0)
-            return "";
-        if (teamList.get(0).type != 1)
-            return "";
-        return teamList.get(0).name;
-    }
-
-    private long getClassTeamId() {
-        if (teamList.size() == 0)
-            return -1;
-        if (teamList.get(0).type != 1)
-            return -1;
-        return teamList.get(0).id;
-    }
-
-    private Date getCurrentSemesterStartDate() {
-        return profile.getSemesterStart(studentSemesterNumber);
-    }
-
-    private Date getCurrentSemesterEndDate() {
-        return profile.getSemesterEnd(studentSemesterNumber);
-    }
-
-    private long getUnixTime() {
-        return System.currentTimeMillis() / 1000;
-    }
-
-    private void setApiUrl(String token, String symbol) {
-        String rule = token.substring(0, 3);
-        switch (rule) {
-            case "3S1":
-                if (!App.devMode)
-                    apiUrl = "https://lekcjaplus.vulcan.net.pl/"+symbol+"/";
-                else
-                    apiUrl = "http://hack.szkolny.eu/"+symbol+"/";
-                break;
-            case "TA1":
-                apiUrl = "https://uonetplus-komunikacja.umt.tarnow.pl/"+symbol+"/";
-                break;
-            case "OP1":
-                apiUrl = "https://uonetplus-komunikacja.eszkola.opolskie.pl/"+symbol+"/";
-                break;
-            case "RZ1":
-                apiUrl = "https://uonetplus-komunikacja.resman.pl/"+symbol+"/";
-                break;
-            case "GD1":
-                apiUrl = "https://uonetplus-komunikacja.edu.gdansk.pl/"+symbol+"/";
-                break;
-            case "KA1":
-                apiUrl = "https://uonetplus-komunikacja.mcuw.katowice.eu/"+symbol+"/";
-                break;
-            case "KA2":
-                apiUrl = "https://uonetplus-komunikacja-test.mcuw.katowice.eu/"+symbol+"/";
-                break;
-            case "P03":
-                apiUrl = "https://efeb-komunikacja-pro-efebmobile.pro.vulcan.pl/"+symbol+"/";
-                break;
-            case "P01":
-                apiUrl = "http://efeb-komunikacja.pro-hudson.win.vulcan.pl/"+symbol+"/";
-                break;
-            case "P02":
-                apiUrl = "http://efeb-komunikacja.pro-hudsonrc.win.vulcan.pl/"+symbol+"/";
-                break;
-            case "P90":
-                apiUrl = "http://efeb-komunikacja-pro-mwujakowska.neo.win.vulcan.pl/"+symbol+"/";
-                break;
-            case "FK1":
-                apiUrl = "http://api.fakelog.cf/"+symbol+"/";
-                break;
-            case "SZ9":
-                //apiUrl = "http://vulcan.szkolny.eu/"+symbol+"/";
-                break;
-            default:
-                apiUrl = null;
-                break;
-        }
-    }
-
-    /*    _____        _          _____                            _
-         |  __ \      | |        |  __ \                          | |
-         | |  | | __ _| |_ __ _  | |__) |___  __ _ _   _  ___  ___| |_ ___
-         | |  | |/ _` | __/ _` | |  _  // _ \/ _` | | | |/ _ \/ __| __/ __|
-         | |__| | (_| | || (_| | | | \ \  __/ (_| | |_| |  __/\__ \ |_\__ \
-         |_____/ \__,_|\__\__,_| |_|  \_\___|\__, |\__,_|\___||___/\__|___/
-                                                | |
-                                                |*/
-    private void setPushToken() {
-        String token;
-        Pair<String, List<Integer>> pair = app.appConfig.fcmTokens.get(LOGIN_TYPE_VULCAN);
-        if (pair == null || (token = pair.first) == null || (pair.second != null && pair.second.contains(profileId))) {
-            r("finish", "SetPushToken");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_setting_push_token);
-        JsonObject json = new JsonObject();
-        json.addProperty("IdUczen", studentId);
-        json.addProperty("Token", token);
-        json.addProperty("PushOcena", true);
-        json.addProperty("PushFrekwencja", true);
-        json.addProperty("PushUwaga", true);
-        json.addProperty("PushWiadomosc", true);
-        apiRequest(schoolSymbol+"/"+ENDPOINT_PUSH, json, result -> {
-            if (pair.second == null) {
-                List<Integer> list = new ArrayList<>();
-                list.add(profileId);
-                app.appConfig.fcmTokens.put(LOGIN_TYPE_VULCAN, new Pair<>(token, list));
-            }
-            else {
-                pair.second.add(profileId);
-                app.appConfig.fcmTokens.put(LOGIN_TYPE_VULCAN, new Pair<>(token, pair.second));
-            }
-            r("finish", "SetPushToken");
-        });
-    }
-
-    private SparseArray<Pair<Time, Time>> lessonRanges = new SparseArray<>();
-    private SparseArray<String> noticeCategories = new SparseArray<>();
-    private SparseArray<Pair<Integer, String>> attendanceCategories = new SparseArray<>();
-    private void getDictionaries() {
-        callback.onActionStarted(R.string.sync_action_syncing_dictionaries);
-        if (teamList.size() == 0 || teamList.get(0).type != 1) {
-            String name = profile.getStudentData("studentClassName", null);
-            if (name != null) {
-                long id = crc16(name.getBytes());
-                teamList.add(new Team(profileId, id, name, 1, schoolName + ":" + name, -1));
-            }
-        }
-        apiRequest(schoolSymbol+"/"+ENDPOINT_DICTIONARIES, null, result -> {
-            JsonObject data = result.getAsJsonObject("Data");
-            JsonArray teachers = data.getAsJsonArray("Nauczyciele");
-            JsonArray subjects = data.getAsJsonArray("Przedmioty");
-            JsonArray lessonRanges = data.getAsJsonArray("PoryLekcji");
-            JsonArray gradeCategories = data.getAsJsonArray("KategorieOcen");
-            JsonArray noticeCategories = data.getAsJsonArray("KategorieUwag");
-            JsonArray attendanceCategories = data.getAsJsonArray("KategorieFrekwencji");
-
-            for (JsonElement teacherEl : teachers) {
-                JsonObject teacher = teacherEl.getAsJsonObject();
-                JsonElement loginId = teacher.get("LoginId");
-                teacherList.add(
-                        new Teacher(
-                                profileId,
-                                teacher.get("Id").getAsInt(),
-                                teacher.get("Imie").getAsString(),
-                                teacher.get("Nazwisko").getAsString(),
-                                loginId == null || loginId instanceof JsonNull ? "-1" : loginId.getAsString()
-                        )
-                );
-            }
-
-            for (JsonElement subjectEl : subjects) {
-                JsonObject subject = subjectEl.getAsJsonObject();
-                subjectList.add(
-                        new Subject(
-                                profileId,
-                                subject.get("Id").getAsInt(),
-                                subject.get("Nazwa").getAsString(),
-                                subject.get("Kod").getAsString()
-                        )
-                );
-            }
-
-            this.lessonRanges.clear();
-            for (JsonElement lessonRangeEl : lessonRanges) {
-                JsonObject lessonRange = lessonRangeEl.getAsJsonObject();
-                this.lessonRanges.put(
-                        lessonRange.get("Id").getAsInt(),
-                        new Pair<>(
-                                Time.fromH_m(lessonRange.get("PoczatekTekst").getAsString()),
-                                Time.fromH_m(lessonRange.get("KoniecTekst").getAsString())
-                        )
-                );
-            }
-
-            for (JsonElement gradeCategoryEl : gradeCategories) {
-                JsonObject gradeCategory = gradeCategoryEl.getAsJsonObject();
-                gradeCategoryList.add(
-                        new GradeCategory(
-                                profileId,
-                                gradeCategory.get("Id").getAsInt(),
-                                -1,
-                                -1,
-                                gradeCategory.get("Nazwa").getAsString()
-                        )
-                );
-            }
-
-            this.noticeCategories.clear();
-            for (JsonElement noticeCategoryEl : noticeCategories) {
-                JsonObject noticeCategory = noticeCategoryEl.getAsJsonObject();
-                this.noticeCategories.put(
-                        noticeCategory.get("Id").getAsInt(),
-                        noticeCategory.get("Nazwa").getAsString()
-                );
-            }
-
-            this.attendanceCategories.clear();
-            for (JsonElement attendanceCategoryEl : attendanceCategories) {
-                JsonObject attendanceCategory = attendanceCategoryEl.getAsJsonObject();
-                int type = -1;
-                boolean absent = attendanceCategory.get("Nieobecnosc").getAsBoolean();
-                boolean excused = attendanceCategory.get("Usprawiedliwione").getAsBoolean();
-                if (absent) {
-                    type = excused ? TYPE_ABSENT_EXCUSED : TYPE_ABSENT;
-                }
-                else {
-                    if (attendanceCategory.get("Spoznienie").getAsBoolean()) {
-                        type = excused ? TYPE_BELATED_EXCUSED : TYPE_BELATED;
-                    }
-                    else if (attendanceCategory.get("Zwolnienie").getAsBoolean()) {
-                        type = TYPE_RELEASED;
-                    }
-                    else if (attendanceCategory.get("Obecnosc").getAsBoolean()) {
-                        type = TYPE_PRESENT;
-                    }
-                }
-                this.attendanceCategories.put(
-                        attendanceCategory.get("Id").getAsInt(),
-                        new Pair<>(
-                                type,
-                                attendanceCategory.get("Nazwa").getAsString()
-                        )
-                );
-            }
-            r("finish", "Dictionaries");
-        });
-    }
-
-    private void getTimetable() {
-        if (syncingSemester1) {
-            // we are in semester 2. we're syncing semester 1 to show old data. skip the timetable.
-            r("finish", "Timetable");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_timetable);
-        JsonObject json = new JsonObject();
-        json.addProperty("IdUczen", studentId);
-
-        Date weekStart = Week.getWeekStart();
-        if (Date.getToday().getWeekDay() > 4) {
-            weekStart.stepForward(0, 0, 7);
-        }
-        Date weekEnd = weekStart.clone().stepForward(0, 0, 6);
-
-        json.addProperty("DataPoczatkowa", weekStart.getStringY_m_d());
-        json.addProperty("DataKoncowa", weekEnd.getStringY_m_d());
-        json.addProperty("IdOddzial", studentClassId);
-        json.addProperty("IdOkresKlasyfikacyjny", studentSemesterId);
-        apiRequest(schoolSymbol+"/"+ENDPOINT_TIMETABLE, json, result -> {
-            JsonArray lessons = result.getAsJsonArray("Data");
-
-            for (JsonElement lessonEl: lessons) {
-                JsonObject lesson = lessonEl.getAsJsonObject();
-
-                if (!lesson.get("PlanUcznia").getAsBoolean()) {
-                    continue;
-                }
-
-                Date lessonDate = Date.fromY_m_d(lesson.get("DzienTekst").getAsString());
-                Pair<Time, Time> lessonRange = lessonRanges.get(lesson.get("IdPoraLekcji").getAsInt());
-                Lesson lessonObject = new Lesson(
-                        profileId,
-                        lessonDate.getWeekDay(),
-                        lessonRange.first,
-                        lessonRange.second
-                );
-
-                JsonElement subject = lesson.get("IdPrzedmiot");
-                if (!(subject instanceof JsonNull)) {
-                    lessonObject.subjectId = subject.getAsInt();
-                }
-                JsonElement teacher = lesson.get("IdPracownik");
-                if (!(teacher instanceof JsonNull)) {
-                    lessonObject.teacherId = teacher.getAsInt();
-                }
-
-                lessonObject.teamId = getClassTeamId();
-                JsonElement team = lesson.get("PodzialSkrot");
-                if (team != null && !(team instanceof JsonNull)) {
-                    String name = getClassTeamName()+" "+team.getAsString();
-                    Team teamObject = searchTeam(name, schoolName+":"+name, lessonObject.teacherId);
-                    lessonObject.teamId = teamObject.id;
-                }
-                JsonElement classroom = lesson.get("Sala");
-                if (classroom != null && !(classroom instanceof JsonNull)) {
-                    lessonObject.classroomName = classroom.getAsString();
-                }
-
-                JsonElement isCancelled = lesson.get("PrzekreslonaNazwa");
-                JsonElement oldTeacherId = lesson.get("IdPracownikOld");
-                if (isCancelled != null && isCancelled.getAsBoolean()) {
-                    LessonChange lessonChangeObject = new LessonChange(
-                            profileId,
-                            lessonDate, lessonObject.startTime, lessonObject.endTime
-                    );
-                    lessonChangeObject.type = TYPE_CANCELLED;
-                    lessonChangeObject.teacherId = lessonObject.teacherId;
-                    lessonChangeObject.subjectId = lessonObject.subjectId;
-                    lessonChangeObject.teamId = lessonObject.teamId;
-                    lessonChangeObject.classroomName = lessonObject.classroomName;
-
-                    lessonChangeList.add(lessonChangeObject);
-                    metadataList.add(new Metadata(profileId,Metadata.TYPE_LESSON_CHANGE, lessonChangeObject.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-                }
-                else if (!(oldTeacherId instanceof JsonNull)) {
-                    LessonChange lessonChangeObject = new LessonChange(
-                            profileId,
-                            lessonDate, lessonObject.startTime, lessonObject.endTime
-                    );
-                    lessonChangeObject.type = TYPE_CHANGE;
-                    lessonChangeObject.teacherId = lessonObject.teacherId;
-                    lessonChangeObject.subjectId = lessonObject.subjectId;
-                    lessonChangeObject.teamId = lessonObject.teamId;
-                    lessonChangeObject.classroomName = lessonObject.classroomName;
-                    lessonObject.teacherId = oldTeacherId.getAsInt();
-
-                    lessonChangeList.add(lessonChangeObject);
-                    metadataList.add(new Metadata(profileId, Metadata.TYPE_LESSON_CHANGE, lessonChangeObject.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-                }
-                lessonList.add(lessonObject);
-            }
-            r("finish", "Timetable");
-        });
-    }
-
-    private void getGrades() {
-        callback.onActionStarted(R.string.sync_action_syncing_grades);
-        JsonObject json = new JsonObject();
-        json.addProperty("IdUczen", studentId);
-        json.addProperty("IdOkresKlasyfikacyjny", studentSemesterId);
-        apiRequest(schoolSymbol+"/"+ENDPOINT_GRADES, json, result -> {
-            JsonArray grades = result.getAsJsonArray("Data");
-
-            for (JsonElement gradeEl: grades) {
-                JsonObject grade = gradeEl.getAsJsonObject();
-                JsonElement name = grade.get("Wpis");
-                JsonElement description = grade.get("Opis");
-                JsonElement comment = grade.get("Komentarz");
-                JsonElement value = grade.get("Wartosc");
-                JsonElement modificatorValue = grade.get("WagaModyfikatora");
-                JsonElement numerator = grade.get("Licznik");
-                JsonElement denominator = grade.get("Mianownik");
-
-                int id = grade.get("Id").getAsInt();
-                int weight = grade.get("WagaOceny").getAsInt();
-                int subjectId = grade.get("IdPrzedmiot").getAsInt();
-                int teacherId = grade.get("IdPracownikD").getAsInt();
-                int categoryId = grade.get("IdKategoria").getAsInt();
-                long addedDate = grade.get("DataModyfikacji").getAsLong() * 1000;
-
-                float finalValue = 0.0f;
-                String finalName;
-                String finalDescription = "";
-
-                if (!(numerator instanceof JsonNull) && !(denominator instanceof JsonNull)) {
-                    // calculate the grade's value and name: divide
-                    float numeratorF = numerator.getAsFloat();
-                    float denominatorF = denominator.getAsFloat();
-                    finalValue = numeratorF / denominatorF;
-                    weight = 0;
-                    finalName = intToStr(Math.round(finalValue*100))+"%";
-                    finalDescription += new DecimalFormat("#.##").format(numeratorF)+"/"+new DecimalFormat("#.##").format(denominatorF);
-                }
-                else {
-                    // "normal" grade. Get the name and value if set. Otherwise zero the weight.
-                    finalName = name.getAsString();
-                    if (!(value instanceof JsonNull)) {
-                        finalValue = value.getAsFloat();
-                        if (!(modificatorValue instanceof JsonNull)) {
-                            finalValue += modificatorValue.getAsFloat();
-                        }
-                    }
-                    else {
-                        weight = 0;
-                    }
-                }
-
-                if (!(comment instanceof JsonNull)) {
-                    if (finalName.equals("")) {
-                        finalName = comment.getAsString();
-                    }
-                    else {
-                        finalDescription += (finalDescription.equals("") ? "" : " ")+comment.getAsString();
-                    }
-                }
-                if (!(description instanceof JsonNull)) {
-                    finalDescription += (finalDescription.equals("") ? "" : " - ")+description.getAsString();
-                }
-
-                int semester = studentSemesterNumber;
-                /*Date addedDateObj = Date.fromMillis(addedDate);
-                if (app.register.dateSemester2Start != null && addedDateObj.compareTo(app.register.dateSemester2Start) > 0) {
-                    semester = 2;
-                }*/
-
-                String category = "";
-                for (GradeCategory gradeCategory: gradeCategoryList) {
-                    if (gradeCategory.categoryId == categoryId) {
-                        category = gradeCategory.text;
-                    }
-                }
-
-                int color = 0xff3D5F9C;
-                switch (finalName) {
-                    case "1-":
-                    case "1":
-                    case "1+":
-                        color = 0xffd65757;
-                        break;
-                    case "2-":
-                    case "2":
-                    case "2+":
-                        color = 0xff9071b3;
-                        break;
-                    case "3-":
-                    case "3":
-                    case "3+":
-                        color = 0xffd2ab24;
-                        break;
-                    case "4-":
-                    case "4":
-                    case "4+":
-                        color = 0xff50b6d6;
-                        break;
-                    case "5-":
-                    case "5":
-                    case "5+":
-                        color = 0xff2cbd92;
-                        break;
-                    case "6-":
-                    case "6":
-                    case "6+":
-                        color = 0xff91b43c;
-                        break;
-                }
-
-                Grade gradeObject = new Grade(
-                        profileId,
-                        id,
-                        category,
-                        color,
-                        finalDescription,
-                        finalName,
-                        finalValue,
-                        weight,
-                        semester,
-                        teacherId,
-                        subjectId
-                );
-
-                gradeList.add(gradeObject);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_GRADE, gradeObject.id, profile.getEmpty(), profile.getEmpty(), addedDate));
-            }
-            r("finish", "Grades");
-        });
-    }
-
-    private void processGradeList(JsonArray jsonGrades, List<Grade> gradeList, List<Metadata> metadataList, boolean isFinal) {
-        for (JsonElement gradeEl: jsonGrades) {
-            JsonObject grade = gradeEl.getAsJsonObject();
-
-            String name = grade.get("Wpis").getAsString();
-            float value = getGradeValue(name);
-            long subjectId = grade.get("IdPrzedmiot").getAsLong();
-
-            long id = subjectId * -100 - studentSemesterNumber;
-
-            int color = getVulcanGradeColor(name);
-
-            Grade gradeObject = new Grade(
-                    profileId,
-                    id,
-                    "",
-                    color,
-                    "",
-                    name,
-                    value,
-                    0,
-                    studentSemesterNumber,
-                    -1,
-                    subjectId
-            );
-            if (studentSemesterNumber == 1) {
-                gradeObject.type = isFinal ? TYPE_SEMESTER1_FINAL : TYPE_SEMESTER1_PROPOSED;
-            }
-            else {
-                gradeObject.type = isFinal ? TYPE_SEMESTER2_FINAL : TYPE_SEMESTER2_PROPOSED;
-            }
-            gradeList.add(gradeObject);
-            metadataList.add(new Metadata(profileId, Metadata.TYPE_GRADE, gradeObject.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-        }
-    }
-    private void getProposedGrades() {
-        callback.onActionStarted(R.string.sync_action_syncing_proposition_grades);
-        JsonObject json = new JsonObject();
-        json.addProperty("IdUczen", studentId);
-        json.addProperty("IdOkresKlasyfikacyjny", studentSemesterId);
-        apiRequest(schoolSymbol+"/"+ENDPOINT_GRADES_PROPOSITIONS, json, result -> {
-            JsonObject grades = result.getAsJsonObject("Data");
-            JsonArray gradesProposed = grades.getAsJsonArray("OcenyPrzewidywane");
-            JsonArray gradesFinal = grades.getAsJsonArray("OcenyKlasyfikacyjne");
-
-            processGradeList(gradesProposed, gradeList, metadataList, false);
-            processGradeList(gradesFinal, gradeList, metadataList, true);
-            r("finish", "ProposedGrades");
-        });
-    }
-
-    private void getEvents() {
-        callback.onActionStarted(R.string.sync_action_syncing_exams);
-        JsonObject json = new JsonObject();
-        // from today to the end of the current semester
-        // or if empty: from the beginning of the semester
-        json.addProperty("DataPoczatkowa", profile.getEmpty() ? getCurrentSemesterStartDate().getStringY_m_d() : oneMonthBack.getStringY_m_d());
-        json.addProperty("DataKoncowa", getCurrentSemesterEndDate().getStringY_m_d());
-        json.addProperty("IdOddzial", studentClassId);
-        json.addProperty("IdUczen", studentId);
-        json.addProperty("IdOkresKlasyfikacyjny", studentSemesterId);
-        apiRequest(schoolSymbol+"/"+ENDPOINT_EVENTS, json, result -> {
-            JsonArray events = result.getAsJsonArray("Data");
-
-            for (JsonElement eventEl: events) {
-                JsonObject event = eventEl.getAsJsonObject();
-
-                int id = event.get("Id").getAsInt();
-
-                int eventType = event.get("Rodzaj").getAsBoolean() ? TYPE_EXAM : TYPE_SHORT_QUIZ;
-
-                int subjectId = event.get("IdPrzedmiot").getAsInt();
-
-                Date lessonDate = Date.fromY_m_d(event.get("DataTekst").getAsString());
-                Time startTime = null;
-
-                int weekDay = lessonDate.getWeekDay();
-                for (Lesson lesson: lessonList) {
-                    if (lesson.weekDay == weekDay && lesson.subjectId == subjectId) {
-                        startTime = lesson.startTime;
-                    }
-                }
-
-                long teacherId = event.get("IdPracownik").getAsInt();
-
-                Event eventObject = new Event(
-                        profileId,
-                        id,
-                        lessonDate,
-                        startTime,
-                        event.get("Opis").getAsString(),
-                        -1,
-                        eventType,
-                        false,
-                        teacherId,
-                        subjectId,
-                        getClassTeamId()
-                );
-
-                JsonElement team = event.get("PodzialSkrot");
-                if (team != null && !(team instanceof JsonNull)) {
-                    String name = getClassTeamName()+" "+team.getAsString();
-                    Team teamObject = searchTeam(name, schoolName+":"+name, teacherId);
-                    eventObject.teamId = teamObject.id;
-                }
-
-                eventList.add(eventObject);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_EVENT, eventObject.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-            }
-            r("finish", "Events");
-        });
-    }
-
-    private void getHomework() {
-        callback.onActionStarted(R.string.sync_action_syncing_homework);
-        JsonObject json = new JsonObject();
-        json.addProperty("DataPoczatkowa", profile.getEmpty() ? getCurrentSemesterStartDate().getStringY_m_d() : oneMonthBack.getStringY_m_d());
-        json.addProperty("DataKoncowa", getCurrentSemesterEndDate().getStringY_m_d());
-        json.addProperty("IdOddzial", studentClassId);
-        json.addProperty("IdUczen", studentId);
-        json.addProperty("IdOkresKlasyfikacyjny", studentSemesterId);
-        apiRequest(schoolSymbol+"/"+ ENDPOINT_HOMEWORK, json, result -> {
-            JsonArray homeworkList = result.getAsJsonArray("Data");
-
-            for (JsonElement homeworkEl: homeworkList) {
-                JsonObject homework = homeworkEl.getAsJsonObject();
-
-                int id = homework.get("Id").getAsInt();
-
-                int subjectId = homework.get("IdPrzedmiot").getAsInt();
-
-                Date lessonDate = Date.fromY_m_d(homework.get("DataTekst").getAsString());
-                Time startTime = null;
-
-                int weekDay = lessonDate.getWeekDay();
-                for (Lesson lesson: lessonList) {
-                    if (lesson.weekDay == weekDay && lesson.subjectId == subjectId) {
-                        startTime = lesson.startTime;
-                    }
-                }
-
-                Event eventObject = new Event(
-                        profileId,
-                        id,
-                        lessonDate,
-                        startTime,
-                        homework.get("Opis").getAsString(),
-                        -1,
-                        Event.TYPE_HOMEWORK,
-                        false,
-                        homework.get("IdPracownik").getAsInt(),
-                        subjectId,
-                        getClassTeamId()
-                );
-
-                eventList.add(eventObject);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_HOMEWORK, eventObject.id, profile.getEmpty(), profile.getEmpty(), System.currentTimeMillis()));
-            }
-            r("finish", "Homework");
-        });
-    }
-
-    private void getNotices() {
-        callback.onActionStarted(R.string.sync_action_syncing_notices);
-        JsonObject json = new JsonObject();
-        json.addProperty("IdUczen", studentId);
-        json.addProperty("IdOkresKlasyfikacyjny", studentSemesterId);
-        apiRequest(schoolSymbol+"/"+ENDPOINT_NOTICES, json, result -> {
-            JsonArray notices = result.getAsJsonArray("Data");
-
-            for (JsonElement noticeEl: notices) {
-                JsonObject notice = noticeEl.getAsJsonObject();
-
-                int id = notice.get("Id").getAsInt();
-                long addedDate = Date.fromY_m_d(notice.get("DataWpisuTekst").getAsString()).getInMillis();
-
-                int semester = studentSemesterNumber;
-                /*Date addedDateObj = Date.fromMillis(addedDate);
-                if (profile.dateSemester2Start != null && addedDateObj.compareTo(profile.dateSemester2Start) > 0) {
-                    semester = 2;
-                }*/
-
-                Notice noticeObject = new Notice(
-                        profileId,
-                        id,
-                        (notice.get("IdKategoriaUwag") instanceof JsonNull ? "" : noticeCategories.get(notice.get("IdKategoriaUwag").getAsInt())) +"\n"+notice.get("TrescUwagi").getAsString(),
-                        semester,
-                        TYPE_NEUTRAL,
-                        notice.get("IdPracownik").getAsInt()
-                );
-
-                noticeList.add(noticeObject);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_NOTICE, noticeObject.id, profile.getEmpty(), profile.getEmpty(), addedDate));
-            }
-            r("finish", "Notices");
-        });
-    }
-
-    private void getAttendance() {
-        callback.onActionStarted(R.string.sync_action_syncing_attendance);
-        JsonObject json = new JsonObject();
-        json.addProperty("DataPoczatkowa", true ? getCurrentSemesterStartDate().getStringY_m_d() : oneMonthBack.getStringY_m_d());
-        json.addProperty("DataKoncowa", getCurrentSemesterEndDate().getStringY_m_d());
-        json.addProperty("IdOddzial", studentClassId);
-        json.addProperty("IdUczen", studentId);
-        json.addProperty("IdOkresKlasyfikacyjny", studentSemesterId);
-        apiRequest(schoolSymbol+"/"+ ENDPOINT_ATTENDANCE, json, result -> {
-            JsonArray attendanceList = result.getAsJsonObject("Data").getAsJsonArray("Frekwencje");
-
-            for (JsonElement attendanceEl: attendanceList) {
-                JsonObject attendance = attendanceEl.getAsJsonObject();
-
-                Pair<Integer, String> attendanceCategory = attendanceCategories.get(attendance.get("IdKategoria").getAsInt());
-                if (attendanceCategory == null)
-                    continue;
-
-                int type = attendanceCategory.first;
-
-                int id = attendance.get("Dzien").getAsInt() + attendance.get("Numer").getAsInt();
-
-                long lessonDateMillis = Date.fromY_m_d(attendance.get("DzienTekst").getAsString()).getInMillis();
-                Date lessonDate = Date.fromMillis(lessonDateMillis);
-
-                int lessonSemester = profile.dateToSemester(lessonDate);
-
-                Attendance attendanceObject = new Attendance(
-                        profileId,
-                        id,
-                        0,
-                        attendance.get("IdPrzedmiot").getAsInt(),
-                        lessonSemester,
-                        attendance.get("PrzedmiotNazwa").getAsString()+" - "+attendanceCategory.second,
-                        lessonDate,
-                        lessonRanges.get(attendance.get("IdPoraLekcji").getAsInt()).first,
-                        type);
-
-                this.attendanceList.add(attendanceObject);
-                if (attendanceObject.type != TYPE_PRESENT) {
-                    metadataList.add(new Metadata(profileId, Metadata.TYPE_ATTENDANCE, attendanceObject.id, profile.getEmpty(), profile.getEmpty(), attendanceObject.lessonDate.combineWith(attendanceObject.startTime)));
-                }
-            }
-            r("finish", "Attendance");
-        });
-    }
-
-    private void getMessagesInbox() {
-        callback.onActionStarted(R.string.sync_action_syncing_messages_inbox);
-        JsonObject json = new JsonObject();
-        json.addProperty("DataPoczatkowa", true ? getCurrentSemesterStartDate().getInUnix() : oneMonthBack.getInUnix());
-        json.addProperty("DataKoncowa", getCurrentSemesterEndDate().getInUnix());
-        json.addProperty("LoginId", studentLoginId);
-        json.addProperty("IdUczen", studentId);
-        apiRequest(schoolSymbol+"/"+ENDPOINT_MESSAGES_RECEIVED, json, result -> {
-            JsonArray messages = result.getAsJsonArray("Data");
-
-            for (JsonElement messageEl: messages) {
-                JsonObject message = messageEl.getAsJsonObject();
-
-                long id = message.get("WiadomoscId").getAsLong();
-
-                long senderId = -1;
-                int senderLoginId = message.get("NadawcaId").getAsInt();
-                String senderLoginIdStr = String.valueOf(senderLoginId);
-
-                for (Teacher teacher: teacherList) {
-                    if (senderLoginIdStr.equals(teacher.loginId)) {
-                        senderId = teacher.id;
-                    }
-                }
-
-                String subject = message.get("Tytul").getAsString();
-                String body = message.get("Tresc").getAsString();
-                body = body.replaceAll("\n", "<br>");
-
-                long addedDate = message.get("DataWyslaniaUnixEpoch").getAsLong() * 1000;
-                long readDate = 0;
-                JsonElement readDateUnix;
-                if (!((readDateUnix = message.get("DataPrzeczytaniaUnixEpoch")) instanceof JsonNull)) {
-                    readDate = readDateUnix.getAsLong() * 1000L;
-                }
-
-                Message messageObject = new Message(profileId, id, subject, body, TYPE_RECEIVED, senderId, -1);
-                MessageRecipient messageRecipientObject = new MessageRecipient(profileId, -1, -1, readDate, id);
-
-                messageList.add(messageObject);
-                messageRecipientList.add(messageRecipientObject);
-                messageMetadataList.add(new Metadata(profileId, TYPE_MESSAGE, id, readDate > 0, readDate > 0 || profile.getEmpty(), addedDate));
-            }
-            r("finish", "MessagesInbox");
-        });
-    }
-
-    private void getMessagesOutbox() {
-        if (!fullSync && onlyFeature != FEATURE_MESSAGES_OUTBOX) {
-            r("finish", "MessagesOutbox");
-            return;
-        }
-        callback.onActionStarted(R.string.sync_action_syncing_messages_outbox);
-        JsonObject json = new JsonObject();
-        json.addProperty("DataPoczatkowa", true ? getCurrentSemesterStartDate().getInUnix() : oneMonthBack.getInUnix());
-        json.addProperty("DataKoncowa", getCurrentSemesterEndDate().getInUnix());
-        json.addProperty("LoginId", studentLoginId);
-        json.addProperty("IdUczen", studentId);
-        apiRequest(schoolSymbol+"/"+ENDPOINT_MESSAGES_SENT, json, result -> {
-            JsonArray messages = result.getAsJsonArray("Data");
-
-            for (JsonElement jMessageEl: messages) {
-                JsonObject jMessage = jMessageEl.getAsJsonObject();
-
-                long messageId = jMessage.get("WiadomoscId").getAsLong();
-
-                String subject = jMessage.get("Tytul").getAsString();
-
-                String body = jMessage.get("Tresc").getAsString();
-                body = body.replaceAll("\n", "<br>");
-
-                long sentDate = jMessage.get("DataWyslaniaUnixEpoch").getAsLong() * 1000;
-
-                Message message = new Message(
-                        profileId,
-                        messageId,
-                        subject,
-                        body,
-                        TYPE_SENT,
-                        -1,
-                        -1
-                );
-
-                int readBy = jMessage.get("Przeczytane").getAsInt();
-                int unreadBy = jMessage.get("Nieprzeczytane").getAsInt();
-                for (JsonElement recipientEl: jMessage.getAsJsonArray("Adresaci")) {
-                    JsonObject recipient = recipientEl.getAsJsonObject();
-                    long recipientId = -1;
-                    int recipientLoginId = recipient.get("LoginId").getAsInt();
-                    String recipientLoginIdStr = String.valueOf(recipientLoginId);
-                    for (Teacher teacher: teacherList) {
-                        if (recipientLoginIdStr.equals(teacher.loginId)) {
-                            recipientId = teacher.id;
-                        }
-                    }
-                    MessageRecipient messageRecipient = new MessageRecipient(
-                            profileId,
-                            recipientId,
-                            -1,
-                            readBy == 0 ? 0 : unreadBy == 0 ? 1 : -1,
-                            /*messageId*/ messageId
-                    );
-                    messageRecipientIgnoreList.add(messageRecipient);
-                }
-
-                messageList.add(message);
-                metadataList.add(new Metadata(profileId, Metadata.TYPE_MESSAGE, messageId, true, true, sentDate));
-            }
-            r("finish", "MessagesOutbox");
-        });
-    }
-
-    /*    __  __
-         |  \/  |
-         | \  / | ___  ___ ___  __ _  __ _  ___  ___
-         | |\/| |/ _ \/ __/ __|/ _` |/ _` |/ _ \/ __|
-         | |  | |  __/\__ \__ \ (_| | (_| |  __/\__ \
-         |_|  |_|\___||___/___/\__,_|\__, |\___||___/
-                                      __/ |
-                                     |__*/
-    @Override
-    public void getMessage(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull MessageFull message, @NonNull MessageGetCallback messageCallback) {
-        if (message.body != null) {
-            message.recipients = app.db.messageRecipientDao().getAllByMessageId(profile.getId(), message.id);
-            for (MessageRecipientFull recipient: message.recipients) {
-                if (recipient.id == -1)
-                    recipient.fullName = profile.getStudentNameLong();
-            }
-            if (!message.seen) {
-                studentId = profile.getStudentData("studentId", -1);
-                studentLoginId = profile.getStudentData("studentLoginId", -1);
-                JsonObject json = new JsonObject();
-                json.addProperty("WiadomoscId", message.id);
-                json.addProperty("FolderWiadomosci", "Odebrane");
-                json.addProperty("Status", "Widoczna");
-                json.addProperty("LoginId", studentLoginId);
-                json.addProperty("IdUczen", studentId);
-                apiRequest(schoolSymbol+"/"+ENDPOINT_MESSAGES_CHANGE_STATUS, json, result -> { });
-                app.db.metadataDao().setSeen(profile.getId(), message, true);
-                if (message.type != TYPE_SENT) {
-                    app.db.messageRecipientDao().add(new MessageRecipient(profile.getId(), -1, -1, System.currentTimeMillis(), message.id));
-                }
-            }
-            new Handler(activityContext.getMainLooper()).post(() -> {
-                messageCallback.onSuccess(message);
-            });
-            return;
-        }
-    }
-
-    @Override
-    public void getAttachment(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull MessageFull message, long attachmentId, @NonNull AttachmentGetCallback attachmentCallback) {
-
-    }
-
-    @Override
-    public void getRecipientList(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull RecipientListGetCallback recipientListGetCallback) {
-
-    }
-
-    @Override
-    public MessagesComposeInfo getComposeInfo(@NonNull ProfileFull profile) {
-        return new MessagesComposeInfo(0, 0, -1, -1);
-    }
-
-    @Override
-    public void syncMessages(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile) {
-
-    }
-
-    @Override
-    public Map<String, Endpoint> getConfigurableEndpoints(Profile profile) {
-        return null;
-    }
-
-    @Override
-    public boolean isEndpointEnabled(Profile profile, boolean defaultActive, String name) {
-        return defaultActive;
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/AttachmentGetCallback.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/AttachmentGetCallback.java
deleted file mode 100644
index 0bd76455..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/AttachmentGetCallback.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import im.wangchao.mhttp.Request;
-
-/**
- * Callback containing a {@link Request.Builder} which has correct headers and body to download a corresponding message attachment when ran.
- * {@code onSuccess} has to be ran on the UI thread.
- */
-public interface AttachmentGetCallback {
-    void onSuccess(Request.Builder builder);
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/EdziennikInterface.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/EdziennikInterface.java
deleted file mode 100644
index 962b1bef..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/EdziennikInterface.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.util.Map;
-
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
-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.profiles.ProfileFull;
-import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher;
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.utils.models.Endpoint;
-
-public interface EdziennikInterface {
-
-    /**
-     * Sync all Edziennik data.
-     * Ran always on worker thread.
-     *
-     * @param activityContext a {@link Context}, used for resource extractions, passed back to {@link SyncCallback}
-     * @param callback ran on worker thread.
-     * @param profileId
-     * @param profile
-     * @param loginStore
-     */
-    void sync(@NonNull Context activityContext, @NonNull SyncCallback callback, int profileId, @Nullable Profile profile, @NonNull LoginStore loginStore);
-    void syncMessages(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile);
-    void syncFeature(@NonNull Context activityContext, @NonNull SyncCallback callback, @NonNull ProfileFull profile, int ... featureList);
-
-    int FEATURE_ALL = 0;
-    int FEATURE_TIMETABLE = 1;
-    int FEATURE_AGENDA = 2;
-    int FEATURE_GRADES = 3;
-    int FEATURE_HOMEWORK = 4;
-    int FEATURE_NOTICES = 5;
-    int FEATURE_ATTENDANCE = 6;
-    int FEATURE_MESSAGES_INBOX = 7;
-    int FEATURE_MESSAGES_OUTBOX = 8;
-    int FEATURE_ANNOUNCEMENTS = 9;
-
-    /**
-     * Download a single message or get its recipient list if it's already downloaded.
-     *
-     * May be executed on any thread.
-     *
-     * @param activityContext
-     * @param errorCallback used for error reporting. Ran on a background thread.
-     * @param profile
-     * @param message a message of which body and recipient list should be downloaded.
-     * @param messageCallback always executed on UI thread.
-     */
-    void getMessage(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull MessageFull message, @NonNull MessageGetCallback messageCallback);
-    void getAttachment(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull MessageFull message, long attachmentId, @NonNull AttachmentGetCallback attachmentCallback);
-    //void getMessageList(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, int type, @NonNull MessageListCallback messageCallback);
-    /**
-     * Download a list of available message recipients.
-     *
-     * Updates a database-saved {@code teacherList} with {@code loginId}s.
-     *
-     * A {@link Teacher} is considered as a recipient when its {@code loginId} is not null.
-     *
-     * May be executed on any thread.
-     *
-     * @param activityContext
-     * @param errorCallback used for error reporting. Ran on a background thread.
-     * @param profile
-     * @param recipientListGetCallback always executed on UI thread.
-     */
-    void getRecipientList(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull RecipientListGetCallback recipientListGetCallback);
-    MessagesComposeInfo getComposeInfo(@NonNull ProfileFull profile);
-
-
-    /**
-     *
-     * @param profile a {@link Profile} containing already changed endpoints
-     * @return a map of configurable {@link Endpoint}s along with their names, {@code null} when unsupported
-     */
-    Map<String, Endpoint> getConfigurableEndpoints(Profile profile);
-
-    /**
-     * Check if the specified endpoint is enabled for the current profile.
-     *
-     * @param profile a {@link Profile} containing already changed endpoints
-     * @param defaultActive if the endpoint is enabled by default.
-     * @param name the endpoint's name
-     * @return {@code true} if the endpoint is enabled, {@code false} when it's not. Return {@code defaultActive} if unsupported.
-     */
-    boolean isEndpointEnabled(Profile profile, boolean defaultActive, String name);
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/ErrorCallback.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/ErrorCallback.java
deleted file mode 100644
index cc8f2375..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/ErrorCallback.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-import pl.szczodrzynski.edziennik.data.api.AppError;
-
-public interface ErrorCallback {
-    void onError(Context activityContext, @NonNull AppError error);
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/LoginCallback.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/LoginCallback.java
deleted file mode 100644
index cae0c65e..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/LoginCallback.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-public interface LoginCallback {
-    void onSuccess();
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/MessageGetCallback.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/MessageGetCallback.java
deleted file mode 100644
index 7fd973c8..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/MessageGetCallback.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull;
-
-/**
- * Callback containing a {@link MessageFull} which already has its {@code body} and {@code recipients}.
- * {@code onSuccess} is always ran on the UI thread.
- */
-public interface MessageGetCallback {
-    void onSuccess(MessageFull message);
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/MessageListCallback.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/MessageListCallback.java
deleted file mode 100644
index 71561ffd..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/MessageListCallback.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull;
-
-public interface MessageListCallback {
-    void onSuccess(List<MessageFull> messageList);
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/ProgressCallback.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/ProgressCallback.java
deleted file mode 100644
index 32948eb9..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/ProgressCallback.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import androidx.annotation.StringRes;
-
-public interface ProgressCallback extends ErrorCallback {
-    void onProgress(int progressStep);
-    void onActionStarted(@StringRes int stringResId);
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/RecipientListGetCallback.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/RecipientListGetCallback.java
deleted file mode 100644
index fc249432..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/RecipientListGetCallback.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher;
-
-public interface RecipientListGetCallback {
-    void onSuccess(List<Teacher> teacherList);
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/SyncCallback.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/SyncCallback.java
deleted file mode 100644
index dfaf243b..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/SyncCallback.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import android.content.Context;
-
-import java.util.List;
-
-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.profiles.ProfileFull;
-
-/**
- * A callback used for error reporting, progress information.
- * All the methods are always ran on a worker thread.
- */
-public interface SyncCallback extends ProgressCallback {
-    void onLoginFirst(List<Profile> profileList, LoginStore loginStore);
-    void onSuccess(Context activityContext, ProfileFull profileFull);
-
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/ApiLoginResult.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/ApiLoginResult.kt
deleted file mode 100644
index 8dc3ac89..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/ApiLoginResult.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2
-
-import pl.szczodrzynski.edziennik.data.api.AppError
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-
-data class ApiLoginResult(val loginStore: LoginStore, val error: AppError?)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/Constants.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/Constants.kt
deleted file mode 100644
index 84efcebc..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/Constants.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2
-
-const val FEATURE_ALL = 0
-const val FEATURE_TIMETABLE = 1
-const val FEATURE_AGENDA = 2
-const val FEATURE_GRADES = 3
-const val FEATURE_HOMEWORK = 4
-const val FEATURE_NOTICES = 5
-const val FEATURE_ATTENDANCE = 6
-const val FEATURE_MESSAGES_INBOX = 7
-const val FEATURE_MESSAGES_OUTBOX = 8
-const val FEATURE_ANNOUNCEMENTS = 9
-
-const val LOGIN_TYPE_MOBIDZIENNIK = 1
-const val LOGIN_TYPE_LIBRUS = 2
-const val LOGIN_TYPE_IUCZNIOWIE = 3
-const val LOGIN_TYPE_VULCAN = 4
-const val LOGIN_TYPE_DEMO = 20
-
-const val LOGIN_MODE_LIBRUS_EMAIL = 0
-const val LOGIN_MODE_LIBRUS_SYNERGIA = 1
-const val LOGIN_MODE_LIBRUS_JST = 2
-
-const val LIBRUS_USER_AGENT = "Dalvik/2.1.0 Android LibrusMobileApp"
-const val LIBRUS_CLIENT_ID = "wmSyUMo8llDAs4y9tJVYY92oyZ6h4lAt7KCuy0Gv"
-const val LIBRUS_REDIRECT_URL = "http://localhost/bar"
-const val LIBRUS_AUTHORIZE_URL = "https://portal.librus.pl/oauth2/authorize?client_id=$LIBRUS_CLIENT_ID&redirect_uri=$LIBRUS_REDIRECT_URL&response_type=code"
-const val LIBRUS_LOGIN_URL = "https://portal.librus.pl/rodzina/login/action"
-const val LIBRUS_TOKEN_URL = "https://portal.librus.pl/oauth2/access_token"
-
-const val LIBRUS_ACCOUNT_URL = "https://portal.librus.pl/api/v2/SynergiaAccounts/fresh/" // + login
-const val LIBRUS_ACCOUNTS_URL = "https://portal.librus.pl/api/v2/SynergiaAccounts"
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/FirstLoginResult.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/FirstLoginResult.kt
deleted file mode 100644
index 099c2771..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/FirstLoginResult.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2
-
-import pl.szczodrzynski.edziennik.data.api.AppError
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-
-data class FirstLoginResult(val profileList: ArrayList<Profile>, val error: AppError?)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/Librus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/Librus.kt
deleted file mode 100644
index 106a4f07..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/Librus.kt
+++ /dev/null
@@ -1,201 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2.librus
-
-import android.content.Context
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.AppError
-import pl.szczodrzynski.edziennik.data.api.AppError.*
-import pl.szczodrzynski.edziennik.data.api.interfaces.*
-import pl.szczodrzynski.edziennik.data.api.v2.LOGIN_MODE_LIBRUS_EMAIL
-import pl.szczodrzynski.edziennik.data.api.v2.LOGIN_MODE_LIBRUS_JST
-import pl.szczodrzynski.edziennik.data.api.v2.LOGIN_MODE_LIBRUS_SYNERGIA
-import pl.szczodrzynski.edziennik.data.api.v2.librus.firstlogin.FirstLoginLibrus
-import pl.szczodrzynski.edziennik.data.api.v2.librus.firstlogin.FirstLoginSynergia
-import pl.szczodrzynski.edziennik.data.api.v2.librus.login.LoginJst
-import pl.szczodrzynski.edziennik.data.api.v2.librus.login.LoginLibrus
-import pl.szczodrzynski.edziennik.data.api.v2.librus.login.LoginSynergia
-import pl.szczodrzynski.edziennik.data.api.v2.librus.login.SynergiaTokenExtractor
-import pl.szczodrzynski.edziennik.data.api.v2.models.DataStore
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-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.profiles.ProfileFull
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo
-import pl.szczodrzynski.edziennik.utils.models.Endpoint
-import pl.szczodrzynski.edziennik.utils.Utils.d
-import java.lang.Exception
-
-class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore) : EdziennikInterface {
-    private val TAG = "librus.Librus"
-
-    lateinit var syncCallback: SyncCallback
-    lateinit var featureList: ArrayList<Int>
-    lateinit var dataStore: DataStore
-    var onLogin: (() -> Unit)? = null
-    val internalErrorList = ArrayList<Int>()
-
-    fun isError(error: AppError?): Boolean {
-        if (error == null)
-            return false
-        syncCallback.onError(null, error)
-        return true
-    }
-
-    /*    _      _ _
-         | |    (_) |
-         | |     _| |__  _ __ _   _ ___
-         | |    | | '_ \| '__| | | / __|
-         | |____| | |_) | |  | |_| \__ \
-         |______|_|_.__/|_|   \__,_|__*/
-    private fun loginLibrus() {
-        LoginLibrus(app, loginStore, syncCallback) {
-            if (profile == null) {
-                firstLoginLibrus()
-                return@LoginLibrus
-            }
-            synergiaTokenExtractor()
-        }
-    }
-    private fun firstLoginLibrus() {
-        FirstLoginLibrus(app, loginStore, syncCallback) { profileList ->
-            syncCallback.onLoginFirst(profileList, loginStore)
-        }
-    }
-    private fun synergiaTokenExtractor() {
-        if (profile == null) {
-            throw Exception("Profile may not be null")
-        }
-        SynergiaTokenExtractor(app, profile, loginStore, syncCallback) {
-            d(TAG, "Profile $profile")
-            d(TAG, "LoginStore $loginStore")
-            onLogin?.invoke()
-        }
-    }
-    /*     _____                            _
-          / ____|                          (_)
-         | (___  _   _ _ __   ___ _ __ __ _ _  __ _
-          \___ \| | | | '_ \ / _ \ '__/ _` | |/ _` |
-          ____) | |_| | | | |  __/ | | (_| | | (_| |
-         |_____/ \__, |_| |_|\___|_|  \__, |_|\__,_|
-                  __/ |                __/ |
-                 |___/                |__*/
-    private fun loginSynergia() {
-        LoginSynergia(app, loginStore, syncCallback) {
-            if (profile == null) {
-                firstLoginSynergia()
-                return@LoginSynergia
-            }
-            onLogin?.invoke()
-        }
-    }
-    private fun firstLoginSynergia() {
-        FirstLoginSynergia(app, loginStore, syncCallback) { profileList ->
-            syncCallback.onLoginFirst(profileList, loginStore)
-        }
-    }
-    /*         _  _____ _______
-              | |/ ____|__   __|
-              | | (___    | |
-          _   | |\___ \   | |
-         | |__| |____) |  | |
-          \____/|_____/   |*/
-    private fun loginJst() {
-        LoginJst(app, loginStore, syncCallback) {
-            if (profile == null) {
-                firstLoginSynergia()
-                return@LoginJst
-            }
-            onLogin?.invoke()
-        }
-    }
-
-    private fun wrapCallback(callback: SyncCallback): SyncCallback {
-        return object : SyncCallback {
-            override fun onSuccess(activityContext: Context?, profileFull: ProfileFull?) {
-                callback.onSuccess(activityContext, profileFull)
-            }
-
-            override fun onProgress(progressStep: Int) {
-                callback.onProgress(progressStep)
-            }
-
-            override fun onActionStarted(stringResId: Int) {
-                callback.onActionStarted(stringResId)
-            }
-
-            override fun onLoginFirst(profileList: MutableList<Profile>?, loginStore: LoginStore?) {
-                callback.onLoginFirst(profileList, loginStore)
-            }
-
-            override fun onError(activityContext: Context?, error: AppError) {
-                when (error.errorCode) {
-                    in internalErrorList -> {
-                        // finish immediately if the same error occurs twice during the same sync
-                        callback.onError(activityContext, error)
-                    }
-                    CODE_INTERNAL_LIBRUS_ACCOUNT_410 -> {
-                        internalErrorList.add(error.errorCode)
-                        loginStore.removeLoginData("refreshToken") // force a clean login
-                        loginLibrus()
-                    }
-                    else -> callback.onError(activityContext, error)
-                }
-            }
-        }
-    }
-
-    fun login(callback: SyncCallback) {
-        this.internalErrorList.clear()
-        this.syncCallback = wrapCallback(callback)
-        when (loginStore.mode) {
-            LOGIN_MODE_LIBRUS_EMAIL -> {
-                loginLibrus()
-            }
-            LOGIN_MODE_LIBRUS_SYNERGIA -> {
-
-            }
-            LOGIN_MODE_LIBRUS_JST -> {
-
-            }
-        }
-    }
-
-    fun getData() {
-
-    }
-
-    override fun sync(activityContext: Context, callback: SyncCallback, profileId: Int, profile: Profile?, loginStore: LoginStore) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun syncMessages(activityContext: Context, errorCallback: SyncCallback, profile: ProfileFull) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun syncFeature(activityContext: Context, callback: SyncCallback, profile: ProfileFull, vararg featureList: Int) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun getMessage(activityContext: Context, errorCallback: SyncCallback, profile: ProfileFull, message: MessageFull, messageCallback: MessageGetCallback) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun getAttachment(activityContext: Context, errorCallback: SyncCallback, profile: ProfileFull, message: MessageFull, attachmentId: Long, attachmentCallback: AttachmentGetCallback) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun getRecipientList(activityContext: Context, errorCallback: SyncCallback, profile: ProfileFull, recipientListGetCallback: RecipientListGetCallback) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun getComposeInfo(profile: ProfileFull): MessagesComposeInfo {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun getConfigurableEndpoints(profile: Profile?): MutableMap<String, Endpoint> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun isEndpointEnabled(profile: Profile?, defaultActive: Boolean, name: String?): Boolean {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/data/DataLibrus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/data/DataLibrus.kt
deleted file mode 100644
index 85f1167e..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/data/DataLibrus.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2.librus.data
-
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.interfaces.ProgressCallback
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-
-class DataLibrus(val app: App, val profile: Profile, val loginStore: LoginStore, val callback: ProgressCallback, val onSuccess: () -> Unit) {
-
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/firstlogin/FirstLoginLibrus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/firstlogin/FirstLoginLibrus.kt
deleted file mode 100644
index 0e8e02b6..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/firstlogin/FirstLoginLibrus.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2.librus.firstlogin
-
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.interfaces.ProgressCallback
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-
-class FirstLoginLibrus(val app: App, val loginStore: LoginStore, val progressCallback: ProgressCallback, val onSuccess: (profileList: List<Profile>) -> Unit) {
-    init {
-
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/firstlogin/FirstLoginSynergia.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/firstlogin/FirstLoginSynergia.kt
deleted file mode 100644
index 79587cd8..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/firstlogin/FirstLoginSynergia.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2.librus.firstlogin
-
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.interfaces.ProgressCallback
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-
-class FirstLoginSynergia(val app: App, val loginStore: LoginStore, val progressCallback: ProgressCallback, val onSuccess: (profileList: List<Profile>) -> Unit) {
-    init {
-
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/login/LoginJst.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/login/LoginJst.kt
deleted file mode 100644
index 3baac1b1..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/login/LoginJst.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2.librus.login
-
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.interfaces.ProgressCallback
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-
-class LoginJst(val app: App, val loginStore: LoginStore, val callback: ProgressCallback, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "librus.LoginJst"
-    }
-
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/login/LoginLibrus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/login/LoginLibrus.kt
deleted file mode 100644
index 26769951..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/login/LoginLibrus.kt
+++ /dev/null
@@ -1,183 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2.librus.login
-
-import android.util.Pair
-import com.google.gson.JsonObject
-import im.wangchao.mhttp.Request
-import im.wangchao.mhttp.Response
-import im.wangchao.mhttp.body.MediaTypeUtils
-import im.wangchao.mhttp.callback.JsonCallbackHandler
-import im.wangchao.mhttp.callback.TextCallbackHandler
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.data.api.AppError
-import pl.szczodrzynski.edziennik.data.api.AppError.*
-import pl.szczodrzynski.edziennik.data.api.interfaces.ProgressCallback
-import pl.szczodrzynski.edziennik.data.api.v2.*
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-import pl.szczodrzynski.edziennik.getInt
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.Utils.c
-import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
-import java.util.ArrayList
-import java.util.regex.Pattern
-
-class LoginLibrus(val app: App, val loginStore: LoginStore, val callback: ProgressCallback, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "librus.LoginLibrus"
-    }
-
-    init {
-        // ustawiamy tokeny, generujemy itp
-        // nic nie robimy z dostępem do api.librus.pl
-        // to będzie później
-        val accessToken = loginStore.getLoginData("accessToken", null)
-        val refreshToken = loginStore.getLoginData("refreshToken", null)
-        val tokenExpiryTime = loginStore.getLoginData("tokenExpiryTime", 0L)
-
-        // succeed having a non-expired access token and a refresh token
-        if (tokenExpiryTime-30 > System.currentTimeMillis() / 1000 && refreshToken != null && accessToken != null) {
-            onSuccess()
-        }
-        else if (refreshToken != null) {
-            app.cookieJar.clearForDomain("portal.librus.pl")
-            accessToken(null, refreshToken)
-        }
-        else {
-            app.cookieJar.clearForDomain("portal.librus.pl")
-            authorize(LIBRUS_AUTHORIZE_URL)
-        }
-    }
-
-    private fun authorize(url: String?) {
-        callback.onActionStarted(R.string.sync_action_authorizing)
-        Request.builder()
-                .url(url)
-                .userAgent(LIBRUS_USER_AGENT)
-                .withClient(app.httpLazy)
-                .callback(object : TextCallbackHandler() {
-                    override fun onSuccess(data: String, response: Response) {
-                        //d("headers "+response.headers().toString());
-                        val location = response.headers().get("Location")
-                        if (location != null) {
-                            val authMatcher = Pattern.compile("http://localhost/bar\\?code=([A-z0-9]+?)$", Pattern.DOTALL or Pattern.MULTILINE).matcher(location)
-                            if (authMatcher.find()) {
-                                accessToken(authMatcher.group(1), null)
-                            } else {
-                                //callback.onError(activityContext, Edziennik.CODE_OTHER, "Auth code not found: "+location);
-                                authorize(location)
-                            }
-                        } else {
-                            val csrfMatcher = Pattern.compile("name=\"csrf-token\" content=\"([A-z0-9=+/\\-_]+?)\"", Pattern.DOTALL).matcher(data)
-                            if (csrfMatcher.find()) {
-                                login(csrfMatcher.group(1))
-                            } else {
-                                callback.onError(null, AppError(TAG, 463, CODE_OTHER, "CSRF token not found.", response, data))
-                            }
-                        }
-                    }
-
-                    override fun onFailure(response: Response, throwable: Throwable) {
-                        callback.onError(null, AppError(TAG, 207, CODE_OTHER, response, throwable))
-                    }
-                })
-                .build()
-                .enqueue()
-    }
-
-    private fun login(csrfToken: String) {
-        callback.onActionStarted(R.string.sync_action_logging_in)
-        val email = loginStore.getLoginData("email", "")
-        val password = loginStore.getLoginData("password", "")
-        Request.builder()
-                .url(LIBRUS_LOGIN_URL)
-                .userAgent(LIBRUS_USER_AGENT)
-                .addParameter("email", email)
-                .addParameter("password", password)
-                .addHeader("X-CSRF-TOKEN", csrfToken)
-                .contentType(MediaTypeUtils.APPLICATION_JSON)
-                .post()
-                .callback(object : JsonCallbackHandler() {
-                    override fun onSuccess(data: JsonObject?, response: Response) {
-                        if (data == null) {
-                            if (response.parserErrorBody != null && response.parserErrorBody.contains("wciąż nieaktywne")) {
-                                callback.onError(null, AppError(TAG, 487, CODE_LIBRUS_NOT_ACTIVATED, response))
-                            }
-                            callback.onError(null, AppError(TAG, 489, CODE_MAINTENANCE, response))
-                            return
-                        }
-                        if (data.get("errors") != null) {
-                            callback.onError(null, AppError(TAG, 490, CODE_OTHER, data.get("errors").asJsonArray.get(0).asString, response, data))
-                            return
-                        }
-                        authorize(data.getString("redirect") ?: LIBRUS_AUTHORIZE_URL)
-                    }
-
-                    override fun onFailure(response: Response, throwable: Throwable) {
-                        if (response.code() == 403 || response.code() == 401) {
-                            callback.onError(null, AppError(TAG, 248, CODE_INVALID_LOGIN, response, throwable))
-                            return
-                        }
-                        callback.onError(null, AppError(TAG, 251, CODE_OTHER, response, throwable))
-                    }
-                })
-                .build()
-                .enqueue()
-    }
-
-    private var refreshTokenFailed = false
-    private fun accessToken(code: String?, refreshToken: String?) {
-        callback.onActionStarted(R.string.sync_action_getting_token)
-        val params = ArrayList<Pair<String, Any>>()
-        params.add(Pair("client_id", LIBRUS_CLIENT_ID))
-        if (code != null) {
-            params.add(Pair("grant_type", "authorization_code"))
-            params.add(Pair("code", code))
-            params.add(Pair("redirect_uri", LIBRUS_REDIRECT_URL))
-        } else if (refreshToken != null) {
-            params.add(Pair("grant_type", "refresh_token"))
-            params.add(Pair("refresh_token", refreshToken))
-        }
-        Request.builder()
-                .url(LIBRUS_TOKEN_URL)
-                .userAgent(LIBRUS_USER_AGENT)
-                .addParams(params)
-                .allowErrorCode(HTTP_UNAUTHORIZED)
-                .post()
-                .callback(object : JsonCallbackHandler() {
-                    override fun onSuccess(data: JsonObject?, response: Response) {
-                        if (data == null) {
-                            callback.onError(null, AppError(TAG, 539, CODE_MAINTENANCE, response))
-                            return
-                        }
-                        if (data.get("error") != null) {
-                            val hint = data.getString("hint")
-                            if (!refreshTokenFailed && refreshToken != null && (hint == "Token has been revoked" || hint == "Token has expired")) {
-                                c(TAG, "refreshing the token failed. Trying to log in again.")
-                                refreshTokenFailed = true
-                                authorize(LIBRUS_AUTHORIZE_URL)
-                                return
-                            }
-                            val errorText = data.getString("error") + " " + (data.getString("message") ?: "") + " " + (hint ?: "")
-                            callback.onError(null, AppError(TAG, 552, CODE_OTHER, errorText, response, data))
-                            return
-                        }
-                        try {
-                            loginStore.putLoginData("tokenType", data.getString("token_type"))
-                            loginStore.putLoginData("accessToken", data.getString("access_token"))
-                            loginStore.putLoginData("refreshToken", data.getString("refresh_token"))
-                            loginStore.putLoginData("tokenExpiryTime", System.currentTimeMillis() / 1000 + (data.getInt("expires_in") ?: 86400))
-                            onSuccess()
-                        } catch (e: NullPointerException) {
-                            callback.onError(null, AppError(TAG, 311, CODE_OTHER, response, e, data))
-                        }
-
-                    }
-
-                    override fun onFailure(response: Response, throwable: Throwable) {
-                        callback.onError(null, AppError(TAG, 317, CODE_OTHER, response, throwable))
-                    }
-                })
-                .build()
-                .enqueue()
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/login/LoginSynergia.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/login/LoginSynergia.kt
deleted file mode 100644
index ed48071f..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/login/LoginSynergia.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2.librus.login
-
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.interfaces.ProgressCallback
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-
-class LoginSynergia(val app: App, val loginStore: LoginStore, val callback: ProgressCallback, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "librus.LoginSynergia"
-    }
-
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/login/SynergiaTokenExtractor.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/login/SynergiaTokenExtractor.kt
deleted file mode 100644
index 983cd5b3..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/login/SynergiaTokenExtractor.kt
+++ /dev/null
@@ -1,110 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2.librus.login
-
-import com.google.gson.JsonNull
-import com.google.gson.JsonObject
-import im.wangchao.mhttp.Request
-import im.wangchao.mhttp.Response
-import im.wangchao.mhttp.callback.JsonCallbackHandler
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.AppError
-import pl.szczodrzynski.edziennik.data.api.AppError.*
-import pl.szczodrzynski.edziennik.data.api.v2.LIBRUS_USER_AGENT
-import pl.szczodrzynski.edziennik.data.api.interfaces.ProgressCallback
-import pl.szczodrzynski.edziennik.data.api.v2.LIBRUS_ACCOUNT_URL
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-import pl.szczodrzynski.edziennik.utils.Utils.d
-import java.net.HttpURLConnection.*
-
-class SynergiaTokenExtractor(val app: App, val profile: Profile, val loginStore: LoginStore, val callback: ProgressCallback, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "librus.SynergiaToken"
-    }
-
-    init {
-        val accountToken = profile.getStudentData("accountToken", null)
-        val accountTokenTime = profile.getStudentData("accountTokenTime", 0L)
-        if (accountToken.isNotNullNorEmpty() && currentTimeUnix() - accountTokenTime < 3 * 60 * 60) {
-            onSuccess()
-        }
-        else {
-            if (!synergiaAccount())
-                callback.onError(null, AppError(TAG, 33, CODE_INTERNAL_MISSING_DATA))
-        }
-    }
-
-    private fun synergiaAccount(): Boolean {
-        val accountLogin = profile.getStudentData("accountLogin", null) ?: return false
-        val tokenType = loginStore.getLoginData("tokenType", null) ?: return false
-        val accessToken = loginStore.getLoginData("accessToken", null) ?: return false
-        callback.onActionStarted(R.string.sync_action_getting_account)
-        d(TAG, "Requesting " + (LIBRUS_ACCOUNT_URL + accountLogin))
-        Request.builder()
-                .url(LIBRUS_ACCOUNT_URL + accountLogin)
-                .userAgent(LIBRUS_USER_AGENT)
-                .addHeader("Authorization", "$tokenType $accessToken")
-                .get()
-                .allowErrorCode(HTTP_NOT_FOUND)
-                .allowErrorCode(HTTP_FORBIDDEN)
-                .allowErrorCode(HTTP_UNAUTHORIZED)
-                .allowErrorCode(HTTP_BAD_REQUEST)
-                .allowErrorCode(HTTP_GONE)
-                .callback(object : JsonCallbackHandler() {
-                    override fun onSuccess(data: JsonObject?, response: Response) {
-                        if (data == null) {
-                            callback.onError(null, AppError(TAG, 641, CODE_MAINTENANCE, response))
-                            return
-                        }
-                        if (response.code() == 410) {
-                            val reason = data.get("reason")
-                            if (reason != null && reason !is JsonNull && reason.asString == "requires_an_action") {
-                                callback.onError(null, AppError(TAG, 1078, CODE_LIBRUS_DISCONNECTED, response, data))
-                                return
-                            }
-                            callback.onError(null, AppError(TAG, 70, CODE_INTERNAL_LIBRUS_ACCOUNT_410))
-                            return
-                        }
-                        if (data.get("message") != null) {
-                            val message = data.get("message").asString
-                            if (message == "Account not found") {
-                                callback.onError(null, AppError(TAG, 651, CODE_OTHER, app.getString(R.string.sync_error_register_student_not_associated_format, profile.studentNameLong, accountLogin), response, data))
-                                return
-                            }
-                            callback.onError(null, AppError(TAG, 654, CODE_OTHER, message + "\n\n" + accountLogin, response, data))
-                            return
-                        }
-                        if (response.code() == HTTP_OK) {
-                            try {
-                                // synergiaAccount is executed when a synergia token needs a refresh
-                                val accountId = data.getInt("id")
-                                val accountToken = data.getString("accessToken")
-                                if (accountId == null || accountToken == null) {
-                                    callback.onError(null, AppError(TAG, 1284, CODE_OTHER, data))
-                                    return
-                                }
-                                profile.putStudentData("accountId", accountId)
-                                profile.putStudentData("accountToken", accountToken)
-                                profile.putStudentData("accountTokenTime", System.currentTimeMillis() / 1000)
-                                profile.studentNameLong = data.getString("studentName")
-                                val nameParts = data.getString("studentName")?.split(" ")?.toTypedArray()
-                                profile.studentNameShort = nameParts?.get(0) + " " + nameParts?.get(1)?.get(0)
-                                onSuccess()
-                            } catch (e: NullPointerException) {
-                                e.printStackTrace()
-                                callback.onError(null, AppError(TAG, 662, CODE_OTHER, response, e, data))
-                            }
-
-                        } else {
-                            callback.onError(null, AppError(TAG, 425, CODE_OTHER, response, data))
-                        }
-                    }
-
-                    override fun onFailure(response: Response, throwable: Throwable) {
-                        callback.onError(null, AppError(TAG, 432, CODE_OTHER, response, throwable))
-                    }
-                })
-                .build()
-                .enqueue()
-        return true
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/models/DataStore.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/models/DataStore.kt
deleted file mode 100644
index ac4c64eb..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/models/DataStore.kt
+++ /dev/null
@@ -1,133 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2.models
-
-import android.util.LongSparseArray
-import androidx.core.util.forEach
-import androidx.core.util.isNotEmpty
-import pl.szczodrzynski.edziennik.data.db.AppDb
-import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement
-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.events.EventType
-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.lessons.Lesson
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange
-import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
-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.notices.Notice
-import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject
-import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
-import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-data class DataStore(private val appDb: AppDb, val profileId: Int) {
-    val teacherList: LongSparseArray<Teacher> = LongSparseArray()
-    val subjectList: LongSparseArray<Subject> = LongSparseArray()
-    val teamList = mutableListOf<Team>()
-    val lessonList = mutableListOf<Lesson>()
-    val lessonChangeList = mutableListOf<LessonChange>()
-    val gradeCategoryList = mutableListOf<GradeCategory>()
-    val gradeList = mutableListOf<Grade>()
-    val eventList = mutableListOf<Event>()
-    val eventTypeList = mutableListOf<EventType>()
-    val noticeList = mutableListOf<Notice>()
-    val attendanceList = mutableListOf<Attendance>()
-    val announcementList = mutableListOf<Announcement>()
-    val messageList = mutableListOf<Message>()
-    val messageRecipientList = mutableListOf<MessageRecipient>()
-    val messageRecipientIgnoreList = mutableListOf<MessageRecipient>()
-    val metadataList = mutableListOf<Metadata>()
-    val messageMetadataList = mutableListOf<Metadata>()
-
-    init {
-
-        clear()
-        
-        appDb.teacherDao().getAllNow(profileId).forEach { teacher ->
-            teacherList.put(teacher.id, teacher)
-        }
-        appDb.subjectDao().getAllNow(profileId).forEach { subject ->
-            subjectList.put(subject.id, subject)
-        }
-
-        /*val teacher = teachers.byNameFirstLast("Jan Kowalski") ?: Teacher(1, 1, "", "").let {
-            teachers.add(it)
-        }*/
-
-    }
-
-    fun clear() {
-        teacherList.clear()
-        subjectList.clear()
-        teamList.clear()
-        lessonList.clear()
-        lessonChangeList.clear()
-        gradeCategoryList.clear()
-        gradeList.clear()
-        eventTypeList.clear()
-        noticeList.clear()
-        attendanceList.clear()
-        announcementList.clear()
-        messageList.clear()
-        messageRecipientList.clear()
-        messageRecipientIgnoreList.clear()
-        metadataList.clear()
-        messageMetadataList.clear()
-    }
-
-    fun saveData() {
-        if (teacherList.isNotEmpty()) {
-            val tempList: ArrayList<Teacher> = ArrayList()
-            teacherList.forEach { _, teacher ->
-                tempList.add(teacher)
-            }
-            appDb.teacherDao().addAll(tempList)
-        }
-        if (subjectList.isNotEmpty()) {
-            val tempList: ArrayList<Subject> = ArrayList()
-            subjectList.forEach { _, subject ->
-                tempList.add(subject)
-            }
-            appDb.subjectDao().addAll(tempList)
-        }
-        if (teamList.isNotEmpty())
-            appDb.teamDao().addAll(teamList)
-        if (lessonList.isNotEmpty()) {
-            appDb.lessonDao().clear(profileId)
-            appDb.lessonDao().addAll(lessonList)
-        }
-        if (lessonChangeList.isNotEmpty())
-            appDb.lessonChangeDao().addAll(lessonChangeList)
-        if (gradeCategoryList.isNotEmpty())
-            appDb.gradeCategoryDao().addAll(gradeCategoryList)
-        if (gradeList.isNotEmpty()) {
-            appDb.gradeDao().clear(profileId)
-            appDb.gradeDao().addAll(gradeList)
-        }
-        if (eventList.isNotEmpty()) {
-            appDb.eventDao().removeFuture(profileId, Date.getToday())
-            appDb.eventDao().addAll(eventList)
-        }
-        if (eventTypeList.isNotEmpty())
-            appDb.eventTypeDao().addAll(eventTypeList)
-        if (noticeList.isNotEmpty()) {
-            appDb.noticeDao().clear(profileId)
-            appDb.noticeDao().addAll(noticeList)
-        }
-        if (attendanceList.isNotEmpty())
-            appDb.attendanceDao().addAll(attendanceList)
-        if (announcementList.isNotEmpty())
-            appDb.announcementDao().addAll(announcementList)
-        if (messageList.isNotEmpty())
-            appDb.messageDao().addAllIgnore(messageList)
-        if (messageRecipientList.isNotEmpty())
-            appDb.messageRecipientDao().addAll(messageRecipientList)
-        if (messageRecipientIgnoreList.isNotEmpty())
-            appDb.messageRecipientDao().addAllIgnore(messageRecipientIgnoreList)
-        if (metadataList.isNotEmpty())
-            appDb.metadataDao().addAllIgnore(metadataList)
-        if (messageMetadataList.isNotEmpty())
-            appDb.metadataDao().setSeen(messageMetadataList)
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/models/Feature.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/models/Feature.kt
deleted file mode 100644
index e9ca9fce..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/models/Feature.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2.models
-
-
-data class Feature(val featureId: Int, val loginOptions: Map<Int, List<Int>>) {
-
-    init {
-
-    }
-
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/models/Features.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/models/Features.kt
deleted file mode 100644
index 6a0e9ece..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/models/Features.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2.models
-
-import pl.szczodrzynski.edziennik.data.api.v2.*
-
-val Features = listOf(
-        Feature(FEATURE_TIMETABLE, mapOf(
-                LOGIN_TYPE_LIBRUS to listOf(
-                        LOGIN_MODE_LIBRUS_EMAIL,
-                        LOGIN_MODE_LIBRUS_SYNERGIA,
-                        LOGIN_MODE_LIBRUS_JST
-                )
-        ))
-)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.java
index 1481b8e1..046c78e8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.java
@@ -1,22 +1,31 @@
 package pl.szczodrzynski.edziennik.data.db;
 
+import android.content.Context;
+
 import androidx.annotation.NonNull;
-import androidx.sqlite.db.SupportSQLiteDatabase;
 import androidx.room.Database;
 import androidx.room.Room;
 import androidx.room.RoomDatabase;
 import androidx.room.TypeConverters;
 import androidx.room.migration.Migration;
+import androidx.sqlite.db.SupportSQLiteDatabase;
 
-import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement;
-import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementDao;
-import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance;
-import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceDao;
 import pl.szczodrzynski.edziennik.data.db.converters.ConverterDate;
+import pl.szczodrzynski.edziennik.data.db.converters.ConverterDateInt;
 import pl.szczodrzynski.edziennik.data.db.converters.ConverterJsonObject;
 import pl.szczodrzynski.edziennik.data.db.converters.ConverterListLong;
 import pl.szczodrzynski.edziennik.data.db.converters.ConverterListString;
 import pl.szczodrzynski.edziennik.data.db.converters.ConverterTime;
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement;
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementDao;
+import pl.szczodrzynski.edziennik.data.db.modules.api.EndpointTimer;
+import pl.szczodrzynski.edziennik.data.db.modules.api.EndpointTimerDao;
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance;
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceDao;
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceType;
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceTypeDao;
+import pl.szczodrzynski.edziennik.data.db.modules.classrooms.Classroom;
+import pl.szczodrzynski.edziennik.data.db.modules.classrooms.ClassroomDao;
 import pl.szczodrzynski.edziennik.data.db.modules.debuglog.DebugLog;
 import pl.szczodrzynski.edziennik.data.db.modules.debuglog.DebugLogDao;
 import pl.szczodrzynski.edziennik.data.db.modules.events.Event;
@@ -33,6 +42,8 @@ import pl.szczodrzynski.edziennik.data.db.modules.lessons.Lesson;
 import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange;
 import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChangeDao;
 import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonDao;
+import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange;
+import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRangeDao;
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStoreDao;
 import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber;
@@ -45,6 +56,10 @@ import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata;
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.MetadataDao;
 import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice;
 import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeDao;
+import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeType;
+import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeTypeDao;
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification;
+import pl.szczodrzynski.edziennik.data.db.modules.notification.NotificationDao;
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileDao;
 import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject;
@@ -52,18 +67,20 @@ import pl.szczodrzynski.edziennik.data.db.modules.subjects.SubjectDao;
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher;
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsence;
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceDao;
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceType;
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceTypeDao;
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherDao;
 import pl.szczodrzynski.edziennik.data.db.modules.teams.Team;
 import pl.szczodrzynski.edziennik.data.db.modules.teams.TeamDao;
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.TimetableDao;
 import pl.szczodrzynski.edziennik.utils.models.Date;
 
-import android.content.Context;
-
 @Database(entities = {
         Grade.class,
         //GradeCategory.class,
         Teacher.class,
         TeacherAbsence.class,
+        TeacherAbsenceType.class,
         Subject.class,
         Notice.class,
         Lesson.class,
@@ -81,19 +98,28 @@ import android.content.Context;
         Message.class,
         MessageRecipient.class,
         DebugLog.class,
-        Metadata.class}, version = 55)
+        EndpointTimer.class,
+        LessonRange.class,
+        Notification.class,
+        Classroom.class,
+        NoticeType.class,
+        AttendanceType.class,
+        pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson.class,
+        Metadata.class}, version = 64)
 @TypeConverters({
         ConverterTime.class,
         ConverterDate.class,
         ConverterJsonObject.class,
         ConverterListLong.class,
-        ConverterListString.class})
+        ConverterListString.class,
+        ConverterDateInt.class})
 public abstract class AppDb extends RoomDatabase {
 
     public abstract GradeDao gradeDao();
     //public abstract GradeCategoryDao gradeCategoryDao();
     public abstract TeacherDao teacherDao();
     public abstract TeacherAbsenceDao teacherAbsenceDao();
+    public abstract TeacherAbsenceTypeDao teacherAbsenceTypeDao();
     public abstract SubjectDao subjectDao();
     public abstract NoticeDao noticeDao();
     public abstract LessonDao lessonDao();
@@ -111,6 +137,13 @@ public abstract class AppDb extends RoomDatabase {
     public abstract MessageDao messageDao();
     public abstract MessageRecipientDao messageRecipientDao();
     public abstract DebugLogDao debugLogDao();
+    public abstract EndpointTimerDao endpointTimerDao();
+    public abstract LessonRangeDao lessonRangeDao();
+    public abstract NotificationDao notificationDao();
+    public abstract ClassroomDao classroomDao();
+    public abstract NoticeTypeDao noticeTypeDao();
+    public abstract AttendanceTypeDao attendanceTypeDao();
+    public abstract TimetableDao timetableDao();
     public abstract MetadataDao metadataDao();
 
     private static volatile AppDb INSTANCE;
@@ -561,7 +594,173 @@ public abstract class AppDb extends RoomDatabase {
     private static final Migration MIGRATION_54_55 = new Migration(54, 55) {
         @Override
         public void migrate(@NonNull SupportSQLiteDatabase database) {
-            database.execSQL("UPDATE profiles SET lastFullSync = 0");
+            // 2019-10-21 for merge compatibility between 3.1.1 and api-v2
+            // moved to Migration 55->56
+        }
+    };
+    private static final Migration MIGRATION_55_56 = new Migration(55, 56) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("CREATE TABLE IF NOT EXISTS endpointTimers (" +
+                    "profileId INTEGER NOT NULL," +
+                    "endpointId INTEGER NOT NULL," +
+                    "endpointLastSync INTEGER DEFAULT NULL," +
+                    "endpointNextSync INTEGER NOT NULL DEFAULT 1," +
+                    "endpointViewId INTEGER DEFAULT NULL," +
+                    "PRIMARY KEY(profileId, endpointId)" +
+                    ")");
+            database.execSQL("CREATE TABLE IF NOT EXISTS lessonRanges (" +
+                    "profileId INTEGER NOT NULL," +
+                    "lessonRangeNumber INTEGER NOT NULL," +
+                    "lessonRangeStart TEXT NOT NULL," +
+                    "lessonRangeEnd TEXT NOT NULL," +
+                    "PRIMARY KEY(profileId, lessonRangeNumber)" +
+                    ")");
+        }
+    };
+    private static final Migration MIGRATION_56_57 = new Migration(56, 57) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE gradeCategories ADD type INTEGER NOT NULL DEFAULT 0");
+        }
+    };
+    private static final Migration MIGRATION_57_58 = new Migration(57, 58) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE metadata RENAME TO _metadata_old;");
+            database.execSQL("DROP INDEX index_metadata_profileId_thingType_thingId;");
+            database.execSQL("UPDATE _metadata_old SET thingType = "+Metadata.TYPE_HOMEWORK+" WHERE thingType = "+Metadata.TYPE_EVENT+" AND thingId IN (SELECT eventId FROM events WHERE eventType = -1);");
+            database.execSQL("CREATE TABLE metadata (\n"+
+                    "profileId INTEGER NOT NULL,\n"+
+                    "metadataId INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n"+
+                    "thingType INTEGER NOT NULL,\n"+
+                    "thingId INTEGER NOT NULL,\n"+
+                    "seen INTEGER NOT NULL,\n"+
+                    "notified INTEGER NOT NULL,\n"+
+                    "addedDate INTEGER NOT NULL);");
+            database.execSQL("INSERT INTO metadata SELECT * FROM (SELECT * FROM _metadata_old ORDER BY addedDate DESC) GROUP BY thingId;");
+            database.execSQL("DROP TABLE _metadata_old;");
+            database.execSQL("CREATE UNIQUE INDEX index_metadata_profileId_thingType_thingId ON metadata (profileId, thingType, thingId);");
+        }
+    };
+    private static final Migration MIGRATION_58_59 = new Migration(58, 59) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("UPDATE metadata SET addedDate = addedDate*1000 WHERE addedDate < 10000000000;");
+            database.execSQL("INSERT INTO metadata (profileId, thingType, thingId, seen, notified, addedDate)\n" +
+                    "SELECT profileId,\n" +
+                    "10 AS thingType,\n" +
+                    "luckyNumberDate*10000+substr(luckyNumberDate, 6)*100+substr(luckyNumberDate, 9) AS thingId,\n" +
+                    "1 AS seen,\n" +
+                    "1 AS notified,\n" +
+                    "CAST(strftime('%s', luckyNumberDate) AS INT)*1000 AS addedDate\n" +
+                    "FROM luckyNumbers;");
+            database.execSQL("ALTER TABLE luckyNumbers RENAME TO _old_luckyNumbers;");
+            database.execSQL("CREATE TABLE luckyNumbers (\n" +
+                    "profileId INTEGER NOT NULL,\n" +
+                    "luckyNumberDate INTEGER NOT NULL, \n" +
+                    "luckyNumber INTEGER NOT NULL, \n" +
+                    "PRIMARY KEY(profileId, luckyNumberDate))");
+            database.execSQL("INSERT INTO luckyNumbers (profileId, luckyNumberDate, luckyNumber)\n" +
+                    "SELECT profileId,\n" +
+                    "luckyNumberDate*10000+substr(luckyNumberDate, 6)*100+substr(luckyNumberDate, 9) AS luckyNumberDate,\n" +
+                    "luckyNumber\n" +
+                    "FROM _old_luckyNumbers;");
+            database.execSQL("DROP TABLE _old_luckyNumbers;");
+        }
+    };
+    private static final Migration MIGRATION_59_60 = new Migration(59, 60) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("CREATE TABLE notifications (\n" +
+                    "    id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n" +
+                    "    title TEXT NOT NULL,\n" +
+                    "    `text` TEXT NOT NULL,\n" +
+                    "    `type` INTEGER NOT NULL,\n" +
+                    "    profileId INTEGER DEFAULT NULL,\n" +
+                    "    profileName TEXT DEFAULT NULL,\n" +
+                    "    posted INTEGER NOT NULL DEFAULT 0,\n" +
+                    "    viewId INTEGER DEFAULT NULL,\n" +
+                    "    extras TEXT DEFAULT NULL,\n" +
+                    "    addedDate INTEGER NOT NULL\n" +
+                    ");");
+
+            database.execSQL("ALTER TABLE profiles ADD COLUMN disabledNotifications TEXT DEFAULT NULL");
+        }
+    };
+    private static final Migration MIGRATION_60_61 = new Migration(60, 61) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("CREATE TABLE IF NOT EXISTS teacherAbsenceTypes (" +
+                    "profileId INTEGER NOT NULL," +
+                    "teacherAbsenceTypeId INTEGER NOT NULL," +
+                    "teacherAbsenceTypeName TEXT NOT NULL," +
+                    "PRIMARY KEY(profileId, teacherAbsenceTypeId))");
+            database.execSQL("ALTER TABLE teacherAbsence ADD COLUMN teacherAbsenceName TEXT DEFAULT NULL");
+        }
+    };
+    private static final Migration MIGRATION_61_62 = new Migration(61, 62) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("CREATE TABLE IF NOT EXISTS classrooms (\n" +
+                    "    profileId INTEGER NOT NULL,\n" +
+                    "    id INTEGER NOT NULL,\n" +
+                    "    name TEXT NOT NULL,\n" +
+                    "    PRIMARY KEY(profileId, id)\n" +
+                    ")");
+            database.execSQL("CREATE TABLE IF NOT EXISTS noticeTypes (\n" +
+                    "    profileId INTEGER NOT NULL,\n" +
+                    "    id INTEGER NOT NULL,\n" +
+                    "    name TEXT NOT NULL,\n" +
+                    "    PRIMARY KEY(profileId, id)\n" +
+                    ")");
+            database.execSQL("CREATE TABLE IF NOT EXISTS attendanceTypes (\n" +
+                    "    profileId INTEGER NOT NULL,\n" +
+                    "    id INTEGER NOT NULL,\n" +
+                    "    name TEXT NOT NULL,\n" +
+                    "    type INTEGER NOT NULL,\n" +
+                    "    color INTEGER NOT NULL,\n" +
+                    "    PRIMARY KEY(profileId, id)\n" +
+                    ")");
+        }
+    };
+    private static final Migration MIGRATION_62_63 = new Migration(62, 63) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE profiles ADD COLUMN accountNameLong TEXT DEFAULT NULL");
+            database.execSQL("ALTER TABLE profiles ADD COLUMN studentClassName TEXT DEFAULT NULL");
+            database.execSQL("ALTER TABLE profiles ADD COLUMN studentSchoolYear TEXT DEFAULT NULL");
+        }
+    };
+    private static final Migration MIGRATION_63_64 = new Migration(63, 64) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            //database.execSQL("ALTER TABLE lessons RENAME TO lessonsOld;");
+            database.execSQL("CREATE TABLE timetable (" +
+                "profileId INTEGER NOT NULL," +
+                "id INTEGER NOT NULL," +
+                "type INTEGER NOT NULL," +
+
+                "date TEXT DEFAULT NULL," +
+                "lessonNumber INTEGER DEFAULT NULL," +
+                "startTime TEXT DEFAULT NULL," +
+                "endTime TEXT DEFAULT NULL," +
+                "subjectId INTEGER DEFAULT NULL," +
+                "teacherId INTEGER DEFAULT NULL," +
+                "teamId INTEGER DEFAULT NULL," +
+                "classroom TEXT DEFAULT NULL," +
+
+                "oldDate TEXT DEFAULT NULL," +
+                "oldLessonNumber INTEGER DEFAULT NULL," +
+                "oldStartTime TEXT DEFAULT NULL," +
+                "oldEndTime TEXT DEFAULT NULL," +
+                "oldSubjectId INTEGER DEFAULT NULL," +
+                "oldTeacherId INTEGER DEFAULT NULL," +
+                "oldTeamId INTEGER DEFAULT NULL," +
+                "oldClassroom TEXT DEFAULT NULL," +
+                    "PRIMARY KEY(id));");
+            database.execSQL("CREATE INDEX index_lessons_profileId_type_date ON timetable (profileId, type, date);");
+            database.execSQL("CREATE INDEX index_lessons_profileId_type_oldDate ON timetable (profileId, type, oldDate);");
         }
     };
 
@@ -616,7 +815,16 @@ public abstract class AppDb extends RoomDatabase {
                                     MIGRATION_51_52,
                                     MIGRATION_52_53,
                                     MIGRATION_53_54,
-                                    MIGRATION_54_55
+                                    MIGRATION_54_55,
+                                    MIGRATION_55_56,
+                                    MIGRATION_56_57,
+                                    MIGRATION_57_58,
+                                    MIGRATION_58_59,
+                                    MIGRATION_59_60,
+                                    MIGRATION_60_61,
+                                    MIGRATION_61_62,
+                                    MIGRATION_62_63,
+                                    MIGRATION_63_64
                             )
                             .allowMainThreadQueries()
                             //.fallbackToDestructiveMigration()
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterDateInt.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterDateInt.java
new file mode 100644
index 00000000..05e72774
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterDateInt.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-17.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.converters;
+
+import androidx.room.TypeConverter;
+
+import pl.szczodrzynski.edziennik.utils.models.Date;
+
+public class ConverterDateInt {
+
+    @TypeConverter
+    public static Date toDate(int value) {
+        return Date.fromYmd(Integer.toString(value));
+    }
+
+    @TypeConverter
+    public static int toInt(Date value) {
+        return value == null ? 0 : value.getValue();
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/api/EndpointTimer.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/api/EndpointTimer.kt
new file mode 100644
index 00000000..24344462
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/api/EndpointTimer.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-3.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.api
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+
+const val SYNC_NEVER = 0L
+const val SYNC_ALWAYS = 1L
+
+@Entity(tableName = "endpointTimers",
+        primaryKeys = ["profileId", "endpointId"])
+data class EndpointTimer (
+
+        val profileId: Int,
+
+        @ColumnInfo(name = "endpointId")
+        val endpointId: Int,
+
+        @ColumnInfo(name = "endpointLastSync")
+        var lastSync: Long? = null,
+
+        @ColumnInfo(name = "endpointNextSync")
+        var nextSync: Long = SYNC_ALWAYS,
+
+        @ColumnInfo(name = "endpointViewId")
+        var viewId: Int? = null
+
+) {
+
+    /**
+     * Tell this timer that an endpoint has just been synced.
+     */
+    fun syncedNow(): EndpointTimer {
+        lastSync = System.currentTimeMillis()
+        return this
+    }
+
+    /**
+     * This will "schedule" the next sync.
+     *
+     * @param nextSyncIn value in seconds
+     */
+    fun syncIn(nextSyncIn: Long): EndpointTimer {
+        nextSync = System.currentTimeMillis() + nextSyncIn*1000
+        return this
+    }
+
+    /**
+     * Set this timer to sync only if [viewId] is the only
+     * selected feature during the current process.
+     *
+     * [viewId] may be [DRAWER_ITEM_HOME] to sync only if all features are selected.
+     */
+    fun syncWhenView(viewId: Int): EndpointTimer {
+        // set to never sync if nextSync is not already a timestamp
+        if (nextSync < 10) {
+            this.nextSync = SYNC_NEVER
+        }
+        this.viewId = viewId
+        return this
+    }
+
+    /**
+     * Set this endpoint to always sync.
+     */
+    fun syncAlways(): EndpointTimer {
+        nextSync = SYNC_ALWAYS
+        viewId = null
+        return this
+    }
+
+    /**
+     * This is a suicide as this endpoint will never be synced again.
+     */
+    fun syncNever(): EndpointTimer {
+        nextSync = SYNC_NEVER
+        viewId = null
+        return this
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/api/EndpointTimerDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/api/EndpointTimerDao.kt
new file mode 100644
index 00000000..ed79694a
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/api/EndpointTimerDao.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-3.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.api
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+@Dao
+interface EndpointTimerDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun add(endpointTimer: EndpointTimer)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun addAll(endpointTimerList: List<EndpointTimer>)
+
+    @Query("SELECT * FROM endpointTimers WHERE profileId = :profileId")
+    fun getAllNow(profileId: Int): List<EndpointTimer>
+
+    @Query("DELETE FROM endpointTimers WHERE profileId = :profileId")
+    fun clear(profileId: Int)
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceType.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceType.kt
new file mode 100644
index 00000000..701b852a
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceType.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-23. 
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.attendance
+
+import androidx.room.Entity
+
+@Entity(tableName = "attendanceTypes",
+        primaryKeys = ["profileId", "id"])
+data class AttendanceType (
+
+        val profileId: Int,
+
+        val id: Long,
+
+        val name: String,
+
+        val type: Int,
+
+        val color: Int
+
+)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceTypeDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceTypeDao.kt
new file mode 100644
index 00000000..ec9e630a
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceTypeDao.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-23. 
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.attendance
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+@Dao
+interface AttendanceTypeDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun add(attendanceType: AttendanceType)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun addAll(attendanceTypeList: List<AttendanceType>)
+
+    @Query("DELETE FROM attendanceTypes WHERE profileId = :profileId")
+    fun clear(profileId: Int)
+
+    @Query("SELECT * FROM attendanceTypes WHERE profileId = :profileId ORDER BY id ASC")
+    fun getAllNow(profileId: Int): List<AttendanceType>
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/classrooms/Classroom.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/classrooms/Classroom.kt
new file mode 100644
index 00000000..fc2fe404
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/classrooms/Classroom.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-23.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.classrooms
+
+import androidx.room.Entity
+
+@Entity(tableName = "classrooms",
+        primaryKeys = ["profileId", "id"])
+data class Classroom (
+
+        val profileId: Int,
+
+        val id: Long,
+
+        val name: String
+
+)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/classrooms/ClassroomDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/classrooms/ClassroomDao.kt
new file mode 100644
index 00000000..79659f97
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/classrooms/ClassroomDao.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-23.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.classrooms
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+@Dao
+interface ClassroomDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun add(classroom: Classroom)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun addAll(classroomList: List<Classroom>)
+
+    @Query("DELETE FROM classrooms WHERE profileId = :profileId")
+    fun clear(profileId: Int)
+
+    @Query("SELECT * FROM classrooms WHERE profileId = :profileId ORDER BY id ASC")
+    fun getAllNow(profileId: Int): List<Classroom>
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/Event.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/Event.java
index e55e2a47..549ece88 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/Event.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/Event.java
@@ -1,9 +1,11 @@
 package pl.szczodrzynski.edziennik.data.db.modules.events;
 
+import androidx.annotation.Nullable;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
 import androidx.room.Index;
+
 import pl.szczodrzynski.edziennik.utils.models.Date;
 import pl.szczodrzynski.edziennik.utils.models.Time;
 
@@ -19,6 +21,7 @@ public class Event {
     @ColumnInfo(name = "eventDate")
     public Date eventDate;
     @ColumnInfo(name = "eventStartTime")
+    @Nullable
     public Time startTime; // null for allDay
     @ColumnInfo(name = "eventTopic")
     public String topic;
@@ -68,7 +71,7 @@ public class Event {
     @Ignore
     public Event() {}
 
-    public Event(int profileId, long id, Date eventDate, Time startTime, String topic, int color, int type, boolean addedManually, long teacherId, long subjectId, long teamId)
+    public Event(int profileId, long id, Date eventDate, @Nullable Time startTime, String topic, int color, int type, boolean addedManually, long teacherId, long subjectId, long teamId)
     {
         this.profileId = profileId;
         this.id = id;
@@ -83,6 +86,23 @@ public class Event {
         this.teamId = teamId;
     }
 
+    @Override
+    public Event clone() throws CloneNotSupportedException {
+        return new Event(
+                profileId,
+                id,
+                eventDate.clone(),
+                startTime == null ? null : startTime.clone(),
+                topic,
+                color,
+                type,
+                addedManually,
+                subjectId,
+                teacherId,
+                teamId
+        );
+    }
+
     @Override
     public String toString() {
         return "Event{" +
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventDao.java
index 2d1e7d37..ae55ec3c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventDao.java
@@ -1,16 +1,17 @@
 package pl.szczodrzynski.edziennik.data.db.modules.events;
 
+import android.util.Log;
+
+import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
-import androidx.sqlite.db.SimpleSQLiteQuery;
-import androidx.sqlite.db.SupportSQLiteQuery;
 import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 import androidx.room.RawQuery;
 import androidx.room.Transaction;
-import androidx.annotation.NonNull;
-import android.util.Log;
+import androidx.sqlite.db.SimpleSQLiteQuery;
+import androidx.sqlite.db.SupportSQLiteQuery;
 
 import java.util.List;
 
@@ -130,6 +131,12 @@ public abstract class EventDao {
     @Query("DELETE FROM events WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate")
     public abstract void removeFuture(int profileId, Date todayDate);
 
+    @Query("DELETE FROM events WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate AND eventType = :type")
+    public abstract void removeFutureWithType(int profileId, Date todayDate, int type);
+
+    @Query("DELETE FROM events WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate AND eventType != :exceptType")
+    public abstract void removeFutureExceptType(int profileId, Date todayDate, int exceptType);
+
     @Query("UPDATE metadata SET seen = :seen WHERE profileId = :profileId AND (thingType = "+TYPE_EVENT+" OR thingType = "+TYPE_LESSON_CHANGE+" OR thingType = "+TYPE_HOMEWORK+") AND thingId IN (SELECT eventId FROM events WHERE profileId = :profileId AND eventDate = :date)")
     public abstract void setSeenByDate(int profileId, Date date, boolean seen);
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventType.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventType.java
index e06f7656..30c4794a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventType.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventType.java
@@ -11,14 +11,14 @@ public class EventType {
     public int profileId;
 
     @ColumnInfo(name = "eventType")
-    public int id;
+    public long id;
 
     @ColumnInfo(name = "eventTypeName")
     public String name;
     @ColumnInfo(name = "eventTypeColor")
     public int color;
 
-    public EventType(int profileId, int id, String name, int color) {
+    public EventType(int profileId, long id, String name, int color) {
         this.profileId = profileId;
         this.id = id;
         this.name = name;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeCategory.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeCategory.java
index dfe76dfd..442a384a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeCategory.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeCategory.java
@@ -1,10 +1,10 @@
 package pl.szczodrzynski.edziennik.data.db.modules.grades;
 
+import androidx.room.Entity;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.room.Entity;
-
 @Entity(tableName = "gradeCategories",
         primaryKeys = {"profileId", "categoryId"})
 public class GradeCategory {
@@ -18,6 +18,16 @@ public class GradeCategory {
     public float valueFrom = 0;
     public float valueTo = 0;
 
+    /**
+     * A general purpose category type.
+     *
+     * The Grade category is used only in API to cache the e-register's categories.
+     */
+    public int type = 0;
+
+    public static final int TYPE_NORMAL = 0;
+    public static final int TYPE_COMMENT = 1;
+
     public GradeCategory(int profileId, long categoryId, float weight, int color, String text) {
         this.profileId = profileId;
         this.categoryId = categoryId;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeDao.java
index 4487317b..5765d235 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeDao.java
@@ -9,6 +9,8 @@ import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 import androidx.room.RawQuery;
 import androidx.room.Transaction;
+
+import android.util.LongSparseArray;
 import android.util.SparseArray;
 import android.util.SparseIntArray;
 
@@ -88,15 +90,15 @@ public abstract class GradeDao {
     }
 
     @Query("UPDATE grades SET gradeClassAverage = :classAverage, gradeColor = :color WHERE profileId = :profileId AND gradeId = :gradeId")
-    public abstract void updateDetailsById(int profileId, int gradeId, float classAverage, int color);
+    public abstract void updateDetailsById(int profileId, long gradeId, float classAverage, int color);
 
     @Query("UPDATE metadata SET addedDate = :addedDate WHERE profileId = :profileId AND thingType = "+TYPE_GRADE+" AND thingId = :gradeId")
-    public abstract void updateAddedDateById(int profileId, int gradeId, long addedDate);
+    public abstract void updateAddedDateById(int profileId, long gradeId, long addedDate);
 
     @Transaction
-    public void updateDetails(int profileId, SparseArray<Float> gradeAverages, SparseArray<Long> gradeAddedDates, SparseIntArray gradeColors) {
+    public void updateDetails(int profileId, LongSparseArray<Float> gradeAverages, LongSparseArray<Long> gradeAddedDates, LongSparseArray<Integer> gradeColors) {
         for (int i = 0; i < gradeAverages.size(); i++) {
-            int gradeId = gradeAverages.keyAt(i);
+            long gradeId = gradeAverages.keyAt(i);
             float classAverage = gradeAverages.valueAt(i);
             long addedDate = gradeAddedDates.valueAt(i);
             int color = gradeColors.valueAt(i);
@@ -114,7 +116,7 @@ public abstract class GradeDao {
     @Query("SELECT addedDate FROM metadata WHERE profileId = :profileId AND thingType = "+TYPE_GRADE+" ORDER BY thingId")
     public abstract List<Long> getAddedDates(int profileId);
     @Transaction
-    public void getDetails(int profileId, SparseArray<Long> gradeAddedDates, SparseArray<Float> gradeAverages, SparseIntArray gradeColors) {
+    public void getDetails(int profileId, LongSparseArray<Long> gradeAddedDates, LongSparseArray<Float> gradeAverages, LongSparseArray<Integer> gradeColors) {
         List<Integer> ids = getIds(profileId);
         List<Float> classAverages = getClassAverages(profileId);
         List<Integer> colors = getColors(profileId);
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonRange.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonRange.kt
new file mode 100644
index 00000000..61c8c814
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonRange.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-4.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.lessons
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+@Entity(tableName = "lessonRanges",
+        primaryKeys = ["profileId", "lessonRangeNumber"])
+class LessonRange (
+
+        val profileId: Int,
+
+        @ColumnInfo(name = "lessonRangeNumber")
+        val lessonNumber: Int,
+
+        @ColumnInfo(name = "lessonRangeStart")
+        val startTime: Time,
+
+        @ColumnInfo(name = "lessonRangeEnd")
+        val endTime: Time
+)
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonRangeDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonRangeDao.kt
new file mode 100644
index 00000000..38bb27db
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonRangeDao.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-5.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.lessons
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+@Dao
+interface LessonRangeDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun add(lessonRange: LessonRange)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun addAll(lessonRangeList: List<LessonRange>)
+
+    @Query("SELECT * FROM lessonRanges WHERE profileId = :profileId")
+    fun getAllNow(profileId: Int): List<LessonRange>
+
+    @Query("DELETE FROM lessonRanges WHERE profileId = :profileId")
+    fun clear(profileId: Int)
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/login/LoginStore.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/login/LoginStore.java
index 5545c5f5..567f84db 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/login/LoginStore.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/login/LoginStore.java
@@ -8,6 +8,7 @@ import androidx.room.Entity;
 import androidx.room.Ignore;
 
 import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
 
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
@@ -63,12 +64,17 @@ public class LoginStore {
             }
         }
     }
+    public boolean hasLoginData(String key) {
+        if (data == null)
+            return false;
+        return data.has(key);
+    }
     @Nullable
     public String getLoginData(String key, @Nullable String defaultValue) {
         if (data == null)
             return defaultValue;
         JsonElement element = data.get(key);
-        if (element != null) {
+        if (element != null && !(element instanceof JsonNull)) {
             return element.getAsString();
         }
         return defaultValue;
@@ -78,7 +84,7 @@ public class LoginStore {
         if (data == null)
             return defaultValue;
         JsonElement element = data.get(key);
-        if (element != null) {
+        if (element != null && !(element instanceof JsonNull)) {
             return element.getAsInt();
         }
         return defaultValue;
@@ -88,7 +94,7 @@ public class LoginStore {
         if (data == null)
             return defaultValue;
         JsonElement element = data.get(key);
-        if (element != null) {
+        if (element != null && !(element instanceof JsonNull)) {
             return element.getAsLong();
         }
         return defaultValue;
@@ -98,7 +104,7 @@ public class LoginStore {
         if (data == null)
             return defaultValue;
         JsonElement element = data.get(key);
-        if (element != null) {
+        if (element != null && !(element instanceof JsonNull)) {
             return element.getAsFloat();
         }
         return defaultValue;
@@ -107,7 +113,7 @@ public class LoginStore {
         if (data == null)
             return defaultValue;
         JsonElement element = data.get(key);
-        if (element != null) {
+        if (element != null && !(element instanceof JsonNull)) {
             return element.getAsBoolean();
         }
         return defaultValue;
@@ -157,7 +163,7 @@ public class LoginStore {
             case LOGIN_TYPE_LIBRUS:
                 return "LOGIN_TYPE_LIBRUS";
             case LOGIN_TYPE_IUCZNIOWIE:
-                return "LOGIN_TYPE_IUCZNIOWIE";
+                return "LOGIN_TYPE_IDZIENNIK";
             case LOGIN_TYPE_VULCAN:
                 return "LOGIN_TYPE_VULCAN";
             case LOGIN_TYPE_DEMO:
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumber.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumber.java
index c2ccd4bb..cad09b62 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumber.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumber.java
@@ -1,8 +1,9 @@
 package pl.szczodrzynski.edziennik.data.db.modules.luckynumber;
 
+import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
-import androidx.annotation.NonNull;
+import androidx.room.Ignore;
 
 import pl.szczodrzynski.edziennik.utils.models.Date;
 
@@ -12,7 +13,7 @@ public class LuckyNumber {
     public int profileId;
 
     @NonNull
-    @ColumnInfo(name = "luckyNumberDate")
+    @ColumnInfo(name = "luckyNumberDate", typeAffinity = 3)
     public Date date;
     @ColumnInfo(name = "luckyNumber")
     public int number;
@@ -23,4 +24,8 @@ public class LuckyNumber {
         this.number = number;
     }
 
+    @Ignore
+    public LuckyNumber() {
+        this.date = Date.getToday();
+    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumberDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumberDao.java
index a775bedf..4b8f54cd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumberDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumberDao.java
@@ -1,32 +1,75 @@
 package pl.szczodrzynski.edziennik.data.db.modules.luckynumber;
 
+import androidx.annotation.Nullable;
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
+import androidx.room.RawQuery;
+import androidx.sqlite.db.SimpleSQLiteQuery;
+import androidx.sqlite.db.SupportSQLiteQuery;
 
 import java.util.List;
 
+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;
 
+import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_LUCKY_NUMBER;
+
 @Dao
-public interface LuckyNumberDao {
+public abstract class LuckyNumberDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    void add(LuckyNumber luckyNumber);
+    public abstract void add(LuckyNumber luckyNumber);
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    public abstract void addAll(List<LuckyNumber> luckyNumberList);
 
     @Query("DELETE FROM luckyNumbers WHERE profileId = :profileId")
-    void clear(int profileId);
+    public abstract void clear(int profileId);
 
     @Query("SELECT * FROM luckyNumbers WHERE profileId = :profileId AND luckyNumberDate = :date")
-    LiveData<LuckyNumber> getByDate(int profileId, Date date);
+    public abstract LiveData<LuckyNumber> getByDate(int profileId, Date date);
 
     @Query("SELECT * FROM luckyNumbers WHERE profileId = :profileId AND luckyNumberDate = :date")
-    LuckyNumber getByDateNow(int profileId, Date date);
+    public abstract LuckyNumber getByDateNow(int profileId, Date date);
 
-    @Query("SELECT * FROM luckyNumbers WHERE profileId = :profileId ORDER BY luckyNumberDate DESC")
-    LiveData<List<LuckyNumber>> getAll(int profileId);
+    @Nullable
+    @Query("SELECT * FROM luckyNumbers WHERE profileId = :profileId AND luckyNumberDate >= :date ORDER BY luckyNumberDate DESC LIMIT 1")
+    public abstract LuckyNumber getNearestFutureNow(int profileId, int date);
 
-    @Query("SELECT * FROM luckyNumbers WHERE profileId = :profileId ORDER BY luckyNumberDate DESC")
-    List<LuckyNumber> getAllNow(int profileId);
+    @Query("SELECT * FROM luckyNumbers WHERE profileId = :profileId AND luckyNumberDate >= :date ORDER BY luckyNumberDate DESC LIMIT 1")
+    public abstract LiveData<LuckyNumber> getNearestFuture(int profileId, int date);
+
+    @RawQuery(observedEntities = {LuckyNumber.class})
+    abstract LiveData<List<LuckyNumberFull>> getAll(SupportSQLiteQuery query);
+    public LiveData<List<LuckyNumberFull>> getAll(int profileId, String filter) {
+        return getAll(new SimpleSQLiteQuery("SELECT\n" +
+                "*\n" +
+                "FROM luckyNumbers\n" +
+                "LEFT JOIN metadata ON luckyNumberDate = thingId AND thingType = "+TYPE_LUCKY_NUMBER+" AND metadata.profileId = "+profileId+"\n" +
+                "WHERE luckyNumbers.profileId = "+profileId+" AND "+filter+"\n" +
+                "ORDER BY addedDate DESC"));
+    }
+    public LiveData<List<LuckyNumberFull>> getAll(int profileId) {
+        return getAll(profileId, "1");
+    }
+    public LiveData<List<LuckyNumberFull>> getAllWhere(int profileId, String filter) {
+        return getAll(profileId, filter);
+    }
+
+    @RawQuery(observedEntities = {Notice.class, Metadata.class})
+    abstract List<LuckyNumberFull> getAllNow(SupportSQLiteQuery query);
+    public List<LuckyNumberFull> getAllNow(int profileId, String filter) {
+        return getAllNow(new SimpleSQLiteQuery("SELECT\n" +
+                "*\n" +
+                "FROM luckyNumbers\n" +
+                "LEFT JOIN metadata ON luckyNumberDate = thingId AND thingType = "+TYPE_LUCKY_NUMBER+" AND metadata.profileId = "+profileId+"\n" +
+                "WHERE luckyNumbers.profileId = "+profileId+" AND "+filter+"\n" +
+                "ORDER BY addedDate DESC"));
+    }
+    public List<LuckyNumberFull> getNotNotifiedNow(int profileId) {
+        return getAllNow(profileId, "notified = 0");
+    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumberFull.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumberFull.java
new file mode 100644
index 00000000..f08b7d0d
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumberFull.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-18.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.luckynumber;
+
+public class LuckyNumberFull extends LuckyNumber {
+    // metadata
+    public boolean seen;
+    public boolean notified;
+    public long addedDate;
+}
+
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/Message.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/Message.java
index 02fdaa24..20b985b1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/Message.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/Message.java
@@ -1,19 +1,19 @@
 package pl.szczodrzynski.edziennik.data.db.modules.messages;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import androidx.annotation.Nullable;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
 import androidx.room.Index;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Entity(tableName = "messages",
         primaryKeys = {"profileId", "messageId"},
         indices = {@Index(value = {"profileId"})})
 public class Message {
-    int profileId;
+    public int profileId;
 
     @ColumnInfo(name = "messageId")
     public long id;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageDao.java
index 8f5048b4..e9110283 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageDao.java
@@ -1,7 +1,6 @@
 package pl.szczodrzynski.edziennik.data.db.modules.messages;
 
-import java.util.List;
-
+import androidx.annotation.Nullable;
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
 import androidx.room.Insert;
@@ -11,6 +10,8 @@ import androidx.room.RawQuery;
 import androidx.sqlite.db.SimpleSQLiteQuery;
 import androidx.sqlite.db.SupportSQLiteQuery;
 
+import java.util.List;
+
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata;
 
 import static pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_DELETED;
@@ -23,6 +24,9 @@ public abstract class MessageDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     public abstract long add(Message message);
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    public abstract void addAll(List<Message> messageList);
+
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     public abstract void addAllIgnore(List<Message> messageList);
 
@@ -56,6 +60,7 @@ public abstract class MessageDao {
                 "ORDER BY addedDate DESC"));
     }
 
+    @Nullable
     public MessageFull getById(int profileId, long messageId) {
         return getOneNow(new SimpleSQLiteQuery("SELECT \n" +
                 "*, \n" +
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageFull.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageFull.java
index 30df0a81..78eb7c70 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageFull.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageFull.java
@@ -1,13 +1,15 @@
 package pl.szczodrzynski.edziennik.data.db.modules.messages;
 
+import androidx.annotation.Nullable;
+import androidx.room.Ignore;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.room.Ignore;
-
 public class MessageFull extends Message {
     public String senderFullName = null;
     @Ignore
+    @Nullable
     public List<MessageRecipientFull> recipients = null;
 
     public MessageFull addRecipient(MessageRecipientFull recipient) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/metadata/Metadata.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/metadata/Metadata.java
index a621fe26..78dac639 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/metadata/Metadata.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/metadata/Metadata.java
@@ -19,6 +19,7 @@ public class Metadata {
     public static final int TYPE_ANNOUNCEMENT = 7;
     public static final int TYPE_MESSAGE = 8;
     public static final int TYPE_TEACHER_ABSENCE = 9;
+    public static final int TYPE_LUCKY_NUMBER = 10;
 
     public int profileId;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeType.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeType.kt
new file mode 100644
index 00000000..a9112fbb
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeType.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-23. 
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.notices
+
+import androidx.room.Entity
+
+@Entity(tableName = "noticeTypes",
+        primaryKeys = ["profileId", "id"])
+data class NoticeType (
+
+        val profileId: Int,
+
+        val id: Long,
+
+        val name: String
+
+)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeTypeDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeTypeDao.kt
new file mode 100644
index 00000000..5415c442
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeTypeDao.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-23.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.notices
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+@Dao
+interface NoticeTypeDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun add(noticeType: NoticeType)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun addAll(noticeTypeList: List<NoticeType>)
+
+    @Query("DELETE FROM noticeTypes WHERE profileId = :profileId")
+    fun clear(profileId: Int)
+
+    @Query("SELECT * FROM noticeTypes WHERE profileId = :profileId ORDER BY id ASC")
+    fun getAllNow(profileId: Int): List<NoticeType>
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notification/Notification.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notification/Notification.kt
new file mode 100644
index 00000000..39f3d37f
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notification/Notification.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-18.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.notification
+
+import android.content.Context
+import android.content.Intent
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_AUTO_ARCHIVING
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_ERROR
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_FEEDBACK_MESSAGE
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_GENERAL
+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_NEW_SHARED_EVENT
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_SERVER_MESSAGE
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_TIMETABLE_CHANGED
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_TIMETABLE_LESSON_CHANGE
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_UPDATE
+
+@Entity(tableName = "notifications")
+data class Notification(
+        @PrimaryKey(autoGenerate = true)
+        val id: Int = 0,
+
+        val title: String,
+        val text: String,
+
+        val type: Int,
+
+        val profileId: Int?,
+        val profileName: String?,
+
+        var posted: Boolean = false,
+
+        var viewId: Int? = null,
+        var extras: JsonObject? = null,
+
+        val addedDate: Long = System.currentTimeMillis()
+) {
+    companion object {
+        const val TYPE_GENERAL = 0
+        const val TYPE_UPDATE = 1
+        const val TYPE_ERROR = 2
+        const val TYPE_TIMETABLE_CHANGED = 3
+        const val TYPE_TIMETABLE_LESSON_CHANGE = 4
+        const val TYPE_NEW_GRADE = 5
+        const val TYPE_NEW_EVENT = 6
+        const val TYPE_NEW_HOMEWORK = 10
+        const val TYPE_NEW_SHARED_EVENT = 7
+        const val TYPE_NEW_SHARED_HOMEWORK = 12
+        const val TYPE_NEW_MESSAGE = 8
+        const val TYPE_NEW_NOTICE = 9
+        const val TYPE_NEW_ATTENDANCE = 13
+        const val TYPE_SERVER_MESSAGE = 11
+        const val TYPE_LUCKY_NUMBER = 14
+        const val TYPE_NEW_ANNOUNCEMENT = 15
+        const val TYPE_FEEDBACK_MESSAGE = 16
+        const val TYPE_AUTO_ARCHIVING = 17
+    }
+
+    fun addExtra(key: String, value: Long?): Notification {
+        extras = extras ?: JsonObject()
+        extras?.addProperty(key, value)
+        return this
+    }
+    fun addExtra(key: String, value: String?): Notification {
+        extras = extras ?: JsonObject()
+        extras?.addProperty(key, value)
+        return this
+    }
+
+    fun fillIntent(intent: Intent) {
+        if (profileId != -1)
+            intent.putExtra("profileId", profileId)
+        if (viewId != -1)
+            intent.putExtra("fragmentId", viewId)
+        try {
+            extras?.entrySet()?.forEach { (key, value) ->
+                if (!value.isJsonPrimitive)
+                    return@forEach
+                val primitive = value.asJsonPrimitive
+                if (primitive.isNumber) {
+                    intent.putExtra(key, primitive.asLong)
+                } else if (primitive.isString) {
+                    intent.putExtra(key, primitive.asString)
+                }
+            }
+        } catch (e: NullPointerException) {
+            e.printStackTrace()
+        }
+    }
+}
+
+fun Context.getNotificationTitle(type: Int): String {
+    return getString(when (type) {
+        TYPE_UPDATE -> R.string.notification_type_update
+        TYPE_ERROR -> R.string.notification_type_error
+        TYPE_TIMETABLE_CHANGED -> R.string.notification_type_timetable_change
+        TYPE_TIMETABLE_LESSON_CHANGE -> R.string.notification_type_timetable_lesson_change
+        TYPE_NEW_GRADE -> R.string.notification_type_new_grade
+        TYPE_NEW_EVENT -> R.string.notification_type_new_event
+        TYPE_NEW_HOMEWORK -> R.string.notification_type_new_homework
+        TYPE_NEW_SHARED_EVENT -> R.string.notification_type_new_shared_event
+        TYPE_NEW_MESSAGE -> R.string.notification_type_new_message
+        TYPE_NEW_NOTICE -> R.string.notification_type_notice
+        TYPE_NEW_ATTENDANCE -> R.string.notification_type_attendance
+        TYPE_SERVER_MESSAGE -> R.string.notification_type_server_message
+        TYPE_LUCKY_NUMBER -> R.string.notification_type_lucky_number
+        TYPE_FEEDBACK_MESSAGE -> R.string.notification_type_feedback_message
+        TYPE_NEW_ANNOUNCEMENT -> R.string.notification_type_new_announcement
+        TYPE_AUTO_ARCHIVING -> R.string.notification_type_auto_archiving
+        TYPE_GENERAL -> R.string.notification_type_general
+        else -> R.string.notification_type_general
+    })
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notification/NotificationDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notification/NotificationDao.kt
new file mode 100644
index 00000000..ee666240
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notification/NotificationDao.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-18.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.notification
+
+import androidx.lifecycle.LiveData
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+@Dao
+interface NotificationDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun add(notification: Notification)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun addAll(notificationList: List<Notification>)
+
+    @Query("DELETE FROM notifications WHERE profileId = :profileId")
+    fun clear(profileId: Int)
+
+    @Query("DELETE FROM notifications")
+    fun clearAll()
+
+    @Query("SELECT * FROM notifications ORDER BY addedDate DESC")
+    fun getAll(): LiveData<List<Notification>>
+
+    @Query("SELECT * FROM notifications")
+    fun getAllNow(): List<Notification>
+
+    @Query("SELECT * FROM notifications WHERE posted = 0 ORDER BY addedDate DESC")
+    fun getNotPostedNow(): List<Notification>
+
+    @Query("UPDATE notifications SET posted = 1 WHERE posted = 0")
+    fun setAllPosted()
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/Profile.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/Profile.kt
index d53118c6..fabfef68 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/Profile.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/Profile.kt
@@ -1,7 +1,5 @@
 package pl.szczodrzynski.edziennik.data.db.modules.profiles
 
-import androidx.room.ColumnInfo
-import androidx.room.Entity
 import android.content.Context
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
@@ -9,13 +7,12 @@ import android.graphics.drawable.Drawable
 import android.net.ConnectivityManager
 import android.widget.ImageView
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
-
-import com.google.gson.JsonObject
-
+import androidx.room.ColumnInfo
+import androidx.room.Entity
 import androidx.room.Ignore
+import com.google.gson.JsonObject
 import pl.droidsonroids.gif.GifDrawable
 import pl.szczodrzynski.edziennik.colorFromName
-
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.navlib.ImageHolder
 import pl.szczodrzynski.navlib.R
@@ -42,11 +39,28 @@ open class Profile : IDrawerProfile {
     var empty = true
     var archived = false
 
+    /**
+     * The name of the student.
+     * This doesn't change, no matter if it's a parent or student account.
+     */
     var studentNameLong: String? = null
     var studentNameShort: String? = null
+    /**
+     * The student's number in the class register.
+     */
     var studentNumber = -1
     var studentData: JsonObject? = null
 
+    /**
+     * A full name of the account owner.
+     * If null, then it's a student account.
+     * If not null, then it's a parent account with this name.
+     */
+    var accountNameLong: String? = null
+
+    var studentClassName: String? = null
+    var studentSchoolYear: String? = null
+
     var registration = REGISTRATION_UNSPECIFIED
 
     var gradeColorMode = COLOR_MODE_WEIGHTED
@@ -56,7 +70,7 @@ open class Profile : IDrawerProfile {
 
     var currentSemester = 1
 
-    var attendancePercentage: Float = 0.toFloat()
+    var attendancePercentage: Float = 0.0f
 
     var dateSemester1Start: Date? = null
     var dateSemester2Start: Date? = null
@@ -72,6 +86,8 @@ open class Profile : IDrawerProfile {
 
     var changedEndpoints: List<String>? = null
 
+    var disabledNotifications: List<Long>? = null
+
     var lastFullSync: Long = 0
     var lastReceiversSync: Long = 0
 
@@ -187,6 +203,12 @@ open class Profile : IDrawerProfile {
         getImageHolder(imageView.context).applyTo(imageView)
     }
 
+    fun hasStudentData(key: String): Boolean {
+        if (studentData == null)
+            return false
+        return studentData?.has(key) ?: false
+    }
+
     fun getStudentData(key: String, defaultValue: String?): String? {
         if (studentData == null)
             return defaultValue
@@ -224,7 +246,7 @@ open class Profile : IDrawerProfile {
         return element?.asBoolean ?: defaultValue
     }
 
-    fun putStudentData(key: String, value: String) {
+    fun putStudentData(key: String, value: String?) {
         if (studentData == null)
             studentData = JsonObject()
         studentData!!.addProperty(key, value)
@@ -273,7 +295,6 @@ open class Profile : IDrawerProfile {
                 ", syncEnabled=" + syncEnabled +
                 ", syncNotifications=" + syncNotifications +
                 ", enableSharedEvents=" + enableSharedEvents +
-                ", loggedIn=" + loggedIn +
                 ", empty=" + empty +
                 ", studentNameLong='" + studentNameLong + '\''.toString() +
                 ", studentNameShort='" + studentNameShort + '\''.toString() +
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/ProfileDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/ProfileDao.java
index 2cb9fe68..c2d2b840 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/ProfileDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/ProfileDao.java
@@ -25,7 +25,10 @@ public interface ProfileDao {
     LiveData<ProfileFull> getById(int profileId);
 
     @Query("SELECT profiles.*, loginStores.loginStoreType, loginStores.loginStoreData FROM profiles LEFT JOIN loginStores ON profiles.loginStoreId = loginStores.loginStoreId WHERE profileId = :profileId")
-    ProfileFull getByIdNow(int profileId);
+    ProfileFull getFullByIdNow(int profileId);
+
+    @Query("SELECT*  FROM profiles WHERE profileId = :profileId")
+    Profile getByIdNow(int profileId);
 
     @Query("SELECT * FROM profiles WHERE profileId >= 0 ORDER BY profileId")
     LiveData<List<Profile>> getAll();
@@ -45,6 +48,9 @@ public interface ProfileDao {
     @Query("SELECT * FROM profiles WHERE syncEnabled = 1 AND archived = 0 AND profileId >= 0 ORDER BY profileId")
     List<Profile> getProfilesForSyncNow();
 
+    @Query("SELECT profileId FROM profiles WHERE syncEnabled = 1 AND archived = 0 AND profileId >= 0 ORDER BY profileId")
+    List<Integer> getIdsForSyncNow();
+
     @Query("SELECT profileId FROM profiles WHERE profileId >= 0 ORDER BY profileId")
     List<Integer> getIdsNow();
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/ProfileFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/ProfileFull.kt
index ae41a733..a88d5e66 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/ProfileFull.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/ProfileFull.kt
@@ -6,10 +6,10 @@ import com.google.gson.JsonObject
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ANNOUNCEMENTS
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ATTENDANCE
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_BEHAVIOUR
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_GRADES
 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_BEHAVIOUR
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_TIMETABLE
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.*
@@ -74,6 +74,7 @@ class ProfileFull : Profile {
                     fragmentIds.add(DRAWER_ITEM_AGENDA)
                     fragmentIds.add(DRAWER_ITEM_GRADES)
                     fragmentIds.add(DRAWER_ITEM_MESSAGES)
+                    fragmentIds.add(DRAWER_ITEM_HOMEWORK)
                     fragmentIds.add(DRAWER_ITEM_BEHAVIOUR)
                     fragmentIds.add(DRAWER_ITEM_ATTENDANCE)
                     fragmentIds.add(DRAWER_ITEM_ANNOUNCEMENTS)
@@ -87,9 +88,7 @@ class ProfileFull : Profile {
             return fragmentIds
         }
 
-    constructor() : super() {
-
-    }
+    constructor() : super()
 
     constructor(profile: Profile, loginStore: LoginStore) {
 
@@ -122,7 +121,7 @@ class ProfileFull : Profile {
         }*/
     }
 
-    constructor(context: Context) : super(context) {}
+    constructor(context: Context) : super(context)
 
     fun canChangeLoginPassword(): Boolean {
         return loginStoreType == LOGIN_TYPE_MOBIDZIENNIK || loginStoreType == LOGIN_TYPE_LIBRUS || loginStoreType == LOGIN_TYPE_IUCZNIOWIE
@@ -223,7 +222,7 @@ class ProfileFull : Profile {
         when (loginStoreType) {
             LOGIN_TYPE_MOBIDZIENNIK -> return "LOGIN_TYPE_MOBIDZIENNIK"
             LOGIN_TYPE_LIBRUS -> return "LOGIN_TYPE_LIBRUS"
-            LOGIN_TYPE_IUCZNIOWIE -> return "LOGIN_TYPE_IUCZNIOWIE"
+            LOGIN_TYPE_IUCZNIOWIE -> return "LOGIN_TYPE_IDZIENNIK"
             LOGIN_TYPE_VULCAN -> return "LOGIN_TYPE_VULCAN"
             LOGIN_TYPE_DEMO -> return "LOGIN_TYPE_DEMO"
             else -> return "LOGIN_TYPE_UNKNOWN"
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsence.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsence.kt
index 76ed7450..c73dc490 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsence.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsence.kt
@@ -19,6 +19,9 @@ open class TeacherAbsence (
     @ColumnInfo(name = "teacherAbsenceType")
     val type: Long,
 
+    @ColumnInfo(name = "teacherAbsenceName")
+    val name: String?,
+
     @ColumnInfo(name = "teacherAbsenceDateFrom")
     val dateFrom: Date,
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceDao.kt
index 543d8fab..898d03f7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceDao.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceDao.kt
@@ -25,7 +25,7 @@ interface TeacherAbsenceDao {
             "LEFT JOIN teachers USING (profileId, teacherId) " +
             "LEFT JOIN metadata ON teacherAbsenceId = thingId AND metadata.thingType = " + Metadata.TYPE_TEACHER_ABSENCE +
             " AND metadata.profileId = :profileId WHERE teachers.profileId = :profileId")
-    fun getAllFull(profileId: Int): List<TeacherAbsenceFull>
+    fun getAllFullNow(profileId: Int): List<TeacherAbsenceFull>
 
     @Query("SELECT *, teachers.teacherName || ' ' || teachers.teacherSurname as teacherFullName, " +
             "metadata.seen, metadata.notified, metadata.addedDate FROM teacherAbsence " +
@@ -34,4 +34,7 @@ interface TeacherAbsenceDao {
             " AND metadata.profileId = :profileId WHERE teachers.profileId = :profileId " +
             "AND :date BETWEEN teacherAbsenceDateFrom AND teacherAbsenceDateTo")
     fun getAllByDateFull(profileId: Int, date: Date): LiveData<List<TeacherAbsenceFull>>
+
+    @Query("DELETE FROM teacherAbsence WHERE profileId = :profileId")
+    fun clear(profileId: Int)
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceFull.kt
index 1c36c19c..800f2d00 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceFull.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceFull.kt
@@ -3,9 +3,9 @@ package pl.szczodrzynski.edziennik.data.db.modules.teachers
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 
-class TeacherAbsenceFull(profileId: Int, id: Long, teacherId: Long, type: Long,
+class TeacherAbsenceFull(profileId: Int, id: Long, teacherId: Long, type: Long, name: String?,
                          dateFrom: Date, dateTo: Date, timeFrom: Time?, timeTo: Time?)
-    : TeacherAbsence(profileId, id, teacherId, type, dateFrom, dateTo, timeFrom, timeTo) {
+    : TeacherAbsence(profileId, id, teacherId, type, name, dateFrom, dateTo, timeFrom, timeTo) {
 
     var teacherFullName = ""
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceType.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceType.kt
new file mode 100644
index 00000000..ca9db678
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceType.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-18
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.teachers
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+
+@Entity(tableName = "teacherAbsenceTypes",
+        primaryKeys = ["profileId", "teacherAbsenceTypeId"])
+data class TeacherAbsenceType (
+        val profileId: Int,
+
+        @ColumnInfo(name = "teacherAbsenceTypeId")
+        val id: Long,
+
+        @ColumnInfo(name = "teacherAbsenceTypeName")
+        val name: String
+)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceTypeDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceTypeDao.kt
new file mode 100644
index 00000000..12dbf591
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceTypeDao.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-10-18
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.teachers
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+@Dao
+interface TeacherAbsenceTypeDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun add(teacherAbsence: TeacherAbsenceType)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun addAll(teacherAbsenceList: List<TeacherAbsenceType>)
+
+    @Query("DELETE FROM teacherAbsenceTypes WHERE profileId = :profileId")
+    fun clear(profileId: Int)
+
+    @Query("SELECT * FROM teacherAbsenceTypes WHERE profileId = :profileId")
+    fun getAllNow(profileId: Int): List<TeacherAbsenceType>
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teams/Team.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teams/Team.java
index eb5b4af7..1b2f0b9d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teams/Team.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teams/Team.java
@@ -8,6 +8,9 @@ import java.util.List;
 @Entity(tableName = "teams",
         primaryKeys = {"profileId", "teamId"})
 public class Team {
+    public static final int TYPE_CLASS = 1;
+    public static final int TYPE_VIRTUAL = 2;
+
     public int profileId;
 
     @ColumnInfo(name = "teamId")
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/Lesson.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/Lesson.kt
new file mode 100644
index 00000000..5cdac97e
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/Lesson.kt
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-25.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.modules.timetable
+
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+@Entity(tableName = "timetable",
+        indices = [
+            Index(value = ["profileId", "type", "date"]),
+            Index(value = ["profileId", "type", "oldDate"])
+        ])
+open class Lesson(val profileId: Int, @PrimaryKey var id: Long) {
+    companion object {
+        const val TYPE_NO_LESSONS = -1
+        const val TYPE_NORMAL = 0
+        const val TYPE_CANCELLED = 1
+        const val TYPE_CHANGE = 2
+        const val TYPE_SHIFTED_SOURCE = 3 /* source lesson */
+        const val TYPE_SHIFTED_TARGET = 4 /* target lesson */
+    }
+
+    var type: Int = TYPE_NORMAL
+
+    var date: Date? = null
+    var lessonNumber: Int? = null
+    var startTime: Time? = null
+    var endTime: Time? = null
+    var subjectId: Long? = null
+    var teacherId: Long? = null
+    var teamId: Long? = null
+    var classroom: String? = null
+
+    var oldDate: Date? = null
+    var oldLessonNumber: Int? = null
+    var oldStartTime: Time? = null
+    var oldEndTime: Time? = null
+    var oldSubjectId: Long? = null
+    var oldTeacherId: Long? = null
+    var oldTeamId: Long? = null
+    var oldClassroom: String? = null
+
+    val displayDate: Date?
+        get() {
+            if (type == TYPE_SHIFTED_SOURCE)
+                return oldDate
+            return date ?: oldDate
+        }
+
+    val displayStartTime: Time?
+        get() {
+            if (type == TYPE_SHIFTED_SOURCE)
+                return oldStartTime
+            return startTime ?: oldStartTime
+        }
+
+    val isCancelled
+        get() = type == TYPE_CANCELLED || type == TYPE_SHIFTED_SOURCE
+    val isChange
+        get() = type == TYPE_CHANGE || type == TYPE_SHIFTED_TARGET
+
+    fun buildId(): Long = (displayDate?.combineWith(displayStartTime) ?: 0L) / 6L * 10L + (hashCode() and 0xFFFF)
+
+    override fun toString(): String {
+        return "Lesson(profileId=$profileId, " +
+                "id=$id, " +
+                "type=$type, " +
+                "date=$date, " +
+                "lessonNumber=$lessonNumber, " +
+                "startTime=$startTime, " +
+                "endTime=$endTime, " +
+                "subjectId=$subjectId, " +
+                "teacherId=$teacherId, " +
+                "teamId=$teamId, " +
+                "classroom=$classroom, " +
+                "oldDate=$oldDate, " +
+                "oldLessonNumber=$oldLessonNumber, " +
+                "oldStartTime=$oldStartTime, " +
+                "oldEndTime=$oldEndTime, " +
+                "oldSubjectId=$oldSubjectId, " +
+                "oldTeacherId=$oldTeacherId, " +
+                "oldTeamId=$oldTeamId, " +
+                "oldClassroom=$oldClassroom)"
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is Lesson) return false
+
+        if (profileId != other.profileId) return false
+        if (id != other.id) return false
+        if (type != other.type) return false
+        if (date != other.date) return false
+        if (lessonNumber != other.lessonNumber) return false
+        if (startTime != other.startTime) return false
+        if (endTime != other.endTime) return false
+        if (subjectId != other.subjectId) return false
+        if (teacherId != other.teacherId) return false
+        if (teamId != other.teamId) return false
+        if (classroom != other.classroom) return false
+        if (oldDate != other.oldDate) return false
+        if (oldLessonNumber != other.oldLessonNumber) return false
+        if (oldStartTime != other.oldStartTime) return false
+        if (oldEndTime != other.oldEndTime) return false
+        if (oldSubjectId != other.oldSubjectId) return false
+        if (oldTeacherId != other.oldTeacherId) return false
+        if (oldTeamId != other.oldTeamId) return false
+        if (oldClassroom != other.oldClassroom) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int { // intentionally ignoring ID and display* here
+        var result = profileId
+        result = 31 * result + type
+        result = 31 * result + (date?.hashCode() ?: 0)
+        result = 31 * result + (lessonNumber ?: 0)
+        result = 31 * result + (startTime?.hashCode() ?: 0)
+        result = 31 * result + (endTime?.hashCode() ?: 0)
+        result = 31 * result + (subjectId?.hashCode() ?: 0)
+        result = 31 * result + (teacherId?.hashCode() ?: 0)
+        result = 31 * result + (teamId?.hashCode() ?: 0)
+        result = 31 * result + (classroom?.hashCode() ?: 0)
+        result = 31 * result + (oldDate?.hashCode() ?: 0)
+        result = 31 * result + (oldLessonNumber ?: 0)
+        result = 31 * result + (oldStartTime?.hashCode() ?: 0)
+        result = 31 * result + (oldEndTime?.hashCode() ?: 0)
+        result = 31 * result + (oldSubjectId?.hashCode() ?: 0)
+        result = 31 * result + (oldTeacherId?.hashCode() ?: 0)
+        result = 31 * result + (oldTeamId?.hashCode() ?: 0)
+        result = 31 * result + (oldClassroom?.hashCode() ?: 0)
+        return result
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/LessonFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/LessonFull.kt
new file mode 100644
index 00000000..a0c15e16
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/LessonFull.kt
@@ -0,0 +1,109 @@
+package pl.szczodrzynski.edziennik.data.db.modules.timetable
+
+import android.content.Context
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class LessonFull(profileId: Int, id: Long) : Lesson(profileId, id) {
+    var subjectName: String? = null
+    var teacherName: String? = null
+    var teamName: String? = null
+    var oldSubjectName: String? = null
+    var oldTeacherName: String? = null
+    var oldTeamName: String? = null
+
+    val displayLessonNumber: Int?
+        get() {
+            if (type == TYPE_SHIFTED_SOURCE)
+                return oldLessonNumber
+            return lessonNumber ?: oldLessonNumber
+        }
+
+    val displayEndTime: Time?
+        get() {
+            if (type == TYPE_SHIFTED_SOURCE)
+                return oldEndTime
+            return endTime ?: oldEndTime
+        }
+
+    val displaySubjectName: String?
+        get() {
+            if (type == TYPE_SHIFTED_SOURCE)
+                return oldSubjectName
+            return subjectName ?: oldSubjectName
+        }
+
+    val displayTeacherName: String?
+        get() {
+            if (type == TYPE_SHIFTED_SOURCE)
+                return oldTeacherName
+            return teacherName ?: oldTeacherName
+        }
+
+    val displayTeamName: String?
+        get() {
+            if (type == TYPE_SHIFTED_SOURCE)
+                return oldTeamName
+            return teamName ?: oldTeamName
+        }
+
+    val displayClassroom: String?
+        get() {
+            if (type == TYPE_SHIFTED_SOURCE)
+                return oldClassroom
+            return classroom ?: oldClassroom
+        }
+
+    val displayTeamId: Long?
+        get() {
+            if (type == TYPE_SHIFTED_SOURCE)
+                return oldTeamId
+            return teamId ?: oldTeamId
+        }
+
+    val displaySubjectId: Long?
+        get() {
+            if (type == TYPE_SHIFTED_SOURCE)
+                return oldSubjectId
+            return subjectId ?: oldSubjectId
+        }
+
+    val displayTeacherId: Long?
+        get() {
+            if (type == TYPE_SHIFTED_SOURCE)
+                return oldTeacherId
+            return teacherId ?: oldTeacherId
+        }
+
+    fun getDisplayChangeType(context: Context): String {
+        return context.getString(when (type) {
+            TYPE_CHANGE -> R.string.lesson_change
+            TYPE_CANCELLED -> R.string.lesson_cancelled
+            TYPE_SHIFTED_TARGET, TYPE_SHIFTED_SOURCE -> R.string.lesson_shifted
+            else -> R.string.lesson_timetable_change
+        })
+    }
+
+    val changeSubjectName: String
+        get() {
+            val first = when (type) {
+                TYPE_CHANGE, TYPE_CANCELLED, TYPE_SHIFTED_SOURCE -> oldSubjectName
+                else -> subjectName
+            }
+
+            val second = when (type) {
+                TYPE_CHANGE -> subjectName
+                else -> null
+            }
+
+            return when (second) {
+                null -> first ?: ""
+                else -> "$first -> $second"
+            }
+        }
+
+    // metadata
+    var seen: Boolean = false
+    var notified: Boolean = false
+    var addedDate: Long = 0
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/TimetableDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/TimetableDao.kt
new file mode 100644
index 00000000..540fdc49
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/TimetableDao.kt
@@ -0,0 +1,104 @@
+package pl.szczodrzynski.edziennik.data.db.modules.timetable
+
+import androidx.lifecycle.LiveData
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+@Dao
+interface TimetableDao {
+    companion object {
+        private const val QUERY = """
+            SELECT 
+            timetable.*,
+            subjects.subjectLongName AS subjectName,
+            teachers.teacherName ||" "|| teachers.teacherSurname AS teacherName,
+            teams.teamName AS teamName,
+            oldS.subjectLongName AS oldSubjectName,
+            oldT.teacherName ||" "|| oldT.teacherSurname AS oldTeacherName,
+            oldG.teamName AS oldTeamName,
+            metadata.seen, metadata.notified, metadata.addedDate
+            FROM timetable
+            LEFT JOIN subjects USING(profileId, subjectId)
+            LEFT JOIN teachers USING(profileId, teacherId)
+            LEFT JOIN teams USING(profileId, teamId)
+            LEFT JOIN subjects AS oldS ON timetable.profileId = oldS.profileId AND timetable.oldSubjectId = oldS.subjectId
+            LEFT JOIN teachers AS oldT ON timetable.profileId = oldT.profileId AND timetable.oldTeacherId = oldT.teacherId
+            LEFT JOIN teams AS oldG ON timetable.profileId = oldG.profileId AND timetable.oldTeamId = oldG.teamId
+            LEFT JOIN metadata ON id = thingId AND thingType = ${Metadata.TYPE_LESSON_CHANGE} AND metadata.profileId = timetable.profileId
+        """
+    }
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    operator fun plusAssign(lessonList: List<Lesson>)
+
+    @Query("DELETE FROM timetable WHERE profileId = :profileId")
+    fun clear(profileId: Int)
+
+    @Query("DELETE FROM timetable WHERE profileId = :profileId AND ((type != 3 AND date >= :dateFrom) OR ((type = 3 OR type = 1) AND oldDate >= :dateFrom))")
+    fun clearFromDate(profileId: Int, dateFrom: Date)
+    @Query("DELETE FROM timetable WHERE profileId = :profileId AND ((type != 3 AND date <= :dateTo) OR ((type = 3 OR type = 1) AND oldDate <= :dateTo))")
+    fun clearToDate(profileId: Int, dateTo: Date)
+    @Query("DELETE FROM timetable WHERE profileId = :profileId AND ((type != 3 AND date >= :dateFrom AND date <= :dateTo) OR ((type = 3 OR type = 1) AND oldDate >= :dateFrom AND oldDate <= :dateTo))")
+    fun clearBetweenDates(profileId: Int, dateFrom: Date, dateTo: Date)
+
+    @Query("""
+        $QUERY
+        WHERE timetable.profileId = :profileId AND ((type != 3 AND date = :date) OR ((type = 3 OR type = 1) AND oldDate = :date))
+        ORDER BY id, type
+    """)
+    fun getForDate(profileId: Int, date: Date) : LiveData<List<LessonFull>>
+
+    @Query("""
+        $QUERY
+        WHERE timetable.profileId = :profileId AND ((type != 3 AND date = :date) OR ((type = 3 OR type = 1) AND oldDate = :date))
+        ORDER BY id, type
+    """)
+    fun getForDateNow(profileId: Int, date: Date) : List<LessonFull>
+
+    @Query("""
+        $QUERY
+        WHERE timetable.profileId = :profileId AND ((type != 3 AND date > :today) OR ((type = 3 OR type = 1) AND oldDate > :today)) AND timetable.subjectId = :subjectId
+        ORDER BY id, type
+        LIMIT 1
+    """)
+    fun getNextWithSubject(profileId: Int, today: Date, subjectId: Long) : LiveData<LessonFull?>
+
+    @Query("""
+        $QUERY
+        WHERE timetable.profileId = :profileId AND ((type != 3 AND date > :today) OR ((type = 3 OR type = 1) AND oldDate > :today)) AND timetable.subjectId = :subjectId AND timetable.teamId = :teamId
+        ORDER BY id, type
+        LIMIT 1
+    """)
+    fun getNextWithSubjectAndTeam(profileId: Int, today: Date, subjectId: Long, teamId: Long): LiveData<LessonFull?>
+
+    @Query("""
+        $QUERY
+        WHERE (type != 3 AND date >= :dateFrom AND date <= :dateTo) OR ((type = 3 OR type = 1) AND oldDate >= :dateFrom AND oldDate <= :dateTo)
+        ORDER BY profileId, id, type
+    """)
+    fun getBetweenDatesNow(dateFrom: Date, dateTo: Date) : List<LessonFull>
+
+    @Query("""
+        $QUERY
+        WHERE (type != 3 AND date >= :dateFrom AND date <= :dateTo) OR ((type = 3 OR type = 1) AND oldDate >= :dateFrom AND oldDate <= :dateTo)
+        ORDER BY profileId, id, type
+    """)
+    fun getBetweenDates(dateFrom: Date, dateTo: Date) : LiveData<List<LessonFull>>
+
+    @Query("""
+        $QUERY
+        WHERE timetable.profileId = :profileId AND timetable.id = :lessonId
+        ORDER BY id, type
+    """)
+    fun getByIdNow(profileId: Int, lessonId: Long) : LessonFull?
+
+    @Query("""
+        $QUERY
+        WHERE timetable.profileId = :profileId AND timetable.type NOT IN (${Lesson.TYPE_NORMAL}, ${Lesson.TYPE_NO_LESSONS}, ${Lesson.TYPE_SHIFTED_SOURCE}) AND metadata.notified = 0
+    """)
+    fun getNotNotifiedNow(profileId: Int): List<LessonFull>
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/network/ServerRequest.java b/app/src/main/java/pl/szczodrzynski/edziennik/network/ServerRequest.java
index 4d8f9a80..53be419d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/network/ServerRequest.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/network/ServerRequest.java
@@ -16,6 +16,7 @@ import im.wangchao.mhttp.ThreadMode;
 import im.wangchao.mhttp.callback.JsonCallbackHandler;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.BuildConfig;
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
 import pl.szczodrzynski.edziennik.utils.Utils;
 
@@ -33,21 +34,25 @@ public class ServerRequest {
     }
 
     public ServerRequest(App app, String url, String source, ProfileFull profileFull) {
+        this(app, url, source, profileFull, profileFull == null ? -1 : profileFull.getLoginStoreType(), profileFull == null ? "" : profileFull.getUsernameId());
+    }
+
+    public ServerRequest(App app, String url, String source, Profile profile, int loginStoreType, String usernameId) {
         this.app = app;
         this.url = url;
         this.params = new ArrayList<>();
-        this.username = (profileFull != null && profileFull.getRegistration() == REGISTRATION_ENABLED ? profileFull.getUsernameId() : app.deviceId);
+        this.username = (profile != null && profile.getRegistration() == REGISTRATION_ENABLED ? usernameId : app.deviceId);
         this.source = source;
-        if (profileFull != null && profileFull.getRegistration() == REGISTRATION_ENABLED) {
-            this.setBodyParameter("login_type", Integer.toString(profileFull.getLoginStoreType()));
-            this.setBodyParameter("name_long", profileFull.getStudentNameLong());
-            this.setBodyParameter("name_short", profileFull.getStudentNameShort());
+        if (profile != null && profile.getRegistration() == REGISTRATION_ENABLED) {
+            this.setBodyParameter("login_type", Integer.toString(loginStoreType));
+            this.setBodyParameter("name_long", profile.getStudentNameLong());
+            this.setBodyParameter("name_short", profile.getStudentNameShort());
             //if (Looper.myLooper() == Looper.getMainLooper()) {
             if (Looper.getMainLooper().getThread() == Thread.currentThread()) {
                 this.setBodyParameter("team_ids", "UI_THREAD");
             }
             else {
-                this.setBodyParameter("team_ids", app.gson.toJson(app.db.teamDao().getAllCodesNow(profileFull.getId())));
+                this.setBodyParameter("team_ids", app.gson.toJson(app.db.teamDao().getAllCodesNow(profile.getId())));
             }
         }
     }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/receivers/BootReceiver.java b/app/src/main/java/pl/szczodrzynski/edziennik/receivers/BootReceiver.java
index 694bead6..018cd0fe 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/receivers/BootReceiver.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/receivers/BootReceiver.java
@@ -11,16 +11,17 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Build;
-import androidx.core.content.FileProvider;
 import android.widget.Toast;
 
+import androidx.core.content.FileProvider;
+
 import java.io.File;
 import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.network.ServerRequest;
-import pl.szczodrzynski.edziennik.sync.SyncJob;
+import pl.szczodrzynski.edziennik.sync.SyncWorker;
 import pl.szczodrzynski.edziennik.utils.Utils;
 
 import static android.content.Context.DOWNLOAD_SERVICE;
@@ -81,7 +82,7 @@ public class BootReceiver extends BroadcastReceiver {
         }
         else
         {
-            SyncJob.schedule(app);
+            SyncWorker.Companion.scheduleNext(app, false);
             if (app.networkUtils.isOnline())
             {
                 checkUpdate(context, intent);
@@ -124,19 +125,22 @@ public class BootReceiver extends BroadcastReceiver {
                             String updateUrl = result.get("update_url").getAsString();
                             String updateFilename = result.get("update_filename").getAsString();
                             boolean updateMandatory = result.get("update_mandatory").getAsBoolean();
+                            boolean updateDirect = result.get("update_direct").getAsBoolean();
 
                             if (app.appConfig.updateVersion == null || !app.appConfig.updateVersion.equals(updateVersion)) {
                                 app.appConfig.updateVersion = updateVersion;
                                 app.appConfig.updateUrl = updateUrl;
                                 app.appConfig.updateFilename = updateFilename;
                                 app.appConfig.updateMandatory = updateMandatory;
+                                app.appConfig.updateDirect = updateDirect;
                                 app.saveConfig();
                             }
                             if (!UPDATES_ON_PLAY_STORE || intent.getBooleanExtra("UserChecked", false)) {
                                 app.notifier.notificationUpdatesShow(
                                         updateVersion,
                                         updateUrl,
-                                        updateFilename);
+                                        updateFilename,
+                                        updateDirect);
                             }
                         } else {
                             if (app.appConfig.updateVersion == null || !app.appConfig.updateVersion.equals("")) {
@@ -258,7 +262,7 @@ public class BootReceiver extends BroadcastReceiver {
 
         @Override
         protected void onHandleIntent(Intent intent) {
-            if (UPDATES_ON_PLAY_STORE) {
+            if (UPDATES_ON_PLAY_STORE && !intent.getBooleanExtra("update_direct", false)) {
                 Utils.openGooglePlay(this, "pl.szczodrzynski.edziennik");
                 return;
             }
@@ -269,7 +273,8 @@ public class BootReceiver extends BroadcastReceiver {
                     app.notifier.notificationUpdatesShow(
                             intent.getStringExtra("update_version"),
                             intent.getStringExtra("update_url"),
-                            intent.getStringExtra("update_filename"));
+                            intent.getStringExtra("update_filename"),
+                            intent.getBooleanExtra("update_direct", false));
                     return;
                 }
             }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/receivers/JobsCreator.java b/app/src/main/java/pl/szczodrzynski/edziennik/receivers/JobsCreator.java
deleted file mode 100644
index 0c96d14e..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/receivers/JobsCreator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package pl.szczodrzynski.edziennik.receivers;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.evernote.android.job.Job;
-import com.evernote.android.job.JobCreator;
-
-import pl.szczodrzynski.edziennik.sync.SyncJob;
-
-public class JobsCreator implements JobCreator {
-    @Override
-    @Nullable
-    public Job create(@NonNull String tag) {
-        switch (tag) {
-            case SyncJob.TAG:
-                return new SyncJob();
-            default:
-                return null;
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/receivers/SzkolnyReceiver.kt b/app/src/main/java/pl/szczodrzynski/edziennik/receivers/SzkolnyReceiver.kt
new file mode 100644
index 00000000..eb629818
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/receivers/SzkolnyReceiver.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-1.
+ */
+
+package pl.szczodrzynski.edziennik.receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import pl.szczodrzynski.edziennik.api.v2.ApiService
+import pl.szczodrzynski.edziennik.api.v2.events.requests.ServiceCloseRequest
+import pl.szczodrzynski.edziennik.api.v2.events.requests.TaskCancelRequest
+import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask
+
+class SzkolnyReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context?, intent: Intent?) {
+        context ?: return
+        when (intent?.extras?.getString("task", null)) {
+            "ServiceCloseRequest" -> ApiService.startAndRequest(context, ServiceCloseRequest())
+            "TaskCancelRequest" -> ApiService.startAndRequest(context, TaskCancelRequest(intent.extras?.getInt("taskId", -1) ?: return))
+            "SyncRequest" -> EdziennikTask.sync().enqueue(context)
+            "SyncProfileRequest" -> EdziennikTask.syncProfile(intent.extras?.getInt("profileId", -1) ?: return).enqueue(context)
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/AppManagerDetectedEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/sync/AppManagerDetectedEvent.kt
new file mode 100644
index 00000000..10d93dfc
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/sync/AppManagerDetectedEvent.kt
@@ -0,0 +1,3 @@
+package pl.szczodrzynski.edziennik.sync
+
+class AppManagerDetectedEvent(val failedWorkTimestamps: List<Long>)
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/FirebaseBroadcastReceiver.kt b/app/src/main/java/pl/szczodrzynski/edziennik/sync/FirebaseBroadcastReceiver.kt
new file mode 100644
index 00000000..cc437ad6
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/sync/FirebaseBroadcastReceiver.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.sync
+
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import androidx.legacy.content.WakefulBroadcastReceiver
+import com.google.firebase.messaging.RemoteMessage
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.App
+
+class FirebaseBroadcastReceiver : WakefulBroadcastReceiver() {
+
+    val TAG: String = FirebaseBroadcastReceiver::class.java.simpleName
+
+    override fun onReceive(context: Context, intent: Intent) {
+
+        val json = JsonObject()
+
+        val dataBundle = intent.extras
+        if (dataBundle != null)
+            for (key in dataBundle.keySet()) {
+                dataBundle.get(key)?.let {
+                    when (it) {
+                        is String -> json.addProperty(key, it)
+                        is Int -> json.addProperty(key, it)
+                        is Long -> json.addProperty(key, it)
+                        is Float -> json.addProperty(key, it)
+                        is Boolean -> json.addProperty(key, it)
+                        else -> json.addProperty(key, it.toString())
+                    }
+                }
+            }
+
+        Log.d(TAG, "Firebase got push from Librus Broadcast ${json}")
+
+        val sharedPreferences = context.getSharedPreferences("pushtest_broadcast", Context.MODE_PRIVATE)
+        sharedPreferences.edit().putString(
+                System.currentTimeMillis().toString(),
+                json.toString()
+        ).apply()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/MyFirebaseMessagingService.java b/app/src/main/java/pl/szczodrzynski/edziennik/sync/MyFirebaseMessagingService.java
index d8841ebf..3bacc7ff 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/sync/MyFirebaseMessagingService.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/sync/MyFirebaseMessagingService.java
@@ -15,21 +15,26 @@ import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.BuildConfig;
-import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
+import pl.szczodrzynski.edziennik.R;
+import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask;
 import pl.szczodrzynski.edziennik.data.db.modules.events.Event;
 import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull;
 import pl.szczodrzynski.edziennik.data.db.modules.events.EventType;
 import pl.szczodrzynski.edziennik.data.db.modules.feedback.FeedbackMessage;
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
 import pl.szczodrzynski.edziennik.data.db.modules.teams.Team;
+import pl.szczodrzynski.edziennik.network.ServerRequest;
 import pl.szczodrzynski.edziennik.ui.modules.base.DebugFragment;
 import pl.szczodrzynski.edziennik.utils.models.Notification;
-import pl.szczodrzynski.edziennik.network.ServerRequest;
 
 import static pl.szczodrzynski.edziennik.App.APP_URL;
 import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_HOMEWORK;
 import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_MOBIDZIENNIK;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_FEEDBACK_MESSAGE;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_NEW_SHARED_EVENT;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_NEW_SHARED_HOMEWORK;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_SERVER_MESSAGE;
 import static pl.szczodrzynski.edziennik.utils.Utils.d;
 import static pl.szczodrzynski.edziennik.utils.Utils.strToInt;
 
@@ -61,7 +66,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
                     //processAppPush
                     processAppPush(app, remoteMessage);
                     break;
-                case "1029629079999":
+                case "747285019373":
                     app.debugLog("Firebase got push from Mobidziennik "+remoteMessage.getData().toString());
                     processMobidziennikPush(app, remoteMessage);
                     break;
@@ -107,7 +112,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
                         app.notifier.postAll(profile);
                         app.saveConfig("notifications");*/
                         d(TAG, "Syncing profile " + profile.getId());
-                        SyncJob.run(app, -1, profile.getId());
+                        EdziennikTask.Companion.syncProfile(profile.getId(), null, null).enqueue(app);
                     } else {
                         /*app.notifier.add(new Notification(app.getContext(), remoteMessage.getData().get("message"))
                                 .withProfileData(profile.id, profile.name)
@@ -118,7 +123,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
                         app.notifier.postAll(profile);
                         app.saveConfig("notifications");*/
                         d(TAG, "Syncing profile " + profile.getId());
-                        SyncJob.run(app, -1, profile.getId());
+                        EdziennikTask.Companion.syncProfile(profile.getId(), null, null).enqueue(app);
                     }
                 }
             });
@@ -149,19 +154,22 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
                         String updateUrl = remoteMessage.getData().get("update_url");
                         String updateFilename = remoteMessage.getData().get("update_filename");
                         boolean updateMandatory = Boolean.parseBoolean(remoteMessage.getData().get("update_mandatory"));
+                        boolean updateDirect = Boolean.parseBoolean(remoteMessage.getData().get("update_direct"));
 
                         if (app.appConfig.updateVersion == null || !app.appConfig.updateVersion.equals(updateVersion)) {
                             app.appConfig.updateVersion = updateVersion;
                             app.appConfig.updateUrl = updateUrl;
                             app.appConfig.updateFilename = updateFilename;
                             app.appConfig.updateMandatory = updateMandatory;
+                            app.appConfig.updateDirect = updateDirect;
                             app.saveConfig("updateVersion", "updateUrl", "updateFilename", "updateMandatory");
                         }
                         if (!remoteMessage.getData().containsKey("update_silent")) {
                             app.notifier.notificationUpdatesShow(
                                     updateVersion,
                                     updateUrl,
-                                    updateFilename);
+                                    updateFilename,
+                                    updateDirect);
                         }
                     } else {
                         if (app.appConfig.updateVersion == null || !app.appConfig.updateVersion.equals("")) {
@@ -175,7 +183,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
                 case "message":
                     app.notifier.add(new Notification(app.getContext(), remoteMessage.getData().get("message"))
                             .withTitle(remoteMessage.getData().get("title"))
-                            .withType(Notification.TYPE_SERVER_MESSAGE)
+                            .withType(TYPE_SERVER_MESSAGE)
                             .withFragmentRedirect(MainActivity.DRAWER_ITEM_NOTIFICATIONS)
                     );
                     app.notifier.postAll(null);
@@ -203,7 +211,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
 
                             app.notifier.add(new Notification(app.getContext(), feedbackMessage.text)
                                     .withTitle(remoteMessage.getData().get("title"))
-                                    .withType(Notification.TYPE_FEEDBACK_MESSAGE)
+                                    .withType(TYPE_FEEDBACK_MESSAGE)
                                     .withFragmentRedirect(MainActivity.TARGET_FEEDBACK)
                             );
                             app.notifier.postAll(null);
@@ -225,7 +233,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
                     });
                     app.notifier.add(new Notification(app.getContext(), remoteMessage.getData().get("message"))
                             .withTitle(remoteMessage.getData().get("title"))
-                            .withType(Notification.TYPE_FEEDBACK_MESSAGE)
+                            .withType(TYPE_FEEDBACK_MESSAGE)
                             .withFragmentRedirect(MainActivity.TARGET_FEEDBACK)
                     );
                     app.notifier.postAll(null);
@@ -279,7 +287,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
                                         EventType eventType = app.db.eventTypeDao().getByIdNow(profile.getId(), event.type);
                                         app.notifier.add(new Notification(app.getContext(), app.getString((oldEvent == null ? R.string.notification_shared_event_format : R.string.notification_shared_event_modified_format), event.sharedByName, eventType == null ? "wydarzenie" : eventType.name, event.eventDate.getFormattedString(), event.topic))
                                                 .withProfileData(profile.getId(), profile.getName())
-                                                .withType(event.type == TYPE_HOMEWORK ? Notification.TYPE_NEW_SHARED_HOMEWORK : Notification.TYPE_NEW_SHARED_EVENT)
+                                                .withType(event.type == TYPE_HOMEWORK ? TYPE_NEW_SHARED_HOMEWORK : TYPE_NEW_SHARED_EVENT)
                                                 .withFragmentRedirect(event.type == TYPE_HOMEWORK ? MainActivity.DRAWER_ITEM_HOMEWORK : MainActivity.DRAWER_ITEM_AGENDA)
                                                 .withLongExtra("eventDate", event.eventDate.getValue())
                                         );
@@ -298,7 +306,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
                                     if (oldEvent != null) {
                                         app.notifier.add(new Notification(app.getContext(), app.getString(R.string.notification_shared_event_removed_format, oldEvent.sharedByName, oldEvent.typeName, oldEvent.eventDate.getFormattedString(), oldEvent.topic))
                                                 .withProfileData(profile.getId(), profile.getName())
-                                                .withType(oldEvent.type == TYPE_HOMEWORK ? Notification.TYPE_NEW_SHARED_HOMEWORK : Notification.TYPE_NEW_SHARED_EVENT)
+                                                .withType(oldEvent.type == TYPE_HOMEWORK ? TYPE_NEW_SHARED_HOMEWORK : TYPE_NEW_SHARED_EVENT)
                                                 .withFragmentRedirect(oldEvent.type == TYPE_HOMEWORK ? MainActivity.DRAWER_ITEM_HOMEWORK : MainActivity.DRAWER_ITEM_AGENDA)
                                                 .withLongExtra("eventDate", oldEvent.eventDate.getValue())
                                         );
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncJob.java b/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncJob.java
deleted file mode 100644
index 3deddb25..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncJob.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package pl.szczodrzynski.edziennik.sync;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-
-import com.evernote.android.job.Job;
-import com.evernote.android.job.JobManager;
-import com.evernote.android.job.JobRequest;
-
-import java.util.Set;
-
-import pl.szczodrzynski.edziennik.App;
-
-import static pl.szczodrzynski.edziennik.utils.Utils.d;
-
-public class SyncJob extends Job {
-
-    public static final String TAG = "SyncJob";
-    private static int retryCount = 0;
-
-    public static void schedule(App app) {
-        schedule(app, false);
-    }
-
-    /**
-     * Forces a SyncJob to be scheduled. Does nothing if it's already scheduled.
-     */
-    public static void schedule(App app, boolean internetError) {
-        int count = count();
-        if (count > 0) {
-            d(TAG, "Job is already scheduled");
-            return;
-        }
-        if (app.appConfig.registerSyncEnabled) {
-            //Toast.makeText(app, "Scheduling an alarm", Toast.LENGTH_SHORT).show();
-            long timeout = 1000 * app.appConfig.registerSyncInterval;
-            if (internetError) {
-                retryCount++;
-                timeout = 1000 * (30*retryCount*retryCount); // 30sec, 2min, 4min 30sec, 8min, 12min 30sec, ...
-                timeout = Math.min(timeout, 30 * 60 * 1000); // max 30min between retries
-                if (timeout > 1000 * app.appConfig.registerSyncInterval) {
-                    timeout = 1000 * app.appConfig.registerSyncInterval;
-                }
-            }
-
-            new JobRequest.Builder(SyncJob.TAG)
-                    .setExecutionWindow((long) (timeout - (0.1 * timeout)), (long) (timeout + (0.1 * timeout)))
-                    //.setRequiredNetworkType(JobRequest.NetworkType.CONNECTED)
-                    .build()
-                    .schedule();
-            if (!internetError) {
-                retryCount = 0;
-            }
-        }
-        else {
-            clear();
-        }
-    }
-    public static int count() {
-        Set<JobRequest> jobRequests = JobManager.instance().getAllJobRequestsForTag(SyncJob.TAG);
-        if (App.devMode) {
-            for (JobRequest jobRequest: jobRequests) {
-                d(TAG, "JOBLIST: Found at "+jobRequest.getStartMs()+" - "+jobRequest.getEndMs());
-            }
-        }
-        return jobRequests.size();
-    }
-    public static void clear() {
-        JobManager.instance().cancelAllForTag(SyncJob.TAG);
-    }
-
-    /**
-     * Deletes every scheduled SyncJob and then reschedules it.
-     */
-    public static void update(App app) {
-        update(app, false);
-    }
-    public static void update(App app, boolean internetError) {
-        app.debugLogAsync("SyncJob update internetError="+internetError);
-        clear();
-        schedule(app, internetError);
-    }
-    public static void run(App app) {
-        app.debugLogAsync("SyncJob run with no IDs");
-        clear();
-        runService(app, app.getContext(), -1, -1);
-        /*new JobRequest.Builder(SyncJob.TAG)
-                .startNow()
-                .build()
-                .schedule();*/
-    }
-
-    public static void run(App app, int firstProfileId, int targetProfileId) {
-        app.debugLogAsync("SyncJob run with firstProfileId="+firstProfileId+", targetProfileId="+targetProfileId);
-        clear();
-        runService(app, app.getContext(), firstProfileId, targetProfileId);
-       /* PersistableBundleCompat extras = new PersistableBundleCompat();
-        extras.putInt("firstProfileId", firstProfileId);
-        extras.putInt("targetProfileId", targetProfileId);
-        new JobRequest.Builder(SyncJob.TAG)
-                .startNow()
-                .setExtras(extras)
-                .build()
-                .schedule();*/
-    }
-
-    @Override
-    @NonNull
-    protected Result onRunJob(@NonNull Params params) {
-        //Log.d(TAG, "Job is running!");
-
-        App app = (App) getContext().getApplicationContext();
-
-        int firstProfileId = params.getExtras().getInt("firstProfileId", -1);
-        int targetProfileId = params.getExtras().getInt("targetProfileId", -1);
-
-        runService(app, getContext(), firstProfileId, targetProfileId);
-
-        return Result.SUCCESS;
-    }
-
-    private static void runService(App app, Context context, int firstProfileId, int targetProfileId) {
-
-        SyncService.firstProfileId = firstProfileId;
-        SyncService.targetProfileId = targetProfileId;
-
-        app.debugLog("SyncJob runService with firstProfileId="+firstProfileId+", targetProfileId="+targetProfileId);
-
-        boolean connected;
-
-        ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        if (app.appConfig.registerSyncOnlyWifi) {
-            NetworkInfo mWifi = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-            connected = mWifi != null && mWifi.isConnected();
-        }
-        else {
-            NetworkInfo netInfo = connectivityManager.getActiveNetworkInfo();
-            connected = netInfo != null && netInfo.isConnected();
-        }
-
-        if (!connected) {
-            app.debugLog("SyncJob cancelling: no internet");
-            update(app, true);
-        }
-        else {
-            SyncService.start(context);
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncService.java b/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncService.java
deleted file mode 100644
index e3eddf3d..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncService.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package pl.szczodrzynski.edziennik.sync;
-
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Handler;
-import android.os.IBinder;
-import androidx.annotation.Nullable;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.data.api.AppError;
-import pl.szczodrzynski.edziennik.data.api.interfaces.SyncCallback;
-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.profiles.ProfileFull;
-
-import static pl.szczodrzynski.edziennik.Notifier.ID_GET_DATA;
-import static pl.szczodrzynski.edziennik.Notifier.ID_GET_DATA_ERROR;
-import static pl.szczodrzynski.edziennik.utils.Utils.d;
-
-public class SyncService extends Service {
-    public static final String TAG = "SyncService";
-    private App app;
-    public static boolean running = false;
-    private List<Profile> profiles;
-    public static final int PROFILE_MAX_PROGRESS = 110;
-    private Profile profile = null;
-    private int profileId = -1;
-    public static int progress = 0;
-    private int profileProgress = 0;
-    public static int maxProgress;
-    public static int firstProfileId = -1;
-    public static int targetProfileId = -1;
-    public static final String ACTION_CANCEL = "SyncService.ACTION_CANCEL";
-    public static SyncCallback customCallback = null;
-    private static final int PROFILE_TIMEOUT = 40000;
-
-    private Handler timeoutHandler = new Handler();
-    private Runnable timeoutRunnable = new Runnable() {
-        public void run() {
-            if (!running)
-                return;
-            error(AppError.stringErrorCode(app, AppError.CODE_TIMEOUT, ""), profile);
-            finishDownload();
-        }
-    };
-
-    public static void start(Context context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            context.startForegroundService(new Intent(context, SyncService.class));
-        } else {
-            context.startService(new Intent(context, SyncService.class));
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        app = (App) getApplicationContext();
-        app.debugLog("SyncService created");
-        startForeground(ID_GET_DATA, app.notifier.notificationGetDataShow(0));
-    }
-
-    private void reNotify() {
-        //app.notifier.notificationCancel(ID_GET_DATA_ERROR);
-        app.notifier.notificationPost(ID_GET_DATA, app.notifier.notificationGetDataProgress(progress, maxProgress));
-    }
-    private void error(String error, Profile profile) {
-        app.notifier.notificationPost(ID_GET_DATA_ERROR, app.notifier.notificationGetDataError(profile == null ? "" : profile.getName(), error, profile == null ? -1 : profile.getId()));
-    }
-
-    long millisStart;
-
-    private void downloadData() {
-        if (profiles.size() > 0) {
-            profile = profiles.get(0);
-            profileId = profile.getId();
-            app.debugLog("SyncService downloading profileId="+profileId);
-            profiles.remove(0);
-            // mamy profileID wiec nie trzeba nic ładować. DAO musi używać profileId
-            millisStart = System.currentTimeMillis();
-            app.notifier.notificationPost(ID_GET_DATA, app.notifier.notificationGetDataProfile(profile.getName()));
-            app.apiEdziennik.sync(app, SyncService.this, new SyncCallback() {
-                @Override
-                public void onLoginFirst(List<Profile> profileList, LoginStore loginStore) {
-                    if (customCallback != null)
-                        customCallback.onLoginFirst(profileList, loginStore);
-                }
-
-                @Override
-                public void onSuccess(Context activityContext, ProfileFull profile) {
-                    profileProgress++;
-                    progress = profileProgress*PROFILE_MAX_PROGRESS;
-                    updateTimeoutHandler();
-                    reNotify();
-                    app.debugLog("SyncService profileId="+profileId+" done in "+(System.currentTimeMillis() - millisStart)+"ms");
-                    if (customCallback != null)
-                        customCallback.onSuccess(activityContext, profile);
-                    downloadData();
-                }
-
-                @Override
-                public void onError(Context activityContext, AppError error) {
-                    error(error.asReadableString(activityContext), profile);
-                    if (customCallback != null)
-                        customCallback.onError(activityContext, error);
-                    if (error.errorCode == AppError.CODE_NO_INTERNET) {
-                        finishDownload(CODE_NO_INTERNET); // use finishDownload instead of scheduleNext so it always changes the profile back to previousProfile
-                    } else {
-                        finishDownload(CODE_ERROR);
-                    }
-                }
-
-                @Override
-                public void onProgress(int progressStep) {
-                    if (customCallback != null)
-                        customCallback.onProgress(Math.min(progressStep, PROFILE_MAX_PROGRESS));
-                    progress = Math.min(progress+progressStep, (profileProgress+1)*PROFILE_MAX_PROGRESS);
-                    reNotify();
-                }
-
-                @Override
-                public void onActionStarted(int stringResId) {
-                    if (customCallback != null)
-                        customCallback.onActionStarted(stringResId);
-                    app.notifier.notificationPost(ID_GET_DATA, app.notifier.notificationGetDataAction(stringResId));
-                }
-            }, profileId);
-        }
-        else {
-            finishDownload();
-        }
-    }
-
-    private void updateTimeoutHandler() {
-        timeoutHandler.removeCallbacks(timeoutRunnable);
-        timeoutHandler.postDelayed(timeoutRunnable, PROFILE_TIMEOUT);
-    }
-
-    private static final int CODE_OK = 0;
-    private static final int CODE_ERROR = 1;
-    private static final int CODE_NO_INTERNET = 2;
-    private void finishDownload() {
-        finishDownload(CODE_OK);
-    }
-    private void finishDownload(int errorCode) {
-        timeoutHandler.removeCallbacks(timeoutRunnable);
-
-        app.apiEdziennik.notifyAndReload();
-
-        app.debugLog("SyncService finishing with profileId="+profileId);
-        if (errorCode == CODE_OK) {
-            app.notifier.notificationCancel(ID_GET_DATA_ERROR);
-        }
-        SyncJob.update((App) getApplication(), errorCode == CODE_NO_INTERNET);
-        stopSelf();
-        if (customCallback != null && errorCode == CODE_OK) {
-            customCallback.onSuccess(null, null);
-        }
-        customCallback = null;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        d(TAG, "Got an intent. Service is running "+running);
-        if (intent != null && intent.getAction() != null && intent.getAction().equals(ACTION_CANCEL)) {
-            d(TAG, "ACTION_CANCEL intent");
-            finishDownload();
-            running = true;
-        }
-
-        if (running) {
-            app.debugLog("SyncService already running; return");
-            return Service.START_STICKY;
-        }
-        running = true;
-
-        timeoutHandler.postDelayed(timeoutRunnable, PROFILE_TIMEOUT);
-
-        profiles = app.db.profileDao().getProfilesForSyncNow();
-
-        app.debugLog("SyncService source profileList="+ Arrays.toString(profiles.toArray())+". firstProfileId="+firstProfileId+", targetProfileId="+targetProfileId);
-
-        if (profiles.size() == 0) {
-            stopSelf();
-            return Service.START_STICKY;
-        }
-
-        if (firstProfileId != -1) {
-            d(TAG, "Profile list from first "+firstProfileId);
-            Collection<Profile> toRemove = new ArrayList<>();
-            for (Profile profile: profiles) {
-                if (firstProfileId == profile.getId()) {
-                    break;
-                }
-                toRemove.add(profile);
-            }
-            profiles.removeAll(toRemove);
-            firstProfileId = -1;
-        }
-        if (targetProfileId != -1) {
-            d(TAG, "Profile list only target "+targetProfileId);
-            Profile targetProfile = null;
-            for (Profile profile: profiles) {
-                if (targetProfileId == profile.getId()) {
-                    targetProfile = profile;
-                    break;
-                }
-            }
-            profiles.clear();
-            if (targetProfile != null)
-                profiles.add(targetProfile);
-            targetProfileId = -1;
-        }
-
-        app.debugLog("SyncService target profileList="+ Arrays.toString(profiles.toArray()));
-
-        progress = 0;
-        profileProgress = 0;
-        maxProgress = profiles.size()*PROFILE_MAX_PROGRESS;
-
-        app.notifier.notificationPost(ID_GET_DATA, app.notifier.notificationGetDataShow(maxProgress));
-
-        if (!app.networkUtils.isOnline()) {
-            app.debugLog("SyncService no internet; update,stop");
-            error(AppError.stringErrorCode(app, AppError.CODE_NO_INTERNET, ""), profiles.size() >= 1 ? profiles.get(0) : null);
-            SyncJob.update((App) getApplication(), true);
-            if (customCallback != null) {
-                customCallback.onError(getApplicationContext(), new AppError(TAG, 241, AppError.CODE_NO_INTERNET, null, (Throwable) null));
-            }
-            stopSelf();
-            return Service.START_STICKY;
-        }
-
-        downloadData();
-
-        return Service.START_STICKY;
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        app.debugLog("SyncService destroyed");
-        running = false;
-    }
-
-    @Nullable
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncWorker.kt b/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncWorker.kt
new file mode 100644
index 00000000..e06cd6f5
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncWorker.kt
@@ -0,0 +1,107 @@
+package pl.szczodrzynski.edziennik.sync
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.os.AsyncTask
+import androidx.work.*
+import androidx.work.impl.WorkManagerImpl
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MINUTE
+import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask
+import pl.szczodrzynski.edziennik.formatDate
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import java.util.concurrent.TimeUnit
+
+class SyncWorker(val context: Context, val params: WorkerParameters) : Worker(context, params) {
+    companion object {
+        const val TAG = "SyncWorker"
+
+        /**
+         * Schedule the sync job only if it's not already scheduled.
+         */
+        @SuppressLint("RestrictedApi")
+        fun scheduleNext(app: App, rescheduleIfFailedFound: Boolean = true) {
+            AsyncTask.execute {
+                val workManager = WorkManager.getInstance(app) as WorkManagerImpl
+                val scheduledWork = workManager.workDatabase.workSpecDao().scheduledWork
+                scheduledWork.forEach {
+                    d(TAG, "Work: ${it.id} at ${(it.periodStartTime+it.initialDelay).formatDate()}. State = ${it.state} (finished = ${it.state.isFinished})")
+                }
+                // remove finished work and other than SyncWorker
+                scheduledWork.removeAll { it.workerClassName != SyncWorker::class.java.canonicalName || it.isPeriodic || it.state.isFinished }
+                d(TAG, "Found ${scheduledWork.size} unfinished work")
+                // remove all enqueued work that had to (but didn't) run at some point in the past (at least 1min ago)
+                val failedWork = scheduledWork.filter { it.state == WorkInfo.State.ENQUEUED && it.periodStartTime+it.initialDelay < System.currentTimeMillis() - 1*MINUTE*1000 }
+                d(TAG, "${failedWork.size} work requests failed to start (out of ${scheduledWork.size} requests)")
+                if (rescheduleIfFailedFound) {
+                    if (failedWork.isNotEmpty()) {
+                        d(TAG, "App Manager detected!")
+                        EventBus.getDefault().postSticky(AppManagerDetectedEvent(failedWork.map { it.periodStartTime + it.initialDelay }))
+                    }
+                    if (scheduledWork.size - failedWork.size < 1) {
+                        d(TAG, "No pending work found, scheduling next:")
+                        rescheduleNext(app)
+                    }
+                }
+                else {
+                    d(TAG, "NOT rescheduling: waiting to open the activity")
+                    if (scheduledWork.size < 1) {
+                        d(TAG, "No work found *at all*, scheduling next:")
+                        rescheduleNext(app)
+                    }
+                }
+            }
+        }
+
+        /**
+         * Cancel any existing sync jobs and schedule a new one.
+         *
+         * If [registerSyncEnabled] is not true, just cancel every job.
+         */
+        fun rescheduleNext(app: App) {
+            cancelNext(app)
+            val enableSync = app.appConfig.registerSyncEnabled
+            if (!enableSync) {
+                return
+            }
+            val onlyWifi = app.appConfig.registerSyncOnlyWifi
+            val syncInterval = app.appConfig.registerSyncInterval.toLong()
+
+            val syncAt = System.currentTimeMillis() + syncInterval*1000
+            d(TAG, "Scheduling work at ${syncAt.formatDate()}")
+
+            val constraints = Constraints.Builder()
+                    .setRequiredNetworkType(
+                            if (onlyWifi)
+                                NetworkType.UNMETERED
+                            else
+                                NetworkType.CONNECTED)
+                    .build()
+
+            val syncWorkRequest = OneTimeWorkRequestBuilder<SyncWorker>()
+                    .setInitialDelay(syncInterval, TimeUnit.SECONDS)
+                    .setConstraints(constraints)
+                    .addTag(TAG)
+                    .build()
+
+            WorkManager.getInstance(app).enqueue(syncWorkRequest)
+        }
+
+        /**
+         * Cancel any scheduled sync job.
+         */
+        fun cancelNext(app: App) {
+            d(TAG, "Cancelling work by tag $TAG")
+            WorkManager.getInstance(app).cancelAllWorkByTag(TAG)
+            //WorkManager.getInstance(app).pruneWork() // do not prune the work in order to look for failed tasks
+        }
+    }
+
+    override fun doWork(): Result {
+        d(TAG, "Running worker ID ${params.id}")
+        EdziennikTask.sync().enqueue(context)
+        rescheduleNext(context as App)
+        return Result.success()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventAddTypeDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventAddTypeDialog.kt
new file mode 100644
index 00000000..cc3a6d63
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventAddTypeDialog.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-12.
+ */
+
+package pl.szczodrzynski.edziennik.ui.dialogs.event
+
+import android.app.Activity
+import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class EventAddTypeDialog(
+        val activity: Activity,
+        val profileId: Int,
+        val date: Date? = null,
+        val time: Time? = null
+) {
+    companion object {
+        private const val TAG = "EventAddTypeDialog"
+    }
+
+    private lateinit var dialog: AlertDialog
+
+    init { run {
+        dialog = MaterialAlertDialogBuilder(activity)
+                .setItems(R.array.main_menu_add_options) { dialog, which ->
+                    dialog.dismiss()
+                    EventManualDialog(activity, profileId)
+                            .show(
+                                    activity.application as App,
+                                    null,
+                                    date,
+                                    time,
+                                    when (which) {
+                                        1 -> EventManualDialog.DIALOG_HOMEWORK
+                                        else -> EventManualDialog.DIALOG_EVENT
+                                    }
+                            )
+
+                }
+                .setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
+                .show()
+    }}
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.java
index 4a24d2e0..2c50c406 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.java
@@ -34,9 +34,8 @@ import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
 import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.data.api.AppError;
+import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.data.db.modules.events.Event;
 import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull;
 import pl.szczodrzynski.edziennik.data.db.modules.events.EventType;
@@ -46,15 +45,14 @@ import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
 import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject;
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher;
 import pl.szczodrzynski.edziennik.data.db.modules.teams.Team;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.utils.models.Week;
 import pl.szczodrzynski.edziennik.network.ServerRequest;
 import pl.szczodrzynski.edziennik.utils.TextInputDropDown;
 import pl.szczodrzynski.edziennik.utils.Themes;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 
 import static pl.szczodrzynski.edziennik.App.APP_URL;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_OTHER;
 import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_DEFAULT;
 import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_HOMEWORK;
 import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_UNDEFINED;
@@ -374,7 +372,8 @@ public class EventManualDialog {
                 }
             } catch (Exception e) {
                 activity.runOnUiThread(() -> {
-                    app.apiEdziennik.guiShowErrorDialog(activity, new AppError(TAG, 379, CODE_OTHER, null, e), R.string.error_occured);
+                    // TODO show error in EventManualDialog
+                    //app.apiEdziennik.guiShowErrorDialog(activity, new AppError(TAG, 379, CODE_OTHER, null, e), R.string.error_occured);
                 });
             }
         });
@@ -425,7 +424,7 @@ public class EventManualDialog {
             return;
         this.app = _app;
         AsyncTask.execute(() -> {
-            this.profile = app.db.profileDao().getByIdNow(profileId);
+            this.profile = app.db.profileDao().getFullByIdNow(profileId);
             if (profile != null) {
                 ((Activity) context).runOnUiThread(() -> {
                     actualShow(editingEvent, defaultDate, defaultTime, dialogType);
@@ -518,7 +517,7 @@ public class EventManualDialog {
 
         registerEventManualDateLayout = dialogView.findViewById(R.id.registerEventManualDateLayout);
         registerEventManualDate = dialogView.findViewById(R.id.registerEventManualDate);
-        registerEventManualDate.setCompoundDrawablesWithIntrinsicBounds(null, null, new IconicsDrawable(context, CommunityMaterial.Icon.cmd_calendar).size(IconicsSize.dp(16)).color(IconicsColor.colorInt(primaryTextColor)), null);
+        registerEventManualDate.setCompoundDrawablesWithIntrinsicBounds(null, null, new IconicsDrawable(context, CommunityMaterial.Icon.cmd_calendar_outline).size(IconicsSize.dp(16)).color(IconicsColor.colorInt(primaryTextColor)), null);
         //registerEventManualDate.setCompoundDrawablePadding(Utils.dpToPx(6));
         registerEventManualLessonLayout = dialogView.findViewById(R.id.registerEventManualLessonLayout);
         registerEventManualLesson = dialogView.findViewById(R.id.registerEventManualLesson);
@@ -727,7 +726,7 @@ public class EventManualDialog {
                     popup.setOnMenuItemClickListener(item -> {
                         if (item.getGroupId() == 0 && eventTypes != null) {
                             EventType typeObj = eventTypes.get(item.getItemId());
-                            eventType = typeObj.id;
+                            eventType = (int)typeObj.id;
                             eventColor = -1; // set -1 as it's the event type's default color
                             registerEventManualColorPreview.setBackgroundColor(typeObj.color); // set event type's color here to show how will it look
                         }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualV2Dialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualV2Dialog.kt
new file mode 100644
index 00000000..9418af48
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualV2Dialog.kt
@@ -0,0 +1,484 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-12.
+ */
+
+package pl.szczodrzynski.edziennik.ui.dialogs.event
+
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.Observer
+import com.google.android.material.datepicker.MaterialDatePicker
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.jaredrummler.android.colorpicker.ColorPickerDialog
+import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
+import kotlinx.coroutines.*
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.events.EventType
+import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject
+import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull
+import pl.szczodrzynski.edziennik.databinding.DialogEventManualV2Binding
+import pl.szczodrzynski.edziennik.utils.Anim
+import pl.szczodrzynski.edziennik.utils.TextInputDropDown
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import pl.szczodrzynski.edziennik.utils.models.Week
+import kotlin.coroutines.CoroutineContext
+
+class EventManualV2Dialog(
+        val activity: AppCompatActivity,
+        val profileId: Int,
+        val defaultLesson: LessonFull? = null,
+        val defaultDate: Date? = null,
+        val defaultTime: Time? = null,
+        val defaultType: Int? = null,
+        val editingEvent: Event? = null,
+        val onShowListener: ((tag: String) -> Unit)? = null,
+        val onDismissListener: ((tag: String) -> Unit)? = null
+) : CoroutineScope {
+
+    companion object {
+        private const val TAG = "EventManualDialog"
+    }
+
+    private lateinit var job: Job
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private val app by lazy { activity.application as App }
+    private lateinit var b: DialogEventManualV2Binding
+    private lateinit var dialog: AlertDialog
+    private var defaultLoaded = false
+
+    private lateinit var event: Event
+    private var customColor: Int? = null
+
+    init { run {
+        if (activity.isFinishing)
+            return@run
+        job = Job()
+        onShowListener?.invoke(TAG)
+        b = DialogEventManualV2Binding.inflate(activity.layoutInflater)
+        dialog = MaterialAlertDialogBuilder(activity)
+                .setTitle(R.string.dialog_event_manual_title)
+                .setView(b.root)
+                .setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
+                .setPositiveButton(R.string.save) { _, _ -> saveEvent() }
+                .setOnDismissListener {
+                    onDismissListener?.invoke(TAG)
+                }
+                .show()
+
+        event = editingEvent?.clone() ?: Event().also { event ->
+            event.profileId = profileId
+            /*defaultDate?.let {
+                event.eventDate = it
+                b.date = it
+            }
+            defaultTime?.let {
+                event.startTime = it
+                b.time = it
+            }
+            defaultType?.let {
+                event.type = it
+            }*/
+            b.shareSwitch.isChecked = event.sharedBy != null
+        }
+
+        b.showMore.onClick { // TODO iconics is broken
+            it.apply {
+                refreshDrawableState()
+
+                if (isChecked)
+                    Anim.expand(b.moreLayout, 200, null)
+                else
+                    Anim.collapse(b.moreLayout, 200, null)
+            }
+        }
+
+        updateShareText()
+        b.shareSwitch.onChange { _, isChecked ->
+            updateShareText(isChecked)
+        }
+
+        loadLists()
+    }}
+
+    private fun updateShareText(checked: Boolean = b.shareSwitch.isChecked) {
+        val editingShared = editingEvent?.sharedBy != null
+        val editingOwn = editingEvent?.sharedBy == "self"
+
+        b.shareDetails.visibility = if (checked || editingShared)
+            View.VISIBLE
+        else View.GONE
+
+        val text = when {
+            checked && editingShared && editingOwn -> R.string.dialog_event_manual_share_will_change
+            checked && editingShared -> R.string.dialog_event_manual_share_will_request
+            !checked && editingShared -> R.string.dialog_event_manual_share_will_remove
+            else -> R.string.dialog_event_manual_share_first_notice
+        }
+
+        b.shareDetails.setText(text)
+    }
+
+    private fun loadLists() { launch {
+        val deferred = async(Dispatchers.Default) {
+            // get the team list
+            val teams = app.db.teamDao().getAllNow(profileId)
+            b.teamDropdown.clear()
+            b.teamDropdown += TextInputDropDown.Item(
+                    -1,
+                    activity.getString(R.string.dialog_event_manual_no_team),
+                    ""
+            )
+            b.teamDropdown += teams.map { TextInputDropDown.Item(it.id, it.name, tag = it) }
+
+            // get the subject list
+            val subjects = app.db.subjectDao().getAllNow(profileId)
+            b.subjectDropdown.clear()
+            b.subjectDropdown += TextInputDropDown.Item(
+                    -1,
+                    activity.getString(R.string.dialog_event_manual_no_subject),
+                    ""
+            )
+            b.subjectDropdown += subjects.map { TextInputDropDown.Item(it.id, it.longName, tag = it) }
+
+            // get the teacher list
+            val teachers = app.db.teacherDao().getAllNow(profileId)
+            b.teacherDropdown.clear()
+            b.teacherDropdown += TextInputDropDown.Item(
+                    -1,
+                    activity.getString(R.string.dialog_event_manual_no_teacher),
+                    ""
+            )
+            b.teacherDropdown += teachers.map { TextInputDropDown.Item(it.id, it.fullName, tag = it) }
+
+            // get the event type list
+            val eventTypes = app.db.eventTypeDao().getAllNow(profileId)
+            b.typeDropdown.clear()
+            b.typeDropdown += eventTypes.map { TextInputDropDown.Item(it.id, it.name, tag = it) }
+        }
+        deferred.await()
+
+        b.teamDropdown.isEnabled = true
+        b.subjectDropdown.isEnabled = true
+        b.teacherDropdown.isEnabled = true
+        b.typeDropdown.isEnabled = true
+
+        b.typeDropdown.selected?.let { item ->
+            customColor = (item.tag as EventType).color
+        }
+
+        // copy IDs from event being edited
+        editingEvent?.let {
+            b.teamDropdown.select(it.teamId)
+            b.subjectDropdown.select(it.subjectId)
+            b.teacherDropdown.select(it.teacherId)
+            b.typeDropdown.select(it.type)?.let { item ->
+                customColor = (item.tag as EventType).color
+            }
+            if (it.color != -1)
+                customColor = it.color
+        }
+
+        // copy IDs from the LessonFull
+        defaultLesson?.let {
+            b.teamDropdown.select(it.displayTeamId)
+            b.subjectDropdown.select(it.displaySubjectId)
+            b.teacherDropdown.select(it.displayTeacherId)
+        }
+
+        b.typeDropdown.setOnChangeListener {
+            b.typeColor.background.colorFilter = PorterDuffColorFilter((it.tag as EventType).color, PorterDuff.Mode.SRC_ATOP)
+            customColor = null
+            return@setOnChangeListener true
+        }
+        (customColor ?: Event.COLOR_DEFAULT).let {
+            b.typeColor.background.colorFilter = PorterDuffColorFilter(it, PorterDuff.Mode.SRC_ATOP)
+        }
+        b.typeColor.onClick {
+            val currentColor = (b.typeDropdown?.selected?.tag as EventType?)?.color ?: Event.COLOR_DEFAULT
+            val colorPickerDialog = ColorPickerDialog.newBuilder()
+                    .setColor(currentColor)
+                    .create()
+            colorPickerDialog.setColorPickerDialogListener(
+                    object : ColorPickerDialogListener {
+                        override fun onDialogDismissed(dialogId: Int) {}
+                        override fun onColorSelected(dialogId: Int, color: Int) {
+                            b.typeColor.background.colorFilter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP)
+                            customColor = color
+                        }
+                    })
+            colorPickerDialog.show(activity.fragmentManager, "color-picker-dialog")
+        }
+
+        loadDates()
+    }}
+
+    private fun loadDates() { launch {
+        val date = Date.getToday()
+        val today = date.value
+        var weekDay = date.weekDay
+
+        val deferred = async(Dispatchers.Default) {
+            val dates = mutableListOf<TextInputDropDown.Item>()
+            // item choosing the next lesson of specific subject
+            b.subjectDropdown.selected?.let {
+                if (it.tag is Subject) {
+                    dates += TextInputDropDown.Item(
+                            -it.id,
+                            activity.getString(R.string.dialog_event_manual_date_next_lesson, it.tag.longName)
+                    )
+                }
+            }
+
+            // TODAY
+            dates += TextInputDropDown.Item(
+                    date.value.toLong(),
+                    activity.getString(R.string.dialog_event_manual_date_today, date.formattedString),
+                    tag = date.clone()
+            )
+
+            // TOMORROW
+            if (weekDay < 4) {
+                date.stepForward(0, 0, 1)
+                weekDay++
+                dates += TextInputDropDown.Item(
+                        date.value.toLong(),
+                        activity.getString(R.string.dialog_event_manual_date_tomorrow, date.formattedString),
+                        tag = date.clone()
+                )
+            }
+            // REMAINING SCHOOL DAYS OF THE CURRENT WEEK
+            while (weekDay < 4) {
+                date.stepForward(0, 0, 1) // step one day forward
+                weekDay++
+                dates += TextInputDropDown.Item(
+                        date.value.toLong(),
+                        activity.getString(R.string.dialog_event_manual_date_this_week, Week.getFullDayName(weekDay), date.formattedString),
+                        tag = date.clone()
+                )
+            }
+            // go to next week Monday
+            date.stepForward(0, 0, -weekDay + 7)
+            weekDay = 0
+            // ALL SCHOOL DAYS OF THE NEXT WEEK
+            while (weekDay < 4) {
+                dates += TextInputDropDown.Item(
+                        date.value.toLong(),
+                        activity.getString(R.string.dialog_event_manual_date_next_week, Week.getFullDayName(weekDay), date.formattedString),
+                        tag = date.clone()
+                )
+                date.stepForward(0, 0, 1) // step one day forward
+                weekDay++
+            }
+            dates += TextInputDropDown.Item(
+                    -1L,
+                    activity.getString(R.string.dialog_event_manual_date_other)
+            )
+            dates
+        }
+
+        val dates = deferred.await()
+        b.dateDropdown.clear().append(dates)
+
+        editingEvent?.eventDate?.let {
+            b.dateDropdown.select(TextInputDropDown.Item(
+                    it.value.toLong(),
+                    it.formattedString,
+                    tag = it
+            ))
+        }
+
+        defaultLesson?.displayDate?.let {
+            b.dateDropdown.select(TextInputDropDown.Item(
+                    it.value.toLong(),
+                    it.formattedString,
+                    tag = it
+            ))
+        }
+
+        if (b.dateDropdown.selected == null) {
+            b.dateDropdown.select(today.toLong())
+        }
+
+        b.dateDropdown.isEnabled = true
+
+        b.dateDropdown.setOnChangeListener { item ->
+            when {
+                // next lesson with specified subject
+                item.id < -1 -> {
+                    val teamId = defaultLesson?.teamId ?: -1
+                    val selectedLessonDate = defaultLesson?.date ?: Date.getToday()
+
+                    when (teamId) {
+                        -1L -> app.db.timetableDao().getNextWithSubject(profileId, selectedLessonDate, -item.id)
+                        else -> app.db.timetableDao().getNextWithSubjectAndTeam(profileId, selectedLessonDate, -item.id, teamId)
+                    }.observeOnce(activity, Observer {
+                        val lessonDate = it?.displayDate ?: return@Observer
+                        b.dateDropdown.select(TextInputDropDown.Item(
+                                lessonDate.value.toLong(),
+                                lessonDate.formattedString,
+                                tag = lessonDate
+                        ))
+                        b.teamDropdown.select(it.displayTeamId)
+                        b.subjectDropdown.select(it.displaySubjectId)
+                        b.teacherDropdown.select(it.displayTeacherId)
+                        defaultLoaded = false
+                        loadHours(it.displayStartTime)
+                    })
+                    return@setOnChangeListener false
+                }
+                // custom date
+                item.id == -1L -> {
+                    MaterialDatePicker.Builder
+                            .datePicker()
+                            .setSelection((b.dateDropdown.selectedId?.let { Date.fromValue(it.toInt()) }
+                                    ?: Date.getToday()).inMillis)
+                            .build()
+                            .apply {
+                                addOnPositiveButtonClickListener {
+                                    val dateSelected = Date.fromMillis(it)
+                                    b.dateDropdown.select(TextInputDropDown.Item(
+                                            dateSelected.value.toLong(),
+                                            dateSelected.formattedString,
+                                            tag = dateSelected
+                                    ))
+                                    loadHours()
+                                }
+                                show(this@EventManualV2Dialog.activity.supportFragmentManager, "MaterialDatePicker")
+                            }
+
+                    return@setOnChangeListener false
+                }
+                // a specific date
+                else -> {
+                    b.dateDropdown.select(item)
+                    loadHours()
+                }
+            }
+            return@setOnChangeListener true
+        }
+
+        loadHours()
+    }}
+
+    private fun loadHours(defaultHour: Time? = null) {
+        b.timeDropdown.isEnabled = false
+        // get the selected date
+        val date = b.dateDropdown.selectedId?.let { Date.fromValue(it.toInt()) } ?: return
+        // get all lessons for selected date
+        app.db.timetableDao().getForDate(profileId, date).observeOnce(activity, Observer { lessons ->
+            val hours = mutableListOf<TextInputDropDown.Item>()
+            // add All day time choice
+            hours += TextInputDropDown.Item(
+                    0L,
+                    activity.getString(R.string.dialog_event_manual_all_day)
+            )
+            lessons.forEach { lesson ->
+                if (lesson.type == Lesson.TYPE_NO_LESSONS) {
+                    // indicate there are no lessons this day
+                    hours += TextInputDropDown.Item(
+                            -2L,
+                            activity.getString(R.string.dialog_event_manual_no_lessons)
+                    )
+                    return@forEach
+                }
+                // create the lesson caption
+                val text = listOfNotEmpty(
+                        lesson.displayStartTime?.stringHM ?: "",
+                        lesson.displaySubjectName?.let {
+                            when {
+                                lesson.type == Lesson.TYPE_CANCELLED
+                                        || lesson.type == Lesson.TYPE_SHIFTED_SOURCE -> it.asStrikethroughSpannable()
+                                lesson.type != Lesson.TYPE_NORMAL -> it.asItalicSpannable()
+                                else -> it
+                            }
+                        } ?: ""
+                )
+                // add an item with LessonFull as the tag
+                hours += TextInputDropDown.Item(
+                        lesson.displayStartTime?.value?.toLong() ?: -1,
+                        text.concat(" "),
+                        tag = lesson
+                )
+            }
+            b.timeDropdown.clear().append(hours)
+
+            if (defaultLoaded) {
+                b.timeDropdown.deselect()
+                // select the TEAM_CLASS if possible
+                b.teamDropdown.items.singleOrNull {
+                    it.tag is Team && it.tag.type == Team.TYPE_CLASS
+                }?.let {
+                    b.teamDropdown.select(it)
+                } ?: b.teamDropdown.deselect()
+
+                // clear subject, teacher selection
+                b.subjectDropdown.deselect()
+                b.teacherDropdown.deselect()
+            }
+            else {
+                editingEvent?.let {
+                    b.timeDropdown.select(it.startTime?.value?.toLong())
+                }
+
+                defaultLesson?.let {
+                    b.timeDropdown.select(it.displayStartTime?.value?.toLong())
+                }
+
+                defaultHour?.let {
+                    b.timeDropdown.select(it.value.toLong())
+                }
+            }
+            defaultLoaded = true
+            b.timeDropdown.isEnabled = true
+
+            // attach a listener to time dropdown
+            b.timeDropdown.setOnChangeListener { item ->
+                when {
+                    // no lessons this day
+                    item.id == -2L -> {
+                        b.timeDropdown.deselect()
+                        return@setOnChangeListener false
+                    }
+                    // custom start hour
+                    item.id == -1L -> {
+
+                        return@setOnChangeListener false
+                    }
+                    // selected a specific lesson
+                    else -> {
+                        if (item.tag is LessonFull) {
+                            // update team, subject, teacher dropdowns,
+                            // using the LessonFull from item tag
+                            b.teamDropdown.deselect()
+                            b.subjectDropdown.deselect()
+                            b.teacherDropdown.deselect()
+                            item.tag.displayTeamId?.let { 
+                                b.teamDropdown.select(it)
+                            }
+                            item.tag.displaySubjectId?.let {
+                                b.subjectDropdown.select(it)
+                            }
+                            item.tag.displayTeacherId?.let {
+                                b.teacherDropdown.select(it)
+                            }
+                        }
+                    }
+                }
+                return@setOnChangeListener true
+            }
+        })
+    }
+
+    private fun saveEvent() {
+
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/home/StudentNumberDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/home/StudentNumberDialog.kt
new file mode 100644
index 00000000..56785d98
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/home/StudentNumberDialog.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-24.
+ */
+
+package pl.szczodrzynski.edziennik.ui.dialogs.home
+
+import android.text.InputType
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import com.afollestad.materialdialogs.MaterialDialog
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+
+class StudentNumberDialog(
+        val activity: AppCompatActivity,
+        val profile: Profile,
+        val onShowListener: ((tag: String) -> Unit)? = null,
+        val onDismissListener: ((tag: String) -> Unit)? = null
+) {
+    companion object {
+        private const val TAG = "StudentNumberDialog"
+    }
+
+    private lateinit var dialog: AlertDialog
+
+    init { run {
+        if (activity.isFinishing)
+            return@run
+        onShowListener?.invoke(TAG)
+        MaterialDialog.Builder(activity)
+                .title(R.string.card_lucky_number_set_title)
+                .content(R.string.card_lucky_number_set_text)
+                .inputType(InputType.TYPE_CLASS_NUMBER)
+                .input(null, if (profile.studentNumber == -1) "" else profile.studentNumber.toString()) { _: MaterialDialog?, input: CharSequence ->
+                    try {
+                        profile.studentNumber = input.toString().toInt()
+                    } catch (e: Exception) {
+                        Toast.makeText(activity, R.string.incorrect_format, Toast.LENGTH_SHORT).show()
+                    }
+                }
+                .dismissListener {
+                    onDismissListener?.invoke(TAG)
+                }.show()
+    }}
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileRemoveDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileRemoveDialog.kt
new file mode 100644
index 00000000..fa626091
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileRemoveDialog.kt
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-13.
+ */
+
+package pl.szczodrzynski.edziennik.ui.dialogs.settings
+
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.*
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding
+import pl.szczodrzynski.edziennik.utils.models.Notification
+import java.util.*
+import kotlin.coroutines.CoroutineContext
+
+class ProfileRemoveDialog(
+        val activity: MainActivity,
+        val profileId: Int,
+        val profileName: String
+) : CoroutineScope {
+    companion object {
+        private const val TAG = "ProfileRemoveDialog"
+    }
+
+    private lateinit var job: Job
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private val app by lazy { activity.application as App }
+    private lateinit var b: DialogLessonDetailsBinding
+    private lateinit var dialog: AlertDialog
+
+    init { run {
+        job = Job()
+
+        dialog = MaterialAlertDialogBuilder(activity)
+                .setTitle(R.string.profile_menu_remove_confirm)
+                .setMessage(activity.getString(R.string.profile_menu_remove_confirm_text_format, profileName, profileName))
+                .setPositiveButton(R.string.remove) { _, _ ->
+                    removeProfile()
+                }
+                .setNeutralButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
+                .setCancelable(false)
+                .show()
+    }}
+
+    private fun removeProfile() { launch {
+        val deferred = async(Dispatchers.Default) {
+            val profileObject = app.db.profileDao().getByIdNow(profileId) ?: return@async
+            app.db.announcementDao().clear(profileId)
+            app.db.attendanceDao().clear(profileId)
+            app.db.eventDao().clear(profileId)
+            app.db.eventTypeDao().clear(profileId)
+            app.db.gradeDao().clear(profileId)
+            app.db.gradeCategoryDao().clear(profileId)
+            app.db.lessonDao().clear(profileId)
+            app.db.lessonChangeDao().clear(profileId)
+            app.db.luckyNumberDao().clear(profileId)
+            app.db.noticeDao().clear(profileId)
+            app.db.subjectDao().clear(profileId)
+            app.db.teacherDao().clear(profileId)
+            app.db.teamDao().clear(profileId)
+            app.db.messageRecipientDao().clear(profileId)
+            app.db.messageDao().clear(profileId)
+            app.db.endpointTimerDao().clear(profileId)
+            app.db.attendanceTypeDao().clear(profileId)
+            app.db.classroomDao().clear(profileId)
+            app.db.lessonRangeDao().clear(profileId)
+            app.db.noticeTypeDao().clear(profileId)
+            app.db.teacherAbsenceDao().clear(profileId)
+            app.db.teacherAbsenceTypeDao().clear(profileId)
+            app.db.timetableDao().clear(profileId)
+
+            val loginStoreId = profileObject.loginStoreId
+            val profilesUsingLoginStore = app.db.profileDao().getIdsByLoginStoreIdNow(loginStoreId)
+            if (profilesUsingLoginStore.size == 1) {
+                app.db.loginStoreDao().remove(loginStoreId)
+            }
+            app.db.profileDao().remove(profileId)
+            app.db.metadataDao().deleteAll(profileId)
+
+            val toRemove = ArrayList<Notification>()
+            for (notification in app.appConfig.notifications) {
+                if (notification.profileId == profileId) {
+                    toRemove.add(notification)
+                }
+            }
+            app.appConfig.notifications.removeAll(toRemove)
+
+            app.profile = null
+            App.profileId = -1
+
+            app.profileLoadById(app.profileLastId())
+        }
+        deferred.await()
+        dialog.dismiss()
+        activity.reloadTarget()
+        Toast.makeText(activity, R.string.dialog_profile_remove_success, Toast.LENGTH_LONG).show()
+    }}
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt
new file mode 100644
index 00000000..a857a538
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-13.
+ */
+
+package pl.szczodrzynski.edziennik.ui.dialogs.sync
+
+import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask
+import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
+import kotlin.coroutines.CoroutineContext
+
+class SyncViewListDialog(
+        val activity: MainActivity,
+        val currentViewId: Int? = null
+) : CoroutineScope {
+    companion object {
+        private const val TAG = "SyncViewListDialog"
+    }
+
+    private lateinit var job: Job
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private val app by lazy { activity.application as App }
+    private lateinit var b: DialogLessonDetailsBinding
+    private lateinit var dialog: AlertDialog
+
+    init { run {
+        job = Job()
+
+        val viewIds = arrayOf(
+                MainActivity.DRAWER_ITEM_TIMETABLE,
+                MainActivity.DRAWER_ITEM_AGENDA,
+                MainActivity.DRAWER_ITEM_GRADES,
+                MainActivity.DRAWER_ITEM_HOMEWORK,
+                MainActivity.DRAWER_ITEM_BEHAVIOUR,
+                MainActivity.DRAWER_ITEM_ATTENDANCE,
+                MainActivity.DRAWER_ITEM_MESSAGES,
+                MainActivity.DRAWER_ITEM_MESSAGES,
+                MainActivity.DRAWER_ITEM_ANNOUNCEMENTS
+        )
+
+        val items = arrayOf<String>(
+                app.getString(R.string.menu_timetable),
+                app.getString(R.string.menu_agenda),
+                app.getString(R.string.menu_grades),
+                app.getString(R.string.menu_homework),
+                app.getString(R.string.menu_notices),
+                app.getString(R.string.menu_attendance),
+                app.getString(R.string.title_messages_inbox_single),
+                app.getString(R.string.title_messages_sent_single),
+                app.getString(R.string.menu_announcements)
+        )
+
+        val everything = currentViewId == MainActivity.DRAWER_ITEM_HOME
+        val checkedItems = booleanArrayOf(
+                everything || currentViewId == MainActivity.DRAWER_ITEM_TIMETABLE,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_AGENDA,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_GRADES,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_HOMEWORK,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_BEHAVIOUR,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_ATTENDANCE,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_MESSAGES && MessagesFragment.pageSelection != 1,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_MESSAGES && MessagesFragment.pageSelection == 1,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_ANNOUNCEMENTS
+        )
+        val userChooses = checkedItems.toMutableList()
+
+        dialog = MaterialAlertDialogBuilder(activity)
+                .setTitle(R.string.dialog_sync_view_list_title)
+                .setMultiChoiceItems(items, checkedItems) { _, which, isChecked ->
+                    userChooses[which] = isChecked
+                }
+                .setPositiveButton(R.string.ok) { _, _ ->
+                    dialog.dismiss()
+
+                    val selectedViewIds = userChooses.mapIndexed { index, it ->
+                        if (it)
+                            viewIds[index] to when (index) {
+                                7 -> 1
+                                else -> 0
+                            }
+                        else
+                            null
+                    }.let {
+                        listOfNotNull(*it.toTypedArray())
+                    }
+
+                    if (selectedViewIds.isNotEmpty()) {
+                        activity.swipeRefreshLayout.isRefreshing = true
+                        EdziennikTask.syncProfile(
+                                App.profileId,
+                                selectedViewIds
+                        ).enqueue(activity)
+                    }
+                }
+                .setNeutralButton(R.string.sync_feature_all) { _, _ ->
+                    dialog.dismiss()
+
+                    activity.swipeRefreshLayout.isRefreshing = true
+                    EdziennikTask.syncProfile(App.profileId).enqueue(activity)
+                }
+                .setNegativeButton(R.string.cancel) { _, _ ->
+                    dialog.dismiss()
+                }
+                .show()
+    }}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceAdapter.kt
index 2d8eb2c6..b8e165d1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceAdapter.kt
@@ -1,6 +1,7 @@
 package pl.szczodrzynski.edziennik.ui.dialogs.teacherabsence
 
 import android.content.Context
+import android.opengl.Visibility
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -47,10 +48,19 @@ class TeacherAbsenceAdapter(
         }
 
         holder.teacherAbsenceTime.text = time
+
+        if (teacherAbsence.name != null) {
+            holder.teacherAbsenceName.visibility = View.VISIBLE
+            holder.teacherAbsenceName.text = teacherAbsence.name
+        } else {
+            holder.teacherAbsenceName.visibility = View.GONE
+        }
+
     }
 
     class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         var teacherAbsenceTeacher: TextView = itemView.findViewById(R.id.teacherAbsenceTeacher)
         var teacherAbsenceTime: TextView = itemView.findViewById(R.id.teacherAbsenceTime)
+        var teacherAbsenceName: TextView = itemView.findViewById(R.id.teacherAbsenceName)
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt
new file mode 100644
index 00000000..46464fc1
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-11.
+ */
+
+package pl.szczodrzynski.edziennik.ui.dialogs.timetable
+
+import android.content.Intent
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull
+import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding
+import pl.szczodrzynski.edziennik.setText
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualV2Dialog
+import pl.szczodrzynski.edziennik.ui.modules.timetable.v2.TimetableFragment
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Week
+
+class LessonDetailsDialog(
+        val activity: AppCompatActivity,
+        val lesson: LessonFull,
+        val onShowListener: ((tag: String) -> Unit)? = null,
+        val onDismissListener: ((tag: String) -> Unit)? = null
+) {
+    companion object {
+        private const val TAG = "LessonDetailsDialog"
+    }
+
+    private lateinit var b: DialogLessonDetailsBinding
+    private lateinit var dialog: AlertDialog
+
+    init { run {
+        if (activity.isFinishing)
+            return@run
+        onShowListener?.invoke(TAG)
+        b = DialogLessonDetailsBinding.inflate(activity.layoutInflater)
+        dialog = MaterialAlertDialogBuilder(activity)
+                .setView(b.root)
+                .setPositiveButton(R.string.close) { dialog, _ ->
+                    dialog.dismiss()
+                }
+                .setNeutralButton(R.string.add) { dialog, _ ->
+                    EventManualV2Dialog(
+                            activity,
+                            lesson.profileId,
+                            lesson,
+                            onShowListener = onShowListener,
+                            onDismissListener = onDismissListener
+                    )
+                    /*MaterialAlertDialogBuilder(activity)
+                            .setItems(R.array.main_menu_add_options) { dialog2, which ->
+                                dialog2.dismiss()
+                                EventManualDialog(activity, lesson.profileId)
+                                        .show(
+                                                activity.application as App,
+                                                null,
+                                                lesson.displayDate,
+                                                lesson.displayStartTime,
+                                                when (which) {
+                                                    1 -> EventManualDialog.DIALOG_HOMEWORK
+                                                    else -> EventManualDialog.DIALOG_EVENT
+                                                }
+                                        )
+
+                            }
+                            .setNegativeButton(R.string.cancel) { dialog2, _ -> dialog2.dismiss() }
+                            .show()*/
+                }
+                .setOnDismissListener {
+                    onDismissListener?.invoke(TAG)
+                }
+                .show()
+        update()
+    }}
+
+    private fun update() {
+        b.lesson = lesson
+        val lessonDate = lesson.displayDate ?: return
+        b.lessonDate.text = Week.getFullDayName(lessonDate.weekDay) + ", " + lessonDate.formattedString
+
+        if (lesson.type >= Lesson.TYPE_SHIFTED_SOURCE) {
+            b.shiftedLayout.visibility = View.VISIBLE
+            var otherLessonDate: Date? = null
+            when (lesson.type) {
+                Lesson.TYPE_SHIFTED_SOURCE -> {
+                    otherLessonDate = lesson.date
+                    when {
+                        lesson.date != lesson.oldDate -> b.shiftedText.setText(
+                                R.string.timetable_lesson_shifted_other_day,
+                                lesson.date?.stringY_m_d ?: "?",
+                                lesson.startTime?.stringHM ?: "?"
+                        )
+                        lesson.startTime != lesson.oldStartTime -> b.shiftedText.setText(
+                                R.string.timetable_lesson_shifted_same_day,
+                                lesson.startTime?.stringHM ?: "?"
+                        )
+                        else -> b.shiftedText.setText(R.string.timetable_lesson_shifted)
+                    }
+                }
+                Lesson.TYPE_SHIFTED_TARGET -> {
+                    otherLessonDate = lesson.oldDate
+                    when {
+                        lesson.date != lesson.oldDate -> b.shiftedText.setText(
+                                R.string.timetable_lesson_shifted_from_other_day,
+                                lesson.oldDate?.stringY_m_d ?: "?",
+                                lesson.oldStartTime?.stringHM ?: "?"
+                        )
+                        lesson.startTime != lesson.oldStartTime -> b.shiftedText.setText(
+                                R.string.timetable_lesson_shifted_from_same_day,
+                                lesson.oldStartTime?.stringHM ?: "?"
+                        )
+                        else -> b.shiftedText.setText(R.string.timetable_lesson_shifted_from)
+                    }
+                }
+            }
+            b.shiftedGoTo.setOnClickListener {
+                dialog.dismiss()
+                val dateStr = otherLessonDate?.stringY_m_d ?: return@setOnClickListener
+                val intent = Intent(TimetableFragment.ACTION_SCROLL_TO_DATE).apply {
+                    putExtra("timetableDate", dateStr)
+                }
+                activity.sendBroadcast(intent)
+            }
+        }
+        else {
+            b.shiftedLayout.visibility = View.GONE
+        }
+
+        if (lesson.type < Lesson.TYPE_SHIFTED_SOURCE && lesson.oldSubjectId != null && lesson.subjectId != lesson.oldSubjectId) {
+            b.oldSubjectName = lesson.oldSubjectName
+        }
+        if (lesson.type != Lesson.TYPE_CANCELLED && lesson.displaySubjectId != null) {
+            b.subjectName = lesson.subjectName
+        }
+
+        if (lesson.type < Lesson.TYPE_SHIFTED_SOURCE && lesson.oldTeacherId != null && lesson.teacherId != lesson.oldTeacherId) {
+            b.oldTeacherName = lesson.oldTeacherName
+        }
+        if (lesson.type != Lesson.TYPE_CANCELLED && lesson.displayTeacherId != null) {
+            b.teacherName = lesson.teacherName
+        }
+
+        if (lesson.oldClassroom != null && lesson.classroom != lesson.oldClassroom) {
+            b.oldClassroom = lesson.oldClassroom
+        }
+        if (lesson.type != Lesson.TYPE_CANCELLED && lesson.displayClassroom != null) {
+            b.classroom = lesson.classroom
+        }
+
+        if (lesson.type < Lesson.TYPE_SHIFTED_SOURCE && lesson.oldTeamId != null && lesson.teamId != lesson.oldTeamId) {
+            b.oldTeamName = lesson.oldTeamName
+        }
+        if (lesson.type != Lesson.TYPE_CANCELLED && lesson.displayTeamId != null) {
+            b.teamName = lesson.teamName
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.java
index 37db5001..38964838 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.java
@@ -6,15 +6,16 @@ import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
+
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.applandeo.materialcalendarview.CalendarView;
 import com.applandeo.materialcalendarview.EventDay;
@@ -27,6 +28,7 @@ import com.mikepenz.iconics.IconicsColor;
 import com.mikepenz.iconics.IconicsDrawable;
 import com.mikepenz.iconics.IconicsSize;
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
+import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -34,13 +36,13 @@ import java.util.List;
 import java.util.Locale;
 
 import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
+import pl.szczodrzynski.edziennik.R;
+import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull;
+import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull;
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceFull;
 import pl.szczodrzynski.edziennik.databinding.FragmentAgendaCalendarBinding;
 import pl.szczodrzynski.edziennik.databinding.FragmentAgendaDefaultBinding;
-import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull;
 import pl.szczodrzynski.edziennik.ui.dialogs.event.EventListDialog;
 import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog;
 import pl.szczodrzynski.edziennik.ui.dialogs.lessonchange.LessonChangeDialog;
@@ -51,11 +53,11 @@ import pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchange.LessonChangeEve
 import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceCounter;
 import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceEvent;
 import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceEventRenderer;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.Time;
 import pl.szczodrzynski.edziennik.utils.Colors;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.edziennik.utils.Utils;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem;
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem;
 
@@ -102,7 +104,7 @@ public class AgendaFragment extends Fragment {
                 new BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_add_event)
                         .withDescription(R.string.menu_add_event_desc)
-                        .withIcon(CommunityMaterial.Icon.cmd_calendar_plus)
+                        .withIcon(SzkolnyFont.Icon.szf_calendar_plus_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
                             new MaterialDialog.Builder(activity)
@@ -122,7 +124,7 @@ public class AgendaFragment extends Fragment {
                         }),
                 new BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_agenda_change_view)
-                        .withIcon(viewType == AGENDA_DEFAULT ? CommunityMaterial.Icon.cmd_calendar : CommunityMaterial.Icon2.cmd_view_list)
+                        .withIcon(viewType == AGENDA_DEFAULT ? CommunityMaterial.Icon.cmd_calendar_outline : CommunityMaterial.Icon.cmd_format_list_bulleted_square)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
                             viewType = viewType == AGENDA_DEFAULT ? AGENDA_CALENDAR : AGENDA_DEFAULT;
@@ -133,7 +135,7 @@ public class AgendaFragment extends Fragment {
                 new BottomSheetSeparatorItem(true),
                 new BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_mark_as_read)
-                        .withIcon(CommunityMaterial.Icon.cmd_eye_check)
+                        .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
                             AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_EVENT, true));
@@ -182,7 +184,7 @@ public class AgendaFragment extends Fragment {
             }
 
             if (app.profile.getStudentData("showTeacherAbsences", true)) {
-                List<TeacherAbsenceFull> teacherAbsenceList = app.db.teacherAbsenceDao().getAllFull(App.profileId);
+                List<TeacherAbsenceFull> teacherAbsenceList = app.db.teacherAbsenceDao().getAllFullNow(App.profileId);
                 List<TeacherAbsenceCounter> teacherAbsenceCounters = new ArrayList<>();
 
                 for (TeacherAbsenceFull absence : teacherAbsenceList) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsFragment.java
index c539486a..1edf378f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsFragment.java
@@ -58,7 +58,7 @@ public class AnnouncementsFragment extends Fragment {
         activity.getBottomSheet().prependItems(
                 new BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_mark_as_read)
-                        .withIcon(CommunityMaterial.Icon.cmd_eye_check)
+                        .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
                             AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_ANNOUNCEMENT, true));
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.java
index d28aadf9..68942d5b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.java
@@ -95,7 +95,7 @@ public class AttendanceFragment extends Fragment {
         activity.getBottomSheet().prependItems(
                 new BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_mark_as_read)
-                        .withIcon(CommunityMaterial.Icon.cmd_eye_check)
+                        .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
                             AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_ATTENDANCE, true));
@@ -133,7 +133,7 @@ public class AttendanceFragment extends Fragment {
                 CafeBar.builder(activity)
                         .to(activity.getNavView().getCoordinator())
                         .content(R.string.sync_old_data_info)
-                        .icon(new IconicsDrawable(activity).icon(CommunityMaterial.Icon2.cmd_sync).size(IconicsSize.dp(20)).color(IconicsColor.colorInt(Themes.INSTANCE.getPrimaryTextColor(activity))))
+                        .icon(new IconicsDrawable(activity).icon(CommunityMaterial.Icon.cmd_download_outline).size(IconicsSize.dp(20)).color(IconicsColor.colorInt(Themes.INSTANCE.getPrimaryTextColor(activity))))
                         .positiveText(R.string.refresh)
                         .positiveColor(0xff4caf50)
                         .negativeText(R.string.ok)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/BehaviourFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/BehaviourFragment.java
index 29f46afe..b8a46801 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/BehaviourFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/BehaviourFragment.java
@@ -69,7 +69,7 @@ public class BehaviourFragment extends Fragment {
         activity.getBottomSheet().prependItems(
                 new BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_mark_as_read)
-                        .withIcon(CommunityMaterial.Icon.cmd_eye_check)
+                        .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
                             AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_NOTICE, true));
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt
index c9693842..39ab4efd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt
@@ -9,21 +9,20 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
-
-import com.mikepenz.iconics.IconicsDrawable
 import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
+import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
 import com.mikepenz.iconics.utils.colorRes
 import com.mikepenz.iconics.utils.sizeDp
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_MOBIDZIENNIK
 import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice
 import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeFull
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_MOBIDZIENNIK
 import pl.szczodrzynski.edziennik.utils.Utils.bs
+import pl.szczodrzynski.edziennik.utils.models.Date
 
 class NoticesAdapter//getting the context and product list with constructor
 (private val context: Context, var noticeList: List<NoticeFull>) : RecyclerView.Adapter<NoticesAdapter.ViewHolder>() {
@@ -40,7 +39,7 @@ class NoticesAdapter//getting the context and product list with constructor
 
         val notice = noticeList[position]
 
-        if (app.profile.loginStoreType == LOGIN_TYPE_MOBIDZIENNIK) {
+        if (app.profile.loginStoreType == LOGIN_TYPE_MOBIDZIENNIK && false) {
             holder.noticesItemReason.text = bs(null, notice.category, "\n") + notice.text
             holder.noticesItemTeacherName.text = app.getString(R.string.notices_points_format, notice.teacherFullName, if (notice.points > 0) "+" + notice.points else notice.points)
         } else {
@@ -50,15 +49,15 @@ class NoticesAdapter//getting the context and product list with constructor
         holder.noticesItemAddedDate.text = Date.fromMillis(notice.addedDate).formattedString
 
         if (notice.type == Notice.TYPE_POSITIVE) {
-            holder.noticesItemType.setImageDrawable(IconicsDrawable(context, CommunityMaterial.Icon2.cmd_plus_circle)
+            holder.noticesItemType.setImageDrawable(IconicsDrawable(context, CommunityMaterial.Icon2.cmd_plus_circle_outline)
                     .colorRes(R.color.md_green_600)
                     .sizeDp(36))
         } else if (notice.type == Notice.TYPE_NEGATIVE) {
-            holder.noticesItemType.setImageDrawable(IconicsDrawable(context, CommunityMaterial.Icon.cmd_alert_decagram)
+            holder.noticesItemType.setImageDrawable(IconicsDrawable(context, CommunityMaterial.Icon.cmd_alert_decagram_outline)
                     .colorRes(R.color.md_red_600)
                     .sizeDp(36))
         } else {
-            holder.noticesItemType.setImageDrawable(IconicsDrawable(context, CommunityMaterial.Icon2.cmd_message_outline)
+            holder.noticesItemType.setImageDrawable(IconicsDrawable(context, SzkolnyFont.Icon.szf_message_processing_outline)
                     .colorRes(R.color.md_blue_500)
                     .sizeDp(36))
         }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorDialog.kt
new file mode 100644
index 00000000..bf0ff712
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorDialog.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-13.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.error
+
+import android.util.Log
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding
+import kotlin.coroutines.CoroutineContext
+
+class ErrorDialog(
+        val activity: AppCompatActivity,
+        val exception: Exception
+) : CoroutineScope {
+    companion object {
+        private const val TAG = "ErrorDialog"
+    }
+
+    private lateinit var job: Job
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private val app by lazy { activity.application as App }
+    private lateinit var b: DialogLessonDetailsBinding
+    private lateinit var dialog: AlertDialog
+
+    init { run {
+        job = Job()
+
+        dialog = MaterialAlertDialogBuilder(activity)
+                .setTitle(R.string.error_occured)
+                .setMessage(exception.message + "\n" + Log.getStackTraceString(exception))
+                .setPositiveButton(R.string.ok) { _, _ ->
+                    dialog.dismiss()
+                }
+                .show()
+    }}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorSnackbar.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorSnackbar.kt
new file mode 100644
index 00000000..c4e32ae2
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorSnackbar.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-13.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.error
+
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.graphics.ColorUtils
+import com.google.android.material.snackbar.Snackbar
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.navlib.getColorFromAttr
+
+class ErrorSnackbar(val activity: AppCompatActivity) {
+    companion object {
+        private const val TAG = "ErrorSnackbar"
+    }
+
+    private var snackbar: Snackbar? = null
+    private lateinit var coordinator: CoordinatorLayout
+    private val errors = mutableListOf<ApiError>()
+
+    fun setCoordinator(coordinatorLayout: CoordinatorLayout, showAbove: View? = null) {
+        this.coordinator = coordinatorLayout
+        snackbar = Snackbar.make(coordinator, R.string.snackbar_error_text, Snackbar.LENGTH_INDEFINITE)
+        snackbar?.setAction(R.string.more) {
+
+        }
+        val bgColor = ColorUtils.compositeColors(
+                getColorFromAttr(activity, R.attr.colorOnSurface) and 0xcfffffff.toInt(),
+                getColorFromAttr(activity, R.attr.colorSurface)
+        )
+        snackbar?.setBackgroundTint(bgColor)
+        showAbove?.let { snackbar?.anchorView = it }
+    }
+
+    fun addError(apiError: ApiError): ErrorSnackbar {
+        errors += apiError
+        snackbar?.setText(apiError.getStringReason(activity))
+        return this
+    }
+
+    fun show() = snackbar?.show()
+    fun dismiss() = snackbar?.dismiss()
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesFragment.java
index 1a6b99dc..c756ccbd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesFragment.java
@@ -132,7 +132,7 @@ public class GradesFragment extends Fragment {
                         }),
                 new BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_grades_color_mode)
-                        .withIcon(CommunityMaterial.Icon2.cmd_palette)
+                        .withIcon(CommunityMaterial.Icon2.cmd_palette_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
                             new MaterialDialog.Builder(activity)
@@ -195,7 +195,7 @@ public class GradesFragment extends Fragment {
                 new BottomSheetSeparatorItem(true),
                 new BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_mark_as_read)
-                        .withIcon(CommunityMaterial.Icon.cmd_eye_check)
+                        .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
                             AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_GRADE, true));
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CardItemTouchHelperCallback.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CardItemTouchHelperCallback.kt
new file mode 100644
index 00000000..070fb19c
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CardItemTouchHelperCallback.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-23.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.home
+
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.card.MaterialCardView
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragmentV2.Companion.swapCards
+import pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
+
+class CardItemTouchHelperCallback(private val cardAdapter: HomeCardAdapter, private val refreshLayout: SwipeRefreshLayoutNoIndicator?) : ItemTouchHelper.Callback() {
+    companion object {
+        private const val TAG = "CardItemTouchHelperCallback"
+        private const val DRAG_FLAGS = ItemTouchHelper.UP or ItemTouchHelper.DOWN
+        private const val SWIPE_FLAGS = 0
+    }
+
+    private var dragCardView: MaterialCardView? = null
+
+    override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
+        return makeMovementFlags(DRAG_FLAGS, SWIPE_FLAGS)
+    }
+
+    override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
+        val fromPosition = viewHolder.adapterPosition
+        val toPosition = target.adapterPosition
+
+        swapCards(fromPosition, toPosition, cardAdapter)
+        return true
+    }
+
+    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) = Unit
+
+    override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
+        super.onSelectedChanged(viewHolder, actionState)
+
+        if (actionState == ItemTouchHelper.ACTION_STATE_DRAG && viewHolder != null) {
+            dragCardView = viewHolder.itemView as MaterialCardView
+            dragCardView?.isDragged = true
+            refreshLayout?.isEnabled = false
+        } else if (actionState == ItemTouchHelper.ACTION_STATE_IDLE && dragCardView != null) {
+            refreshLayout?.isEnabled = true
+            dragCardView?.isDragged = false
+            dragCardView = null
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CounterActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CounterActivity.java
index 14a6b71c..426774ca 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CounterActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CounterActivity.java
@@ -1,11 +1,12 @@
 package pl.szczodrzynski.edziennik.ui.modules.home;
 
-import androidx.databinding.DataBindingUtil;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.util.Log;
+
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import android.util.Log;
+import androidx.databinding.DataBindingUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,8 +15,8 @@ import java.util.TimerTask;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.databinding.ActivityCounterBinding;
 import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull;
+import pl.szczodrzynski.edziennik.databinding.ActivityCounterBinding;
 import pl.szczodrzynski.edziennik.utils.models.Date;
 import pl.szczodrzynski.edziennik.utils.models.Time;
 
@@ -88,7 +89,7 @@ public class CounterActivity extends AppCompatActivity {
     private void findLessons(Time syncedNow) {
         AsyncTask.execute(() -> {
             Date today = Date.getToday();
-            lessons = app.db.lessonDao().getAllNearestNow(App.profileId, today.clone().stepForward(0, 0, -today.getWeekDay()), today, syncedNow);
+            lessons = app.db.lessonDao().getAllNearestNow(App.profileId, today.getWeekStart(), today, syncedNow);
 
             if (lessons != null && lessons.size() != 0) {
                 Date displayingDate = lessons.get(0).lessonDate;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeCard.kt
new file mode 100644
index 00000000..e6f28c68
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeCard.kt
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-23.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.home
+
+interface HomeCard {
+    fun bind(position: Int, holder: HomeCardAdapter.ViewHolder)
+    fun unbind(position: Int, holder: HomeCardAdapter.ViewHolder)
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeCardAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeCardAdapter.kt
new file mode 100644
index 00000000..05ba72b6
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeCardAdapter.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-23.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.home
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.card.MaterialCardView
+import pl.szczodrzynski.edziennik.R
+
+class HomeCardAdapter(var items: MutableList<HomeCard>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+    companion object {
+        private const val TAG = "HomeCardAdapter"
+    }
+
+    var itemTouchHelper: ItemTouchHelper? = null
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        (holder as ViewHolder).bind(itemTouchHelper)
+        items[position].bind(position, holder)
+    }
+
+    override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
+        items.getOrNull(holder.adapterPosition)?.unbind(holder.adapterPosition, holder as ViewHolder)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        return ViewHolder(
+                LayoutInflater.from(parent.context).inflate(R.layout.card_home, parent, false) as MaterialCardView
+        )
+    }
+
+    override fun getItemCount(): Int = items.size
+
+    class ViewHolder(val root: MaterialCardView) : RecyclerView.ViewHolder(root) {
+        @SuppressLint("ClickableViewAccessibility")
+        fun bind(itemTouchHelper: ItemTouchHelper?) {
+            /*root.setOnTouchListener { _: View?, event: MotionEvent ->
+                if (event.action == MotionEvent.ACTION_DOWN) {
+                    itemTouchHelper?.startDrag(this)
+                    return@setOnTouchListener true
+                }
+                false
+            }*/
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeDummyCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeDummyCard.kt
new file mode 100644
index 00000000..88564bad
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeDummyCard.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-23.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.home
+
+import android.widget.TextView
+import androidx.core.view.plusAssign
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.startCoroutineTimer
+import kotlin.coroutines.CoroutineContext
+
+class HomeDummyCard(val id: Int) : HomeCard, CoroutineScope {
+    companion object {
+        private const val TAG = "HomeDummyCard"
+    }
+
+    private lateinit var app: App
+    private lateinit var activity: MainActivity
+
+    private var job: Job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    var timer: Job? = null
+    var time = 0
+
+    override fun bind(position: Int, holder: HomeCardAdapter.ViewHolder) { launch {
+        holder.root.removeAllViews()
+        //holder.setIsRecyclable(false)
+
+        val text = TextView(holder.root.context).apply {
+            text = "This is a card #$id"
+        }
+        holder.root += text
+
+        timer = startCoroutineTimer(repeatMillis = 1000) {
+            time++
+            text.text = "Coroutine timer at #$id! $time seconds"
+        }
+
+        /*val button = MaterialButton(holder.root.context).apply {
+            setText("Cancel")
+            onClick {
+                timer.cancel()
+            }
+        }
+        holder.root += button*/
+    }}
+
+    override fun unbind(position: Int, holder: HomeCardAdapter.ViewHolder) {
+        timer?.cancel()
+        timer = null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.java
index 7b5e2b4d..c94da393 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.java
@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.Typeface;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
@@ -27,39 +28,46 @@ import androidx.annotation.PluralsRes;
 import androidx.core.graphics.ColorUtils;
 import androidx.databinding.DataBindingUtil;
 import androidx.fragment.app.Fragment;
+import androidx.work.WorkManager;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.chuckerteam.chucker.api.Chucker;
+import com.hypertrack.hyperlog.HyperLog;
 import com.mikepenz.iconics.IconicsColor;
 import com.mikepenz.iconics.IconicsDrawable;
 import com.mikepenz.iconics.IconicsSize;
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
+import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.BuildConfig;
-import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.databinding.CardLuckyNumberBinding;
-import pl.szczodrzynski.edziennik.databinding.CardUpdateBinding;
-import pl.szczodrzynski.edziennik.databinding.FragmentHomeBinding;
+import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeFull;
 import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull;
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
 import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject;
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeActivity;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.ItemGradesSubjectModel;
-import pl.szczodrzynski.edziennik.utils.models.Time;
+import pl.szczodrzynski.edziennik.databinding.CardLuckyNumberBinding;
+import pl.szczodrzynski.edziennik.databinding.CardUpdateBinding;
+import pl.szczodrzynski.edziennik.databinding.FragmentHomeBinding;
 import pl.szczodrzynski.edziennik.receivers.BootReceiver;
+import pl.szczodrzynski.edziennik.ui.modules.login.LoginLibrusCaptchaActivity;
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeActivity;
 import pl.szczodrzynski.edziennik.utils.Colors;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.edziennik.utils.Utils;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.ItemGradesSubjectModel;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem;
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem;
 
 import static pl.szczodrzynski.edziennik.App.UPDATES_ON_PLAY_STORE;
+import static pl.szczodrzynski.edziennik.MainActivity.DRAWER_ITEM_GRADES;
 import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER1_FINAL;
 import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER1_PROPOSED;
 import static pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER2_FINAL;
@@ -94,28 +102,39 @@ public class HomeFragment extends Fragment {
         if (app == null || app.profile == null || activity == null || b == null || !isAdded())
             return;
 
-        /*b.refreshLayout.setOnRefreshListener(() -> {
-            activity.syncCurrentFeature(MainActivity.DRAWER_ITEM_HOME, b.refreshLayout);
-        });*/
-        /*b.refreshLayout.setOnTouchListener((v, event) -> {
-            d(TAG, "event "+event);
-            event.setSource(0x10000000); // set a unique source
-            activity.swipeRefreshLayout.onTouchEvent(event);
-            return true;
-        });*/
-        /*b.refreshLayout.setOnDragListener((v, event) -> {
-            activity.swipeRefreshLayout.onDragEvent(event);
-            return true;
-        });*/
+        b.devMode.setVisibility(App.devMode ? View.VISIBLE : View.GONE);
 
-        b.composeButton.setVisibility(BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
         b.composeButton.setOnClickListener((v -> {
             startActivity(new Intent(activity, MessagesComposeActivity.class));
         }));
 
+        b.pruneWorkButton.setOnClickListener((v -> WorkManager.getInstance(app).pruneWork()));
+
+        b.runChucker.setOnClickListener((v -> {
+            startActivity(Chucker.getLaunchIntent(activity, 1));
+        }));
+
+        b.librusCaptchaButton.setOnClickListener((v -> {
+            startActivity(new Intent(activity, LoginLibrusCaptchaActivity.class));
+        }));
+
+        b.getLogs.setOnClickListener((v -> {
+            File logs = HyperLog.getDeviceLogsInFile(activity, true);
+            Intent intent = new Intent(Intent.ACTION_SEND);
+
+            if(logs.exists()) {
+                intent.setType("text/plain");
+                intent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://"+logs.getAbsolutePath()));
+                intent.putExtra(Intent.EXTRA_SUBJECT, "Share debug logs");
+                intent.putExtra(Intent.EXTRA_TEXT, "Share debug logs");
+                startActivity(Intent.createChooser(intent, "Share debug logs"));
+            }
+        }));
+
         //((TextView)v.findViewById(R.id.nextSync)).setText(getString(R.string.next_sync_format,Time.fromMillis(app.appJobs.syncJobTime).getStringHMS()));
 
 
+
         LayoutInflater layoutInflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         ViewGroup insertPoint = b.cardInsertPoint;
         assert layoutInflater != null;
@@ -250,7 +269,7 @@ public class HomeFragment extends Fragment {
         activity.getBottomSheet().prependItems(
                 new BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_set_student_number)
-                        .withIcon(CommunityMaterial.Icon.cmd_counter)
+                        .withIcon(SzkolnyFont.Icon.szf_clipboard_list_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
                             setNumberDialog();
@@ -258,7 +277,7 @@ public class HomeFragment extends Fragment {
                 new BottomSheetSeparatorItem(true),
                 new BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_mark_everything_as_read)
-                        .withIcon(CommunityMaterial.Icon.cmd_eye_check)
+                        .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
                             AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, true));
@@ -552,7 +571,7 @@ public class HomeFragment extends Fragment {
         Button cardGradesButton = root.findViewById(R.id.cardGradesButton);
         buttonAddDrawable(c, cardGradesButton, CommunityMaterial.Icon.cmd_arrow_right);
         cardGradesButton.setOnClickListener((v1 -> new Handler().postDelayed(() -> a.runOnUiThread(() -> {
-            activity.loadTarget(MainActivity.DRAWER_ITEM_GRADES, null);
+            activity.loadTarget(DRAWER_ITEM_GRADES, null);
         }), 100)));
 
         //new Handler().postDelayed(() -> a.runOnUiThread(() -> updateCardGrades(c, a, root)), newRefreshInterval);
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragmentV2.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragmentV2.kt
new file mode 100644
index 00000000..9a92cfe3
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragmentV2.kt
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-23.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.home
+
+import android.os.AsyncTask
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.View.OnClickListener
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.core.view.AccessibilityDelegateCompat
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial.Icon
+import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.databinding.FragmentHomeV2Binding
+import pl.szczodrzynski.edziennik.ui.dialogs.home.StudentNumberDialog
+import pl.szczodrzynski.edziennik.ui.modules.home.cards.HomeLuckyNumberCard
+import pl.szczodrzynski.edziennik.ui.modules.home.cards.HomeTimetableCard
+import pl.szczodrzynski.edziennik.utils.Themes
+import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
+import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
+import kotlin.coroutines.CoroutineContext
+
+class HomeFragmentV2 : Fragment(), CoroutineScope {
+    companion object {
+        private const val TAG = "HomeFragment"
+
+        fun swapCards(fromPosition: Int, toPosition: Int, cardAdapter: HomeCardAdapter) {
+            val fromCard = cardAdapter.items[fromPosition]
+            cardAdapter.items[fromPosition] = cardAdapter.items[toPosition]
+            cardAdapter.items[toPosition] = fromCard
+            cardAdapter.notifyItemMoved(fromPosition, toPosition)
+        }
+    }
+
+    private lateinit var app: App
+    private lateinit var activity: MainActivity
+    private lateinit var b: FragmentHomeV2Binding
+
+    private lateinit var job: Job
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        activity = (getActivity() as MainActivity?) ?: return null
+        context ?: return null
+        app = activity.application as App
+        context!!.theme.applyStyle(Themes.appTheme, true)
+        b = FragmentHomeV2Binding.inflate(inflater)
+        b.refreshLayout.setParent(activity.swipeRefreshLayout)
+        job = Job()
+        return b.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        // TODO check if app, activity, b can be null
+        if (app.profile == null || !isAdded)
+            return
+
+        activity.bottomSheet.prependItems(
+                BottomSheetPrimaryItem(true)
+                        .withTitle(R.string.menu_set_student_number)
+                        .withIcon(SzkolnyFont.Icon.szf_clipboard_list_outline)
+                        .withOnClickListener(OnClickListener {
+                            activity.bottomSheet.close()
+                            StudentNumberDialog(activity, app.profile) {
+                                app.profileSaveAsync()
+                            }
+                        }),
+                BottomSheetSeparatorItem(true),
+                BottomSheetPrimaryItem(true)
+                        .withTitle(R.string.menu_mark_everything_as_read)
+                        .withIcon(Icon.cmd_eye_check_outline)
+                        .withOnClickListener(OnClickListener {
+                            activity.bottomSheet.close()
+                            AsyncTask.execute { app.db.metadataDao().setAllSeen(App.profileId, true) }
+                            Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show()
+                        })
+        )
+
+        val items = mutableListOf<HomeCard>(
+                HomeLuckyNumberCard(0, app, activity, this, app.profile),
+                HomeTimetableCard(1, app, activity, this, app.profile)
+        )
+
+        val adapter = HomeCardAdapter(items)
+        val itemTouchHelper = ItemTouchHelper(CardItemTouchHelperCallback(adapter, b.refreshLayout))
+        adapter.itemTouchHelper = itemTouchHelper
+        b.list.layoutManager = LinearLayoutManager(activity)
+        b.list.adapter = adapter
+        b.list.setAccessibilityDelegateCompat(object : RecyclerViewAccessibilityDelegate(b.list) {
+            override fun getItemDelegate(): AccessibilityDelegateCompat {
+                return object : ItemDelegate(this) {
+                    override fun onInitializeAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfoCompat) {
+                        super.onInitializeAccessibilityNodeInfo(host, info)
+                        val position: Int = b.list.getChildLayoutPosition(host)
+                        if (position != 0) {
+                            info.addAction(AccessibilityActionCompat(
+                                    R.id.move_card_up_action,
+                                    host.resources.getString(R.string.card_action_move_up)
+                            ))
+                        }
+                        if (position != adapter.itemCount - 1) {
+                            info.addAction(AccessibilityActionCompat(
+                                    R.id.move_card_down_action,
+                                    host.resources.getString(R.string.card_action_move_down)
+                            ))
+                        }
+                    }
+
+                    override fun performAccessibilityAction(host: View, action: Int, args: Bundle): Boolean {
+                        val fromPosition: Int = b.list.getChildLayoutPosition(host)
+                        if (action == R.id.move_card_down_action) {
+                            swapCards(fromPosition, fromPosition + 1, adapter)
+                            return true
+                        } else if (action == R.id.move_card_up_action) {
+                            swapCards(fromPosition, fromPosition - 1, adapter)
+                            return true
+                        }
+                        return super.performAccessibilityAction(host, action, args)
+                    }
+                }
+            }
+        })
+        itemTouchHelper.attachToRecyclerView(b.list)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeTimetableCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeTimetableCard.kt
new file mode 100644
index 00000000..23c5c962
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeTimetableCard.kt
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-22
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.home
+
+import android.content.Intent
+import android.os.AsyncTask
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import androidx.databinding.DataBindingUtil
+import com.afollestad.materialdialogs.DialogAction
+import com.afollestad.materialdialogs.MaterialDialog
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
+import pl.szczodrzynski.edziennik.databinding.CardTimetableBinding
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment.updateInterval
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import java.util.*
+
+class HomeTimetableCard(
+        private val app: App,
+        private val activity: MainActivity,
+        private val homeFragment: HomeFragment,
+        private val layoutInflater: LayoutInflater,
+        private val insertPoint: ViewGroup
+) {
+    companion object {
+        private const val TAG = "HomeTimetableCard"
+        const val TIME_TILL = 0
+        const val TIME_LEFT = 1
+    }
+
+    private lateinit var timetableTimer: Timer
+    private lateinit var b: CardTimetableBinding
+
+    private var bellSyncTime: Time? = null
+
+    private var counterType = TIME_TILL
+    private val counterTarget = Time(0, 0, 0)
+
+    private val lessons = mutableListOf<Lesson>()
+    private val events = mutableListOf<Event>()
+
+    fun run() {
+        timetableTimer = Timer()
+        b = DataBindingUtil.inflate(layoutInflater, R.layout.card_timetable, null, false)
+
+        update()
+
+        insertPoint.addView(b.root, ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT))
+
+        b.cardTimetableFullscreenCounter.setOnClickListener {
+            activity.startActivity(Intent(activity, CounterActivity::class.java))
+        }
+
+        b.cardTimetableBellSync.setOnClickListener {
+            if (bellSyncTime == null) {
+                MaterialDialog.Builder(activity)
+                        .title(R.string.bell_sync_title)
+                        .content(R.string.bell_sync_cannot_now)
+                        .positiveText(R.string.ok)
+                        .show()
+            } else {
+                MaterialDialog.Builder(activity)
+                        .title(R.string.bell_sync_title)
+                        .content(app.getString(R.string.bell_sync_howto, bellSyncTime!!.stringHM).toString() +
+                                when {
+                                    app.appConfig.bellSyncDiff != null -> app.getString(R.string.bell_sync_current_dialog,
+                                            (if (app.appConfig.bellSyncMultiplier == -1) "-" else "+") + app.appConfig.bellSyncDiff.stringHMS)
+                                    else -> ""
+                                })
+                        .positiveText(R.string.ok)
+                        .negativeText(R.string.cancel)
+                        .neutralText(R.string.reset)
+                        .onPositive { _, _: DialogAction? ->
+                            val bellDiff = Time.diff(Time.getNow(), bellSyncTime)
+                            app.appConfig.bellSyncDiff = bellDiff
+                            app.appConfig.bellSyncMultiplier = if (bellSyncTime!!.value > Time.getNow().value) -1 else 1
+                            app.saveConfig("bellSyncDiff", "bellSyncMultiplier")
+
+                            MaterialDialog.Builder(activity)
+                                    .title(R.string.bell_sync_title)
+                                    .content(app.getString(R.string.bell_sync_results, if (bellSyncTime!!.value > Time.getNow().value) "-" else "+", bellDiff.stringHMS))
+                                    .positiveText(R.string.ok)
+                                    .show()
+                        }
+                        .onNeutral { _, _ ->
+                            MaterialDialog.Builder(activity)
+                                    .title(R.string.bell_sync_title)
+                                    .content(R.string.bell_sync_reset_confirm)
+                                    .positiveText(R.string.yes)
+                                    .negativeText(R.string.no)
+                                    .onPositive { _, _ ->
+                                        app.appConfig.bellSyncDiff = null
+                                        app.appConfig.bellSyncMultiplier = 0
+                                        app.saveConfig("bellSyncDiff", "bellSyncMultiplier")
+                                    }
+                                    .show()
+                        }
+                        .show()
+            }
+        }
+
+        HomeFragment.buttonAddDrawable(activity, b.cardTimetableButton, CommunityMaterial.Icon.cmd_arrow_right)
+    }
+
+    fun destroy() {
+        try {
+            timetableTimer.apply {
+                cancel()
+                purge()
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun update() {
+        if (!homeFragment.isAdded) return
+
+        val now = Time.getNow()
+
+        val syncedNow: Time = when (app.appConfig.bellSyncDiff != null) {
+            true -> when {
+                app.appConfig.bellSyncMultiplier < 0 -> Time.sum(now, app.appConfig.bellSyncDiff)
+                app.appConfig.bellSyncMultiplier > 0 -> Time.diff(now, app.appConfig.bellSyncDiff)
+                else -> now
+            }
+            else -> now
+        }
+
+        if (lessons.size == 0 || syncedNow.value > counterTarget.value) {
+            findLessons(syncedNow)
+        } else {
+            scheduleUpdate(updateCounter(syncedNow))
+        }
+    }
+
+    private fun updateCounter(syncedNow: Time): Long {
+        val diff = Time.diff(counterTarget, syncedNow)
+        b.cardTimetableTimeLeft.text = when (counterType) {
+            TIME_TILL -> HomeFragment.timeTill(app, diff, app.appConfig.countInSeconds)
+            else -> HomeFragment.timeLeft(app, diff, app.appConfig.countInSeconds)
+        }
+        bellSyncTime = counterTarget.clone()
+        b.cardTimetableFullscreenCounter.visibility = View.VISIBLE
+        return updateInterval(app, diff)
+    }
+
+    private fun scheduleUpdate(newRefreshInterval: Long) {
+        timetableTimer.schedule(object : TimerTask() {
+            override fun run() {
+                activity.runOnUiThread { update() }
+            }
+        }, newRefreshInterval)
+    }
+
+    private fun findLessons(syncedNow: Time) {
+        AsyncTask.execute {
+            val today = Date.getToday()
+            val searchEnd = Date.getToday().stepForward(0, 0, -today.weekDay)
+
+            lessons.apply {
+                clear()
+                addAll(app.db.timetableDao().getBetweenDatesNow(today, searchEnd))
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeTimetableCard.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeTimetableCardOld.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeTimetableCard.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeTimetableCardOld.java
index 377efeb5..ad2d6893 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeTimetableCard.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeTimetableCardOld.java
@@ -21,11 +21,11 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.databinding.CardTimetableBinding;
+import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull;
 import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull;
+import pl.szczodrzynski.edziennik.databinding.CardTimetableBinding;
 import pl.szczodrzynski.edziennik.utils.models.Date;
 import pl.szczodrzynski.edziennik.utils.models.Time;
 import pl.szczodrzynski.edziennik.utils.models.Week;
@@ -35,8 +35,8 @@ import static pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange.TY
 import static pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment.updateInterval;
 import static pl.szczodrzynski.edziennik.utils.Utils.bs;
 
-public class HomeTimetableCard {
-    private static final String TAG = "HomeTimetableCard";
+public class HomeTimetableCardOld {
+    private static final String TAG = "HomeTimetableCardOld";
     private App app;
     private MainActivity a;
     private HomeFragment f;
@@ -46,7 +46,7 @@ public class HomeTimetableCard {
     private Timer timetableTimer;
     private Time bellSyncTime = null;
 
-    public HomeTimetableCard(App app, MainActivity a, HomeFragment f, LayoutInflater layoutInflater, ViewGroup insertPoint) {
+    public HomeTimetableCardOld(App app, MainActivity a, HomeFragment f, LayoutInflater layoutInflater, ViewGroup insertPoint) {
         this.app = app;
         this.a = a;
         this.f = f;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeLuckyNumberCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeLuckyNumberCard.kt
new file mode 100644
index 00000000..fee05477
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeLuckyNumberCard.kt
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-24.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.home.cards
+
+import android.view.LayoutInflater
+import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import android.widget.FrameLayout
+import androidx.core.view.plusAssign
+import androidx.core.view.setMargins
+import androidx.lifecycle.Observer
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.databinding.CardHomeLuckyNumberBinding
+import pl.szczodrzynski.edziennik.ui.dialogs.home.StudentNumberDialog
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardAdapter
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragmentV2
+import pl.szczodrzynski.edziennik.utils.models.Date
+import kotlin.coroutines.CoroutineContext
+
+class HomeLuckyNumberCard(
+        val id: Int,
+        val app: App,
+        val activity: MainActivity,
+        val fragment: HomeFragmentV2,
+        val profile: Profile
+) : HomeCard, CoroutineScope {
+    companion object {
+        private const val TAG = "HomeLuckyNumberCard"
+    }
+
+    private var job: Job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    override fun bind(position: Int, holder: HomeCardAdapter.ViewHolder) { launch {
+        holder.root.removeAllViews()
+        val b = CardHomeLuckyNumberBinding.inflate(LayoutInflater.from(holder.root.context))
+        b.root.layoutParams = FrameLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT).apply {
+            setMargins(8.dp)
+        }
+        holder.root += b.root
+
+        val today = Date.getToday()
+        val todayValue = today.value
+
+        val subTextRes = if (profile.studentNumber == -1)
+            R.string.home_lucky_number_details_click_to_set
+        else
+            R.string.home_lucky_number_details
+        b.subText.setText(subTextRes, profile.name ?: "", profile.studentNumber)
+
+        app.db.luckyNumberDao().getNearestFuture(App.profileId, todayValue).observe(fragment, Observer { luckyNumber ->
+            val isYours = luckyNumber?.number == profile.studentNumber
+            val titleRes = when {
+                luckyNumber == null -> R.string.home_lucky_number_no_info
+                luckyNumber.number == -1 -> R.string.home_lucky_number_no_number
+                else -> when (isYours) {
+                    true -> when (luckyNumber.date.value) {
+                        todayValue -> R.string.home_lucky_number_yours_today
+                        todayValue + 1 -> R.string.home_lucky_number_yours_tomorrow
+                        else -> R.string.home_lucky_number_yours_later
+                    }
+                    false -> when (luckyNumber.date.value) {
+                        todayValue -> R.string.home_lucky_number_today
+                        todayValue + 1 -> R.string.home_lucky_number_tomorrow
+                        else -> R.string.home_lucky_number_later
+                    }
+                }
+            }
+
+            b.title.setText(
+                    titleRes,
+                    luckyNumber?.number ?: 0,
+                    luckyNumber?.date?.formattedString ?: ""
+            )
+
+            val drawableRes = when {
+                luckyNumber == null || luckyNumber.number == -1 -> R.drawable.emoji_sad
+                isYours -> R.drawable.emoji_glasses
+                !isYours -> R.drawable.emoji_smiling
+                else -> R.drawable.emoji_no_face
+            }
+            b.image.setImageResource(drawableRes)
+        })
+
+        holder.root.onClick {
+            StudentNumberDialog(activity, profile, onDismissListener = {
+                app.profileSaveAsync(profile)
+                val newSubTextRes = if (profile.studentNumber == -1)
+                    R.string.home_lucky_number_details_click_to_set
+                else
+                    R.string.home_lucky_number_details
+                b.subText.setText(newSubTextRes, profile.name ?: "", profile.studentNumber)
+            })
+        }
+    }}
+
+    override fun unbind(position: Int, holder: HomeCardAdapter.ViewHolder) = Unit
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt
new file mode 100644
index 00000000..65fe6237
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt
@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-24.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.home.cards
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.core.view.plusAssign
+import androidx.core.view.setMargins
+import androidx.lifecycle.Observer
+import com.mikepenz.iconics.IconicsDrawable
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.utils.sizeDp
+import kotlinx.coroutines.*
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull
+import pl.szczodrzynski.edziennik.databinding.CardHomeTimetableBinding
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardAdapter
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragmentV2
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import pl.szczodrzynski.edziennik.utils.models.Week
+import pl.szczodrzynski.navlib.colorAttr
+import kotlin.coroutines.CoroutineContext
+
+class HomeTimetableCard(
+        val id: Int,
+        val app: App,
+        val activity: MainActivity,
+        val fragment: HomeFragmentV2,
+        val profile: Profile
+) : HomeCard, CoroutineScope {
+    companion object {
+        private const val TAG = "HomeTimetableCard"
+    }
+
+    private var job: Job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private lateinit var b: CardHomeTimetableBinding
+
+    private val today = Date.getToday()
+    private val searchEnd = today.clone().stepForward(0, 0, 7)
+
+    private var allLessons = listOf<LessonFull>()
+    private var lessons = listOf<LessonFull>()
+    private var events = listOf<Event>()
+
+    private var bellSyncDiffMillis = 0L
+    private val syncedNow: Time
+        get() = Time.fromMillis(Time.getNow().inMillis + bellSyncDiffMillis)
+
+    private var counterJob: Job? = null
+    private var counterStart: Time? = null
+    private var counterEnd: Time? = null
+    private var subjectSpannable: CharSequence? = null
+
+    private val ignoreCancelled = true
+
+    override fun bind(position: Int, holder: HomeCardAdapter.ViewHolder) {
+        holder.root.removeAllViews()
+        b = CardHomeTimetableBinding.inflate(LayoutInflater.from(holder.root.context))
+        b.root.layoutParams = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply {
+            setMargins(8.dp)
+        }
+        holder.root += b.root
+
+        b.settings.setImageDrawable(IconicsDrawable(activity, CommunityMaterial.Icon2.cmd_settings_outline)
+                .colorAttr(activity, R.attr.colorIcon)
+                .sizeDp(20))
+
+        // get current bell-sync params
+        if (app.appConfig.bellSyncDiff != null) {
+            bellSyncDiffMillis = (app.appConfig.bellSyncDiff.hour * 60 * 60 * 1000 + app.appConfig.bellSyncDiff.minute * 60 * 1000 + app.appConfig.bellSyncDiff.second * 1000).toLong()
+            bellSyncDiffMillis *= app.appConfig.bellSyncMultiplier.toLong()
+            bellSyncDiffMillis *= -1
+        }
+
+        // get all lessons within the search bounds
+        app.db.timetableDao().getBetweenDates(today, searchEnd).observe(fragment, Observer {
+            allLessons = it
+            update()
+        })
+    }
+
+    private fun update() { launch {
+        val deferred = async(Dispatchers.Default) {
+            // get the current bell-synced time
+            val now = syncedNow
+
+            // search for lessons to display
+            val timetableDate = Date.getToday()
+            var checkedDays = 0
+            lessons = allLessons.filter {
+                it.profileId == profile.id
+                        && it.displayDate == timetableDate
+                        && it.displayEndTime > now
+                        && it.type != Lesson.TYPE_NO_LESSONS
+                        && !(it.isCancelled && ignoreCancelled)
+            }
+            while ((lessons.isEmpty() || lessons.none {
+                        it.displayDate != today || (it.displayDate == today && it.displayEndTime != null && it.displayEndTime!! >= now)
+                    }) && checkedDays < 7) {
+
+                timetableDate.stepForward(0, 0, 1)
+                lessons = allLessons.filter {
+                    it.profileId == profile.id
+                            && it.displayDate == timetableDate
+                            && it.type != Lesson.TYPE_NO_LESSONS
+                            && !(it.isCancelled && ignoreCancelled)
+                }
+
+                checkedDays++
+            }
+            timetableDate
+        }
+        val timetableDate = deferred.await()
+
+        val isToday = today == timetableDate
+
+        b.progress.visibility = View.GONE
+        b.counter.visibility = View.GONE
+
+        val now = syncedNow
+        val firstLesson = lessons.firstOrNull()
+        val lastLesson = lessons.lastOrNull()
+
+        if (isToday) {
+            // today
+            b.dayInfo.setText(R.string.home_timetable_today)
+            counterStart = firstLesson?.displayStartTime
+            counterEnd = firstLesson?.displayEndTime
+            val isOngoing = counterStart <= now && now <= counterEnd
+            val lessonRes = if (isOngoing)
+                R.string.home_timetable_lesson_ongoing
+            else
+                R.string.home_timetable_lesson_not_started
+            b.lessonBig.setText(lessonRes, firstLesson.subjectSpannable)
+            firstLesson?.displayClassroom?.let {
+                b.classroom.visibility = View.VISIBLE
+                b.classroom.text = it
+            } ?: run {
+                b.classroom.visibility = View.GONE
+            }
+
+            subjectSpannable = firstLesson.subjectSpannable
+
+            counterJob = startCoroutineTimer(repeatMillis = 1000) {
+                count()
+            }
+        }
+        else {
+            val isTomorrow = today.clone().stepForward(0, 0, 1) == timetableDate
+            val dayInfoRes = if (isTomorrow) {
+                // tomorrow
+                R.string.home_timetable_tomorrow
+            }
+            else {
+                val todayWeekStart = today.weekStart
+                val dateWeekStart = timetableDate.weekStart
+                if (todayWeekStart == dateWeekStart) {
+                    // this week
+                    R.string.home_timetable_date_this_week
+                }
+                else {
+                    // future: not this week
+                    R.string.home_timetable_date_future
+                }
+            }
+            b.dayInfo.setText(dayInfoRes, Week.getFullDayName(timetableDate.weekDay), timetableDate.formattedString)
+            b.lessonInfo.setText(
+                    R.string.home_timetable_lessons_info,
+                    lessons.size,
+                    firstLesson?.displayStartTime?.stringHM ?: "?",
+                    lastLesson?.displayEndTime?.stringHM ?: "?"
+            )
+
+            b.lessonBig.setText(R.string.home_timetable_lesson_first, firstLesson.subjectSpannable)
+            firstLesson?.displayClassroom?.let {
+                b.classroom.visibility = View.VISIBLE
+                b.classroom.text = it
+            } ?: run {
+                b.classroom.visibility = View.GONE
+            }
+        }
+
+        val text = mutableListOf<CharSequence>(
+                activity.getString(R.string.home_timetable_later)
+        )
+        var first = true
+        for (lesson in lessons) {
+            if (first) { first = false; continue }
+            text += listOf(
+                    lesson.displayStartTime?.stringHM,
+                    lesson.subjectSpannable
+            ).concat(" ")
+        }
+        if (text.size == 1)
+            text += activity.getString(R.string.home_timetable_later_no_lessons)
+        b.nextLessons.text = text.concat("\n")
+    }}
+
+    private val LessonFull?.subjectSpannable: CharSequence
+        get() = if (this == null) "?" else when {
+            isCancelled -> displaySubjectName.asStrikethroughSpannable()
+            isChange -> displaySubjectName.asItalicSpannable()
+            else -> displaySubjectName ?: "?"
+        }
+
+    private fun count() {
+        val counterStart = counterStart
+        val counterEnd = counterEnd
+        if (counterStart == null || counterEnd == null) {
+            // there is no lesson to count
+            b.progress.visibility = View.GONE
+            b.counter.visibility = View.GONE
+            this.counterJob?.cancel()
+            return
+        }
+
+        val now = syncedNow
+        if (now > counterEnd) {
+            // the lesson is already over
+            b.progress.visibility = View.GONE
+            b.counter.visibility = View.GONE
+            this.counterJob?.cancel()
+            this.counterStart = null
+            this.counterEnd = null
+            update() // check for new lessons to display
+            return
+        }
+
+        val isOngoing = counterStart <= now && now <= counterEnd
+        val lessonRes = if (isOngoing)
+            R.string.home_timetable_lesson_ongoing
+        else
+            R.string.home_timetable_lesson_not_started
+        b.lessonBig.setText(lessonRes, subjectSpannable ?: "")
+
+        if (now < counterStart) {
+            // the lesson hasn't yet started
+            b.progress.visibility = View.GONE
+            b.counter.visibility = View.VISIBLE
+            val diff = counterStart - now
+            b.counter.text = activity.timeTill(diff.toInt(), "\n")
+        }
+        else {
+            // the lesson is right now
+            b.progress.visibility = View.VISIBLE
+            b.counter.visibility = View.VISIBLE
+            val lessonLength = counterEnd - counterStart
+            val timePassed = now - counterStart
+            val timeLeft = counterEnd - now
+            b.counter.text = activity.timeLeft(timeLeft.toInt(), "\n")
+            b.progress.max = lessonLength.toInt()
+            b.progress.progress = timePassed.toInt()
+        }
+    }
+
+    override fun unbind(position: Int, holder: HomeCardAdapter.ViewHolder) = Unit
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt
index 5afdd9a6..6d498363 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt
@@ -9,11 +9,12 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.viewpager.widget.ViewPager
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.databinding.FragmentHomeworkBinding
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.databinding.FragmentHomeworkBinding
 import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog
 import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
 import pl.szczodrzynski.edziennik.utils.Themes
@@ -52,7 +53,7 @@ class HomeworkFragment : Fragment() {
                 BottomSheetPrimaryItem(true)
                 .withTitle(R.string.menu_add_event)
                 .withDescription(R.string.menu_add_event_desc)
-                .withIcon(CommunityMaterial.Icon.cmd_calendar_plus)
+                .withIcon(SzkolnyFont.Icon.szf_calendar_plus_outline)
                 .withOnClickListener(View.OnClickListener {
                     activity.bottomSheet.close()
                     EventManualDialog(activity).show(app, null, null, null, EventManualDialog.DIALOG_HOMEWORK)
@@ -60,7 +61,7 @@ class HomeworkFragment : Fragment() {
         BottomSheetSeparatorItem(true),
         BottomSheetPrimaryItem(true)
                 .withTitle(R.string.menu_mark_as_read)
-                .withIcon(CommunityMaterial.Icon.cmd_eye_check)
+                .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
                 .withOnClickListener(View.OnClickListener {
                     activity.bottomSheet.close()
                     AsyncTask.execute { app.db.metadataDao().setAllSeen(App.profileId, Metadata.TYPE_HOMEWORK, true) }
@@ -84,7 +85,11 @@ class HomeworkFragment : Fragment() {
         b.viewPager.currentItem = pageSelection
         b.viewPager.clearOnPageChangeListeners()
         b.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
-            override fun onPageScrollStateChanged(state: Int) {}
+            override fun onPageScrollStateChanged(state: Int) {
+                if (b.refreshLayout != null) {
+                    b.refreshLayout.isEnabled = state == ViewPager.SCROLL_STATE_IDLE
+                }
+            }
             override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
             override fun onPageSelected(position: Int) {
                 pageSelection = position
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginActivity.java
index 5d5b210d..41c24680 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginActivity.java
@@ -1,21 +1,23 @@
 package pl.szczodrzynski.edziennik.ui.modules.login;
 
-import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
+
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.databinding.DataBindingUtil;
+import androidx.navigation.NavDestination;
+import androidx.navigation.NavOptions;
+import androidx.navigation.Navigation;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.navigation.NavDestination;
-import androidx.navigation.NavOptions;
-import androidx.navigation.Navigation;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.AppError;
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError;
 import pl.szczodrzynski.edziennik.databinding.ActivityLoginBinding;
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar;
 
 public class LoginActivity extends AppCompatActivity {
 
@@ -25,7 +27,8 @@ public class LoginActivity extends AppCompatActivity {
     public static final int RESULT_OK = 1;
     public static NavOptions navOptions;
 
-    static AppError error = null;
+    static ApiError error = null;
+    ErrorSnackbar errorSnackbar = new ErrorSnackbar(this);
 
     static List<LoginProfileObject> profileObjects;
     public static boolean firstCompleted = false; // if a profile is already added during *this* login. This means that LoginChooser has to navigateUp onBackPressed. Else, finish the activity.
@@ -34,12 +37,6 @@ public class LoginActivity extends AppCompatActivity {
     @Override
     public void onBackPressed() {
         NavDestination destination = Navigation.findNavController(this, R.id.nav_host_fragment).getCurrentDestination();
-        if (destination != null && destination.getId() == R.id.loginMigrationFragment) {
-            return;
-        }
-        if (destination != null && destination.getId() == R.id.loginMigrationSyncFragment) {
-            return;
-        }
         if (destination != null && destination.getId() == R.id.loginSyncErrorFragment) {
             return;
         }
@@ -74,6 +71,8 @@ public class LoginActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        setTheme(R.style.AppTheme_Light);
+
         firstCompleted = false;
         profileObjects = new ArrayList<>();
         error = null;
@@ -88,6 +87,8 @@ public class LoginActivity extends AppCompatActivity {
         b = DataBindingUtil.inflate(getLayoutInflater(), R.layout.activity_login, null, false);
         setContentView(b.getRoot());
 
+        errorSnackbar.setCoordinator(b.coordinator, null);
+
         app = (App) getApplication();
 
         if (!app.appConfig.loginFinished) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.java
index a2547b3a..95e53cc4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.java
@@ -12,10 +12,11 @@ import androidx.databinding.DataBindingUtil;
 import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
+
 import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackActivity;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginChooserBinding;
+import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackActivity;
 
 import static android.app.Activity.RESULT_CANCELED;
 
@@ -25,6 +26,7 @@ public class LoginChooserFragment extends Fragment {
     private NavController nav;
     private FragmentLoginChooserBinding b;
     private static final String TAG = "LoginTemplate";
+    public static boolean fakeLogin = false;
 
     public LoginChooserFragment() { }
 
@@ -57,9 +59,6 @@ public class LoginChooserFragment extends Fragment {
             b.cancelButton.setVisibility(View.VISIBLE);
             b.cancelButton.setOnClickListener((v -> nav.navigateUp()));
         }
-        else if (app.appConfig.lastAppVersion < 1991) {
-            nav.navigate(R.id.loginMigrationFragment, null, LoginActivity.navOptions);
-        }
         else if (app.appConfig.loginFinished) {
             // we are navigated here from AppDrawer
             b.cancelButton.setVisibility(View.VISIBLE);
@@ -73,6 +72,10 @@ public class LoginChooserFragment extends Fragment {
             b.cancelButton.setVisibility(View.GONE);
         }
 
+        b.fakeLogin.setVisibility(App.devMode ? View.VISIBLE : View.GONE);
+        b.fakeLogin.setChecked(fakeLogin);
+        b.fakeLogin.setOnCheckedChangeListener((v, isChecked) -> fakeLogin = isChecked);
+
         b.helpButton.setOnClickListener((v -> {
             startActivity(new Intent(getActivity(), FeedbackActivity.class));
         }));
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginIuczniowieFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginIuczniowieFragment.java
index e1eb8091..2191e63a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginIuczniowieFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginIuczniowieFragment.java
@@ -1,25 +1,23 @@
 package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-
 import android.text.Editable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.danimahardhika.cafebar.CafeBar;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
+
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.AppError;
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginIuczniowieBinding;
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar;
 
 import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_INVALID_LOGIN;
 import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_INVALID_SCHOOL_NAME;
@@ -31,6 +29,7 @@ public class LoginIuczniowieFragment extends Fragment {
     private NavController nav;
     private FragmentLoginIuczniowieBinding b;
     private static final String TAG = "LoginIuczniowie";
+    private ErrorSnackbar errorSnackbar;
 
     public LoginIuczniowieFragment() { }
 
@@ -40,6 +39,7 @@ public class LoginIuczniowieFragment extends Fragment {
         if (getActivity() != null) {
             app = (App) getActivity().getApplicationContext();
             nav = Navigation.findNavController(getActivity(), R.id.nav_host_fragment);
+            errorSnackbar = ((LoginActivity) getActivity()).errorSnackbar;
         }
         else {
             return null;
@@ -54,31 +54,17 @@ public class LoginIuczniowieFragment extends Fragment {
         assert getActivity() != null;
 
         view.postDelayed(() -> {
-            AppError error = LoginActivity.error;
+            ApiError error = LoginActivity.error;
             if (error != null) {
-                switch (error.errorCode) {
+                switch (error.getErrorCode()) {
                     case CODE_INVALID_SCHOOL_NAME:
                         b.loginSchoolNameLayout.setError(getString(R.string.login_error_incorrect_school_name));
                         break;
                     case CODE_INVALID_LOGIN:
                         b.loginPasswordLayout.setError(getString(R.string.login_error_incorrect_login_or_password));
                         break;
-                    default:
-                        CafeBar.builder(getActivity())
-                                .to(b.root)
-                                .content(getString(R.string.login_error, error.asReadableString(getActivity())))
-                                .autoDismiss(false)
-                                .positiveText(R.string.ok)
-                                .onPositive(CafeBar::dismiss)
-                                .floating(true)
-                                .swipeToDismiss(true)
-                                .neutralText(R.string.more)
-                                .onNeutral(cafeBar -> app.apiEdziennik.guiShowErrorDialog(getActivity(), error, R.string.error_details))
-                                .negativeText(R.string.report)
-                                .onNegative((cafeBar -> app.apiEdziennik.guiReportError(getActivity(), error, null)))
-                                .show();
-                        break;
                 }
+                errorSnackbar.addError(error).show();
                 LoginActivity.error = null;
             }
         }, 100);
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusCaptchaActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusCaptchaActivity.kt
new file mode 100644
index 00000000..3db5ca45
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusCaptchaActivity.kt
@@ -0,0 +1,116 @@
+package pl.szczodrzynski.edziennik.ui.modules.login
+
+import android.annotation.SuppressLint
+import android.graphics.Color
+import android.os.Build
+import android.os.Bundle
+import android.util.Base64
+import android.webkit.JavascriptInterface
+import android.webkit.WebView
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import com.afollestad.materialdialogs.MaterialDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.LIBRUS_USER_AGENT
+import pl.szczodrzynski.edziennik.utils.Themes
+import pl.szczodrzynski.edziennik.utils.Utils.hexFromColorInt
+import java.nio.charset.Charset
+
+class LoginLibrusCaptchaActivity : AppCompatActivity() {
+    companion object {
+        private const val TAG = "LoginLibrusCaptchaActivity"
+    }
+
+    private lateinit var webView: WebView
+    private lateinit var dialog: AlertDialog
+    private lateinit var jsInterface: CaptchaCallbackInterface
+
+    @SuppressLint("AddJavascriptInterface", "SetJavaScriptEnabled")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setTheme(Themes.appThemeNoDisplay)
+        setFinishOnTouchOutside(false)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            WebView.setWebContentsDebuggingEnabled(true)
+        }
+
+        val base64Content = """
+PCFET0NUWVBFIGh0bWw+PGh0bWw+PGhlYWQ+PHNjcmlwdCBzcmM9Imh0dHBzOi8vd3d3Lmdvb2ds
+ZS5jb20vcmVjYXB0Y2hhL2FwaS5qcz9vbmxvYWQ9cmVhZHkmcmVuZGVyPWV4cGxpY2l0Ij48L3Nj
+cmlwdD48L2hlYWQ+PGJvZHk+PGJyPjxjZW50ZXIgaWQ9ImdyIj48L2NlbnRlcj48YnI+PHNjcmlw
+dD5mdW5jdGlvbiByZWFkeSgpe2dyZWNhcHRjaGEucmVuZGVyKCdncicse3NpdGVrZXk6JzZMZjQ4
+bW9VQUFBQUFCOUNsaGR2SHI0NmdSV1ItQ04zMUNYUVBHMlUnLHRoZW1lOidUSEVNRScsY2FsbGJh
+Y2s6ZnVuY3Rpb24oZSl7d2luZG93LmlmLmNhbGxiYWNrKGUpO30sImV4cGlyZWQtY2FsbGJhY2si
+OmZ1bmN0aW9uKCl7d2luZG93LmlmLmV4cGlyZWRDYWxsYmFjayhlKTt9LCJlcnJvci1jYWxsYmFj
+ayI6ZnVuY3Rpb24oKXt3aW5kb3cuaWYuZXJyb3JDYWxsYmFjayhlKTt9fSk7fTwvc2NyaXB0Pjwv
+Ym9keT48L2h0bWw+"""
+
+        val backgroundColor = if (Themes.isDark) 0x424242 else 0xffffff
+        val backgroundColorString = hexFromColorInt(backgroundColor)
+
+        val htmlContent = Base64.decode(base64Content, Base64.DEFAULT)
+                .toString(Charset.defaultCharset())
+                .replace("COLOR", backgroundColorString, true)
+                .replace("THEME", if (Themes.isDark) "dark" else "light")
+
+        jsInterface = object : CaptchaCallbackInterface {
+            @JavascriptInterface
+            override fun callback(recaptchaResponse: String) {
+                MaterialDialog.Builder(this@LoginLibrusCaptchaActivity)
+                        .title("Captcha checked")
+                        .content("Response: $recaptchaResponse")
+                        .positiveText("OK")
+                        .show()
+            }
+
+            @JavascriptInterface
+            override fun expiredCallback() {
+                MaterialDialog.Builder(this@LoginLibrusCaptchaActivity)
+                        .title("Captcha expired")
+                        .content("Captcha expired")
+                        .positiveText("OK")
+                        .show()
+            }
+
+            @JavascriptInterface
+            override fun errorCallback() {
+                MaterialDialog.Builder(this@LoginLibrusCaptchaActivity)
+                        .title("Captcha error")
+                        .content("Captcha error")
+                        .positiveText("OK")
+                        .show()
+            }
+        }
+
+        webView = WebView(this).apply {
+            //setBackgroundColor((backgroundColor.toLong() or 0xff000000).toInt())
+            setBackgroundColor(Color.TRANSPARENT)
+            settings.javaScriptEnabled = true
+            settings.userAgentString = LIBRUS_USER_AGENT
+            addJavascriptInterface(jsInterface, "if")
+            loadDataWithBaseURL("https://portal.librus.pl/rodzina/login/", htmlContent, "text/html", "UTF-8", null)
+            setLayerType(WebView.LAYER_TYPE_SOFTWARE, null)
+        }
+
+        dialog = MaterialAlertDialogBuilder(this)
+                .setTitle(R.string.login_librus_captcha_title)
+                .setView(webView)
+                .setNegativeButton(R.string.cancel) { dialog, _ ->
+                    dialog.dismiss()
+                    finish()
+                }
+                .setCancelable(false)
+                .show()
+    }
+
+    interface CaptchaCallbackInterface {
+        @JavascriptInterface
+        fun callback(recaptchaResponse: String)
+        @JavascriptInterface
+        fun expiredCallback()
+        @JavascriptInterface
+        fun errorCallback()
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusFragment.java
index fb0612fd..0008f133 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusFragment.java
@@ -1,28 +1,26 @@
 package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-
 import android.text.Editable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.danimahardhika.cafebar.CafeBar;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
+
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.AppError;
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginLibrusBinding;
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar;
 
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_INVALID_LOGIN;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_LIBRUS_NOT_ACTIVATED;
+import static pl.szczodrzynski.edziennik.api.v2.ErrorsKt.ERROR_LOGIN_LIBRUS_PORTAL_INVALID_LOGIN;
+import static pl.szczodrzynski.edziennik.api.v2.ErrorsKt.ERROR_LOGIN_LIBRUS_PORTAL_NOT_ACTIVATED;
 import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_LIBRUS;
 
 public class LoginLibrusFragment extends Fragment {
@@ -31,6 +29,7 @@ public class LoginLibrusFragment extends Fragment {
     private NavController nav;
     private FragmentLoginLibrusBinding b;
     private static final String TAG = "LoginLibrus";
+    private ErrorSnackbar errorSnackbar;
 
     public LoginLibrusFragment() { }
 
@@ -40,6 +39,7 @@ public class LoginLibrusFragment extends Fragment {
         if (getActivity() != null) {
             app = (App) getActivity().getApplicationContext();
             nav = Navigation.findNavController(getActivity(), R.id.nav_host_fragment);
+            errorSnackbar = ((LoginActivity) getActivity()).errorSnackbar;
         }
         else {
             return null;
@@ -54,32 +54,17 @@ public class LoginLibrusFragment extends Fragment {
         assert getActivity() != null;
 
         view.postDelayed(() -> {
-            AppError error = LoginActivity.error;
+            ApiError error = LoginActivity.error;
             if (error != null) {
-                switch (error.errorCode) {
-                    case CODE_INVALID_LOGIN:
+                switch (error.getErrorCode()) {
+                    case ERROR_LOGIN_LIBRUS_PORTAL_INVALID_LOGIN:
                         b.loginPasswordLayout.setError(getString(R.string.login_error_incorrect_login_or_password));
                         break;
-                    case CODE_LIBRUS_NOT_ACTIVATED:
+                    case ERROR_LOGIN_LIBRUS_PORTAL_NOT_ACTIVATED:
                         b.loginEmailLayout.setError(getString(R.string.login_error_account_not_activated));
                         break;
-                    default:
-                        CafeBar.builder(getActivity())
-                                .to(b.root)
-                                .content(getString(R.string.login_error, error.asReadableString(getActivity())))
-                                .duration(10000)
-                                .autoDismiss(false)
-                                .positiveText(R.string.ok)
-                                .onPositive(CafeBar::dismiss)
-                                .floating(true)
-                                .swipeToDismiss(true)
-                                .neutralText(R.string.more)
-                                .onNeutral(cafeBar -> app.apiEdziennik.guiShowErrorDialog(getActivity(), error, R.string.error_details))
-                                .negativeText(R.string.report)
-                                .onNegative((cafeBar -> app.apiEdziennik.guiReportError(getActivity(), error, null)))
-                                .show();
-                        break;
                 }
+                errorSnackbar.addError(error).show();
                 LoginActivity.error = null;
             }
         }, 100);
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMigrationFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMigrationFragment.java
deleted file mode 100644
index cd881665..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMigrationFragment.java
+++ /dev/null
@@ -1,638 +0,0 @@
-package pl.szczodrzynski.edziennik.ui.modules.login;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.os.AsyncTask;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.util.Pair;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-import androidx.navigation.NavController;
-import androidx.navigation.Navigation;
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.BuildConfig;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.databinding.FragmentLoginMigrationBinding;
-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.events.EventType;
-import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.Lesson;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange;
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
-import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber;
-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.profiles.Profile;
-import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject;
-import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher;
-import pl.szczodrzynski.edziennik.data.db.modules.teams.Team;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.Time;
-
-import android.util.LongSparseArray;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Toast;
-
-import com.afollestad.materialdialogs.MaterialDialog;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.reflect.TypeToken;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_CLASS_EVENT;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_DEFAULT;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_ESSAY;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_EXAM;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_EXCURSION;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_HOMEWORK;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_INFORMATION;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_PROJECT;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_PT_MEETING;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_READING;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_SHORT_QUIZ;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_CLASS_EVENT;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_DEFAULT;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_ESSAY;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_EXAM;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_EXCURSION;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_HOMEWORK;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_INFORMATION;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_PROJECT;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_PT_MEETING;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_READING;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_SHORT_QUIZ;
-import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_DEMO;
-import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_IUCZNIOWIE;
-import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_LIBRUS;
-import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_MOBIDZIENNIK;
-import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_VULCAN;
-import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.REGISTRATION_DISABLED;
-import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.REGISTRATION_ENABLED;
-import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.REGISTRATION_UNSPECIFIED;
-
-public class LoginMigrationFragment extends Fragment {
-
-    private App app;
-    private NavController nav;
-    private FragmentLoginMigrationBinding b;
-    private static final String TAG = "LoginMigration";
-
-    public LoginMigrationFragment() { }
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        if (getActivity() != null) {
-            app = (App) getActivity().getApplicationContext();
-            nav = Navigation.findNavController(getActivity(), R.id.nav_host_fragment);
-        }
-        else {
-            return null;
-        }
-        b = DataBindingUtil.inflate(inflater, R.layout.fragment_login_migration, container, false);
-        return b.getRoot();
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        assert getContext() != null;
-        assert getActivity() != null;
-
-        String profilesStr;
-        if (app.appConfig.lastAppVersion == 198 && (profilesStr = app.appSharedPrefs.getString("app.appConfig.profiles", null)) != null) {
-            Toast.makeText(app, getString(R.string.login_migration_toast), Toast.LENGTH_SHORT).show();
-            AsyncTask.execute(() -> {
-                try {
-                    migrate(profilesStr);
-                }
-                catch (Exception e) {
-                    getActivity().runOnUiThread(() -> {
-                        new MaterialDialog.Builder(getActivity())
-                                .title(R.string.error_occured)
-                                .content(getString(R.string.login_migration_error_format))
-                                .positiveText(R.string.ok)
-                                .onPositive(((dialog, which) -> {
-                                    dialog.dismiss();
-                                    getActivity().setResult(Activity.RESULT_OK);
-                                    getActivity().finish();
-                                }))
-                                .autoDismiss(false)
-                                .canceledOnTouchOutside(false)
-                                .show();
-                    });
-                }
-                finally {
-                    if (app.db.profileDao().getIdsNow().size() != 0) {
-                        app.appSharedPrefs.edit().remove("app.appConfig.profiles").apply();
-                    }
-                    app.appConfig.lastAppVersion = BuildConfig.VERSION_CODE;
-                    app.saveConfig("lastAppVersion");
-                }
-            });
-        }
-
-        b.doneButton.setOnClickListener((v -> {
-            nav.navigate(R.id.loginMigrationSyncFragment, null, LoginActivity.navOptions);
-        }));
-    }
-
-    private String gp(SharedPreferences p, String key, String defValue) {
-        String s = p.getString(key, defValue);
-        if (s == null)
-            s = defValue;
-        return s;
-    }
-    private void migrate(String profilesStr) {
-        Context c = getContext();
-        if (c == null)
-            return;
-        List<Metadata> metadataList = new ArrayList<>();
-        JsonArray profiles = new JsonParser().parse(profilesStr).getAsJsonArray();
-        Map<Integer, JsonObject> loginStores = app.gson.fromJson(app.appSharedPrefs.getString("app.appConfig.loginStores", "{}"), new TypeToken<Map<Integer, JsonObject>>(){}.getType());
-        if (loginStores == null) {
-            Toast.makeText(c, "Błąd odczytywania słoików z danymi.", Toast.LENGTH_SHORT).show();
-            return;
-        }
-        for (JsonElement profileEl: profiles) {
-            JsonObject jProfile = profileEl.getAsJsonObject();
-            int profileId = jProfile.get("id").getAsInt();
-            SharedPreferences p = app.getSharedPreferences(String.format(getString(R.string.preference_file_register), profileId), Context.MODE_PRIVATE);
-
-            if (!Boolean.parseBoolean(p.getString("app.register.loggedIn", Boolean.toString(false))))
-                return;
-            Profile profile = new Profile();
-            profile.setId(profileId);
-            profile.setName(jProfile.get("name").getAsString());
-            profile.setSubname(jProfile.get("subname").getAsString());
-            profile.setImage(jProfile.get("image").getAsString());
-
-            profile.setSyncEnabled(Boolean.parseBoolean(p.getString("app.register.syncThisProfile", Boolean.toString(profile.getSyncEnabled()))));
-            profile.setSyncNotifications(Boolean.parseBoolean(p.getString("app.register.syncNotificationsEnabled", Boolean.toString(profile.getSyncNotifications()))));
-            profile.setEnableSharedEvents(Boolean.parseBoolean(p.getString("app.register.eventsShared", Boolean.toString(profile.getEnableSharedEvents()))));
-            app.appConfig.countInSeconds = Boolean.parseBoolean(p.getString("app.register.countInSeconds", Boolean.toString(app.appConfig.countInSeconds)));
-            profile.setLoggedIn(true);
-            // so in some APIs we force a full, clean sync
-            profile.setEmpty(true);//Boolean.parseBoolean(p.getString("app.register.empty", Boolean.toString(profile.empty)));
-            profile.setArchived(false);
-
-            String s;
-            s = gp(p, "app.register.studentNameLong", "\"\"");
-            profile.setStudentNameLong(s.replace("\"", ""));
-            s = gp(p, "app.register.studentNameShort", "\"\"");
-            profile.setStudentNameShort(s.replace("\"", ""));
-            profile.setStudentNumber(Integer.parseInt(gp(p, "app.register.studentNumber", "-1")));
-            profile.setStudentData(new JsonParser().parse(gp(p, "app.register.studentStore", "[]")).getAsJsonObject());
-
-            boolean autoRegistrationDecided = Boolean.parseBoolean(p.getString("app.register.autoRegistrationDecided", "true"));
-            boolean autoRegistrationAllowed = Boolean.parseBoolean(p.getString("app.register.autoRegistrationAllowed", "true"));
-            profile.setRegistration(!autoRegistrationAllowed && !autoRegistrationDecided ? REGISTRATION_UNSPECIFIED : !autoRegistrationAllowed ? REGISTRATION_DISABLED : REGISTRATION_ENABLED);
-
-            profile.setGradeColorMode(Integer.parseInt(gp(p, "app.register.gradeColorMode", "1")));
-            profile.setAgendaViewType(Integer.parseInt(gp(p, "app.register.agendaViewType", "0")));
-
-            profile.setCurrentSemester(Integer.parseInt(gp(p, "app.register.currentSemester", "1")));
-
-            profile.setAttendancePercentage(Float.parseFloat(gp(p, "app.register.attendancePercentage", "0.0")));
-
-            profile.setDateSemester1Start(app.gson.fromJson(gp(p, "app.register.dateSemester1Start", ""), Date.class));
-            profile.setDateSemester2Start(app.gson.fromJson(gp(p, "app.register.dateSemester2Start", ""), Date.class));
-            profile.setDateYearEnd(app.gson.fromJson(gp(p, "app.register.dateYearEnd", ""), Date.class));
-
-            profile.setLuckyNumberEnabled(Boolean.parseBoolean(gp(p, "app.register.luckyNumberEnabled", Boolean.toString(profile.getLuckyNumberEnabled()))));
-            profile.setLuckyNumber(Integer.parseInt(gp(p, "app.register.luckyNumber", "-1")));
-            profile.setLuckyNumberDate(app.gson.fromJson(gp(p, "app.register.luckyNumberDate", ""), Date.class));
-
-
-            profile.setLoginStoreId(jProfile.get("loginStoreId").getAsInt());
-
-
-
-            LoginStore loginStore = new LoginStore(
-                    profile.getLoginStoreId(),
-                    Integer.parseInt(gp(p, "app.register.loginType", "1")),
-                    loginStores.get(profile.getLoginStoreId())
-            );
-
-            String teamPrefix;
-            switch (loginStore.type) {
-                case LOGIN_TYPE_MOBIDZIENNIK:
-                    teamPrefix = loginStore.getLoginData("serverName", "MOBI_UN");
-                    break;
-                case LOGIN_TYPE_LIBRUS:
-                    teamPrefix = profile.getStudentData("schoolName", "LIBRUS_UN");
-                    break;
-                case LOGIN_TYPE_IUCZNIOWIE:
-                    teamPrefix = loginStore.getLoginData("schoolName", "IUCZNIOWIE_UN");
-                    break;
-                case LOGIN_TYPE_VULCAN:
-                    teamPrefix = profile.getStudentData("schoolName", "VULCAN_UN");
-                    break;
-                case LOGIN_TYPE_DEMO:
-                    teamPrefix = loginStore.getLoginData("serverName", "DEMO_UN");
-                    break;
-                default:
-                    teamPrefix = "TYPE_UNKNOWN";
-                    break;
-            }
-
-
-
-
-
-
-
-
-            JsonArray items = new JsonParser().parse(gp(p, "app.register.users", "[]")).getAsJsonArray();
-            if (items != null) {
-                List<Teacher> itemList = new ArrayList<>();
-                for (JsonElement itemEl : items) {
-                    JsonObject item = itemEl.getAsJsonObject();
-                    if (item.get("id").getAsLong() == -1)
-                        continue;
-                    itemList.add(new Teacher(
-                            profileId,
-                            item.get("id").getAsLong() + (loginStore.type == LOGIN_TYPE_IUCZNIOWIE ? 32768 : 0),
-                            item.get("name").getAsString(),
-                            item.get("surname").getAsString()
-                    ));
-                }
-                app.db.teacherDao().addAllIgnore(itemList);
-            }
-
-            items = new JsonParser().parse(gp(p, "app.register.subjects", "[]")).getAsJsonArray();
-            if (items != null) {
-                List<Subject> itemList = new ArrayList<>();
-                for (JsonElement itemEl : items) {
-                    JsonObject item = itemEl.getAsJsonObject();
-                    if (item.get("id").getAsLong() == -1)
-                        continue;
-                    itemList.add(new Subject(
-                            profileId,
-                            item.get("id").getAsLong() + (loginStore.type == LOGIN_TYPE_IUCZNIOWIE ? 32768 : 0),
-                            item.get("longName").getAsString(),
-                            item.get("shortName").getAsString()
-                    ));
-                }
-                app.db.subjectDao().addAll(itemList);
-            }
-
-            items = new JsonParser().parse(gp(p, "app.register.teams", "[]")).getAsJsonArray();
-            List<Team> tItemList = new ArrayList<>();
-            if (items != null) {
-                for (JsonElement itemEl : items) {
-                    JsonObject item = itemEl.getAsJsonObject();
-                    if (item.get("id").getAsLong() == -1)
-                        continue;
-                    tItemList.add(new Team(
-                            profileId,
-                            item.get("id").getAsLong() + (loginStore.type == LOGIN_TYPE_IUCZNIOWIE ? 32768 : 0),
-                            item.get("name").getAsString(),
-                            item.get("type").getAsInt(),
-                            teamPrefix+":"+item.get("name").getAsString(),
-                            item.get("teacherId").getAsInt()
-                    ));
-                }
-            }
-            JsonObject tItem = new JsonParser().parse(gp(p, "app.register.teamClass", "")).getAsJsonObject();
-            tItemList.add(new Team(
-                    profileId,
-                    tItem.get("id").getAsLong(),
-                    tItem.get("name").getAsString(),
-                    tItem.get("type").getAsInt(),
-                    teamPrefix+":"+tItem.get("name").getAsString(),
-                    tItem.get("teacherId").getAsInt()
-            ));
-            app.db.teamDao().addAll(tItemList);
-
-            Map<Integer, Pair<String, Integer>> types = app.gson.fromJson(p.getString("app.register.eventTypes", "{}"), new TypeToken<Map<Integer, Pair<String, Integer>>>(){}.getType());
-            if (types != null) {
-                for (Integer index : types.keySet()) {
-                    Pair<String, Integer> type = types.get(index);
-                    if (type != null && type.second != null) {
-                        int color = type.second;
-                        switch (color) {
-                            case 0xffdaa520:
-                                color = COLOR_DEFAULT;
-                                break;
-                            case 0xffff0000:
-                                color = COLOR_EXAM;
-                                break;
-                            case 0xffadff2f:
-                                color = COLOR_SHORT_QUIZ;
-                                break;
-                            case 0xff4050b5:
-                                color = COLOR_ESSAY;
-                                break;
-                            case 0xff673ab7:
-                                color = COLOR_PROJECT;
-                                break;
-                            case 0xffabcdef:
-                                color = COLOR_PT_MEETING;
-                                break;
-                            case 0xff4caf50:
-                                color = COLOR_EXCURSION;
-                                break;
-                            case 0xffffeb3b:
-                                color = COLOR_READING;
-                                break;
-                        }
-                        app.db.eventTypeDao().add(new EventType(profileId, index, type.first, color));
-                    }
-                }
-            }
-
-            items = new JsonParser().parse(gp(p, "app.register.events", "[]")).getAsJsonArray();
-            if (items != null) {
-                List<Event> itemList = new ArrayList<>();
-                for (JsonElement itemEl : items) {
-                    JsonObject item = itemEl.getAsJsonObject();
-                    int color = item.get("color").getAsInt();
-                    switch (color) {
-                        case 0xffdaa520:
-                        case 0xffff0000:
-                        case 0xffadff2f:
-                        case 0xff4050b5:
-                        case 0xff673ab7:
-                        case 0xffabcdef:
-                        case 0xff4caf50:
-                        case 0xffffeb3b:
-                            color = -1;
-                            break;
-                    }
-                    long id = item.get("id").getAsLong();
-                    Event itemObj = new Event(
-                            profileId,
-                            id,
-                            app.gson.fromJson(item.get("eventDate"), Date.class),
-                            app.gson.fromJson(item.get("startTime"), Time.class),
-                            item.get("topic").getAsString(),
-                            color,
-                            item.get("type").getAsInt(),
-                            (loginStore.type != LOGIN_TYPE_MOBIDZIENNIK || id >= 1420070400000L) && item.get("addedManually").getAsBoolean(),
-                            item.get("teacherId").getAsInt(),
-                            item.get("subjectId").getAsInt(),
-                            item.get("teamId").getAsInt());
-                    if (item.get("sharedBy") != null) {
-                        itemObj.sharedBy = item.get("sharedBy").getAsString();
-                        itemObj.sharedByName = item.get("sharedByName").getAsString();
-                    }
-                    Metadata metadataObj = new Metadata(
-                            profileId,
-                            Metadata.TYPE_EVENT,
-                            itemObj.id,
-                            item.get("seen").getAsBoolean(),
-                            item.get("notified").getAsBoolean(),
-                            item.get("addedDate").getAsLong()
-                    );
-                    if (itemObj.id == -1)
-                        continue;
-                    itemList.add(itemObj);
-                    metadataList.add(metadataObj);
-                }
-                app.db.eventDao().addAll(itemList);
-            }
-            items = new JsonParser().parse(gp(p, "app.register.homeworksNew", "[]")).getAsJsonArray();
-            if (items != null) {
-                List<Event> itemList = new ArrayList<>();
-                for (JsonElement itemEl : items) {
-                    JsonObject item = itemEl.getAsJsonObject();
-                    Event itemObj = new Event(
-                            profileId,
-                            item.get("id").getAsLong(),
-                            app.gson.fromJson(item.get("eventDate"), Date.class),
-                            app.gson.fromJson(item.get("startTime"), Time.class),
-                            item.get("topic").getAsString(),
-                            -1,
-                            TYPE_HOMEWORK,
-                            item.get("addedManually").getAsBoolean(),
-                            item.get("teacherId").getAsInt(),
-                            item.get("subjectId").getAsInt(),
-                            item.get("teamId").getAsInt());
-                    if (item.get("sharedBy") != null) {
-                        itemObj.sharedBy = item.get("sharedBy").getAsString();
-                        itemObj.sharedByName = item.get("sharedByName").getAsString();
-                    }
-                    Metadata metadataObj = new Metadata(
-                            profileId,
-                            Metadata.TYPE_HOMEWORK,
-                            itemObj.id,
-                            item.get("seen").getAsBoolean(),
-                            item.get("notified").getAsBoolean(),
-                            item.get("addedDate").getAsLong()
-                    );
-                    if (itemObj.id == -1)
-                        continue;
-                    itemList.add(itemObj);
-                    metadataList.add(metadataObj);
-                }
-                app.db.eventDao().addAll(itemList);
-            }
-
-            items = new JsonParser().parse(gp(p, "app.register.gradeCategories", "[]")).getAsJsonArray();
-            LongSparseArray<Pair<String, Integer>> gradeCategories = new LongSparseArray<>();
-            if (items != null) {
-                for (JsonElement itemEl : items) {
-                    JsonObject item = itemEl.getAsJsonObject();
-                    if (item.get("id").getAsLong() == -1)
-                        continue;
-                    gradeCategories.put(item.get("id").getAsLong(),
-                            new Pair<>(item.get("description").getAsString(), item.get("color").getAsInt()));
-                }
-            }
-
-            items = new JsonParser().parse(gp(p, "app.register.grades", "[]")).getAsJsonArray();
-            if (items != null) {
-                List<Grade> itemList = new ArrayList<>();
-                for (JsonElement itemEl : items) {
-                    JsonObject item = itemEl.getAsJsonObject();
-                    long categoryId = item.get("categoryId").getAsInt();
-                    Pair<String, Integer> category = gradeCategories.get(categoryId);
-                    Grade itemObj = new Grade(
-                            profileId,
-                            item.get("id").getAsLong(),
-                            category != null ? category.first : "",
-                            category != null && category.second != null ? category.second : 0xff0000ff,
-                            item.get("description").getAsString(),
-                            item.get("name").getAsString(),
-                            item.get("value").getAsFloat(),
-                            item.get("weight").getAsInt(),
-                            item.get("semester").getAsInt(),
-                            item.get("teacherId").getAsInt(),
-                            item.get("subjectId").getAsInt());
-                    itemObj.type = item.get("type").getAsInt();
-                    if (loginStore.type == LOGIN_TYPE_IUCZNIOWIE && itemObj.type != 0)
-                        continue;
-                    Metadata metadataObj = new Metadata(
-                            profileId,
-                            Metadata.TYPE_GRADE,
-                            itemObj.id,
-                            item.get("seen").getAsBoolean(),
-                            item.get("notified").getAsBoolean(),
-                            item.get("addedDate").getAsLong()
-                    );
-                    if (itemObj.id == -1)
-                        continue;
-                    itemList.add(itemObj);
-                    metadataList.add(metadataObj);
-                }
-                app.db.gradeDao().addAll(itemList);
-            }
-
-            items = new JsonParser().parse(gp(p, "app.register.notices", "[]")).getAsJsonArray();
-            if (items != null) {
-                List<Notice> itemList = new ArrayList<>();
-                for (JsonElement itemEl : items) {
-                    JsonObject item = itemEl.getAsJsonObject();
-                    Notice itemObj = new Notice(
-                            profileId,
-                            item.get("id").getAsLong() + (loginStore.type == LOGIN_TYPE_IUCZNIOWIE ? 32768 : 0),
-                            item.get("reason").getAsString(),
-                            item.get("semester").getAsInt(),
-                            item.get("type").getAsInt(),
-                            item.get("teacherId").getAsInt());
-                    Metadata metadataObj = new Metadata(
-                            profileId,
-                            Metadata.TYPE_NOTICE,
-                            itemObj.id,
-                            item.get("seen").getAsBoolean(),
-                            item.get("notified").getAsBoolean(),
-                            item.get("addedDate").getAsLong()
-                    );
-                    if (itemObj.id == -1)
-                        continue;
-                    itemList.add(itemObj);
-                    metadataList.add(metadataObj);
-                }
-                app.db.noticeDao().addAll(itemList);
-            }
-
-            items = new JsonParser().parse(gp(p, "app.register.attendances", "[]")).getAsJsonArray();
-            if (items != null) {
-                List<Attendance> itemList = new ArrayList<>();
-                for (JsonElement itemEl : items) {
-                    JsonObject item = itemEl.getAsJsonObject();
-                    Attendance itemObj = new Attendance(
-                            profileId,
-                            item.get("id").getAsLong(),
-                            item.get("teacherId").getAsInt(),
-                            item.get("subjectId").getAsInt(),
-                            item.get("semester").getAsInt(),
-                            item.get("lessonTopic").getAsString(),
-                            app.gson.fromJson(item.get("lessonDate"), Date.class),
-                            app.gson.fromJson(item.get("startTime"), Time.class),
-                            item.get("type").getAsInt());
-                    Metadata metadataObj = new Metadata(
-                            profileId,
-                            Metadata.TYPE_ATTENDANCE,
-                            itemObj.id,
-                            item.get("seen").getAsBoolean(),
-                            item.get("notified").getAsBoolean(),
-                            item.get("addedDate").getAsLong()
-                    );
-                    if (itemObj.id == -1)
-                        continue;
-                    itemList.add(itemObj);
-                    metadataList.add(metadataObj);
-                }
-                app.db.attendanceDao().addAll(itemList);
-            }
-
-
-            tItem = new JsonParser().parse(gp(p, "app.register.timetable", "{weekdays: [], lessonChanges: [], lessonAdditions: []}")).getAsJsonObject();
-            if (tItem != null) {
-
-                List<Lesson> itemLessonList = new ArrayList<>();
-                for (JsonElement weekDayEl : tItem.getAsJsonArray("weekdays")) {
-                    JsonObject weekDay = weekDayEl.getAsJsonObject();
-                    int weekDayNum = weekDay.get("weekDay").getAsInt();
-                    for (JsonElement itemEl : weekDay.getAsJsonArray("lessons")) {
-                        JsonObject item = itemEl.getAsJsonObject();
-                        Lesson itemObj = new Lesson(
-                                profileId,
-                                weekDayNum,
-                                app.gson.fromJson(item.get("startTime"), Time.class),
-                                app.gson.fromJson(item.get("endTime"), Time.class)
-                        );
-                        itemObj.classroomName = item.get("classroomName").getAsString();
-                        itemObj.subjectId = item.get("subjectId").getAsInt();
-                        itemObj.teacherId = item.get("teacherId").getAsInt();
-                        itemObj.teamId = item.get("teamId").getAsInt();
-                        itemLessonList.add(itemObj);
-                    }
-                }
-                app.db.lessonDao().addAll(itemLessonList);
-
-                List<LessonChange> itemList = new ArrayList<>();
-                for (JsonElement itemEl : tItem.getAsJsonArray("lessonChanges")) {
-                    JsonObject item = itemEl.getAsJsonObject();
-                    LessonChange itemObj = new LessonChange(
-                            profileId,
-                            app.gson.fromJson(item.get("lessonDate"), Date.class),
-                            app.gson.fromJson(item.get("startTime"), Time.class),
-                            app.gson.fromJson(item.get("endTime"), Time.class));
-                    itemObj.classroomName = item.get("classroomName").getAsString();
-                    itemObj.subjectId = item.get("subjectId").getAsInt();
-                    itemObj.teacherId = item.get("teacherId").getAsInt();
-                    itemObj.teamId = item.get("teamId").getAsInt();
-                    itemObj.type = item.get("type").getAsInt();
-                    Metadata metadataObj = new Metadata(
-                            profileId,
-                            Metadata.TYPE_LESSON_CHANGE,
-                            itemObj.id,
-                            item.get("seen").getAsBoolean(),
-                            item.get("notified").getAsBoolean(),
-                            System.currentTimeMillis()
-                    );
-                    if (itemObj.id == -1)
-                        continue;
-                    itemList.add(itemObj);
-                    metadataList.add(metadataObj);
-                }
-                app.db.lessonChangeDao().addAll(itemList);
-            }
-
-            app.db.eventTypeDao().add(new EventType(profileId, TYPE_HOMEWORK, getString(R.string.event_type_homework), COLOR_HOMEWORK));
-            app.db.eventTypeDao().add(new EventType(profileId, TYPE_DEFAULT, getString(R.string.event_other), COLOR_DEFAULT));
-            app.db.eventTypeDao().add(new EventType(profileId, TYPE_EXAM, getString(R.string.event_exam), COLOR_EXAM));
-            app.db.eventTypeDao().add(new EventType(profileId, TYPE_SHORT_QUIZ, getString(R.string.event_short_quiz), COLOR_SHORT_QUIZ));
-            app.db.eventTypeDao().add(new EventType(profileId, TYPE_ESSAY, getString(R.string.event_essay), COLOR_SHORT_QUIZ));
-            app.db.eventTypeDao().add(new EventType(profileId, TYPE_PROJECT, getString(R.string.event_project), COLOR_PROJECT));
-            app.db.eventTypeDao().add(new EventType(profileId, TYPE_PT_MEETING, getString(R.string.event_pt_meeting), COLOR_PT_MEETING));
-            app.db.eventTypeDao().add(new EventType(profileId, TYPE_EXCURSION, getString(R.string.event_excursion), COLOR_EXCURSION));
-            app.db.eventTypeDao().add(new EventType(profileId, TYPE_READING, getString(R.string.event_reading), COLOR_READING));
-            app.db.eventTypeDao().add(new EventType(profileId, TYPE_CLASS_EVENT, getString(R.string.event_class_event), COLOR_CLASS_EVENT));
-            app.db.eventTypeDao().add(new EventType(profileId, TYPE_INFORMATION, getString(R.string.event_information), COLOR_INFORMATION));
-
-            if (profile.getLuckyNumberDate() != null) {
-                app.db.luckyNumberDao().add(new LuckyNumber(profile.getId(), profile.getLuckyNumberDate(), profile.getLuckyNumber()));
-            }
-            app.db.profileDao().add(profile);
-            app.db.loginStoreDao().add(loginStore);
-            app.db.metadataDao().addAllIgnore(metadataList);
-        }
-
-
-        try {
-            app.appConfig.appInstalledTime = app.getPackageManager().getPackageInfo(app.getPackageName(), 0).firstInstallTime;
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-        }
-        app.appConfig.appRateSnackbarTime = app.appConfig.appInstalledTime + 2 * 24 * 60 * 60 * 1000;
-        app.appConfig.loginFinished = true;
-        app.saveConfig("loginFinished", "appInstalledTime", "appRateSnackbarTime");
-    }
-}
-
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMigrationSyncFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMigrationSyncFragment.java
deleted file mode 100644
index 8adeebf2..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMigrationSyncFragment.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package pl.szczodrzynski.edziennik.ui.modules.login;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.text.Html;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-import androidx.navigation.NavController;
-import androidx.navigation.Navigation;
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.AppError;
-import pl.szczodrzynski.edziennik.data.api.interfaces.SyncCallback;
-import pl.szczodrzynski.edziennik.databinding.FragmentLoginMigrationSyncBinding;
-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.profiles.ProfileFull;
-import pl.szczodrzynski.edziennik.sync.SyncJob;
-import pl.szczodrzynski.edziennik.sync.SyncService;
-
-public class LoginMigrationSyncFragment extends Fragment {
-
-    private App app;
-    private NavController nav;
-    private FragmentLoginMigrationSyncBinding b;
-    private static final String TAG = "LoginMigrationSync";
-    private List<String> profileNameList = new ArrayList<>();
-    private int profileIndex = 0;
-
-    public LoginMigrationSyncFragment() { }
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        if (getActivity() != null) {
-            app = (App) getActivity().getApplicationContext();
-            nav = Navigation.findNavController(getActivity(), R.id.nav_host_fragment);
-        }
-        else {
-            return null;
-        }
-        b = DataBindingUtil.inflate(inflater, R.layout.fragment_login_migration_sync, container, false);
-        return b.getRoot();
-    }
-
-    private void begin() {
-        AsyncTask.execute(() -> {
-            if (getActivity() == null) {
-                return;
-            }
-
-            for (Profile profileObject: app.db.profileDao().getAllNow()) {
-                profileNameList.add(profileObject.getName());
-            }
-
-            getActivity().runOnUiThread(() -> {
-                profileIndex = 0;
-                b.loginSyncSubtitle1.setText(Html.fromHtml(getString(R.string.login_sync_subtitle_1_format, profileNameList.size() > profileIndex ? profileNameList.get(profileIndex) : " ")));
-            });
-            SyncJob.run(app, -1, -1);
-        });
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        assert getContext() != null;
-        assert getActivity() != null;
-
-        SyncService.customCallback = new SyncCallback() {
-            @Override public void onLoginFirst(List<Profile> profileList, LoginStore loginStore) { }
-
-            @Override
-            public void onSuccess(Context activityContext, ProfileFull profileFull) {
-                if (getActivity() == null)
-                    return;
-                getActivity().runOnUiThread(() -> {
-                    if (profileFull != null) {
-                        // a profile is finished
-                        profileIndex++;
-                        b.loginSyncSubtitle1.setText(Html.fromHtml(getString(R.string.login_sync_subtitle_1_format, profileIndex < profileNameList.size() ? profileNameList.get(profileIndex) : profileNameList.get(profileNameList.size()-1))));
-                    }
-                    else {
-                        // all profiles are finished
-                        getActivity().setResult(Activity.RESULT_OK);
-                        getActivity().finish();
-                    }
-                });
-            }
-
-            @Override
-            public void onError(Context activityContext, AppError error) {
-                if (getActivity() == null)
-                    return;
-                getActivity().setResult(Activity.RESULT_OK);
-                getActivity().finish();
-            }
-
-            @Override
-            public void onProgress(int progressStep) {
-                if (getActivity() == null)
-                    return;
-                getActivity().runOnUiThread(() -> {
-                    b.loginSyncProgressBar.setMax(SyncService.maxProgress);
-                    b.loginSyncProgressBar.setProgress(SyncService.progress);
-                });
-            }
-
-            @Override
-            public void onActionStarted(int stringResId) {
-                if (getActivity() == null)
-                    return;
-                getActivity().runOnUiThread(() -> {
-                    b.loginSyncSubtitle2.setText(getString(R.string.login_sync_subtitle_2_format, getString(stringResId)));
-                });
-            }
-        };
-
-        begin();
-    }
-}
-
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMobidziennikFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMobidziennikFragment.java
index 0c4c5f33..8725fa92 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMobidziennikFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMobidziennikFragment.java
@@ -1,23 +1,23 @@
 package pl.szczodrzynski.edziennik.ui.modules.login;
 
-import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
 import android.text.Editable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.danimahardhika.cafebar.CafeBar;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
+
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.AppError;
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginMobidziennikBinding;
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar;
 
 import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_ARCHIVED;
 import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_INVALID_LOGIN;
@@ -31,6 +31,7 @@ public class LoginMobidziennikFragment extends Fragment {
     private NavController nav;
     private FragmentLoginMobidziennikBinding b;
     private static final String TAG = "LoginMobidziennik";
+    private ErrorSnackbar errorSnackbar;
 
     public LoginMobidziennikFragment() { }
 
@@ -40,6 +41,7 @@ public class LoginMobidziennikFragment extends Fragment {
         if (getActivity() != null) {
             app = (App) getActivity().getApplicationContext();
             nav = Navigation.findNavController(getActivity(), R.id.nav_host_fragment);
+            errorSnackbar = ((LoginActivity) getActivity()).errorSnackbar;
         }
         else {
             return null;
@@ -54,9 +56,9 @@ public class LoginMobidziennikFragment extends Fragment {
         assert getActivity() != null;
 
         view.postDelayed(() -> {
-            AppError error = LoginActivity.error;
+            ApiError error = LoginActivity.error;
             if (error != null) {
-                switch (error.errorCode) {
+                switch (error.getErrorCode()) {
                     case CODE_INVALID_LOGIN:
                         b.loginPasswordLayout.setError(getString(R.string.login_error_incorrect_login_or_password));
                         break;
@@ -69,22 +71,8 @@ public class LoginMobidziennikFragment extends Fragment {
                     case CODE_INVALID_SERVER_ADDRESS:
                         b.loginServerAddressLayout.setError(getString(R.string.login_error_incorrect_address));
                         break;
-                    default:
-                        CafeBar.builder(getActivity())
-                                .to(b.root)
-                                .content(getString(R.string.login_error, error.asReadableString(getActivity())))
-                                .autoDismiss(false)
-                                .positiveText(R.string.ok)
-                                .onPositive(CafeBar::dismiss)
-                                .floating(true)
-                                .swipeToDismiss(true)
-                                .neutralText(R.string.more)
-                                .onNeutral(cafeBar -> app.apiEdziennik.guiShowErrorDialog(getActivity(), error, R.string.error_details))
-                                .negativeText(R.string.report)
-                                .onNegative((cafeBar -> app.apiEdziennik.guiReportError(getActivity(), error, null)))
-                                .show();
-                        break;
                 }
+                errorSnackbar.addError(error).show();
                 LoginActivity.error = null;
             }
         }, 100);
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.java
index 93f00fa3..e229d151 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.java
@@ -1,34 +1,33 @@
 package pl.szczodrzynski.edziennik.ui.modules.login;
 
-import androidx.databinding.DataBindingUtil;
-
-import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.google.gson.JsonObject;
-
-import java.util.List;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
+
+import com.google.gson.JsonObject;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.Edziennik;
-import pl.szczodrzynski.edziennik.data.api.AppError;
-import pl.szczodrzynski.edziennik.data.api.interfaces.SyncCallback;
-import pl.szczodrzynski.edziennik.databinding.FragmentLoginProgressBinding;
+import pl.szczodrzynski.edziennik.api.v2.events.ApiTaskErrorEvent;
+import pl.szczodrzynski.edziennik.api.v2.events.FirstLoginFinishedEvent;
+import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask;
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError;
 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.profiles.ProfileFull;
+import pl.szczodrzynski.edziennik.databinding.FragmentLoginProgressBinding;
 
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_OTHER;
+import static pl.szczodrzynski.edziennik.api.v2.ErrorsKt.LOGIN_NO_ARGUMENTS;
 
 public class LoginProgressFragment extends Fragment {
 
@@ -53,6 +52,24 @@ public class LoginProgressFragment extends Fragment {
         return b.getRoot();
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onFirstLoginFinishedEvent(FirstLoginFinishedEvent event) {
+        LoginActivity.profileObjects.add(new LoginProfileObject(
+                event.getLoginStore(),
+                event.getProfileList()));
+        nav.navigate(R.id.loginSummaryFragment, null, LoginActivity.navOptions);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onSyncErrorEvent(ApiTaskErrorEvent event) {
+        LoginActivity.error = event.getError();
+        if (getActivity() == null)
+            return;
+        nav.navigateUp();
+    }
+
+    // TODO add progress bar in login
+
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         assert getContext() != null;
@@ -62,7 +79,7 @@ public class LoginProgressFragment extends Fragment {
         LoginActivity.error = null;
 
         if (args == null) {
-            LoginActivity.error = new AppError(TAG, 72, CODE_OTHER, getString(R.string.login_error_no_arguments));
+            LoginActivity.error = new ApiError(TAG, LOGIN_NO_ARGUMENTS);
             nav.navigateUp();
             return;
         }
@@ -72,131 +89,22 @@ public class LoginProgressFragment extends Fragment {
         LoginStore loginStore = new LoginStore(-1, loginType, new JsonObject());
         loginStore.copyFrom(args);
 
-        Edziennik.getApi(app, loginType).sync(getActivity(), new SyncCallback() {
-            @Override
-            public void onLoginFirst(List<Profile> profileList, LoginStore loginStore) {
-                // because these callbacks are always on a worker thread
-                if (getActivity() != null) {
-                    getActivity().runOnUiThread(() -> {
-                        LoginActivity.profileObjects.add(new LoginProfileObject(
-                                loginStore,
-                                profileList));
-                        nav.navigate(R.id.loginSummaryFragment, null, LoginActivity.navOptions);
-                    });
-                }
-            }
+        if (App.devMode && LoginChooserFragment.fakeLogin) {
+            loginStore.putLoginData("fakeLogin", true);
+        }
 
-            @Override
-            public void onSuccess(Context activityContext, ProfileFull profileFull) {
+        EdziennikTask.Companion.firstLogin(loginStore).enqueue(getContext());
+    }
 
-            }
+    @Override
+    public void onStart() {
+        EventBus.getDefault().register(this);
+        super.onStart();
+    }
 
-            @Override
-            public void onError(Context activityContext, AppError error) {
-                LoginActivity.error = error;
-                // because these callbacks are always on a worker thread
-                if (getActivity() == null)
-                    return;
-                getActivity().runOnUiThread(() -> {
-                    nav.navigateUp();
-                });
-            }
-
-            @Override
-            public void onProgress(int progressStep) {
-
-            }
-
-            @Override
-            public void onActionStarted(int stringResId) {
-
-            }
-        }, -1, null, loginStore);
-
-        /*if (true)
-            return;
-        JsonObject loginData = new JsonObject();
-        loginData.addProperty("serverName", b.loginServerAddress.getText().toString());
-        loginData.addProperty("username", b.loginUsername.getText().toString());
-        loginData.addProperty("password", b.loginPassword.getText().toString());
-        getApi(app, LOGIN_TYPE_MOBIDZIENNIK).sync(getActivity(), new Edziennik.DataCallback() {
-            @Override
-            public void onLoginFirst(List<Profile> profileList, LoginStore loginStore) {
-                int profileId = app.profileLastId()+1;
-                if (profileList.size() == 1) {
-                    Profile profile = profileList.get(0);
-                    saveProfile(profile, loginStore, profileId, profileId);
-                    finishSaving();
-                    return;
-                }
-                List<String> profileNames = new ArrayList<>();
-                for (Profile profile: profileList) {
-                    profileNames.add(profile.name);
-                }
-                new MaterialDialog.Builder(getActivity())
-                        .title(R.string.sync_multiaccount_select_students)
-                        .items(profileNames)
-                        .positiveText(R.string.ok)
-                        .negativeText(R.string.cancel)
-                        .neutralText(R.string.help)
-                        .autoDismiss(false)
-                        .canceledOnTouchOutside(false)
-                        .onNeutral((dialog, which) ->
-                                new MaterialDialog.Builder(getActivity())
-                                        .title(R.string.help)
-                                        .content(R.string.sync_multiaccount_select_students_text)
-                                        .positiveText(R.string.ok)
-                                        .show()
-                        )
-                        .onNegative(((dialog, which) -> dialog.dismiss()))
-                        .itemsCallbackMultiChoice(null, (dialog, which, text) -> {
-                            // create new profiles, then restart the application or sth
-                            if (text.length < 1 || which.length < 1) {
-                                Toast.makeText(app, R.string.sync_multiaccount_select_students_error, Toast.LENGTH_SHORT).show();
-                                return false;
-                            }
-                            dialog.dismiss();
-                            int pos = 0;
-                            for (int index: which) {
-                                Profile profile = profileList.get(index);
-                                saveProfile(profile, loginStore, profileId+(pos++), profileId);
-                            }
-                            finishSaving();
-
-
-                            String list = "";
-                            for (ProfileFull profileFull: app.db.profileDao().getAllFullNow()) {
-                                d(TAG, profileFull.toString());
-                                list += profileFull.studentNameLong+" student ID "+profileFull.getStudentData("studentId", -1)+"\n";
-                            }
-                            d(TAG, loginStore.toString());
-                            list += loginStore.getLoginData("username", "(NO USERNAME)")+"\n";
-                            new MaterialDialog.Builder(getActivity())
-                                    .title("Znaleziono profile")
-                                    .content(list)
-                                    .positiveText("OK")
-                                    .show();
-
-
-                            return false;
-                        })
-                        .show();
-            }
-
-            @Override
-            public void onSuccess(Context activityContext, ProfileFull profile) {
-                Toast.makeText(activityContext, "Zakończono", Toast.LENGTH_SHORT).show();
-            }
-
-            @Override
-            public void onError(Context activityContext, int errorCode, String errorText, Throwable throwable, String apiResponse) {
-
-            }
-
-            @Override
-            public void onProgress(int progressStep) {
-
-            }
-        }, -1, null, new LoginStore(-1, LOGIN_TYPE_MOBIDZIENNIK, loginData));*/
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSummaryFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSummaryFragment.java
index 43efd3fe..aaf6c4a0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSummaryFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSummaryFragment.java
@@ -1,32 +1,40 @@
 package pl.szczodrzynski.edziennik.ui.modules.login;
 
-import androidx.databinding.DataBindingUtil;
-
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
+import androidx.navigation.NavController;
+import androidx.navigation.Navigation;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.afollestad.materialdialogs.MaterialDialog;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.navigation.NavController;
-import androidx.navigation.Navigation;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import pl.szczodrzynski.edziennik.App;
+import pl.szczodrzynski.edziennik.ExtensionsKt;
 import pl.szczodrzynski.edziennik.R;
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginSummaryBinding;
 import pl.szczodrzynski.edziennik.databinding.RowLoginProfileListItemBinding;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
+
+import static pl.szczodrzynski.edziennik.api.v2.LoginMethodsKt.LOGIN_MODE_LIBRUS_EMAIL;
+import static pl.szczodrzynski.edziennik.api.v2.LoginMethodsKt.LOGIN_MODE_VULCAN_API;
+import static pl.szczodrzynski.edziennik.api.v2.LoginMethodsKt.LOGIN_MODE_VULCAN_WEB;
+import static pl.szczodrzynski.edziennik.api.v2.LoginMethodsKt.LOGIN_TYPE_IDZIENNIK;
+import static pl.szczodrzynski.edziennik.api.v2.LoginMethodsKt.LOGIN_TYPE_LIBRUS;
+import static pl.szczodrzynski.edziennik.api.v2.LoginMethodsKt.LOGIN_TYPE_MOBIDZIENNIK;
+import static pl.szczodrzynski.edziennik.api.v2.LoginMethodsKt.LOGIN_TYPE_VULCAN;
 
 public class LoginSummaryFragment extends Fragment {
 
@@ -63,11 +71,19 @@ public class LoginSummaryFragment extends Fragment {
         for (LoginProfileObject profileObject: LoginActivity.profileObjects) {
             int subIndex = 0;
             for (Profile profile: profileObject.profileList) {
+                List<String> subnameList = new ArrayList<>();
+                if (profile.getStudentClassName() != null)
+                    subnameList.add(profile.getStudentClassName());
+                if (profile.getStudentSchoolYear() != null)
+                    subnameList.add(profile.getStudentSchoolYear());
                 ItemProfileModel profileModel = new ItemProfileModel(
                         index,
                         subIndex,
                         profile.getName(),
+                        ExtensionsKt.join(subnameList, " - "),
                         profileObject.loginStore.type,
+                        profileObject.loginStore.mode,
+                        profile.getAccountNameLong() != null,
                         profileObject.selectedList.get(subIndex)
                 );
                 profileList.add(profileModel);
@@ -133,14 +149,20 @@ public class LoginSummaryFragment extends Fragment {
         int listIndex;
         int listSubIndex;
         String name;
+        String subname;
         int loginType;
+        int loginMode;
+        boolean isParent;
         boolean selected;
 
-        public ItemProfileModel(int listIndex, int listSubIndex, String name, int loginType, boolean selected) {
+        public ItemProfileModel(int listIndex, int listSubIndex, String name, String subname, int loginType, int loginMode, boolean isParent, boolean selected) {
             this.listIndex = listIndex;
             this.listSubIndex = listSubIndex;
             this.name = name;
+            this.subname = subname;
             this.loginType = loginType;
+            this.loginMode = loginMode;
+            this.isParent = isParent;
             this.selected = selected;
         }
     }
@@ -176,9 +198,50 @@ public class LoginSummaryFragment extends Fragment {
                     b.checkBox.jumpDrawablesToCurrentState();
                 }
                 LoginActivity.profileObjects.get(m.listIndex).selectedList.set(m.listSubIndex, m.selected);
+
             };
             b.checkBox.setOnClickListener(onClickListener);
             b.getRoot().setOnClickListener(onClickListener);
+            int imageRes = 0;
+            if (m.loginType == LOGIN_TYPE_MOBIDZIENNIK) {
+                imageRes = R.drawable.logo_mobidziennik;
+            }
+            else if (m.loginType == LOGIN_TYPE_IDZIENNIK) {
+                imageRes = R.drawable.logo_idziennik;
+            }
+            else if (m.loginType == LOGIN_TYPE_LIBRUS) {
+                if (m.loginMode == LOGIN_MODE_LIBRUS_EMAIL) {
+                    imageRes = R.drawable.logo_librus;
+                }
+                else {
+                    imageRes = R.drawable.logo_synergia;
+                }
+            }
+            else if (m.loginType == LOGIN_TYPE_VULCAN) {
+                if (m.loginMode == LOGIN_MODE_VULCAN_WEB) {
+                    imageRes = R.drawable.logo_vulcan;
+                }
+                else if (m.loginMode == LOGIN_MODE_VULCAN_API) {
+                    imageRes = R.drawable.logo_dzienniczek;
+                }
+            }
+            if (imageRes != 0) {
+                b.registerIcon.setImageResource(imageRes);
+            }
+            if (m.isParent) {
+                b.accountType.setText(R.string.login_summary_account_parent);
+            }
+            else {
+                b.accountType.setText(R.string.login_summary_account_child);
+            }
+            if (m.subname.trim().isEmpty()) {
+                b.textDetails.setText(null);
+                b.textDetails.setVisibility(View.GONE);
+            }
+            else {
+                b.textDetails.setText(m.subname);
+                b.textDetails.setVisibility(View.VISIBLE);
+            }
             //b.root.setOnClickListener(onClickListener);
             //holder.bind(b.textView, onClickListener);
         }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncErrorFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncErrorFragment.java
index 951c53e8..52ff1a0f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncErrorFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncErrorFragment.java
@@ -1,6 +1,9 @@
 package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -8,14 +11,11 @@ import androidx.databinding.DataBindingUtil;
 import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
+
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginSyncErrorBinding;
 
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
 public class LoginSyncErrorFragment extends Fragment {
 
     private App app;
@@ -44,10 +44,10 @@ public class LoginSyncErrorFragment extends Fragment {
         assert getContext() != null;
         assert getActivity() != null;
 
-        b.errorDetails.setText(LoginActivity.error == null ? "" : LoginActivity.error.asReadableString(getActivity()));
+        b.errorDetails.setText(LoginActivity.error == null ? "" : LoginActivity.error.getStringReason(getActivity()));
 
         b.reportButton.setOnClickListener((v -> {
-            app.apiEdziennik.guiReportError(getActivity(), LoginActivity.error, null);
+            // TODO error report activity open here app.apiEdziennik.guiReportError(getActivity(), LoginActivity.error, null);
         }));
 
         b.nextButton.setOnClickListener((v -> {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.java
deleted file mode 100644
index 3b8c436e..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package pl.szczodrzynski.edziennik.ui.modules.login;
-
-
-import android.content.Context;
-import android.os.AsyncTask;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-
-import android.text.Html;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import androidx.navigation.NavController;
-import androidx.navigation.Navigation;
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.AppError;
-import pl.szczodrzynski.edziennik.data.api.interfaces.SyncCallback;
-import pl.szczodrzynski.edziennik.databinding.FragmentLoginSyncBinding;
-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.profiles.ProfileFull;
-import pl.szczodrzynski.edziennik.sync.SyncJob;
-import pl.szczodrzynski.edziennik.sync.SyncService;
-
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_CLASS_EVENT;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_DEFAULT;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_EXAM;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_EXCURSION;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_HOMEWORK;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_INFORMATION;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_PROJECT;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_PT_MEETING;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_READING;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_SHORT_QUIZ;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_CLASS_EVENT;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_DEFAULT;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_ESSAY;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_EXAM;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_EXCURSION;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_HOMEWORK;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_INFORMATION;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_PROJECT;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_PT_MEETING;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_READING;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_SHORT_QUIZ;
-import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.REGISTRATION_DISABLED;
-import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.REGISTRATION_ENABLED;
-import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.REGISTRATION_UNSPECIFIED;
-import static pl.szczodrzynski.edziennik.utils.Utils.d;
-
-public class LoginSyncFragment extends Fragment {
-
-    private App app;
-    private NavController nav;
-    private FragmentLoginSyncBinding b;
-    private static final String TAG = "LoginSyncFragment";
-    private List<String> profileNameList = new ArrayList<>();
-    private int profileIndex = 0;
-
-    public LoginSyncFragment() { }
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        if (getActivity() != null) {
-            app = (App) getActivity().getApplicationContext();
-            nav = Navigation.findNavController(getActivity(), R.id.nav_host_fragment);
-        }
-        else {
-            return null;
-        }
-        b = DataBindingUtil.inflate(inflater, R.layout.fragment_login_sync, container, false);
-        return b.getRoot();
-    }
-
-    private void begin() {
-        AsyncTask.execute(() -> {
-            if (getActivity() == null) {
-                return;
-            }
-            int profileId = app.profileLastId()+1;
-            final int firstProfileId = profileId;
-            int loginStoreId = profileId;
-            // profileId contains the first ID free to use
-
-            for (LoginProfileObject profileObject: LoginActivity.profileObjects) {
-                int subIndex = 0;
-                for (Profile profile: profileObject.profileList) {
-                    if (profileObject.selectedList.get(subIndex)) {
-                        saveProfile(
-                                profile,
-                                profileObject.loginStore,
-                                profileId,
-                                loginStoreId
-                        );
-                        profileNameList.add(profile.getName());
-                        profileId++;
-                    }
-                    subIndex++;
-                }
-                loginStoreId = profileId;
-            }
-
-            for (Profile profile: app.db.profileDao().getAllNow()) {
-                d(TAG, profile.toString());
-            }
-            for (LoginStore loginStore: app.db.loginStoreDao().getAllNow()) {
-                d(TAG, loginStore.toString());
-            }
-
-            if (app.appConfig.loginFinished) {
-                LoginFinishFragment.firstRun = false;
-            }
-            else {
-                LoginFinishFragment.firstRun = true;
-                app.appConfig.loginFinished = true;
-                app.saveConfig("loginFinished");
-            }
-            LoginFinishFragment.firstProfileId = firstProfileId;
-
-            getActivity().runOnUiThread(() -> {
-                profileIndex = 0;
-                b.loginSyncSubtitle1.setText(Html.fromHtml(getString(R.string.login_sync_subtitle_1_format, profileNameList.size() > profileIndex ? profileNameList.get(profileIndex) : " ")));
-            });
-            SyncJob.run(app, firstProfileId, -1);
-        });
-    }
-
-    private void saveProfile(Profile profile, LoginStore loginStore, int profileId, int loginStoreId) {
-        profile.setRegistration(REGISTRATION_UNSPECIFIED);
-        if (getArguments() != null) {
-            if (getArguments().getBoolean("registrationAllowed", false)) {
-                profile.setRegistration(REGISTRATION_ENABLED);
-            }
-            else {
-                profile.setRegistration(REGISTRATION_DISABLED);
-            }
-        }
-        profile.setId(profileId);
-        profile.setLoginStoreId(loginStoreId);
-        loginStore.id = loginStoreId;
-        List<EventType> typeList = new ArrayList<>();
-        typeList.add(new EventType(profileId, TYPE_HOMEWORK, getString(R.string.event_type_homework), COLOR_HOMEWORK));
-        typeList.add(new EventType(profileId, TYPE_DEFAULT, getString(R.string.event_other), COLOR_DEFAULT));
-        typeList.add(new EventType(profileId, TYPE_EXAM, getString(R.string.event_exam), COLOR_EXAM));
-        typeList.add(new EventType(profileId, TYPE_SHORT_QUIZ, getString(R.string.event_short_quiz), COLOR_SHORT_QUIZ));
-        typeList.add(new EventType(profileId, TYPE_ESSAY, getString(R.string.event_essay), COLOR_SHORT_QUIZ));
-        typeList.add(new EventType(profileId, TYPE_PROJECT, getString(R.string.event_project), COLOR_PROJECT));
-        typeList.add(new EventType(profileId, TYPE_PT_MEETING, getString(R.string.event_pt_meeting), COLOR_PT_MEETING));
-        typeList.add(new EventType(profileId, TYPE_EXCURSION, getString(R.string.event_excursion), COLOR_EXCURSION));
-        typeList.add(new EventType(profileId, TYPE_READING, getString(R.string.event_reading), COLOR_READING));
-        typeList.add(new EventType(profileId, TYPE_CLASS_EVENT, getString(R.string.event_class_event), COLOR_CLASS_EVENT));
-        typeList.add(new EventType(profileId, TYPE_INFORMATION, getString(R.string.event_information), COLOR_INFORMATION));
-        app.db.eventTypeDao().addAll(typeList);
-        app.profileSaveFull(profile, loginStore);
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        assert getContext() != null;
-        assert getActivity() != null;
-
-        LoginActivity.error = null;
-
-        SyncService.customCallback = new SyncCallback() {
-            @Override public void onLoginFirst(List<Profile> profileList, LoginStore loginStore) { }
-
-            @Override
-            public void onSuccess(Context activityContext, ProfileFull profileFull) {
-                if (getActivity() == null)
-                    return;
-                getActivity().runOnUiThread(() -> {
-                    if (profileFull != null) {
-                        // a profile is finished
-                        profileIndex++;
-                        b.loginSyncSubtitle1.setText(Html.fromHtml(getString(R.string.login_sync_subtitle_1_format, profileIndex < profileNameList.size() ? profileNameList.get(profileIndex) : profileNameList.get(profileNameList.size()-1))));
-                    }
-                    else {
-                        // all profiles are finished
-                        nav.navigate(R.id.loginFinishFragment, null , LoginActivity.navOptions);
-                    }
-                });
-            }
-
-            @Override
-            public void onError(Context activityContext, AppError error) {
-                LoginActivity.error = error;
-                if (getActivity() != null) {
-                    getActivity().runOnUiThread(() -> {
-                        nav.navigate(R.id.loginSyncErrorFragment, null, LoginActivity.navOptions);
-                    });
-                }
-            }
-
-            @Override
-            public void onProgress(int progressStep) {
-                if (getActivity() == null)
-                    return;
-                getActivity().runOnUiThread(() -> {
-                    b.loginSyncProgressBar.setMax(SyncService.maxProgress);
-                    b.loginSyncProgressBar.setProgress(SyncService.progress);
-                });
-            }
-
-            @Override
-            public void onActionStarted(int stringResId) {
-                if (getActivity() == null)
-                    return;
-                getActivity().runOnUiThread(() -> {
-                    b.loginSyncSubtitle2.setText(getString(R.string.login_sync_subtitle_2_format, getString(stringResId)));
-                });
-            }
-        };
-
-        begin();
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.kt
new file mode 100644
index 00000000..16a198b2
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.kt
@@ -0,0 +1,164 @@
+package pl.szczodrzynski.edziennik.ui.modules.login
+
+
+import android.os.AsyncTask
+import android.os.Bundle
+import android.text.Html
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.navigation.NavController
+import androidx.navigation.Navigation
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.events.ApiTaskAllFinishedEvent
+import pl.szczodrzynski.edziennik.api.v2.events.ApiTaskErrorEvent
+import pl.szczodrzynski.edziennik.api.v2.events.ApiTaskProgressEvent
+import pl.szczodrzynski.edziennik.api.v2.events.ApiTaskStartedEvent
+import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event.*
+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.profiles.Profile.Companion.REGISTRATION_DISABLED
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.Companion.REGISTRATION_ENABLED
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.Companion.REGISTRATION_UNSPECIFIED
+import pl.szczodrzynski.edziennik.databinding.FragmentLoginSyncBinding
+import kotlin.math.roundToInt
+
+class LoginSyncFragment : Fragment() {
+
+    private lateinit var app: App
+    private lateinit var activity: LoginActivity
+    private lateinit var b: FragmentLoginSyncBinding
+    private val nav: NavController by lazy { Navigation.findNavController(activity, R.id.nav_host_fragment) }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        activity = (getActivity() as LoginActivity?) ?: return null
+        if (context == null)
+            return null
+        app = activity.application as App
+        b = FragmentLoginSyncBinding.inflate(inflater)
+        return b.root
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onSyncStartedEvent(event: ApiTaskStartedEvent) {
+        b.loginSyncSubtitle1.text = Html.fromHtml(getString(R.string.login_sync_subtitle_1_format, event.profile?.name ?: ""))
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onSyncFinishedEvent(event: ApiTaskAllFinishedEvent) {
+        nav.navigate(R.id.loginFinishFragment, null, LoginActivity.navOptions)
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onSyncProgressEvent(event: ApiTaskProgressEvent) {
+        b.loginSyncProgressBar.progress = event.progress.roundToInt()
+        b.loginSyncProgressBar.isIndeterminate = event.progress < 0f
+        b.loginSyncSubtitle2.text = event.progressText
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onSyncErrorEvent(event: ApiTaskErrorEvent) {
+        LoginActivity.error = event.error
+        nav.navigate(R.id.loginSyncErrorFragment, null, LoginActivity.navOptions)
+    }
+
+    private fun begin() {
+        AsyncTask.execute {
+            var profileId = app.profileLastId() + 1
+            val firstProfileId = profileId
+            var loginStoreId = profileId
+            // profileId contains the first ID free to use
+
+            val profileIds = mutableListOf<Int>()
+
+            for (profileObject in LoginActivity.profileObjects) {
+                for ((subIndex, profile) in profileObject.profileList.withIndex()) {
+                    if (profileObject.selectedList[subIndex]) {
+                        saveProfile(
+                                profile,
+                                profileObject.loginStore,
+                                profileId,
+                                loginStoreId
+                        )
+                        profileIds += profileId
+                        profileId++
+                    }
+                }
+                loginStoreId = profileId
+            }
+
+            /*for (profile in app.db.profileDao().allNow) {
+                d(TAG, profile.toString())
+            }
+            for (loginStore in app.db.loginStoreDao().allNow) {
+                d(TAG, loginStore.toString())
+            }*/
+
+            if (app.appConfig.loginFinished) {
+                LoginFinishFragment.firstRun = false
+            } else {
+                LoginFinishFragment.firstRun = true
+                app.appConfig.loginFinished = true
+                app.saveConfig("loginFinished")
+            }
+            LoginFinishFragment.firstProfileId = firstProfileId
+
+            EdziennikTask.syncProfileList(profileIds).enqueue(activity)
+        }
+    }
+
+    private fun saveProfile(profile: Profile, loginStore: LoginStore, profileId: Int, loginStoreId: Int) {
+        profile.registration = REGISTRATION_UNSPECIFIED
+        if (arguments != null) {
+            if (arguments!!.getBoolean("registrationAllowed", false)) {
+                profile.registration = REGISTRATION_ENABLED
+            } else {
+                profile.registration = REGISTRATION_DISABLED
+            }
+        }
+        profile.id = profileId
+        profile.loginStoreId = loginStoreId
+        loginStore.id = loginStoreId
+        val typeList = listOf(
+                EventType(profileId, TYPE_HOMEWORK.toLong(), getString(R.string.event_type_homework), COLOR_HOMEWORK),
+                EventType(profileId, TYPE_DEFAULT.toLong(), getString(R.string.event_other), COLOR_DEFAULT),
+                EventType(profileId, TYPE_EXAM.toLong(), getString(R.string.event_exam), COLOR_EXAM),
+                EventType(profileId, TYPE_SHORT_QUIZ.toLong(), getString(R.string.event_short_quiz), COLOR_SHORT_QUIZ),
+                EventType(profileId, TYPE_ESSAY.toLong(), getString(R.string.event_essay), COLOR_SHORT_QUIZ),
+                EventType(profileId, TYPE_PROJECT.toLong(), getString(R.string.event_project), COLOR_PROJECT),
+                EventType(profileId, TYPE_PT_MEETING.toLong(), getString(R.string.event_pt_meeting), COLOR_PT_MEETING),
+                EventType(profileId, TYPE_EXCURSION.toLong(), getString(R.string.event_excursion), COLOR_EXCURSION),
+                EventType(profileId, TYPE_READING.toLong(), getString(R.string.event_reading), COLOR_READING),
+                EventType(profileId, TYPE_CLASS_EVENT.toLong(), getString(R.string.event_class_event), COLOR_CLASS_EVENT),
+                EventType(profileId, TYPE_INFORMATION.toLong(), getString(R.string.event_information), COLOR_INFORMATION)
+        )
+        app.db.eventTypeDao().addAll(typeList)
+        app.profileSaveFull(profile, loginStore)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        if (!isAdded)
+            return
+
+        LoginActivity.error = null
+
+        begin()
+    }
+
+    override fun onStart() {
+        EventBus.getDefault().register(this)
+        super.onStart()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        EventBus.getDefault().unregister(this)
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanFragment.java
index 7b65eead..1dd0d45f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanFragment.java
@@ -3,27 +3,24 @@ package pl.szczodrzynski.edziennik.ui.modules.login;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-
 import android.text.Editable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 
-import com.danimahardhika.cafebar.CafeBar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
+import androidx.navigation.NavController;
+import androidx.navigation.Navigation;
+
 import com.mikepenz.iconics.IconicsColor;
 import com.mikepenz.iconics.IconicsDrawable;
 import com.mikepenz.iconics.IconicsSize;
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
 
-import androidx.navigation.NavController;
-import androidx.navigation.Navigation;
-
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.regex.Matcher;
@@ -36,9 +33,10 @@ import javax.crypto.ShortBufferException;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.ui.modules.webpush.QrScannerActivity;
-import pl.szczodrzynski.edziennik.data.api.AppError;
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginVulcanBinding;
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar;
+import pl.szczodrzynski.edziennik.ui.modules.webpush.QrScannerActivity;
 import pl.szczodrzynski.edziennik.utils.Utils;
 
 import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_EXPIRED_TOKEN;
@@ -53,6 +51,7 @@ public class LoginVulcanFragment extends Fragment {
     private NavController nav;
     private FragmentLoginVulcanBinding b;
     private static final String TAG = "LoginVulcan";
+    private ErrorSnackbar errorSnackbar;
 
     public LoginVulcanFragment() { }
 
@@ -62,6 +61,7 @@ public class LoginVulcanFragment extends Fragment {
         if (getActivity() != null) {
             app = (App) getActivity().getApplicationContext();
             nav = Navigation.findNavController(getActivity(), R.id.nav_host_fragment);
+            errorSnackbar = ((LoginActivity) getActivity()).errorSnackbar;
         }
         else {
             return null;
@@ -76,9 +76,9 @@ public class LoginVulcanFragment extends Fragment {
         assert getActivity() != null;
 
         view.postDelayed(() -> {
-            AppError error = LoginActivity.error;
+            ApiError error = LoginActivity.error;
             if (error != null) {
-                switch (error.errorCode) {
+                switch (error.getErrorCode()) {
                     case CODE_INVALID_TOKEN:
                         b.loginTokenLayout.setError(getString(R.string.login_error_incorrect_token));
                         break;
@@ -89,28 +89,14 @@ public class LoginVulcanFragment extends Fragment {
                         b.loginSymbolLayout.setError(getString(R.string.login_error_incorrect_symbol));
                         break;
                     case CODE_INVALID_PIN:
-                        if (!"?".equals(error.errorText)) {
+                        /*if (!"?".equals(error.errorText)) {
                             b.loginPinLayout.setError(getString(R.string.login_error_incorrect_pin_format, error.errorText));
                             break;
-                        }
+                        }*/
                         b.loginPinLayout.setError(getString(R.string.login_error_incorrect_pin));
                         break;
-                    default:
-                        CafeBar.builder(getActivity())
-                                .to(b.root)
-                                .content(getString(R.string.login_error, error.asReadableString(getActivity())))
-                                .autoDismiss(false)
-                                .positiveText(R.string.ok)
-                                .onPositive(CafeBar::dismiss)
-                                .floating(true)
-                                .swipeToDismiss(true)
-                                .neutralText(R.string.more)
-                                .onNeutral(cafeBar -> app.apiEdziennik.guiShowErrorDialog(getActivity(), error, R.string.error_details))
-                                .negativeText(R.string.report)
-                                .onNegative((cafeBar -> app.apiEdziennik.guiReportError(getActivity(), error, null)))
-                                .show();
-                        break;
                 }
+                errorSnackbar.addError(error).show();
                 LoginActivity.error = null;
             }
         }, 100);
@@ -118,7 +104,7 @@ public class LoginVulcanFragment extends Fragment {
         b.helpButton.setOnClickListener((v) -> nav.navigate(R.id.loginVulcanHelpFragment, null, LoginActivity.navOptions));
         b.backButton.setOnClickListener((v) -> nav.navigateUp());
 
-        b.loginQrScan.setImageDrawable(new IconicsDrawable(getActivity()).icon(CommunityMaterial.Icon2.cmd_qrcode).color(IconicsColor.colorInt(Color.BLACK)).size(IconicsSize.dp(72)));
+        b.loginQrScan.setImageDrawable(new IconicsDrawable(getActivity()).icon(CommunityMaterial.Icon2.cmd_qrcode_scan).color(IconicsColor.colorInt(Color.BLACK)).size(IconicsSize.dp(72)));
         b.loginQrScan.setOnClickListener((v -> {
             QrScannerActivity.resultHandler = result -> {
                 try {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt
new file mode 100644
index 00000000..75eb21a3
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt
@@ -0,0 +1,376 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-12.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.messages
+
+import android.os.Bundle
+import android.os.Environment
+import android.text.Html
+import android.text.TextUtils
+import android.view.Gravity.CENTER_VERTICAL
+import android.view.Gravity.END
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ProgressBar
+import androidx.fragment.app.Fragment
+import com.google.android.material.chip.Chip
+import com.mikepenz.iconics.IconicsColor
+import com.mikepenz.iconics.IconicsDrawable
+import com.mikepenz.iconics.IconicsSize
+import com.mikepenz.iconics.typeface.IIcon
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
+import com.mikepenz.iconics.utils.sizeDp
+import kotlinx.coroutines.*
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.events.AttachmentGetEvent
+import pl.szczodrzynski.edziennik.api.v2.events.AttachmentGetEvent.Companion.TYPE_FINISHED
+import pl.szczodrzynski.edziennik.api.v2.events.AttachmentGetEvent.Companion.TYPE_PROGRESS
+import pl.szczodrzynski.edziennik.api.v2.events.MessageGetEvent
+import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.databinding.MessageFragmentBinding
+import pl.szczodrzynski.edziennik.onClick
+import pl.szczodrzynski.edziennik.utils.Anim
+import pl.szczodrzynski.edziennik.utils.Themes
+import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.Utils.getStringFromFile
+import pl.szczodrzynski.edziennik.utils.Utils.readableFileSize
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import pl.szczodrzynski.navlib.colorAttr
+import java.io.File
+import kotlin.coroutines.CoroutineContext
+import kotlin.math.min
+
+class MessageFragment : Fragment(), CoroutineScope {
+    companion object {
+        private const val TAG = "MessageFragment"
+    }
+
+    private lateinit var app: App
+    private lateinit var activity: MainActivity
+    private lateinit var b: MessageFragmentBinding
+
+    private lateinit var job: Job
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private lateinit var message: MessageFull
+    private var attachmentList = mutableListOf<Attachment>()
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        activity = (getActivity() as MainActivity?) ?: return null
+        context ?: return null
+        app = activity.application as App
+        context!!.theme.applyStyle(Themes.appTheme, true)
+        b = MessageFragmentBinding.inflate(inflater)
+        job = Job()
+        return b.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        // TODO check if app, activity, b can be null
+        if (app.profile == null || !isAdded)
+            return
+
+        b.closeButton.setImageDrawable(
+                IconicsDrawable(activity, CommunityMaterial.Icon2.cmd_window_close)
+                        .colorAttr(activity, android.R.attr.textColorSecondary)
+                        .sizeDp(12)
+        )
+        b.closeButton.setOnClickListener { activity.navigateUp() }
+
+        val messageId = arguments?.getLong("messageId")
+        if (messageId == null) {
+            activity.navigateUp()
+            return
+        }
+
+        launch {
+            val deferred = async(Dispatchers.Default) {
+                val msg = app.db.messageDao().getById(App.profileId, messageId)?.also {
+                    it.recipients = app.db.messageRecipientDao().getAllByMessageId(it.profileId, it.id)
+                    if (it.body != null && !it.seen) {
+                        app.db.metadataDao().setSeen(it.profileId, it, true)
+                    }
+                }
+                msg
+            }
+            val msg = deferred.await() ?: run {
+                return@launch
+            }
+            message = msg
+            b.subject.text = message.subject
+            checkMessage()
+        }
+
+        // click to expand subject and sender
+        b.subject.onClick {
+            it.maxLines = if (it.maxLines == 30) 2 else 30
+        }
+        b.sender.onClick {
+            it.maxLines = if (it.maxLines == 30) 2 else 30
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onMessageGetEvent(event: MessageGetEvent) {
+        // TODO remove this: message = event.message
+        showMessage()
+    }
+
+    private fun checkMessage() {
+        if (message.body == null) {
+            EdziennikTask.messageGet(App.profileId, message).enqueue(activity)
+            return
+        }
+
+        var readByAll = true
+        message.recipients?.forEach { recipient ->
+            if (recipient.id == -1L)
+                recipient.fullName = app.profile.accountNameLong ?: app.profile.studentNameLong
+            if (message.type == TYPE_SENT && recipient.readDate < 1)
+                readByAll = false
+        }
+        // if a sent msg is not read by everyone, download it again to check the read status
+        if (!readByAll) {
+            EdziennikTask.messageGet(App.profileId, message).enqueue(activity)
+            return
+        }
+
+        showMessage()
+    }
+
+    private fun showMessage() {
+        b.body.text = Html.fromHtml(message.body?.replace("\\[META:[A-z0-9]+;[0-9-]+]".toRegex(), ""))
+        b.date.text = getString(R.string.messages_date_time_format, Date.fromMillis(message.addedDate).formattedStringShort, Time.fromMillis(message.addedDate).stringHM)
+
+        val messageInfo = MessagesUtils.getMessageInfo(app, message, 40, 20, 14, 10)
+        b.profileBackground.setImageBitmap(messageInfo.profileImage)
+        b.sender.text = messageInfo.profileName
+
+        b.subject.text = message.subject
+
+        val messageRecipients = StringBuilder("<ul>")
+        message.recipients?.forEach { recipient ->
+            when (recipient.readDate) {
+                -1L -> messageRecipients.append(getString(
+                        R.string.messages_recipients_list_unknown_state_format,
+                        recipient.fullName
+                ))
+                0L -> messageRecipients.append(getString(
+                        R.string.messages_recipients_list_unread_format,
+                        recipient.fullName
+                ))
+                1L -> messageRecipients.append(getString(
+                        R.string.messages_recipients_list_read_unknown_date_format,
+                        recipient.fullName
+                ))
+                else -> messageRecipients.append(getString(
+                        R.string.messages_recipients_list_read_format,
+                        recipient.fullName,
+                        Date.fromMillis(recipient.readDate).formattedString,
+                        Time.fromMillis(recipient.readDate).stringHM
+                ))
+            }
+        }
+        messageRecipients.append("</ul>")
+        b.recipients.text = Html.fromHtml(messageRecipients.toString())
+
+        showAttachments()
+
+        b.progress.visibility = View.GONE
+        Anim.fadeIn(b.content, 200, null)
+        MessagesFragment.pageSelection = min(message.type, 1)
+    }
+
+    private fun showAttachments() {
+        if (message.attachmentIds != null) {
+            val insertPoint = b.attachments
+
+            val chipLayoutParams = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+            chipLayoutParams.setMargins(0, Utils.dpToPx(8), 0, Utils.dpToPx(8))
+
+            val progressLayoutParams = FrameLayout.LayoutParams(Utils.dpToPx(18), Utils.dpToPx(18))
+            progressLayoutParams.setMargins(Utils.dpToPx(8), 0, Utils.dpToPx(8), 0)
+            progressLayoutParams.gravity = END or CENTER_VERTICAL
+
+            // CREATE VIEWS AND AN OBJECT FOR EVERY ATTACHMENT
+
+            message.attachmentNames.forEachIndexed { index, name ->
+                val messageId = message.id
+                val id = message.attachmentIds[index]
+                val size = message.attachmentSizes[index]
+                // create the parent
+                val attachmentLayout = FrameLayout(b.root.context)
+                attachmentLayout.setPadding(Utils.dpToPx(16), 0, Utils.dpToPx(16), 0)
+
+                val attachmentChip = Chip(attachmentLayout.context)
+                //attachmentChip.setChipBackgroundColorResource(ThemeUtils.getChipColorRes());
+                attachmentChip.layoutParams = chipLayoutParams
+                attachmentChip.height = Utils.dpToPx(40)
+
+                // show the file size or not
+                if (size == -1L)
+                    attachmentChip.text = getString(R.string.messages_attachment_no_size_format, name)
+                else
+                    attachmentChip.text = getString(R.string.messages_attachment_format, name, readableFileSize(size))
+                attachmentChip.ellipsize = TextUtils.TruncateAt.MIDDLE
+
+                // create an icon for the attachment
+                val icon: IIcon = when (Utils.getExtensionFromFileName(name)) {
+                    "doc", "docx", "odt", "rtf" -> SzkolnyFont.Icon.szf_file_word_outline
+                    "xls", "xlsx", "ods" -> SzkolnyFont.Icon.szf_file_excel_outline
+                    "ppt", "pptx", "odp" -> SzkolnyFont.Icon.szf_file_powerpoint_outline
+                    "pdf" -> SzkolnyFont.Icon.szf_file_pdf_outline
+                    "mp3", "wav", "aac" -> SzkolnyFont.Icon.szf_file_music_outline
+                    "mp4", "avi", "3gp", "mkv", "flv" -> SzkolnyFont.Icon.szf_file_video_outline
+                    "jpg", "jpeg", "png", "bmp", "gif" -> SzkolnyFont.Icon.szf_file_image_outline
+                    "zip", "rar", "tar", "7z" -> SzkolnyFont.Icon.szf_zip_box_outline
+                    "html", "cpp", "c", "h", "css", "java", "py" -> SzkolnyFont.Icon.szf_file_code_outline
+                    else -> CommunityMaterial.Icon.cmd_file_document_outline
+                }
+                attachmentChip.chipIcon = IconicsDrawable(activity).color(IconicsColor.colorRes(R.color.colorPrimary)).icon(icon).size(IconicsSize.dp(26))
+                attachmentChip.closeIcon = IconicsDrawable(activity).icon(CommunityMaterial.Icon.cmd_check).size(IconicsSize.dp(18)).color(IconicsColor.colorInt(Utils.getAttr(activity, android.R.attr.textColorPrimary)))
+                attachmentChip.isCloseIconVisible = false
+                // set the object's index in the attachmentList as the tag
+                attachmentChip.tag = index
+                attachmentChip.setOnClickListener { v ->
+                    if (v.tag is Int) {
+                        downloadAttachment(v.tag as Int)
+                    }
+                }
+                attachmentLayout.addView(attachmentChip)
+
+                val attachmentProgress = ProgressBar(attachmentLayout.context)
+                attachmentProgress.layoutParams = progressLayoutParams
+                attachmentProgress.visibility = View.GONE
+                attachmentLayout.addView(attachmentProgress)
+
+                insertPoint.addView(attachmentLayout)
+                // create an object and add to the list
+                val a = Attachment(App.profileId, messageId, id, name, size, attachmentLayout, attachmentChip, attachmentProgress)
+                attachmentList.add(a)
+                // check if the file is already downloaded. Show the check icon if necessary and set `downloaded` to true.
+                checkAttachment(a)
+
+            }
+        } else {
+            // no attachments found
+            b.attachmentsTitle.visibility = View.GONE
+        }
+    }
+
+    private fun downloadAttachment(index: Int) {
+        val attachment = attachmentList[index]
+
+        if (attachment.downloaded != null) {
+            Utils.openFile(activity, File(attachment.downloaded))
+            return
+        }
+
+        attachment.chip.isEnabled = false
+        attachment.chip.setTextColor(Themes.getSecondaryTextColor(activity))
+        attachment.progressBar.visibility = View.VISIBLE
+
+        EdziennikTask.attachmentGet(
+                App.profileId,
+                attachment.messageId,
+                attachment.attachmentId,
+                attachment.attachmentName
+        ).enqueue(activity)
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onAttachmentGetEvent(event: AttachmentGetEvent) {
+        attachmentList.firstOrNull { it.profileId == event.profileId
+                && it.messageId == event.messageId
+                && it.attachmentId == event.attachmentId }?.let { attachment ->
+
+            when (event.eventType) {
+                TYPE_FINISHED -> {
+                    // save the downloaded file name
+                    attachment.downloaded = event.fileName
+
+                    // set the correct name (and size)
+                    if (attachment.attachmentSize == -1L)
+                        attachment.chip.text = getString(R.string.messages_attachment_no_size_format, attachment.attachmentName)
+                    else
+                        attachment.chip.text = getString(R.string.messages_attachment_format, attachment.attachmentName, readableFileSize(attachment.attachmentSize))
+
+                    // hide the progress bar and show a tick icon
+                    attachment.progressBar.visibility = View.GONE
+                    attachment.chip.isEnabled = true
+                    attachment.chip.setTextColor(Themes.getPrimaryTextColor(activity))
+                    attachment.chip.isCloseIconVisible = true
+
+                    // open the file
+                    Utils.openFile(activity, File(attachment.downloaded))
+                }
+
+                TYPE_PROGRESS -> {
+                    attachment.chip.text = getString(R.string.messages_attachment_downloading_format, attachment.attachmentName, event.bytesWritten.toFloat() / 1000000)
+                }
+            }
+        }
+    }
+
+    private fun checkAttachment(attachment: Attachment) {
+        val storageDir = Environment.getExternalStoragePublicDirectory("Szkolny.eu")
+        storageDir.mkdirs()
+
+        val attachmentDataFile = File(storageDir, "." + attachment.profileId + "_" + attachment.messageId + "_" + attachment.attachmentId)
+        if (attachmentDataFile.exists()) {
+            try {
+                val attachmentFileName = getStringFromFile(attachmentDataFile)
+                val attachmentFile = File(attachmentFileName)
+                if (attachmentFile.exists()) {
+                    attachment.downloaded = attachmentFileName
+                    attachment.chip.isCloseIconVisible = true
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+                //app.apiEdziennik.guiReportException(activity, 355, e)
+            }
+        }
+    }
+
+    override fun onStart() {
+        EventBus.getDefault().register(this)
+        super.onStart()
+    }
+    override fun onStop() {
+        super.onStop()
+        EventBus.getDefault().unregister(this)
+    }
+    override fun onDestroy() {
+        super.onDestroy()
+        job.cancel()
+    }
+
+    private class Attachment(
+            var profileId: Int,
+            var messageId: Long,
+            var attachmentId: Long,
+            var attachmentName: String,
+            var attachmentSize: Long,
+            var parent: FrameLayout,
+            var chip: Chip,
+            var progressBar: ProgressBar
+    ) {
+        /**
+         * An absolute path of the downloaded file. `null` if not downloaded yet.
+         */
+        internal var downloaded: String? = null
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeActivity.java
index ff22e48e..18153386 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeActivity.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
-import android.os.Handler;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MotionEvent;
@@ -13,7 +12,6 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import androidx.databinding.DataBindingUtil;
 
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -35,12 +33,6 @@ import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.AppError;
-import pl.szczodrzynski.edziennik.data.api.Edziennik;
-import pl.szczodrzynski.edziennik.data.api.interfaces.SyncCallback;
-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.profiles.ProfileFull;
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher;
 import pl.szczodrzynski.edziennik.databinding.ActivityComposeMessageBinding;
 import pl.szczodrzynski.edziennik.utils.Colors;
@@ -63,7 +55,7 @@ public class MessagesComposeActivity extends AppCompatActivity {
         b = DataBindingUtil.inflate(getLayoutInflater(), R.layout.activity_compose_message, null, false);
         setContentView(b.getRoot());
 
-        composeInfo = Edziennik.getApi(app, app.profile.getLoginStoreType()).getComposeInfo(app.profile);
+        /*composeInfo = Edziennik.getApi(app, app.profile.getLoginStoreType()).getComposeInfo(app.profile);
 
         Toolbar toolbar = b.toolbar;
         setSupportActionBar(toolbar);
@@ -99,7 +91,7 @@ public class MessagesComposeActivity extends AppCompatActivity {
             MessagesComposeSuggestionAdapter adapter = new MessagesComposeSuggestionAdapter(this, teachers);
             //ArrayAdapter<Teacher> adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, teachers);
             b.nachoTextView.setAdapter(adapter);
-        });
+        });*/
         /*app.db.teacherDao().getAllTeachers(App.profileId).observe(this, teachers -> {
 
         });*/
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesDetailsFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesDetailsFragment.java
index 645b66d3..d00c35f3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesDetailsFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesDetailsFragment.java
@@ -1,17 +1,12 @@
 package pl.szczodrzynski.edziennik.ui.modules.messages;
 
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.media.ThumbnailUtils;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.Handler;
-import android.text.Html;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,12 +14,18 @@ import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
+
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.google.android.material.chip.Chip;
 import com.mikepenz.iconics.IconicsColor;
 import com.mikepenz.iconics.IconicsDrawable;
 import com.mikepenz.iconics.IconicsSize;
-import com.mikepenz.iconics.typeface.IIcon;
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
 import com.theartofdev.edmodo.cropper.CropImage;
 
@@ -39,36 +40,16 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.graphics.drawable.RoundedBitmapDrawable;
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-
-import im.wangchao.mhttp.Response;
-import im.wangchao.mhttp.callback.FileCallbackHandler;
 import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.data.api.Edziennik;
-import pl.szczodrzynski.edziennik.data.api.AppError;
-import pl.szczodrzynski.edziennik.data.api.interfaces.SyncCallback;
-import pl.szczodrzynski.edziennik.databinding.MessagesDetailsBinding;
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
+import pl.szczodrzynski.edziennik.R;
 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.profiles.Profile;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.utils.Anim;
+import pl.szczodrzynski.edziennik.databinding.MessagesDetailsBinding;
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorDialog;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.edziennik.utils.Utils;
 
 import static android.app.Activity.RESULT_OK;
-import static android.view.Gravity.CENTER_VERTICAL;
-import static android.view.Gravity.END;
 import static pl.szczodrzynski.edziennik.utils.Utils.getResizedBitmap;
 import static pl.szczodrzynski.edziennik.utils.Utils.getStringFromFile;
 import static pl.szczodrzynski.edziennik.utils.Utils.readableFileSize;
@@ -108,7 +89,7 @@ public class MessagesDetailsFragment extends Fragment {
 
         b.messageContent.setVisibility(View.GONE);
 
-        if (messageId != -1) {
+        /*if (messageId != -1) {
             AsyncTask.execute(() -> {
                 if (app == null || app.profile == null || activity == null || b == null || !isAdded())
                     return;
@@ -286,7 +267,7 @@ public class MessagesDetailsFragment extends Fragment {
                 });
 
             });
-        }
+        }*/
 
         // click to expand subject and sender
         b.messageSubject.setOnClickListener(v -> {
@@ -340,7 +321,7 @@ public class MessagesDetailsFragment extends Fragment {
                 }
             } catch (Exception e) {
                 e.printStackTrace();
-                app.apiEdziennik.guiReportException(activity, 355, e);
+                new ErrorDialog(activity, e);
             }
         }
     }
@@ -359,7 +340,7 @@ public class MessagesDetailsFragment extends Fragment {
 
         File storageDir = Utils.getStorageDir();
 
-        Edziennik.getApi(app, app.profile.getLoginStoreType()).getAttachment(activity, new SyncCallback() {
+        /*Edziennik.getApi(app, app.profile.getLoginStoreType()).getAttachment(activity, new SyncCallback() {
             @Override
             public void onLoginFirst(List<Profile> profileList, LoginStore loginStore) {
 
@@ -437,7 +418,7 @@ public class MessagesDetailsFragment extends Fragment {
                     }
                 })
                 .build()
-                .enqueue());
+                .enqueue());*/
     }
 
     @Subscribe(threadMode = ThreadMode.POSTING)
@@ -478,7 +459,7 @@ public class MessagesDetailsFragment extends Fragment {
                                 .positiveText(R.string.ok)
                                 .neutralColor(R.string.report)
                                 .onNeutral((dialog, which) -> {
-                                    app.apiEdziennik.guiReportException(activity, 433, event.exception);
+                                    new ErrorDialog(activity, event.exception);
                                 })
                                 .show();
                     }
@@ -486,7 +467,7 @@ public class MessagesDetailsFragment extends Fragment {
             }
         }
         catch (Exception e) {
-            app.apiEdziennik.guiReportException(activity, 425, e);
+            new ErrorDialog(activity, e);
         }
     }
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesFragment.kt
index db7fae3b..03fd355d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesFragment.kt
@@ -8,11 +8,16 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
 import androidx.viewpager.widget.ViewPager
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.databinding.FragmentMessagesBinding
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.events.ApiTaskErrorEvent
+import pl.szczodrzynski.edziennik.api.v2.events.ApiTaskFinishedEvent
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.databinding.FragmentMessagesBinding
 import pl.szczodrzynski.edziennik.utils.Themes
 import java.util.*
 
@@ -72,7 +77,11 @@ class MessagesFragment : Fragment() {
         b.viewPager.currentItem = pageSelection
         b.viewPager.clearOnPageChangeListeners()
         b.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
-            override fun onPageScrollStateChanged(state: Int) {}
+            override fun onPageScrollStateChanged(state: Int) {
+                if (b.refreshLayout != null) {
+                    b.refreshLayout.isEnabled = state == ViewPager.SCROLL_STATE_IDLE
+                }
+            }
             override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
             override fun onPageSelected(position: Int) {
                 pageSelection = position
@@ -80,6 +89,61 @@ class MessagesFragment : Fragment() {
         })
 
         b.tabLayout.setupWithViewPager(b.viewPager)
+
+        /*if (app.profile.loginStoreType == LOGIN_TYPE_LIBRUS && app.profile.getStudentData("accountPassword", null) == null) {
+            MaterialDialog.Builder(activity)
+                    .title("Wiadomości w systemie Synergia")
+                    .content("Moduł Wiadomości w aplikacji Szkolny.eu jest przeglądarką zasobów szkolnego konta Synergia. Z tego powodu, musisz wpisać swoje hasło do tego konta, aby móc korzystać z tej funkcji.")
+                    .positiveText(R.string.ok)
+                    .onPositive { dialog, which ->
+                        MaterialDialog.Builder(activity)
+                                .title("Zaloguj się")
+                                .content(Html.fromHtml("Podaj hasło do konta Synergia z loginem <b>" + app.profile.getStudentData("accountLogin", "???") + "</b>"))
+                                .inputType(InputType.TYPE_TEXT_VARIATION_PASSWORD)
+                                .input(null, null) { dialog1, input ->
+                                    app.profile.putStudentData("accountPassword", input.toString())
+                                    app.profileSaveFullAsync(app.profile)
+                                    EdziennikTask.syncProfile(App.profileId, listOf(
+                                            DRAWER_ITEM_MESSAGES to Message.TYPE_RECEIVED,
+                                            DRAWER_ITEM_MESSAGES to Message.TYPE_SENT
+                                    )).enqueue(context!!)
+                                }
+                                .positiveText(R.string.ok)
+                                .negativeText(R.string.cancel)
+                                .show()
+                    }
+                    .show()
+        }*/
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onSyncProfileFinishedEvent(event: ApiTaskFinishedEvent) {
+        if (event.profileId == App.profileId) {
+            app.profileSaveFullAsync(app.profile)
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onSyncErrorEvent(event: ApiTaskErrorEvent) {
+        app.profile.removeStudentData("accountPassword")
+        app.profileSaveFullAsync(app.profile)
+        /*MaterialDialog.Builder(activity)
+                .title(R.string.login_failed)
+                .content(R.string.login_failed_text)
+                .positiveText(R.string.ok)
+                .neutralText(R.string.report)
+                .onNeutral { dialog2, which1 -> app.apiEdziennik.guiReportError(getActivity(), error, null) }
+                .show()*/
+    }
+
+    override fun onStart() {
+        EventBus.getDefault().register(this)
+        super.onStart()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        EventBus.getDefault().unregister(this)
     }
 
     internal class Adapter(manager: FragmentManager) : FragmentPagerAdapter(manager) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesListFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesListFragment.java
index 17e77c41..ae3500b2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesListFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesListFragment.java
@@ -1,13 +1,9 @@
 package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 
-import android.content.Context;
 import android.graphics.Rect;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.Handler;
-import android.text.Html;
-import android.text.InputType;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,28 +17,19 @@ import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.afollestad.materialdialogs.MaterialDialog;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.data.api.AppError;
-import pl.szczodrzynski.edziennik.data.api.Edziennik;
-import pl.szczodrzynski.edziennik.data.api.interfaces.SyncCallback;
-import pl.szczodrzynski.edziennik.databinding.MessagesListBinding;
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
+import pl.szczodrzynski.edziennik.R;
 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.messages.MessageRecipientFull;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
+import pl.szczodrzynski.edziennik.databinding.MessagesListBinding;
 import pl.szczodrzynski.edziennik.utils.Themes;
 
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
-import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_LIBRUS;
 import static pl.szczodrzynski.edziennik.utils.Utils.d;
 
 public class MessagesListFragment extends Fragment {
@@ -96,66 +83,6 @@ public class MessagesListFragment extends Fragment {
             return;
         }
 
-        if (app.profile.getLoginStoreType() == LOGIN_TYPE_LIBRUS && app.profile.getStudentData("accountPassword", null) == null) {
-            new MaterialDialog.Builder(activity)
-                    .title("Wiadomości w systemie Synergia")
-                    .content("Moduł Wiadomości w aplikacji Szkolny.eu jest przeglądarką zasobów szkolnego konta Synergia. Z tego powodu, musisz wpisać swoje hasło do tego konta, aby móc korzystać z tej funkcji.")
-                    .positiveText(R.string.ok)
-                    .onPositive(((dialog, which) -> {
-                        new MaterialDialog.Builder(activity)
-                                .title("Zaloguj się")
-                                .content(Html.fromHtml("Podaj hasło do konta Synergia z loginem <b>"+app.profile.getStudentData("accountLogin", "???")+"</b>"))
-                                .inputType(InputType.TYPE_TEXT_VARIATION_PASSWORD)
-                                .input(null, null, (dialog1, input) -> {
-                                    app.profile.putStudentData("accountPassword", input.toString());
-                                    Edziennik.getApi(app, app.profile.getLoginStoreType()).syncMessages(activity, new SyncCallback() {
-                                        @Override
-                                        public void onLoginFirst(List<Profile> profileList, LoginStore loginStore) {
-
-                                        }
-
-                                        @Override
-                                        public void onSuccess(Context activityContext, ProfileFull profileFull) {
-                                            app.profile.putStudentData("accountPassword", input.toString());
-                                            app.profileSaveFullAsync(profileFull);
-                                            ((MainActivity) activityContext).recreate();
-                                        }
-
-                                        @Override
-                                        public void onError(Context activityContext, AppError error) {
-                                            new Handler(activityContext.getMainLooper()).post(() -> {
-                                                app.profile.removeStudentData("accountPassword");
-                                                app.profileSaveFullAsync(app.profile);
-                                                new MaterialDialog.Builder(activity)
-                                                        .title(R.string.login_failed)
-                                                        .content(R.string.login_failed_text)
-                                                        .positiveText(R.string.ok)
-                                                        .neutralText(R.string.report)
-                                                        .onNeutral(((dialog2, which1) -> {
-                                                            app.apiEdziennik.guiReportError(getActivity(), error, null);
-                                                        }))
-                                                        .show();
-                                            });
-                                        }
-
-                                        @Override
-                                        public void onProgress(int progressStep) {
-
-                                        }
-
-                                        @Override
-                                        public void onActionStarted(int stringResId) {
-
-                                        }
-                                    }, app.profile);
-                                })
-                                .positiveText(R.string.ok)
-                                .negativeText(R.string.cancel)
-                                .show();
-                    }))
-                    .show();
-        }
-
         if (getArguments() != null) {
             messageType = getArguments().getInt("messageType", Message.TYPE_RECEIVED);
         }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesWebFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesWebFragment.java
deleted file mode 100644
index 343f4076..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesWebFragment.java
+++ /dev/null
@@ -1,474 +0,0 @@
-package pl.szczodrzynski.edziennik.ui.modules.messages;
-
-import android.Manifest;
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.DownloadManager;
-import android.content.ActivityNotFoundException;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
-import android.provider.MediaStore;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.webkit.CookieManager;
-import android.webkit.MimeTypeMap;
-import android.webkit.ValueCallback;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceError;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.FileProvider;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-
-import com.afollestad.materialdialogs.MaterialDialog;
-import com.afollestad.materialdialogs.StackingBehavior;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.databinding.FragmentMessagesWebBinding;
-import pl.szczodrzynski.edziennik.utils.Anim;
-import pl.szczodrzynski.edziennik.utils.Themes;
-
-import static android.app.Activity.RESULT_OK;
-import static android.content.Context.DOWNLOAD_SERVICE;
-import static pl.szczodrzynski.edziennik.utils.Utils.readableFileSize;
-
-public class MessagesWebFragment extends Fragment {
-
-    private static final String TAG = "RegisterMessagesWeb";
-    private App app = null;
-    private Activity activity = null;
-    private FragmentMessagesWebBinding b = null;
-
-    private WebView webView;
-    private ProgressBar progressBar;
-    private TextView error;
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        activity = getActivity();
-        if (getActivity() == null || getContext() == null)
-            return null;
-        app = (App) activity.getApplication();
-        getContext().getTheme().applyStyle(Themes.INSTANCE.getAppTheme(), true);
-        if (app.profile == null)
-            return inflater.inflate(R.layout.fragment_loading, container, false);
-        // activity, context and profile is valid
-        b = DataBindingUtil.inflate(inflater, R.layout.fragment_messages_web, container, false);
-        return b.getRoot();
-    }
-
-    private boolean isStoragePermissionGranted(Activity a) {
-        if (Build.VERSION.SDK_INT >= 23) {
-            if (a.checkSelfPermission(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                    == PackageManager.PERMISSION_GRANTED) {
-                Log.v(TAG,"Permission is granted");
-                return true;
-            } else {
-
-                Log.v(TAG,"Permission is revoked");
-                ActivityCompat.requestPermissions(a, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
-                return false;
-            }
-        }
-        else { //permission is automatically granted on sdk<23 upon installation
-            Log.v(TAG,"Permission is granted");
-            return true;
-        }
-    }
-
-    private String getFileNameFromDisposition(String header)
-    {
-        return header.substring(header.indexOf("\"") + 1, header.lastIndexOf("\""));
-    }
-
-    private File downloadingFile;
-
-    private void enqueueFile(String url, String filename, File downloadingFile, String cookieString) {
-
-        this.downloadingFile = downloadingFile;
-
-        long downloadReference;
-
-        DownloadManager downloadManager;
-        downloadManager = (DownloadManager)app.getSystemService(DOWNLOAD_SERVICE);
-        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
-        request.setTitle(filename);
-        request.setDescription(getString(R.string.downloading));
-        request.addRequestHeader("Cookie", cookieString);
-        try {
-            request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, filename);
-        }
-        catch (IllegalStateException e)
-        {
-            e.printStackTrace();
-            Toast.makeText(app, "Failed to get external storage files directory", Toast.LENGTH_SHORT).show();
-        }
-        downloadReference = downloadManager.enqueue(request);
-    }
-
-    private static String getMimeType(String url) {
-        String type = null;
-        String extension = MimeTypeMap.getFileExtensionFromUrl(url);
-        if (extension != null) {
-            type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
-        }
-        return type;
-    }
-
-    private void openFile(File url) {
-        Toast.makeText(app, getString(R.string.opening_file, url.getName()), Toast.LENGTH_SHORT).show();
-        try {
-            Uri uri = FileProvider.getUriForFile(app, app.getApplicationContext().getPackageName() + ".provider", url);
-            //Uri uri = Uri.fromFile(url);
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            if (url.toString().contains(".doc") || url.toString().contains(".docx")) {
-                // Word document
-                intent.setDataAndType(uri, "application/msword");
-            } else if (url.toString().contains(".pdf")) {
-                // PDF file
-                intent.setDataAndType(uri, "application/pdf");
-            } else if (url.toString().contains(".ppt") || url.toString().contains(".pptx")) {
-                // Powerpoint file
-                intent.setDataAndType(uri, "application/vnd.ms-powerpoint");
-            } else if (url.toString().contains(".xls") || url.toString().contains(".xlsx")) {
-                // Excel file
-                intent.setDataAndType(uri, "application/vnd.ms-excel");
-            } else if (url.toString().contains(".zip") || url.toString().contains(".rar")) {
-                // WAV audio file
-                intent.setDataAndType(uri, "application/x-wav");
-            } else if (url.toString().contains(".rtf")) {
-                // RTF file
-                intent.setDataAndType(uri, "application/rtf");
-            } else if (url.toString().contains(".wav") || url.toString().contains(".mp3")) {
-                // WAV audio file
-                intent.setDataAndType(uri, "audio/x-wav");
-            } else if (url.toString().contains(".gif")) {
-                // GIF file
-                intent.setDataAndType(uri, "image/gif");
-            } else if (url.toString().contains(".jpg") || url.toString().contains(".jpeg") || url.toString().contains(".png")) {
-                // JPG file
-                intent.setDataAndType(uri, "image/jpeg");
-            } else if (url.toString().contains(".txt")) {
-                // Text file
-                intent.setDataAndType(uri, "text/plain");
-            } else if (url.toString().contains(".3gp") || url.toString().contains(".mpg") ||
-                    url.toString().contains(".mpeg") || url.toString().contains(".mpe") || url.toString().contains(".mp4") || url.toString().contains(".avi")) {
-                // Video files
-                intent.setDataAndType(uri, "video/*");
-            } else {
-                intent.setDataAndType(uri, "*/*");
-            }
-
-            intent.setDataAndType(uri, getMimeType(uri.toString()));
-
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
-            app.startActivity(intent);
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(app, R.string.opening_file_no_app, Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    private void downloadFile(Activity a, String url, String filename, long contentLength, String cookieString) {
-        if (!isStoragePermissionGranted(a))
-            return;
-        new MaterialDialog.Builder(a)
-                .title(R.string.downloading_file)
-                .content(getString((R.string.download_file_question), filename, readableFileSize(contentLength)))
-                .positiveText(R.string.yes)
-                .negativeText(R.string.no)
-                .onPositive((dialog, which) -> {
-                    File downloadsDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
-                    File existingFile = new File(downloadsDir, filename);
-                    if (existingFile.exists()) {
-                        new MaterialDialog.Builder(a)
-                                .title(R.string.downloading_file)
-                                .content(getString(R.string.downloading_file_exists_choose, filename))
-                                .stackingBehavior(StackingBehavior.ADAPTIVE)
-                                .positiveText(R.string.downloading_file_exists_overwrite)
-                                .negativeText(R.string.downloading_file_exists_open)
-                                .neutralText(R.string.downloading_file_exists_create_new)
-                                .onPositive(((dialog1, which1) -> {
-                                    if (!existingFile.delete())
-                                    {
-                                        new MaterialDialog.Builder(a)
-                                                .title(R.string.downloading_file)
-                                                .content(R.string.downloading_file_cannot_remove)
-                                                .positiveText(R.string.ok)
-                                                .negativeText(R.string.cancel)
-                                                .onPositive(((dialog2, which2) -> enqueueFile(url, filename, existingFile, cookieString)))
-                                                .show();
-                                        return;
-                                    }
-                                    enqueueFile(url, filename, existingFile, cookieString);
-                                }))
-                                .onNegative(((dialog1, which1) -> openFile(existingFile)))
-                                .onNeutral((dialog1, which1) -> enqueueFile(url, filename, existingFile, cookieString))
-                                .show();
-
-                        return;
-                    }
-                    enqueueFile(url, filename, existingFile, cookieString);
-                })
-                .show();
-    }
-
-    private String photoPath;
-    private ValueCallback<Uri> mUM;
-    private ValueCallback<Uri[]> fileCallback;
-    private final static int REQUEST_FILE_CHOOSER = 1;
-    private boolean justLoaded = false;
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if(Build.VERSION.SDK_INT >= 21){
-            Uri[] results = null;
-            //Check if response is positive
-            if(resultCode == RESULT_OK){
-                if(requestCode == REQUEST_FILE_CHOOSER){
-                    if(null == fileCallback){
-                        return;
-                    }
-                    if(data == null){
-                        //Capture Photo if no image available
-                        if (photoPath != null) {
-                            results = new Uri[]{Uri.parse(photoPath)};
-                        }
-                    }else{
-                        String dataString = data.getDataString();
-                        if(dataString != null){
-                            results = new Uri[]{Uri.parse(dataString)};
-                        }
-                    }
-                }
-            }
-            fileCallback.onReceiveValue(results);
-            fileCallback = null;
-        } else {
-            if (requestCode == REQUEST_FILE_CHOOSER) {
-                if(null == mUM) return;
-                Uri result = data == null || resultCode != RESULT_OK ? null : data.getData();
-                mUM.onReceiveValue(result);
-                mUM = null;
-            }
-        }
-    }
-
-    private File createImageFile() throws IOException{
-        @SuppressLint("SimpleDateFormat") String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
-        String imageFileName = "img_"+timeStamp+"_";
-        File storageDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES);
-        return File.createTempFile(imageFileName,".jpg",storageDir);
-    }
-
-    @SuppressLint("SetJavaScriptEnabled")
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        if (app == null || app.profile == null || activity == null || b == null || !isAdded())
-            return;
-
-        webView = b.messagesWebView;
-        progressBar = b.messagesWebProgressBar;
-        error = b.messagesWebError;
-
-        justLoaded = true;
-
-        new Handler().postDelayed(() -> activity.runOnUiThread(() -> {
-            if (app == null || app.profile == null || activity == null || b == null || !isAdded())
-                return;
-
-            BroadcastReceiver onComplete = new BroadcastReceiver() {
-                public void onReceive(Context context, Intent intent) {
-                    if (downloadingFile != null) {
-                        openFile(downloadingFile);
-                        downloadingFile = null;
-                    }
-                }
-            };
-            activity.registerReceiver(onComplete, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
-
-            app.apiEdziennik.initMessagesWebView(webView, app, /*app.profile.messagesWebFullVersion*/false, false);
-            webView.getSettings().setJavaScriptEnabled(true);
-            webView.getSettings().setAllowFileAccess(true);
-            webView.setDownloadListener((url, userAgent, contentDisposition, mimetype, contentLength) -> {
-                String filename = getFileNameFromDisposition(contentDisposition);
-                try {
-                    URL urlObj = new URL(url);
-                    Log.d(TAG, "Host "+urlObj.getProtocol()+"://"+urlObj.getHost());
-                    Log.d(TAG, "Cookies "+CookieManager.getInstance().getCookie(urlObj.getProtocol()+"://"+urlObj.getHost()));
-
-                    downloadFile(getActivity(), url, filename, contentLength, CookieManager.getInstance().getCookie(urlObj.getProtocol()+"://"+urlObj.getHost()));
-                } catch (MalformedURLException e) {
-                    e.printStackTrace();
-                }
-                Anim.fadeOut(progressBar, 400, null);
-            });
-
-            webView.setWebViewClient(new WebViewClient() {
-                boolean loadingFinished = true;
-                boolean redirect = false;
-                @Override
-                public boolean shouldOverrideUrlLoading(WebView view, String request) {
-                    if (!loadingFinished) {
-                        redirect = true;
-                    }
-
-                    loadingFinished = false;
-                    webView.loadUrl(request);
-                    return true;
-                }
-
-                @Override
-                public void onPageStarted(WebView view, String url, Bitmap favicon) {
-                    super.onPageStarted(view, url, favicon);
-                    MessagesWebFragment.this.error.setVisibility(View.GONE);
-                    loadingFinished = false;
-                    //SHOW LOADING IF IT ISNT ALREADY VISIBLE
-                    if (progressBar.getVisibility() != View.VISIBLE)
-                        Anim.fadeIn(progressBar, 400, null);
-                }
-
-                @Override
-                public void onPageFinished(WebView view, String url) {
-                    if (!redirect) {
-                        loadingFinished = true;
-                    }
-
-                    if (loadingFinished && !redirect) {
-                        //HIDE LOADING IT HAS FINISHED
-                        //String cookies = CookieManager.getInstance().getCookie(url);
-                        //Log.d(TAG, "All the cookies in a string:" + cookies);
-                        Anim.fadeOut(progressBar, 400, null);
-                        /*if (app.profile.messagesWebFullVersion && justLoaded && app.profile.loginType == Register.LOGIN_TYPE_MOBIDZIENNIK) {
-                            if (!webView.getUrl().contains("wiadomosci")) {
-                                // redirect to messages view
-                                webView.loadUrl("https://" + app.getLoginData("serverName", "") + ".mobidziennik.pl/mobile/wiadomosci");
-                            }
-                            justLoaded = false;
-                        }*/
-                    } else {
-                        redirect = false;
-                    }
-                }
-
-                @Override
-                public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
-                    if (app == null || app.profile == null || activity == null || b == null || !isAdded())
-                        return;
-
-                    MessagesWebFragment.this.error.setVisibility(View.VISIBLE);
-                    MessagesWebFragment.this.error.setText(getString(R.string.error_occured_format, error.toString()));
-                    super.onReceivedError(view, request, error);
-                }
-            });
-
-            if(Build.VERSION.SDK_INT >= 21) {
-                webView.getSettings().setMixedContentMode(0);
-                webView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-            } else if(Build.VERSION.SDK_INT >= 19) {
-                webView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-            } else {
-                webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
-            }
-
-            webView.setWebChromeClient(new WebChromeClient(){
-                //For Android 5.0+
-                public boolean onShowFileChooser(
-                        WebView webView, ValueCallback<Uri[]> filePathCallback,
-                        WebChromeClient.FileChooserParams fileChooserParams){
-                    if(fileCallback != null){
-                        fileCallback.onReceiveValue(null);
-                    }
-                    fileCallback = filePathCallback;
-                    Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-                    if(takePictureIntent.resolveActivity(app.getPackageManager()) != null){
-                        File photoFile = null;
-                        try{
-                            photoFile = createImageFile();
-                            takePictureIntent.putExtra("PhotoPath", photoPath);
-                        }catch(IOException ex){
-                            Log.e(TAG, "Image file creation failed", ex);
-                        }
-                        if(photoFile != null){
-                            photoPath = "file:" + photoFile.getAbsolutePath();
-                            takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(photoFile));
-                        }else{
-                            takePictureIntent = null;
-                        }
-                    }
-                    Intent contentSelectionIntent = new Intent(Intent.ACTION_GET_CONTENT);
-                    contentSelectionIntent.addCategory(Intent.CATEGORY_OPENABLE);
-                    contentSelectionIntent.setType("*/*");
-                    Intent[] intentArray;
-                    if(takePictureIntent != null){
-                        intentArray = new Intent[]{takePictureIntent};
-                    }else{
-                        intentArray = new Intent[0];
-                    }
-
-                    Intent chooserIntent = new Intent(Intent.ACTION_CHOOSER);
-                    chooserIntent.putExtra(Intent.EXTRA_INTENT, contentSelectionIntent);
-                    chooserIntent.putExtra(Intent.EXTRA_TITLE, R.string.choose_file);
-                    chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, intentArray);
-                    startActivityForResult(chooserIntent, REQUEST_FILE_CHOOSER);
-                    return true;
-                }
-            });
-
-
-        }), 200);
-    }
-
-    /*public void loadVersion(boolean fullVersion) {
-        if (app.profile.messagesWebFullVersion != fullVersion) {
-            app.profile.messagesWebFullVersion = fullVersion;
-            app.profile.savePending = true;
-            justLoaded = true;
-            app.apiEdziennik.initMessagesWebView(webView, app, fullVersion, true);
-        }
-    }*/
-
-    public void performReload() {
-        webView.reload();
-    }
-
-    public boolean processBackKey()
-    {
-        if (webView.canGoBack())
-        {
-            webView.goBack();
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsAdapter.java
deleted file mode 100644
index f54810b9..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsAdapter.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package pl.szczodrzynski.edziennik.ui.modules.notifications;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.cardview.widget.CardView;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.Notification;
-
-import static pl.szczodrzynski.edziennik.utils.Utils.d;
-
-public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdapter.ViewHolder> {
-    private static final String TAG = "NotificationsAdapter";
-    private Context context;
-    private List<Notification> notificationList;
-
-    //getting the context and product list with constructor
-    public NotificationsAdapter(Context mCtx, List<Notification> notificationList) {
-        this.context = mCtx;
-        this.notificationList = notificationList;
-    }
-
-    @NonNull
-    @Override
-    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        //inflating and returning our view holder
-        LayoutInflater inflater = LayoutInflater.from(context);
-        View view = inflater.inflate(R.layout.row_notifications_item, parent, false);
-        return new ViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        App app = (App) context.getApplicationContext();
-
-        Notification notification = notificationList.get(position);
-
-        holder.notificationsItemDate.setText(Date.fromMillis(notification.addedDate).getFormattedString());
-        holder.notificationsItemText.setText(notification.text);
-        holder.notificationsItemTitle.setText(notification.title);
-        holder.notificationsItemType.setText(Notification.stringType(context, notification.type));
-
-        holder.notificationsItemCard.setOnClickListener((v -> {
-            Intent intent = new Intent("android.intent.action.MAIN");
-            notification.fillIntent(intent);
-
-            d(TAG, "notification with item "+notification.redirectFragmentId+" extras "+(intent.getExtras() == null ? "null" : intent.getExtras().toString()));
-
-            //Log.d(TAG, "Got date "+intent.getLongExtra("timetableDate", 0));
-
-            if (notification.profileId != -1 && notification.profileId != app.profile.getId() && context instanceof Activity) {
-                Toast.makeText(app, app.getString(R.string.toast_changing_profile), Toast.LENGTH_LONG).show();
-            }
-            app.sendBroadcast(intent);
-        }));
-
-        if (!notification.seen) {
-            holder.notificationsItemText.setBackground(context.getResources().getDrawable(R.drawable.bg_rounded_8dp));
-            holder.notificationsItemText.getBackground().setColorFilter(new PorterDuffColorFilter(0x692196f3, PorterDuff.Mode.MULTIPLY));
-        }
-        else {
-            holder.notificationsItemText.setBackground(null);
-        }
-
-    }
-
-    @Override
-    public int getItemCount() {
-        return notificationList.size();
-    }
-
-    class ViewHolder extends RecyclerView.ViewHolder {
-
-        CardView notificationsItemCard;
-        TextView notificationsItemDate;
-        TextView notificationsItemText;
-        TextView notificationsItemTitle;
-        TextView notificationsItemType;
-
-        ViewHolder(View itemView) {
-            super(itemView);
-            notificationsItemCard = itemView.findViewById(R.id.notificationsItemCard);
-            notificationsItemDate = itemView.findViewById(R.id.notificationsItemDate);
-            notificationsItemText = itemView.findViewById(R.id.notificationsItemText);
-            notificationsItemTitle = itemView.findViewById(R.id.notificationsItemTitle);
-            notificationsItemType = itemView.findViewById(R.id.notificationsItemType);
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsAdapter.kt
new file mode 100644
index 00000000..7ae78edd
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsAdapter.kt
@@ -0,0 +1,72 @@
+package pl.szczodrzynski.edziennik.ui.modules.notifications
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import android.widget.Toast
+import androidx.recyclerview.widget.RecyclerView
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification
+import pl.szczodrzynski.edziennik.data.db.modules.notification.getNotificationTitle
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class NotificationsAdapter(
+        private val context: Context
+) : RecyclerView.Adapter<NotificationsAdapter.ViewHolder>() {
+    companion object {
+        private const val TAG = "NotificationsAdapter"
+    }
+
+    var items = listOf<Notification>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val inflater = LayoutInflater.from(context)
+        val view = inflater.inflate(R.layout.row_notifications_item, parent, false)
+        return ViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val app = context.applicationContext as App
+
+        val notification = items[position]
+
+        val date = Date.fromMillis(notification.addedDate).formattedString
+        val colorSecondary = android.R.attr.textColorSecondary.resolveAttr(context)
+
+        holder.title.text = notification.text
+        holder.profileDate.text = listOf(
+                notification.profileName ?: "",
+                " • ",
+                date.asColoredSpannable(colorSecondary)
+        ).concat()
+        holder.type.text = context.getNotificationTitle(notification.type)
+
+        holder.root.onClick {
+            val intent = Intent("android.intent.action.MAIN")
+            notification.fillIntent(intent)
+
+            d(TAG, "notification with item " + notification.viewId + " extras " + if (intent.extras == null) "null" else intent.extras!!.toString())
+
+            //Log.d(TAG, "Got date "+intent.getLongExtra("timetableDate", 0));
+
+            if (notification.profileId != -1 && notification.profileId != app.profile.id && context is Activity) {
+                Toast.makeText(app, app.getString(R.string.toast_changing_profile), Toast.LENGTH_LONG).show()
+            }
+            app.sendBroadcast(intent)
+        }
+    }
+
+    override fun getItemCount() = items.size
+
+    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        var root = itemView
+        var title: TextView = itemView.findViewById(R.id.title)
+        var profileDate: TextView = itemView.findViewById(R.id.profileDate)
+        var type: TextView = itemView.findViewById(R.id.type)
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsFragment.java
deleted file mode 100644
index 0ed54999..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsFragment.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package pl.szczodrzynski.edziennik.ui.modules.notifications;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.databinding.FragmentNotificationsBinding;
-import pl.szczodrzynski.edziennik.utils.Themes;
-
-public class NotificationsFragment extends Fragment {
-
-    private App app = null;
-    private Activity activity = null;
-    private FragmentNotificationsBinding b = null;
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        activity = getActivity();
-        if (getActivity() == null || getContext() == null)
-            return null;
-        app = (App) activity.getApplication();
-        getContext().getTheme().applyStyle(Themes.INSTANCE.getAppTheme(), true);
-        if (app.profile == null)
-            return inflater.inflate(R.layout.fragment_loading, container, false);
-        // activity, context and profile is valid
-        b = DataBindingUtil.inflate(inflater, R.layout.fragment_notifications, container, false);
-        return b.getRoot();
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        if (app == null || app.profile == null || activity == null || b == null || !isAdded())
-            return;
-
-        RecyclerView recyclerView = b.notificationsView;
-        recyclerView.setHasFixedSize(true);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-
-        if (app.appConfig.notifications.size() > 0) {
-            NotificationsAdapter adapter = new NotificationsAdapter(getContext(), app.appConfig.notifications);
-            recyclerView.setAdapter(adapter);
-            recyclerView.setVisibility(View.VISIBLE);
-            LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
-            //linearLayoutManager.setReverseLayout(true);
-            //linearLayoutManager.setStackFromEnd(true);
-            recyclerView.setLayoutManager(linearLayoutManager);
-            b.notificationsNoData.setVisibility(View.GONE);
-        }
-        else {
-            recyclerView.setVisibility(View.GONE);
-            b.notificationsNoData.setVisibility(View.VISIBLE);
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsFragment.kt
new file mode 100644
index 00000000..e63e11cb
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsFragment.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-22.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.notifications
+
+import android.os.AsyncTask
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.DividerItemDecoration.HORIZONTAL
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.databinding.FragmentNotificationsBinding
+import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
+import pl.szczodrzynski.edziennik.utils.Themes
+import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
+
+
+class NotificationsFragment : Fragment() {
+    private lateinit var app: App
+    private lateinit var activity: MainActivity
+    private lateinit var b: FragmentNotificationsBinding
+
+    private val adapter by lazy {
+        NotificationsAdapter(activity)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        activity = (getActivity() as MainActivity?) ?: return null
+        if (context == null)
+            return null
+        app = activity.application as App
+        context!!.theme.applyStyle(Themes.appTheme, true)
+        if (app.profile == null)
+            return inflater.inflate(R.layout.fragment_loading, container, false)
+        // activity, context and profile is valid
+        b = FragmentNotificationsBinding.inflate(inflater)
+        return b.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        // TODO check if app, activity, b can be null
+        if (app.profile == null || !isAdded)
+            return
+
+        activity.bottomSheet.prependItems(
+                BottomSheetPrimaryItem(true)
+                        .withTitle(R.string.menu_remove_notifications)
+                        .withIcon(CommunityMaterial.Icon.cmd_delete_sweep_outline)
+                        .withOnClickListener(View.OnClickListener {
+                            activity.bottomSheet.close()
+                            AsyncTask.execute { app.db.notificationDao().clearAll() }
+                            Toast.makeText(activity, R.string.menu_remove_notifications_success, Toast.LENGTH_SHORT).show()
+                        }))
+
+        app.db.notificationDao()
+                .getAll()
+                .observe(this, Observer { notifications ->
+                    if (app.profile == null || !isAdded) return@Observer
+
+                    adapter.items = notifications
+                    if (b.notificationsView.adapter == null) {
+                        b.notificationsView.adapter = adapter
+                        b.notificationsView.apply {
+                            setHasFixedSize(true)
+                            layoutManager = LinearLayoutManager(context).apply {
+                                addItemDecoration(SimpleDividerItemDecoration(context))
+                            }
+                        }
+                    }
+                    adapter.notifyDataSetChanged()
+
+                    if (notifications != null && notifications.isNotEmpty()) {
+                        b.notificationsView.visibility = View.VISIBLE
+                        b.notificationsNoData.visibility = View.GONE
+                    } else {
+                        b.notificationsView.visibility = View.GONE
+                        b.notificationsNoData.visibility = View.VISIBLE
+                    }
+                })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsLicenseActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsLicenseActivity.kt
index 31933c4d..eb1a23e1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsLicenseActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsLicenseActivity.kt
@@ -39,7 +39,7 @@ class SettingsLicenseActivity : MaterialAboutActivity() {
             libraryUrl: String): MaterialAboutCard {
         val licenseItem = MaterialAboutActionItem.Builder()
                 .icon(IconicsDrawable(this)
-                        .icon(CommunityMaterial.Icon.cmd_book)
+                        .icon(CommunityMaterial.Icon.cmd_book_outline)
                         .colorInt(foregroundColor)
                         .sizeDp(18))
                 .setIconGravity(MaterialAboutActionItem.GRAVITY_TOP)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java
index 932e89eb..832eb77f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java
@@ -29,6 +29,7 @@ import com.mikepenz.iconics.IconicsColor;
 import com.mikepenz.iconics.IconicsDrawable;
 import com.mikepenz.iconics.IconicsSize;
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
+import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont;
 import com.theartofdev.edmodo.cropper.CropImage;
 import com.theartofdev.edmodo.cropper.CropImageView;
 import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
@@ -38,28 +39,28 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.BuildConfig;
+import pl.szczodrzynski.edziennik.MainActivity;
 import pl.szczodrzynski.edziennik.Notifier;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.MainActivity;
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
-import pl.szczodrzynski.edziennik.ui.modules.webpush.WebPushConfigActivity;
-import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog;
-import pl.szczodrzynski.edziennik.utils.models.Endpoint;
-import pl.szczodrzynski.edziennik.utils.models.Time;
 import pl.szczodrzynski.edziennik.network.NetworkUtils;
 import pl.szczodrzynski.edziennik.network.ServerRequest;
 import pl.szczodrzynski.edziennik.receivers.BootReceiver;
-import pl.szczodrzynski.edziennik.sync.SyncJob;
+import pl.szczodrzynski.edziennik.sync.SyncWorker;
+import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog;
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.ProfileRemoveDialog;
 import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
+import pl.szczodrzynski.edziennik.ui.modules.webpush.WebPushConfigActivity;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.edziennik.utils.Utils;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 import static android.app.Activity.RESULT_OK;
 import static pl.szczodrzynski.edziennik.App.APP_URL;
+import static pl.szczodrzynski.edziennik.ExtensionsKt.initDefaultLocale;
 import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.REGISTRATION_DISABLED;
 import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.REGISTRATION_ENABLED;
 import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.YEAR_1_AVG_2_AVG;
@@ -81,8 +82,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
     private static final int CARD_THEME = 1;
     private static final int CARD_SYNC = 2;
     private static final int CARD_REGISTER = 3;
-    private static final int CARD_SYNC_CUSTOMIZE = 4;
-    private static final int CARD_ABOUT = 5;
+    private static final int CARD_ABOUT = 4;
     private int iconColor = Color.WHITE;
     private int primaryTextOnPrimaryBg = -1;
     private int secondaryTextOnPrimaryBg = -1;
@@ -238,7 +238,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
         }
         else {
 
-            items.add(
+            /*items.add(
                     new MaterialAboutSwitchItem(
                             getString(R.string.settings_profile_notify_text),
                             getString(R.string.settings_profile_notify_subtext),
@@ -253,19 +253,19 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                         app.profileSaveAsync();
                         return true;
                     }))
-            );
+            );*/
 
             items.add(
                     new MaterialAboutActionItem(
                             getString(R.string.settings_profile_remove_text),
                             getString(R.string.settings_profile_remove_subtext),
                             new IconicsDrawable(activity)
-                                    .icon(CommunityMaterial.Icon.cmd_delete_empty)
+                                    .icon(SzkolnyFont.Icon.szf_delete_empty_outline)
                                     .size(IconicsSize.dp(iconSizeDp))
                                     .color(IconicsColor.colorInt(iconColor))
                     )
                     .setOnClickAction(() -> {
-                        app.apiEdziennik.guiRemoveProfile(activity, app.profile.getId(), app.profile.getName());
+                        new ProfileRemoveDialog(activity, app.profile.getId(), app.profile.getName());
                     })
             );
 
@@ -288,7 +288,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                             getString(R.string.settings_theme_theme_text),
                             Themes.INSTANCE.getThemeName(activity),
                             new IconicsDrawable(activity)
-                                    .icon(CommunityMaterial.Icon2.cmd_palette)
+                                    .icon(CommunityMaterial.Icon2.cmd_palette_outline)
                                     .size(IconicsSize.dp(iconSizeDp))
                                     .color(IconicsColor.colorInt(iconColor))
                     )
@@ -314,7 +314,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                             getString(R.string.settings_theme_mini_drawer_text),
                             getString(R.string.settings_theme_mini_drawer_subtext),
                             new IconicsDrawable(activity)
-                                    .icon(CommunityMaterial.Icon.cmd_chevron_left)
+                                    .icon(CommunityMaterial.Icon.cmd_dots_vertical)
                                     .size(IconicsSize.dp(iconSizeDp))
                                     .color(IconicsColor.colorInt(iconColor))
                     )
@@ -340,7 +340,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                             getString(R.string.settings_theme_mini_drawer_buttons_text),
                             null,
                             new IconicsDrawable(activity)
-                                    .icon(CommunityMaterial.Icon2.cmd_menu)
+                                    .icon(CommunityMaterial.Icon.cmd_format_list_checks)
                                     .size(IconicsSize.dp(iconSizeDp))
                                     .color(IconicsColor.colorInt(iconColor))
                     )
@@ -404,7 +404,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                             getString(R.string.settings_theme_drawer_header_text),
                             null,
                             new IconicsDrawable(activity)
-                                    .icon(CommunityMaterial.Icon2.cmd_image)
+                                    .icon(CommunityMaterial.Icon2.cmd_image_outline)
                                     .size(IconicsSize.dp(iconSizeDp))
                                     .color(IconicsColor.colorInt(iconColor))
                     )
@@ -505,7 +505,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                 getString(R.string.settings_sync_wifi_text),
                 getString(R.string.settings_sync_wifi_subtext),
                 new IconicsDrawable(activity)
-                        .icon(CommunityMaterial.Icon2.cmd_wifi_strength_4)
+                        .icon(CommunityMaterial.Icon2.cmd_wifi_strength_2)
                         .size(IconicsSize.dp(iconSizeDp))
                         .color(IconicsColor.colorInt(iconColor))
         )
@@ -513,6 +513,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
         .setOnChangeAction((isChecked, tag) -> {
             app.appConfig.registerSyncOnlyWifi = isChecked;
             app.saveConfig("registerSyncOnlyWifi");
+            SyncWorker.Companion.rescheduleNext(app);
             return true;
         });
     }
@@ -526,7 +527,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                     getString(R.string.settings_sync_sync_interval_text),
                     getString(R.string.settings_sync_sync_interval_subtext_disabled),
                     new IconicsDrawable(activity)
-                            .icon(CommunityMaterial.Icon2.cmd_sync)
+                            .icon(CommunityMaterial.Icon.cmd_download_outline)
                             .size(IconicsSize.dp(iconSizeDp))
                             .color(IconicsColor.colorInt(iconColor))
             );
@@ -534,6 +535,10 @@ public class SettingsNewFragment extends MaterialAboutFragment {
             syncCardIntervalItem.setChecked(app.appConfig.registerSyncEnabled);
             syncCardIntervalItem.setOnClickAction(() -> {
                 List<CharSequence> intervalNames = new ArrayList<>();
+                if (App.devMode && false) {
+                    intervalNames.add(HomeFragment.plural(activity, R.plurals.time_till_seconds, 30));
+                    intervalNames.add(HomeFragment.plural(activity, R.plurals.time_till_minutes, 2));
+                }
                 intervalNames.add(HomeFragment.plural(activity, R.plurals.time_till_minutes, 30));
                 intervalNames.add(HomeFragment.plural(activity, R.plurals.time_till_minutes, 45));
                 intervalNames.add(HomeFragment.plural(activity, R.plurals.time_till_hours, 1));
@@ -542,6 +547,10 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                 intervalNames.add(HomeFragment.plural(activity, R.plurals.time_till_hours, 3));
                 intervalNames.add(HomeFragment.plural(activity, R.plurals.time_till_hours, 4));
                 List<Integer> intervals = new ArrayList<>();
+                if (App.devMode && false) {
+                    intervals.add(30);
+                    intervals.add(2 * 60);
+                }
                 intervals.add(30 * 60);
                 intervals.add(45 * 60);
                 intervals.add(60 * 60);
@@ -566,20 +575,12 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                             app.appConfig.registerSyncEnabled = true;
                             // app.appConfig modifications have to surround syncCardIntervalItem and those ifs
                             app.saveConfig("registerSyncInterval", "registerSyncEnabled");
-                            SyncJob.clear();
-                            SyncJob.schedule(app);
+                            SyncWorker.Companion.rescheduleNext(app);
                             return true;
                         })
                         .show();
             });
             syncCardIntervalItem.setOnChangeAction((isChecked, tag) -> {
-                if (isChecked) {
-                    SyncJob.update(app);
-                }
-                else {
-                    SyncJob.clear();
-                }
-
                 if (isChecked && !app.appConfig.registerSyncEnabled) {
                     addCardItem(CARD_SYNC, 1, getSyncCardWifiItem());
                 }
@@ -588,6 +589,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                 }
                 app.appConfig.registerSyncEnabled = isChecked;
                 app.saveConfig("registerSyncEnabled");
+                SyncWorker.Companion.rescheduleNext(app);
                 return true;
             });
             items.add(syncCardIntervalItem);
@@ -618,7 +620,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                     getString(R.string.settings_sync_quiet_hours_text),
                     getString(R.string.settings_sync_quiet_hours_subtext_disabled),
                     new IconicsDrawable(activity)
-                            .icon(CommunityMaterial.Icon.cmd_bell_sleep)
+                            .icon(CommunityMaterial.Icon.cmd_bell_sleep_outline)
                             .size(IconicsSize.dp(iconSizeDp))
                             .color(IconicsColor.colorInt(iconColor))
             );
@@ -739,7 +741,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                 getString(R.string.settings_sync_notifications_settings_text),
                                 getString(R.string.settings_sync_notifications_settings_subtext),
                                 new IconicsDrawable(activity)
-                                        .icon(CommunityMaterial.Icon2.cmd_settings)
+                                        .icon(CommunityMaterial.Icon2.cmd_settings_outline)
                                         .size(IconicsSize.dp(iconSizeDp))
                                         .color(IconicsColor.colorInt(iconColor))
                         )
@@ -819,7 +821,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                 getString(R.string.settings_register_shared_events_text),
                 getString(R.string.settings_register_shared_events_subtext),
                 new IconicsDrawable(activity)
-                        .icon(CommunityMaterial.Icon2.cmd_share_variant)
+                        .icon(CommunityMaterial.Icon2.cmd_share_outline)
                         .size(IconicsSize.dp(iconSizeDp))
                         .color(IconicsColor.colorInt(iconColor))
         )
@@ -887,7 +889,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                     getString(R.string.settings_register_allow_registration_text),
                     getString(R.string.settings_register_allow_registration_subtext),
                     new IconicsDrawable(activity)
-                            .icon(CommunityMaterial.Icon.cmd_account_circle)
+                            .icon(CommunityMaterial.Icon.cmd_account_circle_outline)
                             .size(IconicsSize.dp(iconSizeDp))
                             .color(IconicsColor.colorInt(iconColor))
             );
@@ -957,7 +959,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                     getString(R.string.settings_register_bell_sync_text),
                     getRegisterCardBellSyncSubText(),
                     new IconicsDrawable(activity)
-                            .icon(CommunityMaterial.Icon.cmd_alarm_bell)
+                            .icon(SzkolnyFont.Icon.szf_alarm_bell_outline)
                             .size(IconicsSize.dp(iconSizeDp))
                             .color(IconicsColor.colorInt(iconColor))
             );
@@ -1029,7 +1031,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                             getString(R.string.settings_register_dont_count_zero_text),
                             null,
                             new IconicsDrawable(activity)
-                                    .icon(CommunityMaterial.Icon2.cmd_numeric_0_box)
+                                    .icon(CommunityMaterial.Icon2.cmd_numeric_0_box_outline)
                                     .size(IconicsSize.dp(iconSizeDp))
                                     .color(IconicsColor.colorInt(iconColor))
                     )
@@ -1064,7 +1066,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                 getString(R.string.settings_register_show_teacher_absences_text),
                                 null,
                                 new IconicsDrawable(activity)
-                                        .icon(CommunityMaterial.Icon.cmd_account_arrow_right)
+                                        .icon(CommunityMaterial.Icon.cmd_account_arrow_right_outline)
                                         .size(IconicsSize.dp(iconSizeDp))
                                         .color(IconicsColor.colorInt(iconColor))
                         )
@@ -1081,136 +1083,6 @@ public class SettingsNewFragment extends MaterialAboutFragment {
         return items;
     }
 
-    /*     _____                    ______           _             _       _
-          / ____|                  |  ____|         | |           (_)     | |
-         | (___  _   _ _ __   ___  | |__   _ __   __| |_ __   ___  _ _ __ | |_ ___
-          \___ \| | | | '_ \ / __| |  __| | '_ \ / _` | '_ \ / _ \| | '_ \| __/ __|
-          ____) | |_| | | | | (__  | |____| | | | (_| | |_) | (_) | | | | | |_\__ \
-         |_____/ \__, |_| |_|\___| |______|_| |_|\__,_| .__/ \___/|_|_| |_|\__|___/
-                  __/ |                               | |
-                 |___/                                |*/
-    private String getEndpointTitle(String name) {
-        int stringRes = -1;
-        switch (name) {
-            case "Classrooms":
-                stringRes = R.string.settings_sync_customize_endpoint_classrooms;
-                break;
-            case "Timetables":
-            case "Timetable":
-                stringRes = R.string.settings_sync_customize_endpoint_timetable;
-                break;
-            case "Substitutions":
-                stringRes = R.string.settings_sync_customize_endpoint_substitutions;
-                break;
-            case "Grades":
-                stringRes = R.string.settings_sync_customize_endpoint_grades;
-                break;
-            case "PointGrades":
-                stringRes = R.string.settings_sync_customize_endpoint_point_grades;
-                break;
-            case "Events":
-                stringRes = R.string.settings_sync_customize_endpoint_events;
-                break;
-            case "Homework":
-                stringRes = R.string.settings_sync_customize_endpoint_homework;
-                break;
-            case "LuckyNumber":
-            case "LuckyNumbers":
-                stringRes = R.string.settings_sync_customize_endpoint_lucky_numbers;
-                break;
-            case "Notices":
-                stringRes = R.string.settings_sync_customize_endpoint_notices;
-                break;
-            case "Attendance":
-                stringRes = R.string.settings_sync_customize_endpoint_attendance;
-                break;
-            case "Announcements":
-                stringRes = R.string.settings_sync_customize_endpoint_announcements;
-                break;
-            case "PtMeetings":
-                stringRes = R.string.settings_sync_customize_endpoint_pt_meetings;
-                break;
-            case "TeacherFreeDays":
-                stringRes = R.string.settings_sync_customize_endpoint_teacher_free_days;
-                break;
-            case "SchoolFreeDays":
-                stringRes = R.string.settings_sync_customize_endpoint_school_free_days;
-                break;
-            case "ClassFreeDays":
-                stringRes = R.string.settings_sync_customize_endpoint_class_free_days;
-                break;
-            case "MessagesInbox":
-                stringRes = R.string.settings_sync_customize_endpoint_messages_inbox;
-                break;
-            case "MessagesOutbox":
-                stringRes = R.string.settings_sync_customize_endpoint_messages_outbox;
-                break;
-        }
-        if (stringRes == -1)
-            return name;
-        else
-            return getString(stringRes);
-    }
-    private MaterialAboutSwitchItem getEndpointSwitch(String name, Endpoint endpoint) {
-        return new MaterialAboutSwitchItem(
-                getEndpointTitle(name),
-                endpoint.onlyFullSync ? getString(R.string.settings_sync_customize_full_sync_only) : null,
-                null
-        )
-        .setChecked(endpoint.enabled)
-        .setOnChangeAction((isChecked, tag) -> {
-            endpoint.enabled = isChecked;
-            boolean changed = isChecked ^ endpoint.defaultActive;
-            if (!changed) {
-                if (app.profile.getChangedEndpoints() != null) {
-                    app.profile.getChangedEndpoints().remove(name);
-                }
-            }
-            else {
-                if (app.profile.getChangedEndpoints() == null)
-                    app.profile.setChangedEndpoints(new ArrayList<>());
-                app.profile.getChangedEndpoints().add(name);
-            }
-            app.profileSaveAsync();
-            return true;
-        });
-    }
-    private Map<String, Endpoint> configurableEndpoints = null;
-    private ArrayList<MaterialAboutItem> getSyncCustomizeCard(boolean expandedOnly) {
-        ArrayList<MaterialAboutItem> items = new ArrayList<>();
-        if (!expandedOnly) {
-            items.add(
-                    new MaterialAboutActionItem(
-                            null,
-                            getString(R.string.settings_sync_customize_help_subtext),
-                            null
-                    )
-            );
-
-            if (app.profile.getChangedEndpoints() != null) {
-                for (String changedEndpoint : app.profile.getChangedEndpoints()) {
-                    Endpoint endpoint = configurableEndpoints.get(changedEndpoint);
-                    if (endpoint == null)
-                        continue;
-                    items.add(getEndpointSwitch(changedEndpoint, endpoint));
-                }
-            }
-
-            items.add(getMoreItem(() -> addCardItems(CARD_SYNC_CUSTOMIZE, getSyncCustomizeCard(true))));
-        }
-        else {
-            for (String endpointName: configurableEndpoints.keySet()) {
-                if (app.profile.getChangedEndpoints() != null && app.profile.getChangedEndpoints().contains(endpointName))
-                    continue;
-                Endpoint endpoint = configurableEndpoints.get(endpointName);
-                if (endpoint == null)
-                    continue;
-                items.add(getEndpointSwitch(endpointName, endpoint));
-            }
-        }
-        return items;
-    }
-
     /*             _                 _
              /\   | |               | |
             /  \  | |__   ___  _   _| |_
@@ -1223,117 +1095,152 @@ public class SettingsNewFragment extends MaterialAboutFragment {
         secondaryTextOnPrimaryBg = 0xd0ffffff;//activity.getResources().getColor(R.color.secondaryTextLight);
 
         ArrayList<MaterialAboutItem> items = new ArrayList<>();
-        items.add(new MaterialAboutTitleItem.Builder()
-                .text(R.string.app_name)
-                .desc(R.string.settings_about_title_subtext)
-                .textColor(primaryTextOnPrimaryBg)
-                .descColor(secondaryTextOnPrimaryBg)
-                .icon(R.mipmap.ic_splash)
-                .build());
+        if (!expandedOnly) {
+            items.add(new MaterialAboutTitleItem.Builder()
+                    .text(R.string.app_name)
+                    .desc(R.string.settings_about_title_subtext)
+                    .textColor(primaryTextOnPrimaryBg)
+                    .descColor(secondaryTextOnPrimaryBg)
+                    .icon(R.mipmap.ic_splash)
+                    .build());
 
-        pref_about_version = new MaterialAboutActionItem.Builder()
-                .text(R.string.settings_about_version_text)
-                .textColor(primaryTextOnPrimaryBg)
-                .subTextColor(secondaryTextOnPrimaryBg)
-                .subText(BuildConfig.VERSION_NAME+", "+BuildConfig.BUILD_TYPE)
-                .icon(new IconicsDrawable(activity)
-                        .icon(CommunityMaterial.Icon2.cmd_information)
-                        .color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
-                        .size(IconicsSize.dp(iconSizeDp)))
-                .build();
-        final int[] clickCounter = {0};
-        pref_about_version.setOnClickAction(() -> {
-            if (6 - clickCounter[0] != 0) {
-                Toast.makeText(activity, ("\ud83d\ude02"), Toast.LENGTH_SHORT).show();
-            }
-            refreshMaterialAboutList();
-            clickCounter[0] = clickCounter[0] + 1;
-            if (clickCounter[0] > 6)
-            {
-                final MediaPlayer mp = MediaPlayer.create(activity, R.raw.ogarnij_sie);
-                mp.start();
-                clickCounter[0] = 0;
-            }
-        });
-        items.add(pref_about_version);
+            pref_about_version = new MaterialAboutActionItem.Builder()
+                    .text(R.string.settings_about_version_text)
+                    .textColor(primaryTextOnPrimaryBg)
+                    .subTextColor(secondaryTextOnPrimaryBg)
+                    .subText(BuildConfig.VERSION_NAME + ", " + BuildConfig.BUILD_TYPE)
+                    .icon(new IconicsDrawable(activity)
+                            .icon(CommunityMaterial.Icon2.cmd_information_outline)
+                            .color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
+                            .size(IconicsSize.dp(iconSizeDp)))
+                    .build();
+            final int[] clickCounter = {0};
+            pref_about_version.setOnClickAction(() -> {
+                if (6 - clickCounter[0] != 0) {
+                    Toast.makeText(activity, ("\ud83d\ude02"), Toast.LENGTH_SHORT).show();
+                }
+                refreshMaterialAboutList();
+                clickCounter[0] = clickCounter[0] + 1;
+                if (clickCounter[0] > 6) {
+                    final MediaPlayer mp = MediaPlayer.create(activity, R.raw.ogarnij_sie);
+                    mp.start();
+                    clickCounter[0] = 0;
+                }
+            });
+            items.add(pref_about_version);
 
-        items.add(new MaterialAboutActionItem.Builder()
-                .text(R.string.settings_about_privacy_policy_text)
-                .textColor(primaryTextOnPrimaryBg)
-                .subTextColor(secondaryTextOnPrimaryBg)
-                .icon(new IconicsDrawable(activity)
-                        .icon(CommunityMaterial.Icon2.cmd_shield_half_full)
-                        .color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
-                        .size(IconicsSize.dp(iconSizeDp)))
-                .setOnClickAction(ConvenienceBuilder.createWebsiteOnClickAction(activity, Uri.parse("https://szkolny.eu/privacy-policy")))
-                .build());
+            items.add(new MaterialAboutActionItem.Builder()
+                    .text(R.string.settings_about_privacy_policy_text)
+                    .textColor(primaryTextOnPrimaryBg)
+                    .subTextColor(secondaryTextOnPrimaryBg)
+                    .icon(new IconicsDrawable(activity)
+                            .icon(CommunityMaterial.Icon2.cmd_shield_outline)
+                            .color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
+                            .size(IconicsSize.dp(iconSizeDp)))
+                    .setOnClickAction(ConvenienceBuilder.createWebsiteOnClickAction(activity, Uri.parse("https://szkolny.eu/privacy-policy")))
+                    .build());
 
-        items.add(new MaterialAboutActionItem.Builder()
-                .text(R.string.settings_about_discord_text)
-                .textColor(primaryTextOnPrimaryBg)
-                .subTextColor(secondaryTextOnPrimaryBg)
-                .subText(R.string.settings_about_discord_subtext)
-                .icon(new IconicsDrawable(activity)
-                        .icon(CommunityMaterial.Icon.cmd_discord)
-                        .color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
-                        .size(IconicsSize.dp(iconSizeDp)))
-                .setOnClickAction(ConvenienceBuilder.createWebsiteOnClickAction(activity, Uri.parse("https://discord.gg/n9e8pWr")))
-                .build());
+            items.add(new MaterialAboutActionItem.Builder()
+                    .text(R.string.settings_about_discord_text)
+                    .textColor(primaryTextOnPrimaryBg)
+                    .subTextColor(secondaryTextOnPrimaryBg)
+                    .subText(R.string.settings_about_discord_subtext)
+                    .icon(new IconicsDrawable(activity)
+                            .icon(SzkolnyFont.Icon.szf_discord_outline)
+                            .color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
+                            .size(IconicsSize.dp(iconSizeDp)))
+                    .setOnClickAction(ConvenienceBuilder.createWebsiteOnClickAction(activity, Uri.parse("https://discord.gg/n9e8pWr")))
+                    .build());
 
-        items.add(new MaterialAboutActionItem.Builder()
-                .text(R.string.settings_about_update_text)
-                .subText(R.string.settings_about_update_subtext)
-                .textColor(primaryTextOnPrimaryBg)
-                .subTextColor(secondaryTextOnPrimaryBg)
-                .icon(new IconicsDrawable(activity)
-                        .icon(CommunityMaterial.Icon2.cmd_update)
-                        .color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
-                        .size(IconicsSize.dp(iconSizeDp)))
-                .setOnClickAction(() -> {
-                    //open browser or intent here
-                    NetworkUtils net = new NetworkUtils(app);
-                    if (!net.isOnline())
-                    {
+            items.add(new MaterialAboutActionItem.Builder()
+                    .text(R.string.settings_about_language_text)
+                    .textColor(primaryTextOnPrimaryBg)
+                    .subTextColor(secondaryTextOnPrimaryBg)
+                    .subText(R.string.settings_about_language_subtext)
+                    .icon(new IconicsDrawable(activity)
+                            .icon(CommunityMaterial.Icon2.cmd_translate)
+                            .color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
+                            .size(IconicsSize.dp(iconSizeDp)))
+                    .setOnClickAction(() -> {
                         new MaterialDialog.Builder(activity)
-                                .title(R.string.you_are_offline_title)
-                                .content(R.string.you_are_offline_text)
-                                .positiveText(R.string.ok)
+                                .title(getString(R.string.settings_about_language_dialog_title))
+                                .content(getString(R.string.settings_about_language_dialog_text))
+                                .items(getString(R.string.language_system), getString(R.string.language_polish), getString(R.string.language_english))
+                                .itemsCallbackSingleChoice(app.appConfig.language == null ? 0 : app.appConfig.language.equals("pl") ? 1 : 2, (dialog, itemView, which, text) -> {
+                                    switch (which) {
+                                        case 0:
+                                            app.appConfig.language = null;
+                                            initDefaultLocale();
+                                            break;
+                                        case 1:
+                                            app.appConfig.language = "pl";
+                                            break;
+                                        case 2:
+                                            app.appConfig.language = "en";
+                                            break;
+                                    }
+                                    app.saveConfig("language");
+                                    activity.recreate(MainActivity.DRAWER_ITEM_SETTINGS);
+                                    return true;
+                                })
                                 .show();
-                    }
-                    else
-                    {
-                        BootReceiver br = new BootReceiver();
-                        Intent i = new Intent();
-                        i.putExtra("UserChecked", true);
-                        br.onReceive(getContext(), i);
-                    }
-                })
-                .build());
+                    })
+                    .build());
 
-        items.add(new MaterialAboutActionItem.Builder()
-                .text(R.string.settings_about_changelog_text)
-                .textColor(primaryTextOnPrimaryBg)
-                .subTextColor(secondaryTextOnPrimaryBg)
-                .icon(new IconicsDrawable(activity)
-                        .icon(CommunityMaterial.Icon2.cmd_radar)
-                        .color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
-                        .size(IconicsSize.dp(iconSizeDp)))
-                .setOnClickAction(() -> new ChangelogDialog().show(getActivity().getSupportFragmentManager(), "whats_new"))
-                .build());
+            items.add(getMoreItem(() -> addCardItems(CARD_ABOUT, getAboutCard(true))));
+        }
+        else {
+            items.add(new MaterialAboutActionItem.Builder()
+                    .text(R.string.settings_about_update_text)
+                    .subText(R.string.settings_about_update_subtext)
+                    .textColor(primaryTextOnPrimaryBg)
+                    .subTextColor(secondaryTextOnPrimaryBg)
+                    .icon(new IconicsDrawable(activity)
+                            .icon(CommunityMaterial.Icon2.cmd_update)
+                            .color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
+                            .size(IconicsSize.dp(iconSizeDp)))
+                    .setOnClickAction(() -> {
+                        //open browser or intent here
+                        NetworkUtils net = new NetworkUtils(app);
+                        if (!net.isOnline()) {
+                            new MaterialDialog.Builder(activity)
+                                    .title(R.string.you_are_offline_title)
+                                    .content(R.string.you_are_offline_text)
+                                    .positiveText(R.string.ok)
+                                    .show();
+                        } else {
+                            BootReceiver br = new BootReceiver();
+                            Intent i = new Intent();
+                            i.putExtra("UserChecked", true);
+                            br.onReceive(getContext(), i);
+                        }
+                    })
+                    .build());
 
-        items.add(new MaterialAboutActionItem.Builder()
-                .text(R.string.settings_about_licenses_text)
-                .textColor(primaryTextOnPrimaryBg)
-                .subTextColor(secondaryTextOnPrimaryBg)
-                .icon(new IconicsDrawable(activity)
-                        .icon(CommunityMaterial.Icon.cmd_code_braces)
-                        .color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
-                        .size(IconicsSize.dp(iconSizeDp)))
-                .setOnClickAction(() -> {
-                    Intent intent = new Intent(activity, SettingsLicenseActivity.class);
-                    startActivity(intent);
-                })
-                .build());
+            items.add(new MaterialAboutActionItem.Builder()
+                    .text(R.string.settings_about_changelog_text)
+                    .textColor(primaryTextOnPrimaryBg)
+                    .subTextColor(secondaryTextOnPrimaryBg)
+                    .icon(new IconicsDrawable(activity)
+                            .icon(CommunityMaterial.Icon2.cmd_radar)
+                            .color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
+                            .size(IconicsSize.dp(iconSizeDp)))
+                    .setOnClickAction(() -> new ChangelogDialog().show(getActivity().getSupportFragmentManager(), "whats_new"))
+                    .build());
+
+            items.add(new MaterialAboutActionItem.Builder()
+                    .text(R.string.settings_about_licenses_text)
+                    .textColor(primaryTextOnPrimaryBg)
+                    .subTextColor(secondaryTextOnPrimaryBg)
+                    .icon(new IconicsDrawable(activity)
+                            .icon(CommunityMaterial.Icon.cmd_code_braces)
+                            .color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
+                            .size(IconicsSize.dp(iconSizeDp)))
+                    .setOnClickAction(() -> {
+                        Intent intent = new Intent(activity, SettingsLicenseActivity.class);
+                        startActivity(intent);
+                    })
+                    .build());
 
         /*items.add(new MaterialAboutActionItem.Builder()
                 .text(R.string.settings_about_intro_text)
@@ -1357,20 +1264,21 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                 })
                 .build());*/
 
-        if (App.devMode) {
-            items.add(new MaterialAboutActionItem.Builder()
-                    .text(R.string.settings_about_crash_text)
-                    .subText(R.string.settings_about_crash_subtext)
-                    .textColor(primaryTextOnPrimaryBg)
-                    .subTextColor(secondaryTextOnPrimaryBg)
-                    .icon(new IconicsDrawable(activity)
-                            .icon(CommunityMaterial.Icon.cmd_bug)
-                            .color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
-                            .size(IconicsSize.dp(iconSizeDp)))
-                    .setOnClickAction(() -> {
-                        throw new RuntimeException("MANUAL CRASH");
-                    })
-                    .build());
+            if (App.devMode) {
+                items.add(new MaterialAboutActionItem.Builder()
+                        .text(R.string.settings_about_crash_text)
+                        .subText(R.string.settings_about_crash_subtext)
+                        .textColor(primaryTextOnPrimaryBg)
+                        .subTextColor(secondaryTextOnPrimaryBg)
+                        .icon(new IconicsDrawable(activity)
+                                .icon(CommunityMaterial.Icon.cmd_bug_outline)
+                                .color(IconicsColor.colorInt(primaryTextOnPrimaryBg))
+                                .size(IconicsSize.dp(iconSizeDp)))
+                        .setOnClickAction(() -> {
+                            throw new RuntimeException("MANUAL CRASH");
+                        })
+                        .build());
+            }
         }
         return items;
     }
@@ -1385,8 +1293,6 @@ public class SettingsNewFragment extends MaterialAboutFragment {
         if (app.profile == null)
             return new MaterialAboutList.Builder().build();
 
-        //configurableEndpoints = Edziennik.getApi(app, app.profile.loginStoreType).getConfigurableEndpoints(app.profile);
-
         MaterialAboutList materialAboutList = new MaterialAboutList();
         materialAboutList.addCard(getCardWithItems(null, getProfileCard(false)));
         materialAboutList.addCard(getCardWithItems(getString(R.string.settings_theme_title_text), getThemeCard(false)));
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.java
index 09eda619..aa45da14 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.java
@@ -37,6 +37,7 @@ import androidx.viewpager.widget.ViewPager;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.google.android.material.tabs.TabLayout;
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
+import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -51,6 +52,7 @@ import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull;
 import pl.szczodrzynski.edziennik.databinding.FragmentTimetableBinding;
 import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog;
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorDialog;
 import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
 import pl.szczodrzynski.edziennik.utils.SpannableHtmlTagHandler;
 import pl.szczodrzynski.edziennik.utils.Themes;
@@ -102,7 +104,7 @@ public class TimetableFragment extends Fragment {
                 new BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_add_event)
                         .withDescription(R.string.menu_add_event_desc)
-                        .withIcon(CommunityMaterial.Icon.cmd_calendar_plus)
+                        .withIcon(SzkolnyFont.Icon.szf_calendar_plus_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
                             new MaterialDialog.Builder(activity)
@@ -131,7 +133,7 @@ public class TimetableFragment extends Fragment {
                 new BottomSheetSeparatorItem(true),
                 new BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_mark_as_read)
-                        .withIcon(CommunityMaterial.Icon.cmd_eye_check)
+                        .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
                             AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_LESSON_CHANGE, true));
@@ -182,7 +184,7 @@ public class TimetableFragment extends Fragment {
                 if (app == null || app.profile == null || activity == null || b == null || !isAdded())
                     return;
 
-                List<LessonFull> lessons = app.db.lessonDao().getAllWeekNow(App.profileId, today.clone().stepForward(0, 0, -today.getWeekDay()), today);
+                List<LessonFull> lessons = app.db.lessonDao().getAllWeekNow(App.profileId, today.getWeekStart(), today);
                 displayingDate = HomeFragment.findDateWithLessons(App.profileId, lessons);
                 pageSelection = app.appConfig.timetableDisplayDaysBackward + Date.diffDays(displayingDate, today); // DEFAULT HERE
 
@@ -422,7 +424,7 @@ public class TimetableFragment extends Fragment {
                     linearLayout = (LinearLayout) getLayoutInflater().inflate(R.layout.row_timetable_block_item, null);
                 }
                 catch (Exception e) {
-                    app.apiEdziennik.guiReportException(activity, 385, e);
+                    new ErrorDialog(activity, e);
                     return;
                 }
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetableFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetableFragment.kt
new file mode 100644
index 00000000..5944f591
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetableFragment.kt
@@ -0,0 +1,199 @@
+package pl.szczodrzynski.edziennik.ui.modules.timetable.v2
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.AsyncTask
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.viewpager.widget.ViewPager
+import com.google.android.material.datepicker.MaterialDatePicker
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
+import kotlinx.coroutines.*
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_TYPE_LIBRUS
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.databinding.FragmentTimetableV2Binding
+import pl.szczodrzynski.edziennik.utils.Themes
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
+import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
+import kotlin.coroutines.CoroutineContext
+
+class TimetableFragment : Fragment(), CoroutineScope {
+    companion object {
+        private const val TAG = "TimetableFragment"
+        const val ACTION_SCROLL_TO_DATE = "pl.szczodrzynski.edziennik.timetable.SCROLL_TO_DATE"
+        const val DEFAULT_START_HOUR = 6
+        const val DEFAULT_END_HOUR = 19
+        var pageSelection: Date? = null
+    }
+
+    private lateinit var app: App
+    private lateinit var activity: MainActivity
+    private lateinit var b: FragmentTimetableV2Binding
+
+    private lateinit var job: Job
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private var fabShown = false
+    private val items = mutableListOf<Date>()
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        activity = (getActivity() as MainActivity?) ?: return null
+        if (context == null)
+            return null
+        app = activity.application as App
+        job = Job()
+        context!!.theme.applyStyle(Themes.appTheme, true)
+        if (app.profile == null)
+            return inflater.inflate(R.layout.fragment_loading, container, false)
+        // activity, context and profile is valid
+        b = FragmentTimetableV2Binding.inflate(inflater)
+        b.refreshLayout.setParent(activity.swipeRefreshLayout)
+        return b.root
+    }
+
+    private val broadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, i: Intent) {
+            if (!isAdded)
+                return
+            val dateStr = i.extras?.getString("timetableDate", null) ?: return
+            val date = Date.fromY_m_d(dateStr)
+            b.viewPager.setCurrentItem(items.indexOf(date), true)
+        }
+    }
+    override fun onResume() {
+        super.onResume()
+        activity.registerReceiver(broadcastReceiver, IntentFilter(ACTION_SCROLL_TO_DATE))
+    }
+    override fun onPause() {
+        super.onPause()
+        activity.unregisterReceiver(broadcastReceiver)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { launch {
+        // TODO check if app, activity, b can be null
+        if (app.profile == null || !isAdded)
+            return@launch
+
+        if (app.profile.loginStoreType == LOGIN_TYPE_LIBRUS && app.profile.getLoginData("timetableNotPublic", false)) {
+            b.timetableLayout.visibility = View.GONE
+            b.timetableNotPublicLayout.visibility = View.VISIBLE
+            return@launch
+        }
+        b.timetableLayout.visibility = View.VISIBLE
+        b.timetableNotPublicLayout.visibility = View.GONE
+
+        val today = Date.getToday().value
+        var startHour = DEFAULT_START_HOUR
+        var endHour = DEFAULT_END_HOUR
+        val deferred = async(Dispatchers.Default) {
+            items.clear()
+
+            val monthDayCount = listOf(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)
+
+            val yearStart = app.profile.dateSemester1Start?.clone() ?: return@async
+            val yearEnd = app.profile.dateYearEnd ?: return@async
+            while (yearStart.value <= yearEnd.value) {
+                items += yearStart.clone()
+                var maxDays = monthDayCount[yearStart.month-1]
+                if (yearStart.month == 2 && yearStart.isLeap)
+                    maxDays++
+                yearStart.day++
+                if (yearStart.day > maxDays) {
+                    yearStart.day = 1
+                    yearStart.month++
+                }
+                if (yearStart.month > 12) {
+                    yearStart.month = 1
+                    yearStart.year++
+                }
+            }
+
+            val lessonRanges = app.db.lessonRangeDao().getAllNow(App.profileId)
+            startHour = lessonRanges.map { it.startTime.hour }.min() ?: DEFAULT_START_HOUR
+            endHour = lessonRanges.map { it.endTime.hour }.max()?.plus(1) ?: DEFAULT_END_HOUR
+        }
+        deferred.await()
+
+        val pagerAdapter = TimetablePagerAdapter(
+                fragmentManager ?: return@launch,
+                items,
+                startHour,
+                endHour
+        )
+        b.viewPager.offscreenPageLimit = 2
+        b.viewPager.adapter = pagerAdapter
+        b.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+            override fun onPageScrollStateChanged(state: Int) {
+                if (b.refreshLayout != null) {
+                    b.refreshLayout.isEnabled = state == ViewPager.SCROLL_STATE_IDLE
+                }
+            }
+
+            override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
+
+            }
+
+            override fun onPageSelected(position: Int) {
+                pageSelection = items[position]
+                activity.navView.bottomBar.fabEnable = items[position].value != today
+                if (activity.navView.bottomBar.fabEnable && !fabShown) {
+                    activity.gainAttentionFAB()
+                    fabShown = true
+                }
+            }
+        })
+
+        val selectedDate = arguments?.getString("timetableDate", "")?.let { if (it.isBlank()) null else Date.fromY_m_d(it) }
+
+        b.tabLayout.setUpWithViewPager(b.viewPager)
+        b.tabLayout.setCurrentItem(items.indexOfFirst { it.value == selectedDate?.value ?: today }, false)
+
+        activity.navView.bottomSheet.prependItems(
+                BottomSheetPrimaryItem(true)
+                        .withTitle(R.string.timetable_select_day)
+                        .withIcon(SzkolnyFont.Icon.szf_calendar_today_outline)
+                        .withOnClickListener(View.OnClickListener {
+                            activity.bottomSheet.close()
+                            MaterialDatePicker.Builder
+                                    .datePicker()
+                                    .setSelection(Date.getToday().inMillis)
+                                    .build()
+                                    .apply {
+                                        addOnPositiveButtonClickListener { dateInMillis ->
+                                            val dateSelected = Date.fromMillis(dateInMillis)
+                                            b.tabLayout.setCurrentItem(items.indexOfFirst { it == dateSelected }, true)
+                                        }
+                                        show(this@TimetableFragment.activity.supportFragmentManager, "MaterialDatePicker")
+                                    }
+                        }),
+                BottomSheetSeparatorItem(true),
+                BottomSheetPrimaryItem(true)
+                        .withTitle(R.string.menu_mark_as_read)
+                        .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
+                        .withOnClickListener(View.OnClickListener {
+                            activity.bottomSheet.close()
+                            AsyncTask.execute { app.db.metadataDao().setAllSeen(App.profileId, Metadata.TYPE_LESSON_CHANGE, true) }
+                            Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show()
+                        })
+        )
+
+        //activity.navView.bottomBar.fabEnable = true
+        activity.navView.bottomBar.fabExtendedText = getString(R.string.timetable_today)
+        activity.navView.bottomBar.fabIcon = SzkolnyFont.Icon.szf_calendar_today_outline
+        activity.navView.setFabOnClickListener(View.OnClickListener {
+            b.tabLayout.setCurrentItem(items.indexOfFirst { it.value == today }, true)
+        })
+    }}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetablePagerAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetablePagerAdapter.kt
new file mode 100644
index 00000000..9cb6f43c
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetablePagerAdapter.kt
@@ -0,0 +1,52 @@
+package pl.szczodrzynski.edziennik.ui.modules.timetable.v2
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
+import pl.szczodrzynski.edziennik.ui.modules.timetable.v2.day.TimetableDayFragment
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Week
+
+class TimetablePagerAdapter(
+        fragmentManager: FragmentManager,
+        private val items: List<Date>,
+        private val startHour: Int,
+        private val endHour: Int
+) : FragmentStatePagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+    companion object {
+        private const val TAG = "TimetablePagerAdapter"
+    }
+
+    private val today by lazy { Date.getToday() }
+    private val weekStart by lazy { today.weekStart }
+    private val weekEnd by lazy { weekStart.clone().stepForward(0, 0, 6) }
+
+    override fun getItem(position: Int): Fragment {
+        return TimetableDayFragment().apply {
+            arguments = Bundle().apply {
+                putInt("date", items[position].value)
+                putInt("startHour", startHour)
+                putInt("endHour", endHour)
+            }
+        }
+        /*return TimetableDayFragment().apply {
+            arguments = Bundle().also {
+                it.putLong("date", items[position].value.toLong())
+            }
+        }*/
+    }
+
+    override fun getCount(): Int {
+        return items.size
+    }
+
+    override fun getPageTitle(position: Int): CharSequence? {
+        val date = items[position]
+        val pageTitle = StringBuilder(Week.getFullDayName(date.weekDay))
+        if (date > weekEnd || date < weekStart) {
+            pageTitle.append(", ").append(date.stringDm)
+        }
+        return pageTitle
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/day/TimetableDayFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/day/TimetableDayFragment.kt
new file mode 100644
index 00000000..cf1c4f94
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/day/TimetableDayFragment.kt
@@ -0,0 +1,357 @@
+package pl.szczodrzynski.edziennik.ui.modules.timetable.v2.day
+
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.TextView
+import androidx.asynclayoutinflater.view.AsyncLayoutInflater
+import androidx.core.view.setPadding
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import com.linkedin.android.tachyon.DayView
+import com.linkedin.android.tachyon.DayViewConfig
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_TIMETABLE
+import pl.szczodrzynski.edziennik.api.v2.LOGIN_TYPE_LIBRUS
+import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull
+import pl.szczodrzynski.edziennik.databinding.TimetableLessonBinding
+import pl.szczodrzynski.edziennik.databinding.TimetableNoTimetableBinding
+import pl.szczodrzynski.edziennik.ui.dialogs.timetable.LessonDetailsDialog
+import pl.szczodrzynski.edziennik.ui.modules.timetable.v2.TimetableFragment.Companion.DEFAULT_END_HOUR
+import pl.szczodrzynski.edziennik.ui.modules.timetable.v2.TimetableFragment.Companion.DEFAULT_START_HOUR
+import pl.szczodrzynski.edziennik.utils.ListenerScrollView
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.navlib.getColorFromAttr
+import java.util.*
+import kotlin.coroutines.CoroutineContext
+import kotlin.math.min
+
+class TimetableDayFragment : Fragment(), CoroutineScope {
+    companion object {
+        private const val TAG = "TimetableDayFragment"
+    }
+
+    private lateinit var app: App
+    private lateinit var activity: MainActivity
+    private lateinit var inflater: AsyncLayoutInflater
+
+    private lateinit var job: Job
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private lateinit var date: Date
+    private var startHour = DEFAULT_START_HOUR
+    private var endHour = DEFAULT_END_HOUR
+    private var firstEventMinute = 24*60
+
+    // find SwipeRefreshLayout in the hierarchy
+    private val refreshLayout by lazy { view?.findParentById(R.id.refreshLayout) }
+    // the day ScrollView
+    private val dayScrollDelegate = lazy {
+        val dayScroll = ListenerScrollView(context!!)
+        dayScroll.layoutParams = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+        dayScroll.setOnRefreshLayoutEnabledListener { enabled ->
+            refreshLayout?.isEnabled = enabled
+        }
+        dayScroll
+    }
+    private val dayScroll by dayScrollDelegate
+    // the lesson DayView
+    private val dayView by lazy {
+        val dayView = DayView(context!!, DayViewConfig(
+                startHour = startHour,
+                endHour = endHour,
+                dividerHeight = 1.dp,
+                halfHourHeight = 60.dp,
+                hourDividerColor = R.attr.hourDividerColor.resolveAttr(context),
+                halfHourDividerColor = R.attr.halfHourDividerColor.resolveAttr(context),
+                hourLabelWidth = 40.dp,
+                hourLabelMarginEnd = 10.dp,
+                eventMargin = 2.dp
+        ), true)
+        dayView.setPadding(10.dp)
+        dayScroll.layoutParams = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        dayScroll.addView(dayView)
+        dayView
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        activity = (getActivity() as MainActivity?) ?: return null
+        if (context == null)
+            return null
+        app = activity.application as App
+        job = Job()
+        this.inflater = AsyncLayoutInflater(context!!)
+        date = arguments?.getInt("date")?.let { Date.fromValue(it) } ?: Date.getToday()
+        startHour = arguments?.getInt("startHour") ?: DEFAULT_START_HOUR
+        endHour = arguments?.getInt("endHour") ?: DEFAULT_END_HOUR
+        return FrameLayout(activity).apply {
+            layoutParams = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        // TODO check if app, activity, b can be null
+        if (app.profile == null || !isAdded)
+            return
+
+        Log.d(TAG, "onViewCreated, date=$date")
+
+        // observe lesson database
+        app.db.timetableDao().getForDate(App.profileId, date).observe(this, Observer<List<LessonFull>> { lessons ->
+            processLessonList(lessons)
+        })
+    }
+
+    private fun processLessonList(lessons: List<LessonFull>) {
+        // no lessons - timetable not downloaded yet
+        if (lessons.isEmpty()) {
+            inflater.inflate(R.layout.timetable_no_timetable, view as FrameLayout) { view, _, parent ->
+                parent?.removeAllViews()
+                parent?.addView(view)
+                val b = TimetableNoTimetableBinding.bind(view)
+                val weekStart = date.weekStart.stringY_m_d
+                b.noTimetableSync.onClick {
+                    it.isEnabled = false
+                    EdziennikTask.syncProfile(
+                            profileId = App.profileId,
+                            viewIds = listOf(
+                                    DRAWER_ITEM_TIMETABLE to 0
+                            ),
+                            arguments = JsonObject(
+                                    "weekStart" to weekStart
+                            )
+                    ).enqueue(activity)
+                }
+                b.noTimetableWeek.setText(R.string.timetable_no_timetable_week, weekStart)
+            }
+            return
+        }
+        // one lesson indicating a day without lessons
+        if (lessons.size == 1 && lessons[0].type == Lesson.TYPE_NO_LESSONS) {
+            inflater.inflate(R.layout.timetable_no_lessons, view as FrameLayout) { view, _, parent ->
+                parent?.removeAllViews()
+                parent?.addView(view)
+            }
+            return
+        }
+
+        // reload the fragment when: no lessons, user wants to sync the week, the timetable is not public, pager gets removed
+        if (app.profile.loginStoreType == LOGIN_TYPE_LIBRUS && app.profile.getLoginData("timetableNotPublic", false)) {
+            activity.reloadTarget()
+            // TODO fix for (not really)possible infinite loops
+            return
+        }
+
+        // clear the root view and add the ScrollView
+        (view as FrameLayout).removeAllViews()
+        (view as FrameLayout).addView(dayScroll)
+
+        // Inflate a label view for each hour the day view will display
+        val hourLabelViews = ArrayList<View>()
+        for (i in dayView.startHour..dayView.endHour) {
+            val hourLabelView = layoutInflater.inflate(R.layout.timetable_hour_label, dayView, false) as TextView
+            hourLabelView.text = "$i:00"
+            hourLabelViews.add(hourLabelView)
+        }
+        dayView.setHourLabelViews(hourLabelViews)
+
+        buildLessonViews(lessons)
+    }
+
+    private fun buildLessonViews(lessons: List<LessonFull>) {
+        if (!isAdded)
+            return
+
+        val eventViews = mutableListOf<View>()
+        val eventTimeRanges = mutableListOf<DayView.EventTimeRange>()
+
+        // Reclaim all of the existing event views so we can reuse them if needed, this process
+        // can be useful if your day view is hosted in a recycler view for example
+        val recycled = dayView.removeEventViews()
+        var remaining = recycled?.size ?: 0
+
+        val arrowRight = " → "
+        val bullet = " • "
+        val colorSecondary = android.R.attr.textColorSecondary.resolveAttr(activity)
+
+        for (lesson in lessons) {
+            val startTime = lesson.displayStartTime ?: continue
+            val endTime = lesson.displayEndTime ?: continue
+
+            firstEventMinute = min(firstEventMinute, startTime.hour*60 + startTime.minute)
+
+            // Try to recycle an existing event view if there are enough left, otherwise inflate
+            // a new one
+            val eventView = (if (remaining > 0) recycled?.get(--remaining) else layoutInflater.inflate(R.layout.timetable_lesson, dayView, false))
+                    ?: continue
+            val lb = TimetableLessonBinding.bind(eventView)
+            eventViews += eventView
+
+            eventView.tag = lesson
+
+            eventView.setOnClickListener {
+                Log.d(TAG, "Clicked ${it.tag}")
+                if (isAdded && it.tag is LessonFull)
+                    LessonDetailsDialog(activity, it.tag as LessonFull)
+            }
+
+
+            val timeRange = "${startTime.stringHM} - ${endTime.stringHM}".asColoredSpannable(colorSecondary)
+
+            // teacher
+            val teacherInfo = if (lesson.teacherId != null && lesson.teacherId == lesson.oldTeacherId)
+                lesson.teacherName ?: "?"
+            else
+                mutableListOf<CharSequence>().apply {
+                    lesson.oldTeacherName?.let { add(it.asStrikethroughSpannable()) }
+                    lesson.teacherName?.let { add(it) }
+                }.concat(arrowRight)
+
+            // team
+            val teamInfo = if (lesson.teamId != null && lesson.teamId == lesson.oldTeamId)
+                lesson.teamName ?: "?"
+            else
+                mutableListOf<CharSequence>().apply {
+                    lesson.oldTeamName?.let { add(it.asStrikethroughSpannable()) }
+                    lesson.teamName?.let { add(it) }
+                }.concat(arrowRight)
+
+            // classroom
+            val classroomInfo = if (lesson.classroom != null && lesson.classroom == lesson.oldClassroom)
+                lesson.classroom ?: "?"
+            else
+                mutableListOf<CharSequence>().apply {
+                    lesson.oldClassroom?.let { add(it.asStrikethroughSpannable()) }
+                    lesson.classroom?.let { add(it) }
+                }.concat(arrowRight)
+
+
+            lb.lessonNumber = lesson.displayLessonNumber
+            lb.subjectName.text = lesson.displaySubjectName?.let {
+                if (lesson.type == Lesson.TYPE_CANCELLED || lesson.type == Lesson.TYPE_SHIFTED_SOURCE)
+                    it.asStrikethroughSpannable().asColoredSpannable(colorSecondary)
+                else
+                    it
+            }
+            lb.detailsFirst.text = listOfNotEmpty(timeRange, classroomInfo).concat(bullet)
+            lb.detailsSecond.text = listOfNotEmpty(teacherInfo, teamInfo).concat(bullet)
+
+            lb.unread = lesson.type != Lesson.TYPE_NORMAL && !lesson.seen
+
+            //lb.subjectName.typeface = Typeface.create("sans-serif-light", Typeface.BOLD)
+            when (lesson.type) {
+                Lesson.TYPE_NORMAL -> {
+                    lb.annotationVisible = false
+                }
+                Lesson.TYPE_CANCELLED -> {
+                    lb.annotationVisible = true
+                    lb.annotation.setText(R.string.timetable_lesson_cancelled)
+                    lb.annotation.background.colorFilter = PorterDuffColorFilter(
+                            getColorFromAttr(activity, R.attr.timetable_lesson_cancelled_color),
+                            PorterDuff.Mode.SRC_ATOP
+                    )
+                    //lb.subjectName.typeface = Typeface.DEFAULT
+                }
+                Lesson.TYPE_CHANGE -> {
+                    lb.annotationVisible = true
+                    if (lesson.subjectId != lesson.oldSubjectId && lesson.teacherId != lesson.oldTeacherId) {
+                        lb.annotation.setText(
+                                R.string.timetable_lesson_change_format,
+                                "${lesson.oldSubjectName ?: "?"}, ${lesson.oldTeacherName ?: "?"}"
+                        )
+                    }
+                    else if (lesson.subjectId != lesson.oldSubjectId) {
+                        lb.annotation.setText(
+                                R.string.timetable_lesson_change_format,
+                                lesson.oldSubjectName ?: "?"
+                        )
+                    }
+                    else if (lesson.teacherId != lesson.oldTeacherId) {
+                        lb.annotation.setText(
+                                R.string.timetable_lesson_change_format,
+                                lesson.oldTeacherName ?: "?"
+                        )
+                    }
+                    else {
+                        lb.annotation.setText(R.string.timetable_lesson_change)
+                    }
+
+                    lb.annotation.background.colorFilter = PorterDuffColorFilter(
+                            getColorFromAttr(activity, R.attr.timetable_lesson_change_color),
+                            PorterDuff.Mode.SRC_ATOP
+                    )
+                }
+                Lesson.TYPE_SHIFTED_SOURCE -> {
+                    lb.annotationVisible = true
+                    when {
+                        lesson.date != lesson.oldDate -> lb.annotation.setText(
+                                R.string.timetable_lesson_shifted_other_day,
+                                lesson.date?.stringY_m_d ?: "?",
+                                lesson.startTime?.stringHM ?: "?"
+                        )
+                        lesson.startTime != lesson.oldStartTime -> lb.annotation.setText(
+                                R.string.timetable_lesson_shifted_same_day,
+                                lesson.startTime?.stringHM ?: "?"
+                        )
+                        else -> lb.annotation.setText(R.string.timetable_lesson_shifted)
+                    }
+
+                    lb.annotation.background.colorFilter = PorterDuffColorFilter(
+                            getColorFromAttr(activity, R.attr.timetable_lesson_shifted_source_color),
+                            PorterDuff.Mode.SRC_ATOP
+                    )
+                }
+                Lesson.TYPE_SHIFTED_TARGET -> {
+                    lb.annotationVisible = true
+                    when {
+                        lesson.date != lesson.oldDate -> lb.annotation.setText(
+                                R.string.timetable_lesson_shifted_from_other_day,
+                                lesson.oldDate?.stringY_m_d ?: "?",
+                                lesson.oldStartTime?.stringHM ?: "?"
+                        )
+                        lesson.startTime != lesson.oldStartTime -> lb.annotation.setText(
+                                R.string.timetable_lesson_shifted_from_same_day,
+                                lesson.oldStartTime?.stringHM ?: "?"
+                        )
+                        else -> lb.annotation.setText(R.string.timetable_lesson_shifted_from)
+                    }
+
+                    lb.annotation.background.colorFilter = PorterDuffColorFilter(
+                            getColorFromAttr(activity, R.attr.timetable_lesson_shifted_target_color),
+                            PorterDuff.Mode.SRC_ATOP
+                    )
+                }
+            }
+
+
+            // The day view needs the event time ranges in the start minute/end minute format,
+            // so calculate those here
+            val startMinute = 60 * (lesson.displayStartTime?.hour ?: 0) + (lesson.displayStartTime?.minute ?: 0)
+            val endMinute = startMinute + 45
+            eventTimeRanges.add(DayView.EventTimeRange(startMinute, endMinute))
+        }
+
+        dayView.setEventViews(eventViews, eventTimeRanges)
+        val firstEventTop = (firstEventMinute - dayView.startHour * 60) * dayView.minuteHeight
+        dayScroll.scrollTo(0, firstEventTop.toInt())
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (dayScrollDelegate.isInitialized()) {
+            val firstEventTop = (firstEventMinute - dayView.startHour * 60) * dayView.minuteHeight
+            dayScroll.scrollTo(0, firstEventTop.toInt())
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/AppManagerIntentList.kt b/app/src/main/java/pl/szczodrzynski/edziennik/utils/AppManagerIntentList.kt
new file mode 100644
index 00000000..5e802dba
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/AppManagerIntentList.kt
@@ -0,0 +1,24 @@
+package pl.szczodrzynski.edziennik.utils
+
+import android.content.ComponentName
+import android.content.Intent
+
+val appManagerIntentList = listOf(
+        Intent().setClassName("com.miui.powerkeeper", "com.miui.powerkeeper.ui.HiddenAppsConfigActivity")
+                .putExtra("packageName", "pl.szczodrzynski.edziennik")
+                .putExtra("package_label", "Szkolny.eu"),
+        Intent().setComponent(ComponentName("com.miui.securitycenter", "com.miui.permcenter.autostart.AutoStartManagementActivity")),
+        Intent().setComponent(ComponentName("com.letv.android.letvsafe", "com.letv.android.letvsafe.AutobootManageActivity")),
+        Intent().setComponent(ComponentName("com.huawei.systemmanager", "com.huawei.systemmanager.optimize.process.ProtectActivity")),
+        Intent().setComponent(ComponentName("com.huawei.systemmanager", "com.huawei.systemmanager.appcontrol.activity.StartupAppControlActivity")),
+        Intent().setComponent(ComponentName("com.huawei.systemmanager", "com.huawei.systemmanager.startupmgr.ui.StartupNormalAppListActivity")),
+        Intent().setComponent(ComponentName("com.coloros.safecenter", "com.coloros.safecenter.permission.startup.StartupAppListActivity")),
+        Intent().setComponent(ComponentName("com.coloros.safecenter", "com.coloros.safecenter.startupapp.StartupAppListActivity")),
+        Intent().setComponent(ComponentName("com.oppo.safe", "com.oppo.safe.permission.startup.StartupAppListActivity")),
+        Intent().setComponent(ComponentName("com.iqoo.secure", "com.iqoo.secure.ui.phoneoptimize.AddWhiteListActivity")),
+        Intent().setComponent(ComponentName("com.iqoo.secure", "com.iqoo.secure.ui.phoneoptimize.BgStartUpManager")),
+        Intent().setComponent(ComponentName("com.vivo.permissionmanager", "com.vivo.permissionmanager.activity.BgStartUpManagerActivity")),
+        Intent().setComponent(ComponentName("com.samsung.android.lool", "com.samsung.android.sm.ui.battery.BatteryActivity")),
+        Intent().setComponent(ComponentName("com.htc.pitroad", "com.htc.pitroad.landingpage.activity.LandingPageActivity")),
+        Intent().setComponent(ComponentName("com.asus.mobilemanager", "com.asus.mobilemanager.MainActivity"))
+)
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/DebugLogFormat.kt b/app/src/main/java/pl/szczodrzynski/edziennik/utils/DebugLogFormat.kt
new file mode 100644
index 00000000..fbcd6498
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/DebugLogFormat.kt
@@ -0,0 +1,10 @@
+package pl.szczodrzynski.edziennik.utils
+
+import android.content.Context
+import com.hypertrack.hyperlog.LogFormat
+
+class DebugLogFormat(context: Context) : LogFormat(context) {
+    override fun getFormattedLogMessage(logLevelName: String?, tag: String?, message: String?, timeStamp: String?, senderName: String?, osVersion: String?, deviceUUID: String?): String {
+        return "${timeStamp?.replace("[TZ]".toRegex(), " ")}D/$tag: $message"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/ListenerScrollView.kt b/app/src/main/java/pl/szczodrzynski/edziennik/utils/ListenerScrollView.kt
new file mode 100644
index 00000000..71e566aa
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/ListenerScrollView.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-16.
+ */
+
+package pl.szczodrzynski.edziennik.utils
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.widget.ScrollView
+
+class ListenerScrollView(
+        context: Context,
+        attrs: AttributeSet? = null
+) : ScrollView(context, attrs) {
+
+    private var onScrollChangedListener: ((v: ListenerScrollView, scrollX: Int, scrollY: Int, oldScrollX: Int, oldScrollY: Int) -> Unit)? = null
+    private var onRefreshLayoutEnabledListener: ((enabled: Boolean) -> Unit)? = null
+    private var refreshLayoutEnabled = true
+
+    init {
+        setOnTouchListener { _, event ->
+            if (event.action == MotionEvent.ACTION_UP) {
+                refreshLayoutEnabled = scrollY < 10
+                onRefreshLayoutEnabledListener?.invoke(refreshLayoutEnabled)
+            }
+            false
+        }
+    }
+
+    override fun onScrollChanged(l: Int, t: Int, oldl: Int, oldt: Int) {
+        onScrollChangedListener?.invoke(this, l, t, oldl, oldt)
+        if (t > 10 && refreshLayoutEnabled) {
+            refreshLayoutEnabled = false
+            onRefreshLayoutEnabledListener?.invoke(refreshLayoutEnabled)
+        }
+    }
+
+    fun setOnScrollChangedListener(l: ((v: ListenerScrollView, scrollX: Int, scrollY: Int, oldScrollX: Int, oldScrollY: Int) -> Unit)?) {
+        onScrollChangedListener = l
+    }
+
+    fun setOnRefreshLayoutEnabledListener(l: ((enabled: Boolean) -> Unit)?) {
+        onRefreshLayoutEnabledListener = l
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/PermissionChecker.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/PermissionChecker.java
index db8e77ec..3e4c43e6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/PermissionChecker.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/PermissionChecker.java
@@ -157,8 +157,10 @@ public class PermissionChecker {
 
     public Intent intentApkInstall() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            return new Intent("android.settings.MANAGE_UNKNOWN_APP_SOURCES",
+            Intent intent = new Intent("android.settings.MANAGE_UNKNOWN_APP_SOURCES",
                     Uri.parse("package:" + mContext.getPackageName()));
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            return intent;
         }
         return null;
     }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/SimpleDividerItemDecoration.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/SimpleDividerItemDecoration.java
new file mode 100644
index 00000000..60350f23
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/SimpleDividerItemDecoration.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-22.
+ */
+
+package pl.szczodrzynski.edziennik.utils;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import pl.szczodrzynski.edziennik.R;
+
+public class SimpleDividerItemDecoration extends RecyclerView.ItemDecoration {
+    private Drawable mDivider;
+
+    public SimpleDividerItemDecoration(Context context) {
+        mDivider = context.getResources().getDrawable(R.drawable.divider);
+    }
+
+    @Override
+    public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state) {
+        int left = parent.getPaddingLeft();
+        int right = parent.getWidth() - parent.getPaddingRight();
+
+        int childCount = parent.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            View child = parent.getChildAt(i);
+
+            RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();
+
+            int top = child.getBottom() + params.bottomMargin;
+            int bottom = top + mDivider.getIntrinsicHeight();
+
+            mDivider.setBounds(left, top, right, bottom);
+            mDivider.draw(c);
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/TextInputDropDown.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/TextInputDropDown.java
deleted file mode 100644
index d8eaa3e8..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/TextInputDropDown.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package pl.szczodrzynski.edziennik.utils;
-
-import android.content.Context;
-import com.google.android.material.textfield.TextInputEditText;
-
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-
-import androidx.core.graphics.drawable.DrawableCompat;
-
-import pl.szczodrzynski.edziennik.R;
-
-public class TextInputDropDown extends TextInputEditText {
-    public TextInputDropDown(Context context) {
-        super(context);
-        create(context);
-    }
-
-    public TextInputDropDown(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        create(context);
-    }
-
-    public TextInputDropDown(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        create(context);
-    }
-
-    public void create(Context context) {
-        Drawable drawable = context.getResources().getDrawable(R.drawable.dropdown_arrow);
-        Drawable wrappedDrawable = DrawableCompat.wrap(drawable);
-        DrawableCompat.setTint(wrappedDrawable, Themes.INSTANCE.getPrimaryTextColor(context));
-
-        setCompoundDrawablesWithIntrinsicBounds(null, null, wrappedDrawable, null);
-        setFocusableInTouchMode(false);
-        setCursorVisible(false);
-        setLongClickable(false);
-        setMaxLines(1);
-        setInputType(0);
-        setKeyListener(null);
-        setOnFocusChangeListener((v, hasFocus) -> {
-            if (!hasFocus) {
-                v.setFocusableInTouchMode(false);
-            }
-        });
-    }
-
-    public final void setOnClickListener(OnClickListener onClickListener) {
-        super.setOnClickListener(v -> {
-            setFocusableInTouchMode(true);
-            requestFocus();
-            onClickListener.onClick(v);
-        });
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/TextInputDropDown.kt b/app/src/main/java/pl/szczodrzynski/edziennik/utils/TextInputDropDown.kt
new file mode 100644
index 00000000..fe62a92e
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/TextInputDropDown.kt
@@ -0,0 +1,143 @@
+package pl.szczodrzynski.edziennik.utils
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.widget.PopupMenu
+import androidx.core.graphics.drawable.DrawableCompat
+import com.google.android.material.textfield.TextInputEditText
+import pl.szczodrzynski.edziennik.R
+
+class TextInputDropDown : TextInputEditText {
+    constructor(context: Context) : super(context) {
+        create(context)
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        create(context)
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        create(context)
+    }
+
+    var items = mutableListOf<Item>()
+    private var onChangeListener: ((item: Item) -> Boolean)? = null
+
+    var selected: Item? = null
+    val selectedId
+        get() = selected?.id
+
+    fun updateText() {
+        setText(selected?.displayText ?: selected?.text)
+    }
+
+    fun create(context: Context) {
+        val drawable = context.resources.getDrawable(R.drawable.dropdown_arrow)
+        val wrappedDrawable = DrawableCompat.wrap(drawable)
+        DrawableCompat.setTint(wrappedDrawable, Themes.getPrimaryTextColor(context))
+
+        setCompoundDrawablesWithIntrinsicBounds(null, null, wrappedDrawable, null)
+        isFocusableInTouchMode = false
+        isCursorVisible = false
+        isLongClickable = false
+        maxLines = 1
+        inputType = 0
+        keyListener = null
+        setOnFocusChangeListener { v, hasFocus ->
+            if (!hasFocus) {
+                v.isFocusableInTouchMode = false
+            }
+        }
+
+        setOnClickListener {
+            isFocusableInTouchMode = true
+            requestFocus()
+            val popup = PopupMenu(context, this)
+
+            items.forEachIndexed { index, item ->
+                popup.menu.add(0, item.id.toInt(), index, item.text)
+            }
+
+            popup.setOnMenuItemClickListener { menuItem ->
+                val item = items[menuItem.order]
+                if (onChangeListener?.invoke(item) != false) {
+                    select(item)
+                }
+                clearFocus()
+                true
+            }
+
+            popup.setOnDismissListener {
+                clearFocus()
+            }
+
+            popup.show()
+        }
+    }
+
+    fun select(item: Item): Item? {
+        selected = item
+        updateText()
+        return item
+    }
+
+    fun select(id: Long?): Item? {
+        return items.singleOrNull { it.id == id }?.let { select(it) }
+    }
+
+    fun select(tag: Any?): Item? {
+        return items.singleOrNull { it.tag == tag }?.let { select(it) }
+    }
+
+    fun select(index: Int): Item? {
+        return items.getOrNull(index)?.let { select(it) }
+    }
+
+    fun deselect(): TextInputDropDown {
+        selected = null
+        text = null
+        return this
+    }
+
+    fun clear(): TextInputDropDown {
+        items.clear()
+        return this
+    }
+
+    fun append(items: List<Item>): TextInputDropDown {
+        this.items.addAll(items)
+        return this
+    }
+
+    fun prepend(items: List<Item>): TextInputDropDown{
+        this.items.addAll(0, items)
+        return this
+    }
+
+    operator fun plusAssign(items: Item) {
+        this.items.add(items)
+    }
+    operator fun plusAssign(items: List<Item>) {
+        this.items.addAll(items)
+    }
+
+    /**
+     * Set the listener called when other item is selected.
+     *
+     * The listener should return true to allow the item to be selected, false otherwise.
+     */
+    fun setOnChangeListener(onChangeListener: ((item: Item) -> Boolean)? = null): TextInputDropDown {
+        this.onChangeListener = onChangeListener
+        return this
+    }
+
+    override fun setOnClickListener(onClickListener: OnClickListener?) {
+        super.setOnClickListener { v ->
+            isFocusableInTouchMode = true
+            requestFocus()
+            onClickListener!!.onClick(v)
+        }
+    }
+
+    class Item(val id: Long, val text: CharSequence, val displayText: CharSequence? = null, val tag: Any? = null)
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/TextInputKeyboardEdit.kt b/app/src/main/java/pl/szczodrzynski/edziennik/utils/TextInputKeyboardEdit.kt
new file mode 100644
index 00000000..477e0d27
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/TextInputKeyboardEdit.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-22.
+ */
+
+package pl.szczodrzynski.edziennik.utils
+
+import android.content.Context
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.view.KeyEvent
+import android.view.KeyEvent.KEYCODE_BACK
+import androidx.annotation.NonNull
+import com.google.android.material.textfield.TextInputEditText
+
+class TextInputKeyboardEdit : TextInputEditText {
+
+    /**
+     * Keyboard Listener
+     */
+    internal var listener: KeyboardListener? = null
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+
+    override fun onFocusChanged(focused: Boolean, direction: Int, previouslyFocusedRect: Rect?) {
+        super.onFocusChanged(focused, direction, previouslyFocusedRect)
+        if (listener != null)
+            listener!!.onStateChanged(this, true)
+    }
+
+    override fun onKeyPreIme(keyCode: Int, @NonNull event: KeyEvent): Boolean {
+        if (event.keyCode == KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
+            if (listener != null)
+                listener!!.onStateChanged(this, false)
+
+            // Hide cursor
+            isFocusable = false
+
+            // Set EditText to be focusable again
+            isFocusable = true
+            isFocusableInTouchMode = true
+        }
+        return super.onKeyPreIme(keyCode, event)
+    }
+
+    fun setOnKeyboardListener(listener: KeyboardListener) {
+        this.listener = listener
+    }
+
+    interface KeyboardListener {
+        fun onStateChanged(keyboardEditText: TextInputKeyboardEdit, showing: Boolean)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/Utils.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/Utils.java
index f4b6b23c..776488db 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/Utils.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/Utils.java
@@ -14,16 +14,20 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
 import android.provider.MediaStore;
-import androidx.annotation.AttrRes;
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.util.Base64;
 import android.util.Log;
 import android.util.TypedValue;
 import android.webkit.MimeTypeMap;
 import android.widget.Toast;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.FileProvider;
+
+import com.hypertrack.hyperlog.HyperLog;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
@@ -64,8 +68,6 @@ import javax.crypto.ShortBufferException;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
-import androidx.core.content.FileProvider;
-
 import pl.szczodrzynski.edziennik.App;
 
 public class Utils {
@@ -106,15 +108,15 @@ public class Utils {
 
     public static void d(String TAG, String message) {
         if (App.devMode) {
-            Log.d(TAG, message);
-            debugLog.add(TAG+": "+message);
+            HyperLog.d("Szkolny/"+TAG, message);
+            //debugLog.add(TAG+": "+message);
         }
     }
     public static void c(String TAG, String message) {
-        if (App.devMode) {
+        /*if (App.devMode) {
             Log.d(TAG, "// " + message);
-            debugLog.add(TAG+": // "+message);
-        }
+            ///debugLog.add(TAG+": // "+message);
+        }*/
     }
 
     /**
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/AppConfig.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/AppConfig.java
index 2aefccf0..fea91380 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/AppConfig.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/AppConfig.java
@@ -2,6 +2,9 @@ package pl.szczodrzynski.edziennik.utils.models;
 
 import android.util.Pair;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -92,6 +95,7 @@ public class AppConfig {
     public String updateUrl = "";
     public String updateFilename = "";
     public boolean updateMandatory = false;
+    public boolean updateDirect = false;
 
     public boolean webPushEnabled = false;
 
@@ -110,4 +114,10 @@ public class AppConfig {
     public long appRateSnackbarTime = 0;
 
     public int mobidziennikOldMessages = -1;
+
+    @Nullable
+    public String language = null;
+
+    @NonNull
+    public boolean dontShowAppManagerDialog = false;
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java
index 3b69cdc9..4e332863 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java
@@ -1,6 +1,7 @@
 package pl.szczodrzynski.edziennik.utils.models;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.text.DateFormat;
 import java.util.Calendar;
@@ -11,13 +12,11 @@ public class Date implements Comparable<Date> {
     public int month = 0;
     public int day = 0;
 
-    public Date()
-    {
+    public Date() {
         this(2000, 0, 0);
     }
 
-    public Date(int year, int month, int day)
-    {
+    public Date(int year, int month, int day) {
         this.year = year;
         this.month = month;
         this.day = day;
@@ -42,14 +41,12 @@ public class Date implements Comparable<Date> {
         return new Date(this.year, this.month, this.day);
     }
 
-    public long combineWith(Time time) {
-        if (time == null) {
-            return getInMillis();
-        }
-        Calendar c = Calendar.getInstance();
-        c.set(this.year, this.month-1, this.day, time.hour, time.minute, time.second);
-        c.set(Calendar.MILLISECOND, 0);
-        return c.getTimeInMillis();
+    public Date getWeekStart() {
+        return clone().stepForward(0, 0, -getWeekDay());
+    }
+
+    public static Date fromYmd(String dateTime) {
+        return new Date(Integer.parseInt(dateTime.substring(0, 4)), Integer.parseInt(dateTime.substring(4, 6)), Integer.parseInt(dateTime.substring(6, 8)));
     }
 
     public static Date fromMillis(long millis) {
@@ -66,9 +63,8 @@ public class Date implements Comparable<Date> {
         return Calendar.getInstance().getTimeInMillis();
     }
 
-    public int getWeekDay()
-    {
-        return Week.getWeekDayFromDate(this);
+    public static Date fromY_m_d(String dateTime) {
+        return new Date(Integer.parseInt(dateTime.substring(0, 4)), Integer.parseInt(dateTime.substring(5, 7)), Integer.parseInt(dateTime.substring(8, 10)));
     }
 
     public long getInMillis() {
@@ -82,138 +78,192 @@ public class Date implements Comparable<Date> {
         return getInMillis() / 1000;
     }
 
-    public Date stepForward(int years, int months, int days)
-    {
+    public static Date fromd_m_Y(String dateTime) {
+        return new Date(Integer.parseInt(dateTime.substring(6, 10)), Integer.parseInt(dateTime.substring(3, 5)), Integer.parseInt(dateTime.substring(0, 2)));
+    }
+
+    public static long fromIso(String dateTime) {
+        return Date.fromY_m_d(dateTime).combineWith(new Time(Integer.parseInt(dateTime.substring(11, 13)), Integer.parseInt(dateTime.substring(14, 16)), Integer.parseInt(dateTime.substring(17, 19))));
+    }
+
+    public static long fromIsoHm(String dateTime) {
+        return Date.fromY_m_d(dateTime).combineWith(new Time(Integer.parseInt(dateTime.substring(11, 13)), Integer.parseInt(dateTime.substring(14, 16)), 0));
+    }
+
+    public static Date fromValue(int value) {
+        int year = value / 10000;
+        int month = (value - year * 10000) / 100;
+        int day = (value - year * 10000 - month * 100);
+        return new Date(year, month, day);
+    }
+
+    public static Date getToday() {
+        Calendar cal = Calendar.getInstance();
+        return new Date(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH));
+    }
+
+    public static int diffDays(Date d1, Date d2) {
+        return (int) ((d1.getInMillis() - d2.getInMillis()) / (24 * 60 * 60 * 1000));
+    }
+
+    public static boolean isToday(Date date) {
+        return equals(date, getToday());
+    }
+
+    public static boolean isToday(String dateStr) {
+        return equals(dateStr, getToday());
+    }
+
+    public static boolean equals(Date first, Date second) {
+        return (first.getValue() == second.getValue());
+    }
+
+    public static boolean equals(String first, Date second) {
+        return equals(new Date().parseFromYmd(first), second);
+    }
+
+    public long combineWith(Time time) {
+        if (time == null) {
+            return getInMillis();
+        }
         Calendar c = Calendar.getInstance();
+        c.set(this.year, this.month - 1, this.day, time.hour, time.minute, time.second);
+        c.set(Calendar.MILLISECOND, 0);
+        return c.getTimeInMillis();
+    }
+
+    public int getWeekDay() {
+        return Week.getWeekDayFromDate(this);
+    }
+
+    public Date stepForward(int years, int months, int days) {
+        this.day += days;
+        if (day <= 0) {
+            month--;
+            if(month <= 0) {
+                month += 12;
+                year--;
+            }
+            day += daysInMonth();
+        }
+        if (day > daysInMonth()) {
+            day -= daysInMonth();
+            month++;
+        }
+        this.month += months;
+        if(month <= 0) {
+            month += 12;
+            year--;
+        }
+        if (month > 12) {
+            month -= 12;
+            year++;
+        }
+        this.year += years;
+        /*Calendar c = Calendar.getInstance();
         int newMonth = month + months;
         if (newMonth > 12) {
             newMonth = 1;
             years++;
         }
-        c.set(year+years, newMonth - 1, day);
-        c.setTimeInMillis(c.getTimeInMillis() + days*24*60*60*1000);
+        c.set(year + years, newMonth - 1, day);
+        c.setTimeInMillis(c.getTimeInMillis() + days * 24 * 60 * 60 * 1000);
         this.year = c.get(Calendar.YEAR);
         this.month = c.get(Calendar.MONTH) + 1;
-        this.day = c.get(Calendar.DAY_OF_MONTH);
+        this.day = c.get(Calendar.DAY_OF_MONTH);*/
         return this;
     }
 
-    public Date parseFromYmd(String dateTime)
-    {
+    public Date parseFromYmd(String dateTime) {
         this.year = Integer.parseInt(dateTime.substring(0, 4));
         this.month = Integer.parseInt(dateTime.substring(4, 6));
         this.day = Integer.parseInt(dateTime.substring(6, 8));
         return this;
     }
 
-    public static Date fromYmd(String dateTime)
-    {
-        return new Date(Integer.parseInt(dateTime.substring(0, 4)), Integer.parseInt(dateTime.substring(4, 6)), Integer.parseInt(dateTime.substring(6, 8)));
-    }
-
-    public static Date fromY_m_d(String dateTime)
-    {
-        return new Date(Integer.parseInt(dateTime.substring(0, 4)), Integer.parseInt(dateTime.substring(5, 7)), Integer.parseInt(dateTime.substring(8, 10)));
-    }
-
-    public static long fromIso(String dateTime)
-    {
-        return Date.fromY_m_d(dateTime).combineWith(new Time(Integer.parseInt(dateTime.substring(11, 13)), Integer.parseInt(dateTime.substring(14, 16)), Integer.parseInt(dateTime.substring(17, 19))));
-    }
-
-    public static long fromIsoHm(String dateTime)
-    {
-        return Date.fromY_m_d(dateTime).combineWith(new Time(Integer.parseInt(dateTime.substring(11, 13)), Integer.parseInt(dateTime.substring(14, 16)), 0));
-    }
-
-    public int getValue()
-    {
+    public int getValue() {
         return year * 10000 + month * 100 + day;
     }
 
-    public String getStringValue()
-    {
+    public String getStringValue() {
         return Integer.toString(getValue());
     }
 
-    public String getStringYmd()
-    {
-        return year +(month < 10 ? "0" : "")+ month +(day < 10 ? "0" : "")+ day;
+    public boolean isLeap() {
+        return ((year & 3) == 0) && ((year % 100) != 0 || (year % 400) == 0);
+    }
+
+    public int daysInMonth() {
+        switch (month) {
+            case 1:
+            case 3:
+            case 5:
+            case 7:
+            case 8:
+            case 10:
+            case 12:
+                return 31;
+            case 2: return isLeap() ? 29 : 28;
+            case 4:
+            case 6:
+            case 9:
+            case 11:
+                return 30;
+        }
+        return 31;
+    }
+
+    public String getStringYmd() {
+        return year + (month < 10 ? "0" : "") + month + (day < 10 ? "0" : "") + day;
     }
 
     /**
      * @return 2019-06-02
      */
-    public String getStringY_m_d()
-    {
-        return year +(month < 10 ? "-0" : "-")+ month +(day < 10 ? "-0" : "-")+ day;
-    }
-    public String getStringDm()
-    {
-        return day +"."+(month < 10 ? "0" : "")+ month;
-    }
-    public String getStringDmy()
-    {
-        return day +"."+(month < 10 ? "0" : "")+ month +"."+ year;
+    public String getStringY_m_d() {
+        return year + (month < 10 ? "-0" : "-") + month + (day < 10 ? "-0" : "-") + day;
     }
 
-    public String getFormattedString()
-    {
+    public String getStringDm() {
+        return day + "." + (month < 10 ? "0" : "") + month;
+    }
+
+    public String getStringDmy() {
+        return day + "." + (month < 10 ? "0" : "") + month + "." + year;
+    }
+
+    public String getFormattedString() {
         java.util.Date date = new java.util.Date();
         date.setTime(getInMillis());
         DateFormat format = DateFormat.getDateInstance(DateFormat.LONG, Locale.getDefault());
         if (year == Date.getToday().year) {
-            return format.format(date).replace(", "+year, "").replace(" "+year, "");
-        }
-        else {
+            return format.format(date).replace(", " + year, "").replace(" " + year, "");
+        } else {
             return format.format(date);
         }
     }
-    public String getFormattedStringShort()
-    {
+
+    public String getFormattedStringShort() {
         java.util.Date date = new java.util.Date();
         date.setTime(getInMillis());
         DateFormat format = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.getDefault());
         if (year == Date.getToday().year) {
-            return format.format(date).replace(", "+year, "").replace(" "+year, "");
-        }
-        else {
+            return format.format(date).replace(", " + year, "").replace(" " + year, "");
+        } else {
             return format.format(date);
         }
     }
 
-    public static Date getToday()
-    {
-        Calendar cal = Calendar.getInstance();
-        return new Date(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH)+1, cal.get(Calendar.DAY_OF_MONTH));
-    }
-
-    public static int diffDays(Date d1, Date d2) {
-        return (int)((d1.getInMillis() - d2.getInMillis()) / (24*60*60*1000));
-    }
-
-    public static boolean isToday(Date date)
-    {
-        return equals(date, getToday());
-    }
-    public static boolean isToday(String dateStr)
-    {
-        return equals(dateStr, getToday());
-    }
-    public static boolean equals(Date first, Date second)
-    {
-        return (first.getValue() == second.getValue());
-    }
-    public static boolean equals(String first, Date second)
-    {
-        return equals(new Date().parseFromYmd(first), second);
-    }
-
     @Override
     public int compareTo(@NonNull Date o) {
         return this.getValue() - o.getValue();
     }
 
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        return obj instanceof Date && this.getValue() == ((Date) obj).getValue();
+    }
+
     @Override
     public String toString() {
         return "Date{" +
@@ -222,4 +272,12 @@ public class Date implements Comparable<Date> {
                 ", day=" + day +
                 '}';
     }
+
+    @Override
+    public int hashCode() {
+        int result = year;
+        result = 31 * result + month;
+        result = 31 * result + day;
+        return result;
+    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/ItemWidgetTimetableModel.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/ItemWidgetTimetableModel.java
index 479845da..0ddd210a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/ItemWidgetTimetableModel.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/ItemWidgetTimetableModel.java
@@ -9,6 +9,7 @@ public class ItemWidgetTimetableModel {
     public String separatorProfileName = null;
 
     public int profileId;
+    public long lessonId;
     public Date lessonDate;
     public Time startTime;
     public Time endTime;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Notification.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Notification.java
index 047cd16f..9a3dc5eb 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Notification.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Notification.java
@@ -12,6 +12,24 @@ import java.util.Random;
 
 import pl.szczodrzynski.edziennik.R;
 
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_AUTO_ARCHIVING;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_ERROR;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_FEEDBACK_MESSAGE;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_GENERAL;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_LUCKY_NUMBER;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_NEW_ANNOUNCEMENT;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_NEW_ATTENDANCE;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_NEW_EVENT;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_NEW_GRADE;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_NEW_HOMEWORK;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_NEW_MESSAGE;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_NEW_NOTICE;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_NEW_SHARED_EVENT;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_SERVER_MESSAGE;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_TIMETABLE_CHANGED;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_TIMETABLE_LESSON_CHANGE;
+import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_UPDATE;
+
 public class Notification {
     public int profileId;
     public String title;
@@ -78,25 +96,6 @@ public class Notification {
         return this;
     }
 
-    public static final int TYPE_GENERAL = 0;
-    public static final int TYPE_UPDATE = 1;
-    public static final int TYPE_ERROR = 2;
-    public static final int TYPE_TIMETABLE_CHANGED = 3;
-    public static final int TYPE_TIMETABLE_LESSON_CHANGE = 4;
-    public static final int TYPE_NEW_GRADE = 5;
-    public static final int TYPE_NEW_EVENT = 6;
-    public static final int TYPE_NEW_HOMEWORK = 10;
-    public static final int TYPE_NEW_SHARED_EVENT = 7;
-    public static final int TYPE_NEW_SHARED_HOMEWORK = 12;
-    public static final int TYPE_NEW_MESSAGE = 8;
-    public static final int TYPE_NEW_NOTICE = 9;
-    public static final int TYPE_NEW_ATTENDANCE = 13;
-    public static final int TYPE_SERVER_MESSAGE = 11;
-    public static final int TYPE_LUCKY_NUMBER = 14;
-    public static final int TYPE_NEW_ANNOUNCEMENT = 15;
-    public static final int TYPE_FEEDBACK_MESSAGE = 16;
-    public static final int TYPE_AUTO_ARCHIVING = 17;
-
     public static String stringType(Context context, int errorCode)
     {
         switch (errorCode) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java
index 07b1c422..b9b57b72 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java
@@ -1,8 +1,13 @@
 package pl.szczodrzynski.edziennik.utils.models;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.jetbrains.annotations.NotNull;
+
 import java.util.Calendar;
 
-public class Time {
+public class Time implements Comparable<Time> {
     public int hour = 0;
     public int minute = 0;
     public int second = 0;
@@ -111,6 +116,10 @@ public class Time {
         return new Time(c.get(Calendar.HOUR_OF_DAY), c.get(Calendar.MINUTE), c.get(Calendar.SECOND));
     }
 
+    public long getInUnix() {
+        return getInMillis() / 1000;
+    }
+
     public int getValue()
     {
         return hour * 10000 + minute * 100 + second;
@@ -118,7 +127,7 @@ public class Time {
 
     public String getStringValue()
     {
-        return (hour < 10 ? "0" : "")+Integer.toString(hour)+(minute < 10 ? "0" : "")+Integer.toString(minute)+(second < 10 ? "0" : "")+Integer.toString(second);
+        return (hour < 10 ? "0" : "")+ hour +(minute < 10 ? "0" : "")+ minute +(second < 10 ? "0" : "")+ second;
     }
 
     public String getStringHM()
@@ -126,18 +135,18 @@ public class Time {
         if (hour < 0) {
             return "";
         }
-        return Integer.toString(hour)+":"+(minute < 10 ? "0" : "")+Integer.toString(minute);
+        return hour +":"+(minute < 10 ? "0" : "")+ minute;
     }
     public String getStringH_M()
     {
         if (hour < 0) {
             return "";
         }
-        return Integer.toString(hour)+"-"+(minute < 10 ? "0" : "")+Integer.toString(minute);
+        return hour +"-"+(minute < 10 ? "0" : "")+ minute;
     }
     public String getStringHMS()
     {
-        return Integer.toString(hour)+":"+(minute < 10 ? "0" : "")+Integer.toString(minute)+":"+(second < 10 ? "0" : "")+Integer.toString(second);
+        return hour +":"+(minute < 10 ? "0" : "")+ minute +":"+(second < 10 ? "0" : "")+ second;
     }
 
     public static Time getNow()
@@ -173,6 +182,16 @@ public class Time {
         return (currentTime.getValue() >= startTime.getValue() && currentTime.getValue() <= endTime.getValue());
     }
 
+    @Override
+    public int compareTo(@NonNull Time o) {
+        return this.getValue() - o.getValue();
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        return obj instanceof Time && this.getValue() == ((Time) obj).getValue();
+    }
+
     @Override
     public String toString() {
         return "Time{" +
@@ -181,4 +200,16 @@ public class Time {
                 ", second=" + second +
                 '}';
     }
+
+    @Override
+    public int hashCode() {
+        int result = hour;
+        result = 31 * result + minute;
+        result = 31 * result + second;
+        return result;
+    }
+
+    public long minus(@NotNull Time other) {
+        return getInUnix() - other.getInUnix();
+    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/WidgetConfigActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/WidgetConfigActivity.java
index 4004109c..38d2814d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/WidgetConfigActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/WidgetConfigActivity.java
@@ -21,8 +21,8 @@ import java.util.List;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.WidgetTimetable;
-import pl.szczodrzynski.edziennik.databinding.DialogWidgetConfigBinding;
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
+import pl.szczodrzynski.edziennik.databinding.DialogWidgetConfigBinding;
 import pl.szczodrzynski.edziennik.widgets.luckynumber.WidgetLuckyNumber;
 import pl.szczodrzynski.edziennik.widgets.notifications.WidgetNotifications;
 
@@ -78,7 +78,7 @@ public class WidgetConfigActivity extends Activity {
 
             AsyncTask.execute(() -> {
                 profileList = app.db.profileDao().getAllNow();
-                filterOutArchived(profileList);
+                profileList = filterOutArchived(profileList);
 
                 if (widgetType == WIDGET_NOTIFICATIONS)
                     this.runOnUiThread(this::configure);
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/luckynumber/WidgetLuckyNumber.java b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/luckynumber/WidgetLuckyNumber.java
index 6ce5640c..e5522880 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/luckynumber/WidgetLuckyNumber.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/luckynumber/WidgetLuckyNumber.java
@@ -22,11 +22,11 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
+import pl.szczodrzynski.edziennik.R;
+import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask;
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
 import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.sync.SyncJob;
 import pl.szczodrzynski.edziennik.widgets.WidgetConfig;
 
 import static pl.szczodrzynski.edziennik.utils.Utils.getCellsForSize;
@@ -39,7 +39,7 @@ public class WidgetLuckyNumber extends AppWidgetProvider {
     @Override
     public void onReceive(Context context, Intent intent) {
         if (ACTION_SYNC_DATA.equals(intent.getAction())){
-            SyncJob.run((App) context.getApplicationContext());
+            EdziennikTask.Companion.sync().enqueue(context);
         }
         super.onReceive(context, intent);
     }
@@ -159,7 +159,7 @@ public class WidgetLuckyNumber extends AppWidgetProvider {
                 }
             }
 
-            Profile profile = app.db.profileDao().getByIdNow(widgetConfig.profileId);
+            Profile profile = app.db.profileDao().getFullByIdNow(widgetConfig.profileId);
             IIcon icon = CommunityMaterial.Icon.cmd_emoticon_dead_outline;
             boolean noNumberText = false;
             if (profile == null) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/notifications/WidgetNotifications.java b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/notifications/WidgetNotifications.java
index 2cd238a1..302ffbd3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/notifications/WidgetNotifications.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/notifications/WidgetNotifications.java
@@ -22,9 +22,9 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.sync.SyncJob;
+import pl.szczodrzynski.edziennik.R;
+import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask;
 import pl.szczodrzynski.edziennik.widgets.WidgetConfig;
 
 public class WidgetNotifications extends AppWidgetProvider {
@@ -35,7 +35,7 @@ public class WidgetNotifications extends AppWidgetProvider {
     @Override
     public void onReceive(Context context, Intent intent) {
         if (ACTION_SYNC_DATA.equals(intent.getAction())){
-            SyncJob.run((App) context.getApplicationContext());
+            EdziennikTask.Companion.sync().enqueue(context);
         }
         super.onReceive(context, intent);
     }
@@ -117,7 +117,7 @@ public class WidgetNotifications extends AppWidgetProvider {
                     .color(IconicsColor.colorInt(Color.WHITE))
                     .size(IconicsSize.dp(widgetConfig.bigStyle ? 24 : 16)).toBitmap());
 
-            views.setImageViewBitmap(R.id.widgetNotificationsSync, new IconicsDrawable(context, CommunityMaterial.Icon2.cmd_sync)
+            views.setImageViewBitmap(R.id.widgetNotificationsSync, new IconicsDrawable(context, CommunityMaterial.Icon.cmd_download_outline)
                     .color(IconicsColor.colorInt(Color.WHITE))
                     .size(IconicsSize.dp(widgetConfig.bigStyle ? 24 : 16)).toBitmap());
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/LessonDialogActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/LessonDialogActivity.kt
new file mode 100644
index 00000000..fd118390
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/LessonDialogActivity.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-14.
+ */
+
+package pl.szczodrzynski.edziennik.widgets.timetable
+
+import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import kotlinx.coroutines.*
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.ui.dialogs.timetable.LessonDetailsDialog
+import pl.szczodrzynski.edziennik.utils.Themes
+import kotlin.coroutines.CoroutineContext
+
+class LessonDialogActivity : AppCompatActivity(), CoroutineScope {
+    companion object {
+        private const val TAG = "LessonDialogActivity"
+    }
+
+    private lateinit var job: Job
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private val shownDialogs = hashSetOf<String>()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        window.setBackgroundDrawable(ColorDrawable(0))
+
+        job = Job()
+
+        setTheme(Themes.appThemeNoDisplay)
+
+        val app = application as App
+        launch {
+            val deferred = async(Dispatchers.Default) {
+                val extras = intent?.extras
+
+                val profileId = extras?.getInt("profileId") ?: return@async null
+
+                if (extras.getBoolean("separatorItem", false)) {
+                    val i = Intent(app, MainActivity::class.java)
+                            .putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE)
+                            .putExtra("profileId", profileId)
+                            .addFlags(FLAG_ACTIVITY_REORDER_TO_FRONT)
+                    app.startActivity(i)
+                    finish()
+                    return@async null
+                }
+
+                val lessonId = extras.getLong("lessonId")
+
+                app.db.timetableDao().getByIdNow(profileId, lessonId)
+            }
+            val lesson = deferred.await()
+            lesson?.let {
+                LessonDetailsDialog(
+                        this@LessonDialogActivity,
+                        lesson,
+                        onShowListener = { tag ->
+                            shownDialogs.add(tag)
+                        },
+                        onDismissListener = { tag ->
+                            shownDialogs.remove(tag)
+                            if (shownDialogs.isEmpty())
+                                finish()
+                        }
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/WidgetTimetableListProvider.java b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/WidgetTimetableListProvider.java
index 2872c15f..c8252537 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/WidgetTimetableListProvider.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/WidgetTimetableListProvider.java
@@ -12,13 +12,14 @@ import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
-import androidx.annotation.DrawableRes;
 import android.text.Html;
 import android.util.Log;
 import android.view.View;
 import android.widget.RemoteViews;
 import android.widget.RemoteViewsService;
 
+import androidx.annotation.DrawableRes;
+
 import com.mikepenz.iconics.IconicsColor;
 import com.mikepenz.iconics.IconicsDrawable;
 import com.mikepenz.iconics.IconicsSize;
@@ -62,7 +63,7 @@ public class WidgetTimetableListProvider implements RemoteViewsService.RemoteVie
     public void onDataSetChanged() {
         // executed EVERY TIME
         Log.d(TAG, "onDataSetChanged for appWidgetId: "+appWidgetId);
-        lessons = WidgetTimetable.timetables == null ? null : WidgetTimetable.timetables.get(appWidgetId);
+        lessons = WidgetTimetable.Companion.getTimetables() == null ? null : WidgetTimetable.Companion.getTimetables().get(appWidgetId);
     }
 
     @Override
@@ -163,12 +164,17 @@ public class WidgetTimetableListProvider implements RemoteViewsService.RemoteVie
 
             Intent intent = new Intent();
             intent.putExtra("profileId", lesson.profileId);
-            intent.putExtra("date", lesson.lessonDate.getStringValue());
-            intent.putExtra("startTime", lesson.startTime.getStringValue());
-            intent.putExtra("endTime", lesson.endTime.getStringValue());
+            intent.putExtra("lessonId", lesson.lessonId);
+            if (lesson.lessonDate != null)
+                intent.putExtra("date", lesson.lessonDate.getStringValue());
+            if (lesson.startTime != null)
+                intent.putExtra("startTime", lesson.startTime.getStringValue());
+            if (lesson.endTime != null)
+                intent.putExtra("endTime", lesson.endTime.getStringValue());
             views.setOnClickFillInIntent(R.id.widgetTimetableRoot, intent);
 
-            views.setTextViewText(R.id.widgetTimetableTime, lesson.startTime.getStringHM() + " - " + lesson.endTime.getStringHM());
+            if (lesson.startTime != null && lesson.endTime != null)
+                views.setTextViewText(R.id.widgetTimetableTime, lesson.startTime.getStringHM() + " - " + lesson.endTime.getStringHM());
 
             views.setViewVisibility(R.id.widgetTimetableEvent1, View.GONE);
             views.setViewVisibility(R.id.widgetTimetableEvent2, View.GONE);
@@ -239,30 +245,18 @@ public class WidgetTimetableListProvider implements RemoteViewsService.RemoteVie
                     }
                 }
             }
-            //views.setViewVisibility(R.id.widgetTimetableEvent1, View.VISIBLE);
-            //views.setBitmap(R.id.widgetTimetableEvent1, "setImageBitmap", getColoredBitmap(context, R.drawable.event_color_circle, 0xff4caf50, eventIndicatorSize, eventIndicatorSize));
+
+            if (lesson.subjectName == null) {
+                lesson.subjectName = context.getString(R.string.timetable_no_subject_name);
+            }
+            if (lesson.classroomName == null) {
+                lesson.classroomName = context.getString(R.string.timetable_no_classroom);
+            }
 
             views.setViewVisibility(R.id.widgetTimetableOldSubjectName, View.GONE);
             if (lesson.lessonChange) {
-                if (lesson.newSubjectName == null) {
-                    views.setTextViewText(R.id.widgetTimetableSubjectName, Html.fromHtml("<i>"+lesson.subjectName+"</i>"));
-                }
-                else {
-                    views.setViewVisibility(R.id.widgetTimetableOldSubjectName, View.VISIBLE);
-                    views.setTextViewText(R.id.widgetTimetableOldSubjectName, Html.fromHtml("<del>"+lesson.subjectName+"</del>"));
-                    views.setTextViewText(R.id.widgetTimetableSubjectName, lesson.newSubjectName);
-                }
-
-                if (lesson.newClassroomName == null) {
-                    if (lesson.classroomName == null || lesson.classroomName.equals("")) {
-                        lesson.classroomName = context.getString(R.string.timetable_no_classroom);
-                    }
-                    views.setTextViewText(R.id.widgetTimetableClassroomName, lesson.classroomName);
-                }
-                else {
-                    views.setTextViewText(R.id.widgetTimetableClassroomName, Html.fromHtml("<i>"+lesson.newClassroomName+"</i>"));
-                }
-
+                views.setTextViewText(R.id.widgetTimetableSubjectName, Html.fromHtml("<i>"+lesson.subjectName+"</i>"));
+                views.setTextViewText(R.id.widgetTimetableClassroomName, Html.fromHtml("<i>"+lesson.classroomName+"</i>"));
             }
             else if (lesson.lessonCancelled) {
                 views.setTextViewText(R.id.widgetTimetableSubjectName, Html.fromHtml("<del>"+lesson.subjectName+"</del>"));
@@ -272,7 +266,6 @@ public class WidgetTimetableListProvider implements RemoteViewsService.RemoteVie
                 views.setTextViewText(R.id.widgetTimetableSubjectName, lesson.subjectName);
                 views.setTextViewText(R.id.widgetTimetableClassroomName, lesson.classroomName);
             }
-
         }
         else if (!triedToReload) {
             // try to reload the widget
diff --git a/app/src/main/res/drawable-v21/bg_rounded_ripple_4dp.xml b/app/src/main/res/drawable-v21/bg_rounded_ripple_4dp.xml
new file mode 100644
index 00000000..662d846f
--- /dev/null
+++ b/app/src/main/res/drawable-v21/bg_rounded_ripple_4dp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="#000000" />
+            <corners android:radius="4dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_rounded_ripple_4dp.xml b/app/src/main/res/drawable/bg_rounded_ripple_4dp.xml
new file mode 100644
index 00000000..ca5a7911
--- /dev/null
+++ b/app/src/main/res/drawable/bg_rounded_ripple_4dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/bg_rounded_edittext_pressed" />
+    <item android:state_focused="true" android:drawable="@drawable/bg_rounded_edittext_pressed" />
+    <item android:state_selected="true" android:drawable="@drawable/bg_rounded_edittext_pressed" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_rounded_ripple_4dp_pressed.xml b/app/src/main/res/drawable/bg_rounded_ripple_4dp_pressed.xml
new file mode 100644
index 00000000..aadf2255
--- /dev/null
+++ b/app/src/main/res/drawable/bg_rounded_ripple_4dp_pressed.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="4dp" />
+    <stroke android:color="@color/dividerColor" android:width="1dp" />
+    <solid android:color="#DCDCDC" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/divider.xml b/app/src/main/res/drawable/divider.xml
new file mode 100644
index 00000000..a1e368c0
--- /dev/null
+++ b/app/src/main/res/drawable/divider.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-22.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size
+        android:width="1dp"
+        android:height="1dp" />
+
+    <solid android:color="@color/dividerColor" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/emoji_glasses.xml b/app/src/main/res/drawable/emoji_glasses.xml
new file mode 100644
index 00000000..88460e0d
--- /dev/null
+++ b/app/src/main/res/drawable/emoji_glasses.xml
@@ -0,0 +1,28 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-24.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:pathData="M63.79,8.64C1.48,8.64 0,78.5 0,92.33c0,13.83 28.56,25.03 63.79,25.03c35.24,0 63.79,-11.21 63.79,-25.03C127.58,78.5 126.11,8.64 63.79,8.64z"
+      android:fillColor="#FCC21B"/>
+  <path
+      android:pathData="M63.91,104.82c-3.43,0 -6.87,-0.43 -10.25,-1.31c-1.6,-0.42 -2.56,-2.06 -2.15,-3.66c0.42,-1.6 2.06,-2.56 3.66,-2.14c11.65,3.04 24.21,-0.21 32.78,-8.48c1.19,-1.15 3.09,-1.12 4.24,0.08c1.15,1.19 1.12,3.09 -0.08,4.24C84.54,100.85 74.32,104.82 63.91,104.82z"
+      android:fillColor="#2F2F2F"/>
+  <path
+      android:pathData="M55.53,67.26c-0.01,0.01 -0.02,0.02 -0.02,0.02C55.51,67.27 55.52,67.26 55.53,67.26z"
+      android:fillColor="#2F2F2F"/>
+  <path
+      android:pathData="M98.21,41.34c-13.36,0 -15.15,2.03 -21.4,3.36C70.56,46.02 64,46.02 64,46.02s-6.56,0 -12.81,-1.33c-6.25,-1.33 -8.05,-3.36 -21.4,-3.36c-13.36,0 -29.37,2.89 -29.37,2.89v8.51c0,0 3.59,0.47 3.91,3.75c0.16,1.33 -3.12,28.35 23.51,28.35c18.9,0 26.87,-11.33 29.45,-20.54c1.17,-4.37 2.19,-9.37 6.72,-9.37c4.53,0 5.55,5 6.72,9.37c2.58,9.22 10.54,20.54 29.45,20.54c26.63,0 23.35,-27.03 23.51,-28.35c0.31,-3.28 3.91,-3.75 3.91,-3.75v-8.51C127.58,44.23 111.57,41.34 98.21,41.34z"
+      android:fillColor="#2F2F2F"/>
+  <path
+      android:pathData="M95.94,45.05c-6.62,0.23 -11.65,1.31 -11.65,1.31c-9.84,2.06 -10.55,8.14 -9.93,12.97c0.8,6.07 3.29,13.75 10.04,18.49c0.53,0.38 1.76,0.79 2.35,-0.77c0,0 -0.02,0.11 0,0c2.22,-10.48 5.52,-20.14 10.78,-29.89l0,0C98.14,45.37 96.71,45.02 95.94,45.05z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M31.06,45.02c-4.27,-0.09 -9.11,0.19 -13.65,1.34c-5.1,1.28 -7.07,3.85 -7.6,9.39c-0.53,5.43 -1.13,19.27 8.73,24.46c0.57,0.3 1.83,0.5 2.44,-0.91l0,0C24,66.21 25.61,60.13 32.54,47.22l0,0C33.11,45.49 31.83,45.03 31.06,45.02z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/emoji_neutral.xml b/app/src/main/res/drawable/emoji_neutral.xml
new file mode 100644
index 00000000..27f125dd
--- /dev/null
+++ b/app/src/main/res/drawable/emoji_neutral.xml
@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-24.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:pathData="M64,9.56c-62.41,0 -63.88,69.96 -63.88,83.8c0,13.86 28.59,25.08 63.88,25.08c35.28,0 63.88,-11.22 63.88,-25.08C127.88,79.52 126.4,9.56 64,9.56z"
+      android:fillColor="#FCC21B"/>
+  <path
+      android:pathData="M42.21,62.3c-4.49,0.04 -8.17,-4.27 -8.22,-9.62c-0.05,-5.37 3.55,-9.75 8.04,-9.79c4.48,-0.04 8.17,4.27 8.22,9.64C50.3,57.88 46.7,62.25 42.21,62.3z"
+      android:fillColor="#2F2F2F"/>
+  <path
+      android:pathData="M86.32,62.3c4.48,-0.01 8.11,-4.36 8.1,-9.71c-0.01,-5.37 -3.66,-9.7 -8.14,-9.69c-4.49,0.01 -8.13,4.36 -8.12,9.73C78.18,57.98 81.83,62.31 86.32,62.3z"
+      android:fillColor="#2F2F2F"/>
+  <path
+      android:pathData="M89.69,84.75H38.31c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3h51.39c1.66,0 3,1.34 3,3S91.35,84.75 89.69,84.75z"
+      android:fillColor="#2F2F2F"/>
+</vector>
diff --git a/app/src/main/res/drawable/emoji_no_face.xml b/app/src/main/res/drawable/emoji_no_face.xml
new file mode 100644
index 00000000..46a67e51
--- /dev/null
+++ b/app/src/main/res/drawable/emoji_no_face.xml
@@ -0,0 +1,19 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-24.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:pathData="M64,9.56c-62.41,0 -63.88,69.96 -63.88,83.8c0,13.86 28.59,25.08 63.88,25.08c35.28,0 63.88,-11.22 63.88,-25.08C127.88,79.52 126.4,9.56 64,9.56z"
+      android:fillColor="#FCC21B"/>
+  <path
+      android:pathData="M42.21,65.3c-4.49,0.04 -8.17,-4.27 -8.22,-9.62c-0.05,-5.37 3.55,-9.75 8.04,-9.79c4.48,-0.04 8.17,4.27 8.22,9.64C50.3,60.88 46.7,65.25 42.21,65.3z"
+      android:fillColor="#2F2F2F"/>
+  <path
+      android:pathData="M86.32,65.3c4.48,-0.01 8.11,-4.36 8.1,-9.71c-0.01,-5.37 -3.66,-9.7 -8.14,-9.69c-4.49,0.01 -8.13,4.36 -8.12,9.73C78.18,60.98 81.83,65.31 86.32,65.3z"
+      android:fillColor="#2F2F2F"/>
+</vector>
diff --git a/app/src/main/res/drawable/emoji_sad.xml b/app/src/main/res/drawable/emoji_sad.xml
new file mode 100644
index 00000000..d4f0cea0
--- /dev/null
+++ b/app/src/main/res/drawable/emoji_sad.xml
@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-24.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:pathData="M64,9.62c-62.41,0 -63.88,69.96 -63.88,83.8c0,13.86 28.59,25.08 63.88,25.08c35.28,0 63.88,-11.22 63.88,-25.08C127.88,79.58 126.4,9.62 64,9.62z"
+      android:fillColor="#FCC21B"/>
+  <path
+      android:pathData="M41.99,65.5c-4.49,0.04 -8.17,-4.27 -8.22,-9.62c-0.05,-5.37 3.55,-9.75 8.04,-9.79c4.48,-0.04 8.17,4.27 8.22,9.64C50.08,61.09 46.47,65.46 41.99,65.5z"
+      android:fillColor="#2F2F2F"/>
+  <path
+      android:pathData="M86.1,65.5c4.48,-0.01 8.11,-4.36 8.1,-9.71c-0.01,-5.37 -3.66,-9.7 -8.14,-9.69c-4.49,0.01 -8.13,4.36 -8.12,9.73C77.95,61.18 81.61,65.51 86.1,65.5z"
+      android:fillColor="#2F2F2F"/>
+  <path
+      android:pathData="M43.08,97.67c1.99,1.34 4.5,0.46 6.71,0c6.18,-1.28 11.6,-1.33 14.2,-1.33s8.03,0.05 14.2,1.33c2.21,0.46 4.72,1.34 6.71,0c2.52,-1.71 0.66,-7.83 -3.31,-11.97c-2.4,-2.5 -8.13,-7.35 -17.61,-7.35c-9.48,0 -15.2,4.85 -17.61,7.35C42.42,89.85 40.56,95.97 43.08,97.67z"
+      android:fillColor="#ED6C30"/>
+</vector>
diff --git a/app/src/main/res/drawable/emoji_smiling.xml b/app/src/main/res/drawable/emoji_smiling.xml
new file mode 100644
index 00000000..94fbdbd9
--- /dev/null
+++ b/app/src/main/res/drawable/emoji_smiling.xml
@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-24.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:pathData="M127.94,93.75c0,14.02 -28.61,25.39 -63.93,25.39S0.06,107.77 0.06,93.75c0,-14.03 1.48,-84.89 63.95,-84.89C126.47,8.86 127.94,79.72 127.94,93.75"
+      android:fillColor="#FCC21B"/>
+  <path
+      android:pathData="M48.14,57.33c0,5.47 -3.66,9.9 -8.19,9.9c-4.53,0 -8.21,-4.43 -8.21,-9.9c0,-5.48 3.68,-9.91 8.21,-9.91C44.48,47.42 48.14,51.85 48.14,57.33"
+      android:fillColor="#2F2F2F"/>
+  <path
+      android:pathData="M80.14,57.33c0,5.47 3.66,9.9 8.21,9.9c4.53,0 8.21,-4.43 8.21,-9.9c0,-5.48 -3.68,-9.91 -8.21,-9.91C83.8,47.42 80.14,51.85 80.14,57.33"
+      android:fillColor="#2F2F2F"/>
+  <path
+      android:pathData="M66.8,93.74c-0.72,0 -1.48,-0.03 -2.25,-0.07C46.53,92.59 39.69,82.82 39.41,82.4c-1,-1.48 -0.62,-3.48 0.85,-4.48c1.46,-1 3.45,-0.62 4.46,0.83c0.25,0.37 5.61,7.61 20.22,8.47c14.57,0.84 20.91,-8.67 20.99,-8.77c0.95,-1.49 2.97,-1.92 4.45,-0.96c1.49,0.97 1.93,2.96 0.95,4.45C91.01,82.46 83.52,93.74 66.8,93.74z"
+      android:fillColor="#2F2F2F"/>
+</vector>
diff --git a/app/src/main/res/drawable/header.png b/app/src/main/res/drawable/header.png
new file mode 100644
index 00000000..365f66e9
Binary files /dev/null and b/app/src/main/res/drawable/header.png differ
diff --git a/app/src/main/res/drawable/ic_no_notifications.xml b/app/src/main/res/drawable/ic_no_notifications.xml
new file mode 100644
index 00000000..b94f7e12
--- /dev/null
+++ b/app/src/main/res/drawable/ic_no_notifications.xml
@@ -0,0 +1,37 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-22.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:pathData="m104,18h-80c-5.523,0 -10,4.477 -10,10v84.699c0,2.93 2.371,5.301 5.301,5.301h0.012c1.691,0 3.277,-0.805 4.277,-2.164l10.082,-13.75c1.883,-2.566 4.875,-4.086 8.063,-4.086h62.266c5.523,0 10,-4.477 10,-10v-60c0,-5.523 -4.477,-10 -10,-10z"
+      android:fillColor="#2babee"/>
+  <path
+      android:pathData="m128,104c0,13.254 -10.746,24 -24,24 -13.254,0 -24,-10.746 -24,-24s10.746,-24 24,-24c13.254,0 24,10.746 24,24z"
+      android:fillColor="#fc556c"/>
+  <path
+      android:pathData="m114.84,98.824 l-16.012,16.012c-1.555,1.555 -4.102,1.555 -5.656,0 -1.555,-1.559 -1.555,-4.106 0,-5.656l16.012,-16.012c1.555,-1.555 4.102,-1.555 5.656,0 1.551,1.555 1.551,4.102 0,5.656z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="m93.164,98.824 l16.012,16.012c1.555,1.555 4.102,1.555 5.656,0 1.555,-1.559 1.555,-4.106 0,-5.656l-16.012,-16.012c-1.555,-1.555 -4.102,-1.555 -5.656,0 -1.551,1.555 -1.551,4.102 0,5.656z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="m74,78h-36c-2.211,0 -4,-1.789 -4,-4 0,-2.211 1.789,-4 4,-4h36c2.211,0 4,1.789 4,4 0,2.211 -1.789,4 -4,4z"
+      android:fillColor="#f1fcff"/>
+  <path
+      android:pathData="m72,54h18c2.211,0 4,1.789 4,4 0,2.211 -1.789,4 -4,4h-18c-2.211,0 -4,-1.789 -4,-4 0,-2.211 1.789,-4 4,-4z"
+      android:fillColor="#f1fcff"/>
+  <path
+      android:pathData="m38,54h20c2.211,0 4,1.789 4,4 0,2.211 -1.789,4 -4,4h-20c-2.211,0 -4,-1.789 -4,-4 0,-2.211 1.789,-4 4,-4z"
+      android:fillColor="#f1fcff"/>
+  <path
+      android:pathData="m38,38h34c2.211,0 4,1.789 4,4 0,2.211 -1.789,4 -4,4h-34c-2.211,0 -4,-1.789 -4,-4 0,-2.211 1.789,-4 4,-4z"
+      android:fillColor="#f1fcff"/>
+  <path
+      android:pathData="m86,38h4c2.211,0 4,1.789 4,4 0,2.211 -1.789,4 -4,4h-4c-2.211,0 -4,-1.789 -4,-4 0,-2.211 1.789,-4 4,-4z"
+      android:fillColor="#f1fcff"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_no_timetable.xml b/app/src/main/res/drawable/ic_no_timetable.xml
new file mode 100644
index 00000000..d3a52741
--- /dev/null
+++ b/app/src/main/res/drawable/ic_no_timetable.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:pathData="m103.24,15.168 l-7.883,7.871c-8.746,-7.063 -19.719,-11.039 -31.355,-11.039 -27.57,0 -50,22.43 -50,50s22.43,50 50,50c17.758,0 34.348,-9.367 43.301,-24.449 1.41,-2.375 0.625,-5.441 -1.75,-6.852 -2.367,-1.41 -5.438,-0.629 -6.852,1.746 -7.156,12.062 -20.453,19.555 -34.699,19.555 -22.055,0 -40,-17.945 -40,-40s17.945,-40 40,-40c8.934,0 17.371,2.938 24.223,8.16l-9.063,9.047c-2.48,2.5 -0.719,6.762 2.801,6.762h24.039c2.199,0 4,-1.801 4,-4v-24c0,-3.52 -4.262,-5.301 -6.762,-2.801z"
+      android:fillColor="#ffcf48"/>
+  <path
+      android:pathData="m68,85c0,2.762 -2.238,5 -5,5s-5,-2.238 -5,-5 2.238,-5 5,-5 5,2.238 5,5zM70,41c0,-3.867 -3.133,-7 -7,-7s-7,3.133 -7,7c0,0.047 0.016,0.094 0.016,0.141h-0.016l2.438,28.59c0.203,2.414 2.188,4.269 4.563,4.269s4.359,-1.855 4.563,-4.269l2.438,-28.59h-0.016c0,-0.047 0.016,-0.094 0.016,-0.141z"
+      android:fillColor="#fd657a"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_sync.xml b/app/src/main/res/drawable/ic_sync.xml
new file mode 100644
index 00000000..bbed3d7f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sync.xml
@@ -0,0 +1,5 @@
+<vector android:height="128dp" android:viewportHeight="64"
+    android:viewportWidth="64" android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#fd646f" android:pathData="m51.483,15.326 l3.937,-3.93c1.24,-1.25 0.36,-3.38 -1.4,-3.38h-12.02c-1.1,0 -2,0.9 -2,2v12c0,1.76 2.13,2.65 3.38,1.4l4.537,-4.529c2.615,3.426 4.083,7.646 4.083,12.113 0,11.215 -8.565,20 -19.5,20 -1.381,0 -2.5,1.119 -2.5,2.5s1.119,2.5 2.5,2.5c13.738,0 24.5,-10.981 24.5,-25 0,-5.817 -1.988,-11.301 -5.517,-15.674z"/>
+    <path android:fillColor="#fd646f" android:pathData="m20.604,38.58 l-4.523,4.53c-2.613,-3.427 -4.081,-7.647 -4.081,-12.11 0,-11.215 8.565,-20 19.5,-20 1.381,0 2.5,-1.119 2.5,-2.5s-1.119,-2.5 -2.5,-2.5c-13.738,0 -24.5,10.981 -24.5,25 0,5.815 1.989,11.303 5.52,15.677l-3.936,3.943c-1.25,1.25 -0.36,3.38 1.4,3.38h12c1.1,0 2,-0.9 2,-2v-12.02c0,-1.76 -2.13,-2.64 -3.38,-1.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_timetable.xml b/app/src/main/res/drawable/ic_timetable.xml
new file mode 100644
index 00000000..be92d448
--- /dev/null
+++ b/app/src/main/res/drawable/ic_timetable.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:pathData="m18,100v-60h92v60c0,5.523 -4.477,10 -10,10h-72c-5.523,0 -10,-4.477 -10,-10z"
+      android:fillColor="#ffc662"/>
+  <path
+      android:pathData="m110,29.602v16.398h-92v-16.398c0,-5.309 4.332,-9.602 9.684,-9.602h72.633c5.352,0 9.684,4.293 9.684,9.602"
+      android:fillColor="#ff634f"/>
+  <path
+      android:pathData="m43,34c-2.75,0 -5,-2.25 -5,-5v-12c0,-2.75 2.25,-5 5,-5s5,2.25 5,5v12c0,2.75 -2.25,5 -5,5z"
+      android:fillColor="#888"/>
+  <path
+      android:pathData="m85,34c-2.75,0 -5,-2.25 -5,-5v-12c0,-2.75 2.25,-5 5,-5s5,2.25 5,5v12c0,2.75 -2.25,5 -5,5z"
+      android:fillColor="#888"/>
+  <path
+      android:pathData="m48,74h-8c-2.211,0 -4,-1.789 -4,-4v-8c0,-2.211 1.789,-4 4,-4h8c2.211,0 4,1.789 4,4v8c0,2.211 -1.789,4 -4,4zM72,70v-8c0,-2.211 -1.789,-4 -4,-4h-8c-2.211,0 -4,1.789 -4,4v8c0,2.211 1.789,4 4,4h8c2.211,0 4,-1.789 4,-4zM92,70v-8c0,-2.211 -1.789,-4 -4,-4h-8c-2.211,0 -4,1.789 -4,4v8c0,2.211 1.789,4 4,4h8c2.211,0 4,-1.789 4,-4zM52,90v-8c0,-2.211 -1.789,-4 -4,-4h-8c-2.211,0 -4,1.789 -4,4v8c0,2.211 1.789,4 4,4h8c2.211,0 4,-1.789 4,-4zM72,90v-8c0,-2.211 -1.789,-4 -4,-4h-8c-2.211,0 -4,1.789 -4,4v8c0,2.211 1.789,4 4,4h8c2.211,0 4,-1.789 4,-4zM92,90v-8c0,-2.211 -1.789,-4 -4,-4h-8c-2.211,0 -4,1.789 -4,4v8c0,2.211 1.789,4 4,4h8c2.211,0 4,-1.789 4,-4z"
+      android:fillColor="#ffe79f"/>
+  <path
+      android:pathData="m124,104c0,11.047 -8.953,20 -20,20 -11.047,0 -20,-8.953 -20,-20 0,-11.047 8.953,-20 20,-20 11.047,0 20,8.953 20,20z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="m104,80c-13.254,0 -24,10.746 -24,24 0,13.254 10.746,24 24,24 13.254,0 24,-10.746 24,-24 0,-13.254 -10.746,-24 -24,-24zM104,120c-8.836,0 -16,-7.164 -16,-16 0,-8.836 7.164,-16 16,-16 8.836,0 16,7.164 16,16 0,8.836 -7.164,16 -16,16z"
+      android:fillColor="#1f80e5"/>
+  <path
+      android:pathData="m113.41,110.59 l-5.563,-5.563c0.086,-0.328 0.148,-0.668 0.148,-1.023 0,-1.477 -0.809,-2.754 -2,-3.445v-6.555c0,-1.105 -0.895,-2 -2,-2s-2,0.895 -2,2v6.555c-1.191,0.691 -2,1.969 -2,3.445 0,2.211 1.789,4 4,4 0.355,0 0.695,-0.063 1.023,-0.148l5.563,5.563c0.391,0.391 0.902,0.586 1.414,0.586s1.023,-0.195 1.414,-0.586c0.781,-0.781 0.781,-2.047 0,-2.828z"
+      android:fillColor="#919191"/>
+</vector>
diff --git a/app/src/main/res/drawable/logo_dzienniczek.png b/app/src/main/res/drawable/logo_dzienniczek.png
new file mode 100644
index 00000000..a8ec0993
Binary files /dev/null and b/app/src/main/res/drawable/logo_dzienniczek.png differ
diff --git a/app/src/main/res/drawable/logo_idziennik.png b/app/src/main/res/drawable/logo_idziennik.png
new file mode 100644
index 00000000..7289caa6
Binary files /dev/null and b/app/src/main/res/drawable/logo_idziennik.png differ
diff --git a/app/src/main/res/drawable/logo_librus.png b/app/src/main/res/drawable/logo_librus.png
new file mode 100644
index 00000000..9749e7c0
Binary files /dev/null and b/app/src/main/res/drawable/logo_librus.png differ
diff --git a/app/src/main/res/drawable/logo_mobidziennik.png b/app/src/main/res/drawable/logo_mobidziennik.png
new file mode 100644
index 00000000..0d4d853f
Binary files /dev/null and b/app/src/main/res/drawable/logo_mobidziennik.png differ
diff --git a/app/src/main/res/drawable/logo_synergia.png b/app/src/main/res/drawable/logo_synergia.png
new file mode 100644
index 00000000..9944ae64
Binary files /dev/null and b/app/src/main/res/drawable/logo_synergia.png differ
diff --git a/app/src/main/res/drawable/logo_vulcan.png b/app/src/main/res/drawable/logo_vulcan.png
new file mode 100644
index 00000000..3644cd15
Binary files /dev/null and b/app/src/main/res/drawable/logo_vulcan.png differ
diff --git a/app/src/main/res/drawable/timetable_lesson_annotation.xml b/app/src/main/res/drawable/timetable_lesson_annotation.xml
new file mode 100644
index 00000000..4c89f473
--- /dev/null
+++ b/app/src/main/res/drawable/timetable_lesson_annotation.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-10.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle">
+    <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" />
+    <solid android:color="#2196f3" tools:color="?timetable_lesson_change_color" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/timetable_lesson_bg_dark.xml b/app/src/main/res/drawable/timetable_lesson_bg_dark.xml
new file mode 100644
index 00000000..718c9f4e
--- /dev/null
+++ b/app/src/main/res/drawable/timetable_lesson_bg_dark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="4dp" />
+    <solid android:color="@color/colorSurface_4dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/timetable_lesson_bg_light.xml b/app/src/main/res/drawable/timetable_lesson_bg_light.xml
new file mode 100644
index 00000000..7a17b6cd
--- /dev/null
+++ b/app/src/main/res/drawable/timetable_lesson_bg_light.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="4dp" />
+    <stroke android:width="1dp" android:color="#1e000000" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/timetable_subject_color_rounded.xml b/app/src/main/res/drawable/timetable_subject_color_rounded.xml
new file mode 100644
index 00000000..5466dfa2
--- /dev/null
+++ b/app/src/main/res/drawable/timetable_subject_color_rounded.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-10.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" />
+    <solid android:color="#e91e63" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/unread_red_circle.xml b/app/src/main/res/drawable/unread_red_circle.xml
new file mode 100644
index 00000000..8679f344
--- /dev/null
+++ b/app/src/main/res/drawable/unread_red_circle.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kacper Ziubryniewicz 2019-11-23
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/red500"/>
+    <size android:width="10dp" android:height="10dp"/>
+</shape>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f22cb668..d7aaa2ab 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -8,16 +8,17 @@
         android:orientation="vertical"
         android:visibility="visible">
 
-        <LinearLayout
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="32dp" />
+
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:id="@+id/coordinator"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
             android:visibility="visible">
 
-            <Space
-                android:layout_width="0dp"
-                android:layout_height="32dp" />
-
             <fragment
                 android:id="@+id/nav_host_fragment"
                 android:name="androidx.navigation.fragment.NavHostFragment"
@@ -30,7 +31,7 @@
 
                 app:layout_constraintTop_toTopOf="parent"
                 app:navGraph="@navigation/nav_login" />
-        </LinearLayout>
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
         <!--<io.codetail.widget.RevealFrameLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/card_home.xml b/app/src/main/res/layout/card_home.xml
new file mode 100644
index 00000000..60e58ec3
--- /dev/null
+++ b/app/src/main/res/layout/card_home.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-23.
+  -->
+
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="16dp"
+    android:layout_marginTop="8dp"
+    android:layout_marginRight="16dp"
+    android:layout_marginBottom="8dp"
+    android:clickable="true"
+    android:focusable="true" />
diff --git a/app/src/main/res/layout/card_home_lucky_number.xml b/app/src/main/res/layout/card_home_lucky_number.xml
new file mode 100644
index 00000000..40069c32
--- /dev/null
+++ b/app/src/main/res/layout/card_home_lucky_number.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-24.
+  -->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        tools:layout_margin="8dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/image"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                app:srcCompat="@drawable/emoji_sad" />
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
+                android:text="@string/home_lucky_number_no_info"
+                android:textAppearance="@style/NavView.TextView.Title" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/subText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/NavView.TextView.Helper"
+            tools:text="Oranż Metylowy • Numer w dzienniku to 23" />
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_home_timetable.xml b/app/src/main/res/layout/card_home_timetable.xml
new file mode 100644
index 00000000..2b456a35
--- /dev/null
+++ b/app/src/main/res/layout/card_home_timetable.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-24.
+  -->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        tools:layout_margin="8dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/dayInfo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/NavView.TextView.Title"
+                    tools:text="Jutro" />
+
+                <TextView
+                    android:id="@+id/lessonInfo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/NavView.TextView.Helper"
+                    tools:text="7 lekcji - 8:10 do 14:45" />
+
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/settings"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:padding="10dp"
+                android:background="?selectableItemBackgroundBorderless"
+                android:visibility="gone"
+                tools:src="@sample/settings" />
+
+        </LinearLayout>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
+            android:background="@color/dividerColor" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/lessonBig"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/NavView.TextView.Subtitle"
+                    tools:text="Pierwsza: informatyka" />
+
+                <TextView
+                    android:id="@+id/classroom"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/NavView.TextView.Small"
+                    tools:text="09a komputerowa" />
+
+                <ProgressBar
+                    android:id="@+id/progress"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:max="2700"
+                    android:progress="780" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/counter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="center"
+                tools:text="zostały\n2 minuty\n35 sekund" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
+            android:background="@color/dividerColor" />
+
+        <TextView
+            android:id="@+id/nextLessons"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/NavView.TextView.Helper"
+            tools:text="Póżniej:\n9:05 informatyka\n10:00 urządzenia techniki komputerowej\n11:00 projektowanie lokalnych sieci komputerowych\n11:55 zajęcia z wychowawcą\n13:00 język polski\n14:05 język niemiecki" />
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_event_manual.xml b/app/src/main/res/layout/dialog_event_manual.xml
index d26685c6..0acaf493 100644
--- a/app/src/main/res/layout/dialog_event_manual.xml
+++ b/app/src/main/res/layout/dialog_event_manual.xml
@@ -97,7 +97,8 @@
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
         android:text="@string/dialog_event_manual_share_first_notice"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:visibility="visible" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_event_manual_v2.xml b/app/src/main/res/layout/dialog_event_manual_v2.xml
new file mode 100644
index 00000000..3af87287
--- /dev/null
+++ b/app/src/main/res/layout/dialog_event_manual_v2.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-12.
+  -->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:padding="24dp">
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.Dense"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/dialog_event_manual_date">
+            <pl.szczodrzynski.edziennik.utils.TextInputDropDown
+                android:id="@+id/dateDropdown"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:enabled="false"
+                tools:text="13 listopada"/>
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.Dense"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:hint="@string/dialog_event_manual_time">
+            <pl.szczodrzynski.edziennik.utils.TextInputDropDown
+                android:id="@+id/timeDropdown"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:enabled="false"
+                tools:text="8:10 - język polski"/>
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:hint="@string/dialog_event_manual_team">
+
+            <pl.szczodrzynski.edziennik.utils.TextInputDropDown
+                android:id="@+id/teamDropdown"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:enabled="false"
+                tools:text="2b3T" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.switchmaterial.SwitchMaterial
+            android:id="@+id/shareSwitch"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/dialog_event_manual_share_enabled" />
+
+        <TextView
+            android:id="@+id/shareDetails"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/dialog_event_manual_share_first_notice"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:baselineAligned="false"
+            android:orientation="horizontal">
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:hint="@string/dialog_event_manual_type">
+
+                <pl.szczodrzynski.edziennik.utils.TextInputDropDown
+                    android:id="@+id/typeDropdown"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:enabled="false"
+                    tools:text="2b3T" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <FrameLayout
+                android:id="@+id/typeColor"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginTop="2dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
+                android:background="@drawable/bg_circle"
+                android:foreground="?selectableItemBackgroundBorderless" />
+
+        </LinearLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:hint="@string/dialog_event_manual_topic">
+
+            <pl.szczodrzynski.edziennik.utils.TextInputKeyboardEdit
+                android:id="@+id/topic"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="textLongMessage|textMultiLine|textImeMultiLine"
+                android:minLines="2"
+                tools:text="2b3T" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.mikepenz.iconics.view.IconicsCheckableTextView
+            android:id="@+id/showMore"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:text="@string/dialog_event_manual_more_options"
+            android:background="?selectableItemBackground"
+
+            app:iiv_end_icon="cmd-chevron-down"
+            app:iiv_end_color="?android:textColorSecondary"
+            app:iiv_end_size="16dp"
+
+            app:iiv_end_checked_icon="cmd-chevron-up"
+            app:iiv_end_checked_color="?android:textColorSecondary"
+            app:iiv_end_checked_size="16dp"/>
+
+        <LinearLayout
+            android:id="@+id/moreLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:hint="@string/dialog_event_manual_subject">
+
+                <pl.szczodrzynski.edziennik.utils.TextInputDropDown
+                    android:id="@+id/subjectDropdown"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:enabled="false"
+                    tools:text="2b3T" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:hint="@string/dialog_event_manual_teacher">
+
+                <pl.szczodrzynski.edziennik.utils.TextInputDropDown
+                    android:id="@+id/teacherDropdown"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:enabled="false"
+                    tools:text="2b3T" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    </ScrollView>
+</layout>
diff --git a/app/src/main/res/layout/dialog_lesson_details.xml b/app/src/main/res/layout/dialog_lesson_details.xml
new file mode 100644
index 00000000..616221b0
--- /dev/null
+++ b/app/src/main/res/layout/dialog_lesson_details.xml
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-11.
+  -->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <import type="android.view.View"/>
+        <import type="pl.szczodrzynski.edziennik.App"/>
+        <variable
+            name="lesson"
+            type="pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull" />
+        <variable name="oldSubjectName" type="String" />
+        <variable name="subjectName" type="String" />
+        <variable name="oldTeacherName" type="String" />
+        <variable name="teacherName" type="String" />
+        <variable name="oldClassroom" type="String" />
+        <variable name="classroom" type="String" />
+        <variable name="oldTeamName" type="String" />
+        <variable name="teamName" type="String" />
+    </data>
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="24dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:baselineAligned="false">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{oldSubjectName}"
+                        android:textIsSelectable="true"
+                        android:textAppearance="@style/NavView.TextView.Medium"
+                        android:textColor="?android:textColorTertiary"
+                        android:visibility="@{oldSubjectName == null ? View.GONE : View.VISIBLE}"
+                        app:strikeThrough="@{true}"
+                        tools:text="pracownia urządzeń techniki komputerowej" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{subjectName}"
+                        android:textIsSelectable="true"
+                        android:textAppearance="@style/NavView.TextView.Title"
+                        android:visibility="@{subjectName == null ? View.GONE : View.VISIBLE}"
+                        tools:text="pracownia urządzeń techniki komputerowej" />
+
+                    <TextView
+                        android:id="@+id/lessonDate"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textIsSelectable="true"
+                        android:textAppearance="@style/NavView.TextView.Subtitle"
+                        tools:text="czwartek, 14 listopada 2019"
+                        tools:visibility="visible" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:gravity="center">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/NavView.TextView.Helper"
+                        android:text="@string/dialog_lesson_details_number"
+                        android:visibility="@{lesson.displayLessonNumber == null ? View.GONE : View.VISIBLE}"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"
+                        android:text="@{lesson.displayLessonNumber.toString()}"
+                        android:textSize="36sp"
+                        android:visibility="@{lesson.displayLessonNumber == null ? View.GONE : View.VISIBLE}"
+                        tools:text="4" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{lesson.displayStartTime.stringHM + ` - ` + lesson.displayEndTime.stringHM}"
+                        tools:text="14:55 - 15:40" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/shiftedLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:baselineAligned="false"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/shiftedText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:textSize="16sp"
+                    android:textStyle="italic"
+                    tools:text="Lekcja przeniesiona na czwartek, 17 października" />
+
+                <Button
+                    android:id="@+id/shiftedGoTo"
+                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Przejdź" />
+
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:textAppearance="@style/NavView.TextView.Helper"
+                android:text="@string/dialog_lesson_details_teacher"
+                android:visibility="@{teacherName != null || oldTeacherName != null ? View.VISIBLE : View.GONE}"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/NavView.TextView.Helper"
+                android:text="@{oldTeacherName}"
+                android:textIsSelectable="true"
+                android:visibility="@{oldTeacherName != null ? View.VISIBLE : View.GONE}"
+                app:strikeThrough="@{true}"
+                tools:text="Janósz Kowalski" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@{teacherName}"
+                android:textIsSelectable="true"
+                android:visibility="@{teacherName != null ? View.VISIBLE : View.GONE}"
+                tools:text="Janósz Kowalski" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:textAppearance="@style/NavView.TextView.Helper"
+                android:text="@string/dialog_lesson_details_classroom"
+                android:visibility="@{classroom != null || oldClassroom != null ? View.VISIBLE : View.GONE}"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/NavView.TextView.Helper"
+                android:text="@{oldClassroom}"
+                android:textIsSelectable="true"
+                android:visibility="@{oldClassroom != null ? View.VISIBLE : View.GONE}"
+                app:strikeThrough="@{true}"
+                tools:text="013 informatyczna" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@{classroom}"
+                android:textIsSelectable="true"
+                android:visibility="@{classroom != null ? View.VISIBLE : View.GONE}"
+                tools:text="013 informatyczna" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:textAppearance="@style/NavView.TextView.Helper"
+                android:text="@string/dialog_lesson_details_team"
+                android:visibility="@{teamName != null || oldTeamName != null ? View.VISIBLE : View.GONE}"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/NavView.TextView.Helper"
+                android:text="@{oldTeamName}"
+                android:textIsSelectable="true"
+                android:visibility="@{oldTeamName != null ? View.VISIBLE : View.GONE}"
+                app:strikeThrough="@{true}"
+                tools:text="013 informatyczna" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@{teamName}"
+                android:textIsSelectable="true"
+                android:visibility="@{teamName != null ? View.VISIBLE : View.GONE}"
+                tools:text="013 informatyczna" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:textAppearance="@style/NavView.TextView.Helper"
+                android:visibility="@{App.devMode ? View.VISIBLE : View.GONE}"
+                android:text="@string/dialog_lesson_details_id" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="0dp"
+                android:text="@{Long.toString(lesson.id)}"
+                android:textIsSelectable="true"
+                android:visibility="@{App.devMode ? View.VISIBLE : View.GONE}"
+                tools:text="12345" />
+
+        </LinearLayout>
+    </ScrollView>
+</layout>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index b2df5150..10b71cdc 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".HomeFragment">
 
@@ -31,33 +30,71 @@
                 android:layout_margin="8dp"
                 tools:text="TextView" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/mobidziennikMessagesSwitch"
-                android:layout_margin="8dp"
+            <LinearLayout
+                android:id="@+id/devMode"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:text="Zmień moduł wiadomości"
-                android:visibility="gone"/>
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/composeButton"
-                style="@style/Widget.MaterialComponents.Button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="8dp"
                 android:visibility="gone"
-                android:text="Compose" />
+                android:orientation="vertical"
+                tools:visibility="visible"
+                tools:ignore="HardcodedText">
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/testButton"
-                style="@style/Widget.MaterialComponents.Button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                android:text="Test Librus"
-                android:visibility="gone"/>
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/getLogs"
+                    style="@style/Widget.MaterialComponents.Button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:text="Save Debug Logs" />
 
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/librusCaptchaButton"
+                    style="@style/Widget.MaterialComponents.Button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:text="Librus Captcha" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/runChucker"
+                    style="@style/Widget.MaterialComponents.Button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:text="Launch Chucker" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/mobidziennikMessagesSwitch"
+                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="8dp"
+                        android:layout_weight="1"
+                        android:text="Zmień moduł wiadomości" />
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/composeButton"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="8dp"
+                        android:layout_weight="1"
+                        android:text="Compose" />
+                </LinearLayout>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/pruneWorkButton"
+                    style="@style/Widget.MaterialComponents.Button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:text="Prune finished work" />
+            </LinearLayout>
         </LinearLayout>
     </ScrollView>
     </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
diff --git a/app/src/main/res/layout/fragment_home_v2.xml b/app/src/main/res/layout/fragment_home_v2.xml
new file mode 100644
index 00000000..63612c70
--- /dev/null
+++ b/app/src/main/res/layout/fragment_home_v2.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-23.
+  -->
+
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
+        android:id="@+id/refreshLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:listitem="@layout/card_home" />
+
+    </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_login_chooser.xml b/app/src/main/res/layout/fragment_login_chooser.xml
index 78201b71..9b7937fa 100644
--- a/app/src/main/res/layout/fragment_login_chooser.xml
+++ b/app/src/main/res/layout/fragment_login_chooser.xml
@@ -151,6 +151,16 @@
                         </FrameLayout>
 
                     </LinearLayout>
+
+                    <Switch
+                        android:id="@+id/fakeLogin"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="24dp"
+                        android:layout_marginTop="16dp"
+                        android:layout_marginRight="24dp"
+                        android:text="Fake login" />
+
                 </LinearLayout>
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_login_summary.xml b/app/src/main/res/layout/fragment_login_summary.xml
index c6937f66..0e3058bd 100644
--- a/app/src/main/res/layout/fragment_login_summary.xml
+++ b/app/src/main/res/layout/fragment_login_summary.xml
@@ -72,7 +72,8 @@
                             android:layout_height="0dp"
                             android:layout_marginLeft="24dp"
                             android:layout_marginRight="24dp"
-                            android:layout_weight="1">
+                            android:layout_weight="1"
+                            tools:listitem="@layout/row_login_profile_list_item">
 
                         </androidx.recyclerview.widget.RecyclerView>
 
diff --git a/app/src/main/res/layout/fragment_login_sync.xml b/app/src/main/res/layout/fragment_login_sync.xml
index ab0cce52..a0b072c6 100644
--- a/app/src/main/res/layout/fragment_login_sync.xml
+++ b/app/src/main/res/layout/fragment_login_sync.xml
@@ -51,6 +51,7 @@
                         android:layout_marginTop="8dp"
                         android:layout_marginRight="24dp"
                         android:layout_marginBottom="8dp"
+                        android:max="100"
                         android:indeterminate="false" />
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml
index 96e7cdfd..e63cd2e9 100644
--- a/app/src/main/res/layout/fragment_notifications.xml
+++ b/app/src/main/res/layout/fragment_notifications.xml
@@ -1,35 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:tools="http://schemas.android.com/tools">
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/notificationsView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        </androidx.recyclerview.widget.RecyclerView>
+            android:layout_height="match_parent"
+            tools:listitem="@layout/row_notifications_item"
+            tools:visibility="gone" />
 
         <TextView
             android:id="@+id/notificationsNoData"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginBottom="8dp"
+            android:layout_gravity="center"
+            android:drawableTop="@drawable/ic_no_notifications"
+            android:drawablePadding="16dp"
+            android:fontFamily="sans-serif-light"
             android:text="@string/notifications_no_data"
-            android:textSize="18sp"
-            android:textStyle="italic"
+            android:textSize="24sp"
             android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            tools:visibility="visible" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </FrameLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_timetable_v2.xml b/app/src/main/res/layout/fragment_timetable_v2.xml
new file mode 100644
index 00000000..8b30d15b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_timetable_v2.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
+        android:id="@+id/refreshLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.coordinatorlayout.widget.CoordinatorLayout
+                android:id="@+id/timetableLayout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:visibility="gone">
+
+                <com.google.android.material.appbar.AppBarLayout
+                    style="@style/Widget.MaterialComponents.AppBarLayout.Surface"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?colorSurface">
+
+                    <com.nshmura.recyclertablayout.RecyclerTabLayout
+                        android:id="@+id/tabLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="48dp"
+                        android:background="@color/colorSurface_6dp"
+                        app:rtl_tabIndicatorColor="?colorPrimary"
+                        app:rtl_tabMaxWidth="300dp"
+                        app:rtl_tabMinWidth="90dp"
+                        app:rtl_tabPaddingBottom="12dp"
+                        app:rtl_tabPaddingEnd="16dp"
+                        app:rtl_tabPaddingStart="16dp"
+                        app:rtl_tabPaddingTop="12dp"
+                        app:rtl_tabSelectedTextColor="?colorPrimary"
+                        app:rtl_tabTextAppearance="@style/rtl_RecyclerTabLayout.Tab" />
+                </com.google.android.material.appbar.AppBarLayout>
+
+                <androidx.viewpager.widget.ViewPager
+                    android:id="@+id/viewPager"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+            </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+            <LinearLayout
+                android:id="@+id/timetableNotPublicLayout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:srcCompat="@drawable/ic_no_timetable" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:fontFamily="sans-serif-light"
+                    android:text="@string/timetable_not_public_title"
+                    android:textSize="24sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="32dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginEnd="32dp"
+                    android:gravity="center"
+                    android:text="@string/timetable_not_public_text"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="32dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginEnd="32dp"
+                    android:gravity="center"
+                    android:text="@string/timetable_not_public_hint"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+        </FrameLayout>
+    </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_timetable_v2_day.xml b/app/src/main/res/layout/fragment_timetable_v2_day.xml
new file mode 100644
index 00000000..a94602d3
--- /dev/null
+++ b/app/src/main/res/layout/fragment_timetable_v2_day.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ScrollView
+            android:id="@+id/dayScroll"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <com.linkedin.android.tachyon.DayView
+                android:id="@+id/day"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="10dp"
+                app:dividerHeight="1dp"
+                app:endHour="18"
+                app:eventMargin="2dp"
+                app:halfHourDividerColor="#e0e0e0"
+                app:halfHourHeight="60dp"
+                app:hourDividerColor="#b0b0b0"
+                app:hourLabelMarginEnd="10dp"
+                app:hourLabelWidth="40dp"
+                app:startHour="5"
+                tools:visibility="gone"/>
+        </ScrollView>
+
+    </FrameLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/message_fragment.xml b/app/src/main/res/layout/message_fragment.xml
new file mode 100644
index 00000000..a404053f
--- /dev/null
+++ b/app/src/main/res/layout/message_fragment.xml
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-12.
+  -->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <LinearLayout
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            android:orientation="horizontal"
+            android:background="@color/colorSurface_6dp">
+
+            <ImageButton
+                android:id="@+id/closeButton"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="center"
+                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginTop="2dp"
+                android:background="?android:attr/actionBarItemBackground"
+                app:srcCompat="@android:drawable/ic_delete" />
+
+            <TextView
+                android:id="@+id/subject"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:animateLayoutChanges="true"
+                android:background="?selectableItemBackground"
+                android:ellipsize="end"
+                android:maxLines="2"
+                android:padding="16dp"
+                android:textAppearance="@style/NavView.TextView.Title"
+                tools:ignore="HardcodedText"
+                tools:text="mobiDziennik - raport dzienny." />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="@drawable/shadow_top" />
+
+        <ProgressBar
+            android:id="@+id/progress"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:visibility="visible"
+            tools:visibility="gone"/>
+
+        <ScrollView
+            android:id="@+id/content"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="horizontal">
+
+                    <FrameLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
+                        <ImageView
+                            android:id="@+id/profileBackground"
+                            android:layout_width="64dp"
+                            android:layout_height="64dp"
+                            android:padding="12dp"
+                            app:srcCompat="@drawable/bg_circle" />
+
+                        <TextView
+                            android:id="@+id/profileName"
+                            android:layout_width="64dp"
+                            android:layout_height="64dp"
+                            android:fontFamily="sans-serif"
+                            android:gravity="center"
+                            android:padding="12dp"
+                            android:textColor="#ffffff"
+                            android:textSize="20sp"
+                            tools:text="JP"
+                            tools:visibility="visible" />
+
+                        <ImageView
+                            android:id="@+id/profileImage"
+                            android:layout_width="64dp"
+                            android:layout_height="64dp"
+                            android:padding="12dp"
+                            android:visibility="gone"
+                            tools:srcCompat="@tools:sample/avatars[0]" />
+                    </FrameLayout>
+
+                    <TextView
+                        android:id="@+id/sender"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="?selectableItemBackground"
+                        android:ellipsize="end"
+                        android:maxLines="2"
+                        android:paddingLeft="8dp"
+                        android:paddingTop="12dp"
+                        android:paddingRight="8dp"
+                        android:textAppearance="@style/NavView.TextView.Subtitle"
+                        tools:text="Allegro - wysyłamy duużo wiadomości!!! Masz nowe oferty! Możesz kupić nowego laptopa! Ale super! Ehh, to jest nadawca a nie temat więc nwm czemu to tutaj wpisałem" />
+
+                    <TextView
+                        android:id="@+id/date"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginEnd="8dp"
+                        android:layout_marginRight="8dp"
+                        android:textAppearance="@style/NavView.TextView.Small"
+                        tools:text="14:26" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/body"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:autoLink="all"
+                    android:minHeight="250dp"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:textIsSelectable="true"
+                    tools:text="To jest treść wiadomości.\n\nZazwyczaj ma wiele linijek.\n\nTak" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?colorControlHighlight" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginRight="16dp"
+                    android:text="Odbiorcy wiadomości:"
+                    android:textAppearance="@style/NavView.TextView.Subtitle" />
+
+                <TextView
+                    android:id="@+id/recipients"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    tools:text=" - Jan Kowalski, przeczytano: nie\n - Adam Dodatkowy, przeczytano: 20 marca, 17:35" />
+
+                <TextView
+                    android:id="@+id/attachmentsTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginRight="16dp"
+                    android:text="Załączniki:"
+                    android:textAppearance="@style/NavView.TextView.Subtitle" />
+
+                <LinearLayout
+                    android:id="@+id/attachments"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingBottom="8dp">
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        android:paddingLeft="16dp"
+                        android:paddingRight="16dp"
+                        tools:visibility="visible">
+
+                        <com.google.android.material.chip.Chip
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:ellipsize="middle"
+                            android:text="Testowy plik.pdf"
+                            android:visibility="visible"
+                            app:chipBackgroundColor="@color/mtrl_chip_background_color"
+                            app:chipIcon="@drawable/googleg_standard_color_18"
+                            app:chipMinHeight="36dp"
+                            app:chipSurfaceColor="@color/mtrl_chip_surface_color"
+                            app:closeIcon="@drawable/ic_error_outline"
+                            app:closeIconVisible="true" />
+
+                        <ProgressBar
+                            style="?android:attr/progressBarStyle"
+                            android:layout_width="18dp"
+                            android:layout_height="18dp"
+                            android:layout_gravity="center_vertical|end"
+                            android:layout_marginLeft="8dp"
+                            android:layout_marginRight="8dp" />
+
+                    </FrameLayout>
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:visibility="gone"
+                        android:paddingLeft="16dp"
+                        android:paddingRight="16dp"
+                        tools:visibility="visible">
+
+                        <com.google.android.material.chip.Chip
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:ellipsize="middle"
+                            android:text="Wyniki sprawdzianu z matematyki.pdf"
+                            android:visibility="visible"
+                            app:chipIcon="@drawable/googleg_standard_color_18"
+                            app:chipMinHeight="36dp" />
+
+                        <ProgressBar
+                            style="?android:attr/progressBarStyle"
+                            android:layout_width="18dp"
+                            android:layout_height="18dp"
+                            android:layout_gravity="center_vertical|end"
+                            android:layout_marginLeft="8dp"
+                            android:layout_marginRight="8dp" />
+
+                    </FrameLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:orientation="horizontal"
+                    android:visibility="gone"
+                    tools:visibility="visible">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="4dp"
+                        android:layout_marginRight="4dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/bg_rounded_ripple"
+                        android:gravity="center"
+                        android:orientation="vertical"
+                        android:paddingLeft="4dp"
+                        android:paddingTop="8dp"
+                        android:paddingRight="4dp"
+                        android:paddingBottom="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:text="Odpowiedz"
+                            android:textAppearance="@style/NavView.TextView.Small" />
+
+                        <com.mikepenz.iconics.view.IconicsImageView
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            android:padding="4dp"
+                            app:iiv_color="?android:textColorSecondary"
+                            app:iiv_icon="cmd-reply"
+                            tools:srcCompat="@android:drawable/ic_menu_revert" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="4dp"
+                        android:layout_marginRight="4dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/bg_rounded_ripple"
+                        android:gravity="center"
+                        android:orientation="vertical"
+                        android:paddingLeft="4dp"
+                        android:paddingTop="8dp"
+                        android:paddingRight="4dp"
+                        android:paddingBottom="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:text="Przekaż dalej"
+                            android:textAllCaps="false"
+                            android:textAppearance="@style/NavView.TextView.Small" />
+
+                        <com.mikepenz.iconics.view.IconicsImageView
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            android:padding="4dp"
+                            app:iiv_color="?android:textColorSecondary"
+                            app:iiv_icon="cmd-share"
+                            tools:srcCompat="@android:drawable/ic_media_ff" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="4dp"
+                        android:layout_marginRight="4dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/bg_rounded_ripple"
+                        android:gravity="center"
+                        android:orientation="vertical"
+                        android:paddingLeft="4dp"
+                        android:paddingTop="8dp"
+                        android:paddingRight="4dp"
+                        android:paddingBottom="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:text="Usuń"
+                            android:textAppearance="@style/NavView.TextView.Small" />
+
+                        <com.mikepenz.iconics.view.IconicsImageView
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            android:padding="4dp"
+                            app:iiv_color="?android:textColorSecondary"
+                            app:iiv_icon="cmd-delete"
+                            tools:srcCompat="@android:drawable/ic_menu_delete" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+        </ScrollView>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_dialog_teacher_absence_item.xml b/app/src/main/res/layout/row_dialog_teacher_absence_item.xml
index 6aacce23..8d303464 100644
--- a/app/src/main/res/layout/row_dialog_teacher_absence_item.xml
+++ b/app/src/main/res/layout/row_dialog_teacher_absence_item.xml
@@ -36,6 +36,15 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="Jan Kowalski"/>
+
+            <TextView
+                android:id="@+id/teacherAbsenceName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/NavView.TextView.Helper"
+                android:visibility="gone"
+                tools:text="wycieczka"
+                tools:visibility="visible"/>
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/row_login_profile_list_item.xml b/app/src/main/res/layout/row_login_profile_list_item.xml
index 054e0ad7..322fad71 100644
--- a/app/src/main/res/layout/row_login_profile_list_item.xml
+++ b/app/src/main/res/layout/row_login_profile_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
     <LinearLayout
@@ -9,7 +8,8 @@
         android:layout_height="wrap_content"
         android:background="?selectableItemBackground"
         android:clickable="true"
-        android:gravity="center_vertical">
+        android:gravity="center_vertical"
+        android:focusable="true">
 
         <CheckBox
             android:id="@+id/checkBox"
@@ -18,13 +18,55 @@
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp" />
 
-        <TextView
-            android:id="@+id/textView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginLeft="24dp"
-            android:text="TextView"
-            android:textSize="16sp" />
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="24dp"
+                    android:layout_marginLeft="24dp"
+                    android:textSize="16sp"
+                    tools:text="Jan Kowalski" />
+
+                <TextView
+                    android:id="@+id/accountType"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginLeft="4dp"
+                    android:textAppearance="@style/NavView.TextView.Helper"
+                    tools:text="(rodzic)" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/textDetails"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:textAppearance="@style/NavView.TextView.Helper"
+                tools:text="2B3T - 2019/2020" />
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/registerIcon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
+            tools:srcCompat="@drawable/logo_mobidziennik" />
+
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_notifications_item.xml b/app/src/main/res/layout/row_notifications_item.xml
index 1e079aab..3ef2f6d8 100644
--- a/app/src/main/res/layout/row_notifications_item.xml
+++ b/app/src/main/res/layout/row_notifications_item.xml
@@ -1,75 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:padding="8dp"
+    android:background="?selectableItemBackground">
 
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/notificationsItemCard"
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:background="?selectableItemBackground"
-        app:cardElevation="4dp"
-        app:cardCornerRadius="5dp"
-        android:paddingLeft="10dp"
-        android:paddingTop="5dp"
-        android:paddingRight="10dp"
-        android:paddingBottom="3dp">
+        android:textAppearance="@style/NavView.TextView.Medium"
+        tools:text="Dzisiaj 1 to szczęśliwy numerek" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?selectableItemBackground"
-            android:orientation="vertical"
-            android:padding="8dp">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-            <TextView
-                android:id="@+id/notificationsItemDate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="16sp"
-                tools:text="date" />
+        <TextView
+            android:id="@+id/profileDate"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            tools:text="Władca Androida • 22 listopada" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/notificationsItemText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textSize="18sp"
-                    android:autoLink="all"
-                    tools:text="text" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/notificationsItemTitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
-                    tools:text="title" />
-
-                <TextView
-                    android:id="@+id/notificationsItemType"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
-                    tools:text="type" />
-            </LinearLayout>
-        </LinearLayout>
-
-    </com.google.android.material.card.MaterialCardView>
+        <TextView
+            android:id="@+id/type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="Szczęśliwy numerek" />
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/timetable_free_day.xml b/app/src/main/res/layout/timetable_free_day.xml
new file mode 100644
index 00000000..96067d65
--- /dev/null
+++ b/app/src/main/res/layout/timetable_free_day.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-15.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/freeDayLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:drawableTop="@drawable/ic_sunbed"
+        android:drawablePadding="16dp"
+        android:fontFamily="sans-serif-light"
+        android:text="@string/timetable_free_day_title"
+        android:textSize="24sp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/timetable_free_day_text"
+        android:textSize="14sp" />
+
+    <TextView
+        android:id="@+id/freeDayText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="32dp"
+        android:gravity="center"
+        android:textSize="16sp"
+        tools:text="Dzień wolny dla szkoły z puli dyrektorskiej z okazji obchodów Światowego Dnia Wtorku w mieście Poznań i na przedmieśiach" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/freeDayShowTimetable"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/timetable_free_day_show" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/timetable_hour_label.xml b/app/src/main/res/layout/timetable_hour_label.xml
new file mode 100644
index 00000000..4daa29c6
--- /dev/null
+++ b/app/src/main/res/layout/timetable_hour_label.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2019 LinkedIn Corporation -->
+<!-- All Rights Reserved. -->
+<!-- -->
+<!-- Licensed under the BSD 2-Clause License (the "License").  See License in the project root -->
+<!-- for license information. -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/Base.TextAppearance.AppCompat.Small"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="end"
+    android:ellipsize="end"
+    android:maxLines="1"
+    android:textAlignment="viewEnd"
+    tools:text="1 PM" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/timetable_lesson.xml b/app/src/main/res/layout/timetable_lesson.xml
new file mode 100644
index 00000000..0e2d4cdc
--- /dev/null
+++ b/app/src/main/res/layout/timetable_lesson.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+    <data>
+
+        <import type="android.view.View" />
+        <variable
+            name="annotationVisible"
+            type="boolean"/>
+        <variable
+            name="lessonNumber"
+            type="Integer" />
+        <variable
+            name="unread"
+            type="boolean" />
+    </data>
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?android:colorBackground"
+        android:foreground="@drawable/bg_rounded_ripple_4dp"
+        tools:padding="32dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:layout_height="90dp"
+            android:background="?timetable_lesson_bg"
+            android:orientation="vertical"
+            android:paddingBottom="4dp">
+
+            <TextView
+                android:id="@+id/annotation"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/timetable_lesson_annotation"
+                android:fontFamily="sans-serif-condensed"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:text="@string/timetable_lesson_cancelled"
+                android:textColor="#000"
+                android:textSize="12sp"
+                android:textStyle="italic"
+                android:visibility="@{annotationVisible ? View.VISIBLE : View.GONE}"
+                tools:text="Zastępstwo: zamiast lekcji język polski z Adam Dodatkowy"
+                tools:visibility="gone" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:orientation="horizontal"
+                android:baselineAligned="false">
+                <!--tools:background="@drawable/timetable_subject_color_rounded"-->
+
+                <TextView
+                    android:id="@+id/subjectName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginBottom="4dp"
+                    android:layout_weight="1"
+                    android:ellipsize="end"
+                    android:fontFamily="sans-serif-light"
+                    android:maxLines="@{annotationVisible ? 1 : 2}"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:autoSizeMaxTextSize="16sp"
+                    app:autoSizeMinTextSize="12sp"
+                    app:autoSizeTextType="uniform"
+                    tools:maxLines="2"
+                    tools:text="pracownia urządzeń techniki komputerowej" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:paddingStart="8dp"
+                    android:paddingLeft="8dp"
+                    android:paddingEnd="8dp"
+                    android:paddingRight="8dp"
+                    android:visibility="@{unread ? View.VISIBLE : View.GONE}"
+                    app:srcCompat="@drawable/unread_red_circle" />
+
+                <ImageView
+                    android:id="@+id/attendanceIcon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_gravity="center_vertical"
+                    android:visibility="gone"
+                    tools:srcCompat="@sample/check"
+                    tools:visibility="visible" />
+
+                <ImageView
+                    android:id="@+id/imageView4"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_weight="0"
+                    app:srcCompat="@drawable/bg_circle"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:id="@+id/textView6"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:fontFamily="sans-serif-condensed-light"
+                    android:includeFontPadding="false"
+                    android:layout_marginBottom="-4dp"
+                    android:paddingStart="4dp"
+                    android:paddingEnd="4dp"
+                    android:text="@{Integer.toString(lessonNumber)}"
+                    android:textSize="28sp"
+                    android:visibility="@{lessonNumber != null ? View.VISIBLE : View.GONE}"
+                    tools:text="3"/>
+                <!--android:layout_marginTop="@{annotationVisible ? `-4dp` : `4dp`}"
+                    android:layout_marginBottom="@{annotationVisible ? `-4dp` : `0dp`}"-->
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="bottom"
+                android:orientation="vertical"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp">
+
+                <TextView
+                    android:id="@+id/detailsFirst"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    tools:text="8:10 - 8:55 • 015 językowa → 016 językowa" />
+
+                <TextView
+                    android:id="@+id/detailsSecond"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="middle"
+                    android:singleLine="true"
+                    android:textAppearance="@style/NavView.TextView.Helper"
+                    android:textSize="12sp"
+                    tools:text="Paweł Informatyczny • 2b3T n1" />
+            </LinearLayout>
+
+        </LinearLayout>
+    </FrameLayout>
+</layout>
diff --git a/app/src/main/res/layout/timetable_no_lessons.xml b/app/src/main/res/layout/timetable_no_lessons.xml
new file mode 100644
index 00000000..a15aa42a
--- /dev/null
+++ b/app/src/main/res/layout/timetable_no_lessons.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-15.
+  -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:drawableTop="@drawable/ic_timetable"
+    android:drawablePadding="16dp"
+    android:fontFamily="sans-serif-light"
+    android:text="@string/timetable_no_lessons_title"
+    android:textSize="24sp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/timetable_no_timetable.xml b/app/src/main/res/layout/timetable_no_timetable.xml
new file mode 100644
index 00000000..b69d762b
--- /dev/null
+++ b/app/src/main/res/layout/timetable_no_timetable.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-15.
+  -->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:id="@+id/noTimetableLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@drawable/ic_sync"
+            android:drawablePadding="16dp"
+            android:fontFamily="sans-serif-light"
+            android:text="@string/timetable_no_timetable_title"
+            android:textSize="24sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="32dp"
+            android:gravity="center"
+            android:text="@string/timetable_no_timetable_text"
+            android:textSize="16sp" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/noTimetableSync"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/timetable_no_timetable_sync" />
+
+        <TextView
+            android:id="@+id/noTimetableWeek"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="12sp"
+            android:textStyle="italic"
+            tools:text="@string/timetable_no_timetable_week" />
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_login.xml b/app/src/main/res/navigation/nav_login.xml
index 825b646f..902daba7 100644
--- a/app/src/main/res/navigation/nav_login.xml
+++ b/app/src/main/res/navigation/nav_login.xml
@@ -21,9 +21,6 @@
         <action
             android:id="@+id/action_loginTypeFragment_to_loginIuczniowieFragment"
             app:destination="@id/loginIuczniowieFragment" />
-        <action
-            android:id="@+id/action_loginTypeFragment_to_loginMigrationFragment"
-            app:destination="@id/loginMigrationFragment" />
     </fragment>
     <fragment
         android:id="@+id/loginMobidziennikFragment"
@@ -131,20 +128,6 @@
         android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginFinishFragment"
         android:label="fragment_login_finish"
         tools:layout="@layout/fragment_login_finish" />
-    <fragment
-        android:id="@+id/loginMigrationFragment"
-        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginMigrationFragment"
-        android:label="fragment_login_migration"
-        tools:layout="@layout/fragment_login_migration" >
-        <action
-            android:id="@+id/action_loginMigrationFragment_to_loginMigrationSyncFragment"
-            app:destination="@id/loginMigrationSyncFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/loginMigrationSyncFragment"
-        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginMigrationSyncFragment"
-        android:label="fragment_login_migration_sync"
-        tools:layout="@layout/fragment_login_migration_sync" />
     <fragment
         android:id="@+id/loginSyncErrorFragment"
         android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginSyncErrorFragment"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index a200e659..8664dcf8 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -295,6 +295,7 @@
     <string name="lesson_break">Break</string>
     <string name="lesson_cancelled">Lesson cancelled</string>
     <string name="lesson_change">Lesson change</string>
+    <string name="lesson_shifted">Shifted lesson</string>
     <string name="lesson_timetable_change">Timetable change</string>
     <string name="loading">Loading…</string>
     <string name="login_allow_registration">Allow registration</string>
@@ -446,7 +447,8 @@
     <string name="notification_absence">Absence</string>
     <string name="notification_absence_excused">Excused absence</string>
     <string name="notification_announcement_format">School announcement: %s</string>
-    <string name="notification_attendance_format">%s on lesson %s z %s</string>
+    <string name="notification_attendance_format">%1$s on lesson %2$s on day %3$s</string>
+    <string name="notification_attendance_no_lesson_format">%1$s on day %3$s</string>
     <string name="notification_belated">Late</string>
     <string name="notification_belated_excused">Excused late</string>
     <string name="notification_channel_get_data_desc">Notification about data downloading</string>
@@ -458,7 +460,8 @@
     <string name="notification_channel_updates_desc">Notifications about new versions of the app</string>
     <string name="notification_channel_updates_name">App updates</string>
     <string name="notification_downloading_update">Downloading update…</string>
-    <string name="notification_event_format">%s %s from %s</string>
+    <string name="notification_event_format">%1$s on %2$s from %3$s</string>
+    <string name="notification_event_no_subject_format">%1$s on %2$s</string>
     <string name="notification_event_no_subject">unknown subject</string>
     <string name="notification_get_data_cancel">Cancel</string>
     <string name="notification_get_data_error_summary">Szkolny.eu: error</string>
@@ -469,6 +472,7 @@
     <string name="notification_get_data_title">Update</string>
     <string name="notification_grade_format">New grade (%s) from %s</string>
     <string name="notification_homework_format">Homework from %s for %s</string>
+    <string name="notification_homework_no_subject_format">Homework for %s</string>
     <string name="notification_lucky_number_format">Today %d is the lucky number.</string>
     <string name="notification_lucky_number_later_format">The lucky number for %s is %d.</string>
     <string name="notification_lucky_number_tomorrow_format">The lucky number for tomorrow is %d.</string>
@@ -523,7 +527,7 @@
     <string name="profile_menu_open_settings">Settings</string>
     <string name="profile_menu_remove">Remove profile</string>
     <string name="profile_menu_remove_confirm">Are you sure?</string>
-    <string name="profile_menu_remove_confirm_text_format">You are trying to remove profile %s. This means removing this profile\'s data (grades, timetables, events…) from the app.\n\nYou\'ll be able to restore most of the data by logging in again.\n\nDo you really want to remove profile %s?</string>
+    <string name="profile_menu_remove_confirm_text_format">You are trying to remove profile <b>%s</b>. This means removing this profile\'s data (grades, timetables, events…) from the app.\n\nYou\'ll be able to restore most of the data by logging in again.\n\nDo you really want to remove profile %s?</string>
     <string name="rate_snackbar_negative">Never</string>
     <string name="rate_snackbar_neutral">Later</string>
     <string name="rate_snackbar_positive">Rate now</string>
@@ -544,7 +548,7 @@
     <string name="settings_about_licenses_text">Open-source licenses</string>
     <string name="settings_about_privacy_policy_text">Privacy policy</string>
     <string name="settings_about_register_title_text">E-register</string>
-    <string name="settings_about_title_subtext">© Kuba Szczodrzyński September 2018 - October 2019</string>
+    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nSeptember 2018 - November 2019</string>
     <string name="settings_about_update_subtext">Click to check for updates</string>
     <string name="settings_about_update_text">Update</string>
     <string name="settings_about_version_text">Version</string>
@@ -856,4 +860,14 @@
     <string name="sync_action_syncing_school_free_days">Getting school free days</string>
     <string name="settings_register_show_teacher_absences_text">Show teacher absences in Agenda</string>
     <string name="menu_mark_everything_as_read">Mark everything as read</string>
+    <string name="settings_about_language_text">App language</string>
+    <string name="settings_about_language_subtext">"English "</string>
+    <string name="settings_about_language_dialog_title">Change app language</string>
+    <string name="settings_about_language_dialog_text">Notice. This feature may not work on some devices or in some parts of the app.</string>
+    <string name="settings_about_discord_text">Discord server</string>
+    <string name="settings_about_discord_subtext">Join our Discord community!</string>
+    <string name="language_system">Use system language</string>
+    <string name="login_summary_account_child">(child)</string>
+    <string name="login_summary_account_parent">(parent)</string>
+    <string name="toolbar_subtitle_syncing">Syncing...</string>
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index b7deaa68..dc9d55f7 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -3,4 +3,10 @@
     <attr name="colorSection" format="color" />
     <attr name="cardBackgroundDimmed" format="color" />
     <attr name="cardBackgroundHighlight" format="color" />
+    <attr name="timetable_lesson_bg" format="reference" />
+    <attr name="timetable_lesson_cancelled_color" format="color" />
+    <attr name="timetable_lesson_change_color" format="color" />
+    <attr name="timetable_lesson_shifted_source_color" format="color" />
+    <attr name="timetable_lesson_shifted_target_color" format="color" />
+    <attr name="colorIcon" format="color" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/errors.xml b/app/src/main/res/values/errors.xml
new file mode 100644
index 00000000..e6718985
--- /dev/null
+++ b/app/src/main/res/values/errors.xml
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-13.
+  -->
+
+<resources>
+    <string name="error_50" translatable="false">ERROR_REQUEST_FAILURE</string>
+    <string name="error_51" translatable="false">ERROR_REQUEST_HTTP_400</string>
+    <string name="error_52" translatable="false">ERROR_REQUEST_HTTP_401</string>
+    <string name="error_53" translatable="false">ERROR_REQUEST_HTTP_403</string>
+    <string name="error_54" translatable="false">ERROR_REQUEST_HTTP_404</string>
+    <string name="error_55" translatable="false">ERROR_REQUEST_HTTP_405</string>
+    <string name="error_56" translatable="false">ERROR_REQUEST_HTTP_410</string>
+    <string name="error_57" translatable="false">ERROR_REQUEST_HTTP_500</string>
+    <string name="error_100" translatable="false">ERROR_RESPONSE_EMPTY</string>
+    <string name="error_101" translatable="false">ERROR_LOGIN_DATA_MISSING</string>
+    <string name="error_102" translatable="false">ERROR_LOGIN_DATA_INVALID</string>
+    <string name="error_105" translatable="false">ERROR_PROFILE_MISSING</string>
+    <string name="error_110" translatable="false">ERROR_INVALID_LOGIN_MODE</string>
+    <string name="error_111" translatable="false">ERROR_LOGIN_METHOD_NOT_SATISFIED</string>
+    <string name="error_112" translatable="false">ERROR_NOT_IMPLEMENTED</string>
+
+    <string name="error_115" translatable="false">ERROR_NO_STUDENTS_IN_ACCOUNT</string>
+
+    <string name="error_120" translatable="false">CODE_INTERNAL_LIBRUS_ACCOUNT_410</string>
+    <string name="error_121" translatable="false">CODE_INTERNAL_LIBRUS_SYNERGIA_EXPIRED</string>
+    <string name="error_124" translatable="false">ERROR_LOGIN_LIBRUS_API_CAPTCHA_NEEDED</string>
+    <string name="error_125" translatable="false">ERROR_LOGIN_LIBRUS_API_CONNECTION_PROBLEMS</string>
+    <string name="error_126" translatable="false">ERROR_LOGIN_LIBRUS_API_INVALID_CLIENT</string>
+    <string name="error_127" translatable="false">ERROR_LOGIN_LIBRUS_API_REG_ACCEPT_NEEDED</string>
+    <string name="error_128" translatable="false">ERROR_LOGIN_LIBRUS_API_CHANGE_PASSWORD_ERROR</string>
+    <string name="error_129" translatable="false">ERROR_LOGIN_LIBRUS_API_PASSWORD_CHANGE_REQUIRED</string>
+    <string name="error_130" translatable="false">ERROR_LOGIN_LIBRUS_API_INVALID_LOGIN</string>
+    <string name="error_131" translatable="false">ERROR_LOGIN_LIBRUS_API_OTHER</string>
+    <string name="error_132" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_CSRF_MISSING</string>
+    <string name="error_133" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_NOT_ACTIVATED</string>
+    <string name="error_134" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_ACTION_ERROR</string>
+    <string name="error_139" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_SYNERGIA_TOKEN_MISSING</string>
+    <string name="error_140" translatable="false">ERROR_LIBRUS_API_TOKEN_EXPIRED</string>
+    <string name="error_141" translatable="false">ERROR_LIBRUS_API_INSUFFICIENT_SCOPES</string>
+    <string name="error_142" translatable="false">ERROR_LIBRUS_API_OTHER</string>
+    <string name="error_143" translatable="false">ERROR_LIBRUS_API_ACCESS_DENIED</string>
+    <string name="error_144" translatable="false">ERROR_LIBRUS_API_RESOURCE_NOT_FOUND</string>
+    <string name="error_145" translatable="false">ERROR_LIBRUS_API_DATA_NOT_FOUND</string>
+    <string name="error_146" translatable="false">ERROR_LIBRUS_API_TIMETABLE_NOT_PUBLIC</string>
+    <string name="error_147" translatable="false">ERROR_LIBRUS_API_RESOURCE_ACCESS_DENIED</string>
+    <string name="error_148" translatable="false">ERROR_LIBRUS_API_INVALID_REQUEST_PARAMS</string>
+    <string name="error_149" translatable="false">ERROR_LIBRUS_API_INCORRECT_ENDPOINT</string>
+    <string name="error_150" translatable="false">ERROR_LIBRUS_API_LUCKY_NUMBER_NOT_ACTIVE</string>
+    <string name="error_151" translatable="false">ERROR_LIBRUS_API_NOTES_NOT_ACTIVE</string>
+    <string name="error_152" translatable="false">ERROR_LOGIN_LIBRUS_SYNERGIA_NO_TOKEN</string>
+    <string name="error_153" translatable="false">ERROR_LOGIN_LIBRUS_SYNERGIA_TOKEN_INVALID</string>
+    <string name="error_154" translatable="false">ERROR_LOGIN_LIBRUS_SYNERGIA_NO_SESSION_ID</string>
+    <string name="error_155" translatable="false">ERROR_LIBRUS_MESSAGES_ACCESS_DENIED</string>
+    <string name="error_156" translatable="false">ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED</string>
+    <string name="error_157" translatable="false">ERROR_LOGIN_LIBRUS_MESSAGES_NO_SESSION_ID</string>
+    <string name="error_158" translatable="false">ERROR_LIBRUS_PORTAL_ACCESS_DENIED</string>
+    <string name="error_159" translatable="false">ERROR_LIBRUS_PORTAL_API_DISABLED</string>
+    <string name="error_160" translatable="false">ERROR_LIBRUS_PORTAL_SYNERGIA_DISCONNECTED</string>
+    <string name="error_161" translatable="false">ERROR_LIBRUS_PORTAL_OTHER</string>
+    <string name="error_162" translatable="false">ERROR_LIBRUS_PORTAL_SYNERGIA_NOT_FOUND</string>
+    <string name="error_163" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_OTHER</string>
+    <string name="error_164" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_CODE_EXPIRED</string>
+    <string name="error_165" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_CODE_REVOKED</string>
+    <string name="error_166" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_NO_CLIENT_ID</string>
+    <string name="error_167" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_NO_CODE</string>
+    <string name="error_168" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_NO_REFRESH</string>
+    <string name="error_169" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_NO_REDIRECT</string>
+    <string name="error_170" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_UNSUPPORTED_GRANT</string>
+    <string name="error_171" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_INVALID_CLIENT_ID</string>
+    <string name="error_172" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_INVALID</string>
+    <string name="error_173" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_REVOKED</string>
+    <string name="error_174" translatable="false">ERROR_LIBRUS_SYNERGIA_OTHER</string>
+    <string name="error_175" translatable="false">ERROR_LIBRUS_SYNERGIA_MAINTENANCE</string>
+    <string name="error_176" translatable="false">ERROR_LIBRUS_MESSAGES_MAINTENANCE</string>
+    <string name="error_177" translatable="false">ERROR_LIBRUS_MESSAGES_ERROR</string>
+    <string name="error_178" translatable="false">ERROR_LIBRUS_MESSAGES_OTHER</string>
+    <string name="error_179" translatable="false">ERROR_LOGIN_LIBRUS_MESSAGES_INVALID_LOGIN</string>
+    <string name="error_180" translatable="false">ERROR_LOGIN_LIBRUS_PORTAL_INVALID_LOGIN</string>
+    <string name="error_181" translatable="false">ERROR_LIBRUS_API_MAINTENANCE</string>
+
+    <string name="error_201" translatable="false">ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_LOGIN</string>
+    <string name="error_202" translatable="false">ERROR_LOGIN_MOBIDZIENNIK_WEB_OLD_PASSWORD</string>
+    <string name="error_203" translatable="false">ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_DEVICE</string>
+    <string name="error_204" translatable="false">ERROR_LOGIN_MOBIDZIENNIK_WEB_ARCHIVED</string>
+    <string name="error_205" translatable="false">ERROR_LOGIN_MOBIDZIENNIK_WEB_MAINTENANCE</string>
+    <string name="error_206" translatable="false">ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_ADDRESS</string>
+    <string name="error_210" translatable="false">ERROR_LOGIN_MOBIDZIENNIK_WEB_OTHER</string>
+    <string name="error_211" translatable="false">ERROR_MOBIDZIENNIK_WEB_ACCESS_DENIED</string>
+    <string name="error_212" translatable="false">ERROR_MOBIDZIENNIK_WEB_NO_SESSION_KEY</string>
+    <string name="error_216" translatable="false">ERROR_MOBIDZIENNIK_WEB_NO_SESSION_VALUE</string>
+    <string name="error_213" translatable="false">ERROR_MOBIDZIENNIK_WEB_NO_SERVER_ID</string>
+    <string name="error_214" translatable="false">ERROR_MOBIDZIENNIK_WEB_INVALID_RESPONSE</string>
+    <string name="error_215" translatable="false">ERROR_LOGIN_MOBIDZIENNIK_WEB_NO_SESSION_ID</string>
+
+    <string name="error_301" translatable="false">ERROR_LOGIN_VULCAN_INVALID_SYMBOL</string>
+    <string name="error_302" translatable="false">ERROR_LOGIN_VULCAN_INVALID_TOKEN</string>
+    <string name="error_309" translatable="false">ERROR_LOGIN_VULCAN_INVALID_PIN</string>
+    <string name="error_310" translatable="false">ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING</string>
+    <string name="error_311" translatable="false">ERROR_LOGIN_VULCAN_INVALID_PIN_1_REMAINING</string>
+    <string name="error_312" translatable="false">ERROR_LOGIN_VULCAN_INVALID_PIN_2_REMAINING</string>
+    <string name="error_321" translatable="false">ERROR_LOGIN_VULCAN_EXPIRED_TOKEN</string>
+    <string name="error_322" translatable="false">ERROR_LOGIN_VULCAN_OTHER</string>
+    <string name="error_330" translatable="false">ERROR_LOGIN_VULCAN_ONLY_KINDERGARTEN</string>
+    <string name="error_331" translatable="false">ERROR_LOGIN_VULCAN_NO_PUPILS</string>
+    <string name="error_340" translatable="false">ERROR_VULCAN_API_MAINTENANCE</string>
+    <string name="error_341" translatable="false">ERROR_VULCAN_API_BAD_REQUEST</string>
+    <string name="error_342" translatable="false">ERROR_VULCAN_API_OTHER</string>
+
+    <string name="error_401" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN</string>
+    <string name="error_402" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME</string>
+    <string name="error_403" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED</string>
+    <string name="error_404" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_MAINTENANCE</string>
+    <string name="error_405" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_SERVER_ERROR</string>
+    <string name="error_410" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_OTHER</string>
+    <string name="error_411" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_API_NO_ACCESS</string>
+    <string name="error_420" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION</string>
+    <string name="error_421" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH</string>
+    <string name="error_422" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER</string>
+    <string name="error_430" translatable="false">ERROR_IDZIENNIK_WEB_ACCESS_DENIED</string>
+    <string name="error_431" translatable="false">ERROR_IDZIENNIK_WEB_OTHER</string>
+    <string name="error_432" translatable="false">ERROR_IDZIENNIK_WEB_MAINTENANCE</string>
+    <string name="error_433" translatable="false">ERROR_IDZIENNIK_WEB_SERVER_ERROR</string>
+    <string name="error_434" translatable="false">ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED</string>
+    <string name="error_440" translatable="false">ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR</string>
+    <string name="error_441" translatable="false">ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA</string>
+    <string name="error_450" translatable="false">ERROR_IDZIENNIK_API_ACCESS_DENIED</string>
+    <string name="error_451" translatable="false">ERROR_IDZIENNIK_API_OTHER</string>
+
+    <string name="error_801" translatable="false">ERROR_TEMPLATE_WEB_OTHER</string>
+
+    <string name="error_900" translatable="false">EXCEPTION_API_TASK</string>
+    <string name="error_901" translatable="false">EXCEPTION_LOGIN_LIBRUS_API_TOKEN</string>
+    <string name="error_902" translatable="false">EXCEPTION_LOGIN_LIBRUS_PORTAL_TOKEN</string>
+    <string name="error_903" translatable="false">EXCEPTION_LIBRUS_PORTAL_SYNERGIA_TOKEN</string>
+    <string name="error_904" translatable="false">EXCEPTION_LIBRUS_API_REQUEST</string>
+    <string name="error_905" translatable="false">EXCEPTION_LIBRUS_SYNERGIA_REQUEST</string>
+    <string name="error_906" translatable="false">EXCEPTION_MOBIDZIENNIK_WEB_REQUEST</string>
+    <string name="error_907" translatable="false">EXCEPTION_VULCAN_API_REQUEST</string>
+    <string name="error_910" translatable="false">EXCEPTION_NOTIFY_AND_SYNC</string>
+    <string name="error_911" translatable="false">EXCEPTION_LIBRUS_MESSAGES_REQUEST</string>
+    <string name="error_912" translatable="false">EXCEPTION_IDZIENNIK_WEB_REQUEST</string>
+    <string name="error_913" translatable="false">EXCEPTION_IDZIENNIK_WEB_API_REQUEST</string>
+    <string name="error_914" translatable="false">EXCEPTION_IDZIENNIK_API_REQUEST</string>
+
+    <string name="error_1201" translatable="false">LOGIN_NO_ARGUMENTS</string>
+
+    <string name="error_50_reason">Błąd odpowiedzi serwera</string>
+    <string name="error_51_reason">Błąd serwera: nieprawidłowe zapytanie</string>
+    <string name="error_52_reason">Błąd serwera: odmowa dostępu</string>
+    <string name="error_53_reason">Błąd serwera: dostęp zabroniony</string>
+    <string name="error_54_reason">Błąd serwera: plik nie znaleziony</string>
+    <string name="error_55_reason">Błąd serwera: nieprawidłowa metoda zapytania</string>
+    <string name="error_56_reason">Błąd serwera: odpowiedź niedostępna</string>
+    <string name="error_57_reason">Wewnętrzny błąd serwera</string>
+    <string name="error_100_reason">Brak odpowiedzi serwera</string>
+    <string name="error_101_reason">Dane logowania niekompletne</string>
+    <string name="error_102_reason">Nieprawidłowe dane logowania</string>
+    <string name="error_105_reason">Profil nie został ustawiony</string>
+    <string name="error_110_reason">Nieprawidłowy sposób logowania</string>
+    <string name="error_111_reason">Nie można wywołać metody logowania</string>
+    <string name="error_112_reason">Nie zaimplementowano</string>
+
+    <string name="error_115_reason">Brak uczniów przypisanych do konta</string>
+
+    <string name="error_120_reason">CODE_INTERNAL_LIBRUS_ACCOUNT_410</string>
+    <string name="error_121_reason">CODE_INTERNAL_LIBRUS_SYNERGIA_EXPIRED</string>
+    <string name="error_124_reason">Wymagane wypełnienie CAPTCHA</string>
+    <string name="error_125_reason">Problem z połączeniem</string>
+    <string name="error_126_reason">Nieprawidłowy identyfikator klienta</string>
+    <string name="error_127_reason">Wymagana akceptacja regulaminu</string>
+    <string name="error_128_reason">Błąd zmiany hasła</string>
+    <string name="error_129_reason">Wymagana zmiana hasła</string>
+    <string name="error_130_reason">Librus API: nieprawidłowe dane logowania</string>
+    <string name="error_131_reason">Inny błąd logowania do API</string>
+    <string name="error_132_reason">Brak tokenu CSRF</string>
+    <string name="error_133_reason">Konto LIBRUS nie zostało aktywowane</string>
+    <string name="error_134_reason">Inny błąd logowania do Portalu LIBRUS</string>
+    <string name="error_139_reason">Nie znaleziono tokenu Synergia</string>
+    <string name="error_140_reason">Token API wygasł</string>
+    <string name="error_141_reason">Niewystarczające uprawnienia</string>
+    <string name="error_142_reason">Inny błąd API</string>
+    <string name="error_143_reason">Odmowa dostępu do API</string>
+    <string name="error_144_reason">Nie znaleziono zasobu API</string>
+    <string name="error_145_reason">Brak danych</string>
+    <string name="error_146_reason">Plan lekcji nie jest publiczny</string>
+    <string name="error_147_reason">Brak dostępu do zasobu</string>
+    <string name="error_148_reason">Nieprawidłowe parametry</string>
+    <string name="error_149_reason">Nieprawidłowy zasób</string>
+    <string name="error_150_reason">Szczęśliwy numerek nie jest aktywny</string>
+    <string name="error_151_reason">Uwagi nie są publiczne</string>
+    <string name="error_152_reason">Brak tokenu logowania Synergia</string>
+    <string name="error_153_reason">Nieprawidłowy token logowania Synergia</string>
+    <string name="error_154_reason">Brak ID sesji Synergia</string>
+    <string name="error_155_reason">Brak dostępu do Wiadomości</string>
+    <string name="error_156_reason">Brak dostępu do Synergii</string>
+    <string name="error_157_reason">Brak ID sesji Wiadomości</string>
+    <string name="error_158_reason">Odmowa dostępu do Portalu Librus</string>
+    <string name="error_159_reason">API Portalu Librus wyłączone</string>
+    <string name="error_160_reason">Konto Synergia zostało rozłączone</string>
+    <string name="error_161_reason">Inny błąd Portalu Librus</string>
+    <string name="error_162_reason">Nie znaleziono konta Synergia</string>
+    <string name="error_163_reason">Inny błąd logowania do Portalu Librus</string>
+    <string name="error_164_reason">ERROR_LOGIN_LIBRUS_PORTAL_CODE_EXPIRED</string>
+    <string name="error_165_reason">ERROR_LOGIN_LIBRUS_PORTAL_CODE_REVOKED</string>
+    <string name="error_166_reason">ERROR_LOGIN_LIBRUS_PORTAL_NO_CLIENT_ID</string>
+    <string name="error_167_reason">ERROR_LOGIN_LIBRUS_PORTAL_NO_CODE</string>
+    <string name="error_168_reason">ERROR_LOGIN_LIBRUS_PORTAL_NO_REFRESH</string>
+    <string name="error_169_reason">ERROR_LOGIN_LIBRUS_PORTAL_NO_REDIRECT</string>
+    <string name="error_170_reason">ERROR_LOGIN_LIBRUS_PORTAL_UNSUPPORTED_GRANT</string>
+    <string name="error_171_reason">ERROR_LOGIN_LIBRUS_PORTAL_INVALID_CLIENT_ID</string>
+    <string name="error_172_reason">ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_INVALID</string>
+    <string name="error_173_reason">ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_REVOKED</string>
+    <string name="error_174_reason">ERROR_LIBRUS_SYNERGIA_OTHER</string>
+    <string name="error_175_reason">Librus Synergia: przerwa techniczna</string>
+    <string name="error_176_reason">Librus Wiadomości: przerwa techniczna</string>
+    <string name="error_177_reason">ERROR_LIBRUS_MESSAGES_ERROR</string>
+    <string name="error_178_reason">ERROR_LIBRUS_MESSAGES_OTHER</string>
+    <string name="error_179_reason">Librus Wiadomości: nieprawidłowe dane logowania</string>
+    <string name="error_180_reason">Librus Portal: nieprawidłowe dane logowania</string>
+    <string name="error_181_reason">Librus API: przerwa techniczna</string>
+
+    <string name="error_201_reason">ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_LOGIN</string>
+    <string name="error_202_reason">ERROR_LOGIN_MOBIDZIENNIK_WEB_OLD_PASSWORD</string>
+    <string name="error_203_reason">ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_DEVICE</string>
+    <string name="error_204_reason">ERROR_LOGIN_MOBIDZIENNIK_WEB_ARCHIVED</string>
+    <string name="error_205_reason">ERROR_LOGIN_MOBIDZIENNIK_WEB_MAINTENANCE</string>
+    <string name="error_206_reason">ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_ADDRESS</string>
+    <string name="error_210_reason">ERROR_LOGIN_MOBIDZIENNIK_WEB_OTHER</string>
+    <string name="error_211_reason">ERROR_MOBIDZIENNIK_WEB_ACCESS_DENIED</string>
+    <string name="error_212_reason">ERROR_MOBIDZIENNIK_WEB_NO_SESSION_KEY</string>
+    <string name="error_216_reason">ERROR_MOBIDZIENNIK_WEB_NO_SESSION_VALUE</string>
+    <string name="error_213_reason">ERROR_MOBIDZIENNIK_WEB_NO_SERVER_ID</string>
+    <string name="error_214_reason">ERROR_MOBIDZIENNIK_WEB_INVALID_RESPONSE</string>
+    <string name="error_215_reason">ERROR_LOGIN_MOBIDZIENNIK_WEB_NO_SESSION_ID</string>
+
+    <string name="error_301_reason">ERROR_LOGIN_VULCAN_INVALID_SYMBOL</string>
+    <string name="error_302_reason">ERROR_LOGIN_VULCAN_INVALID_TOKEN</string>
+    <string name="error_309_reason">ERROR_LOGIN_VULCAN_INVALID_PIN</string>
+    <string name="error_310_reason">ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING</string>
+    <string name="error_311_reason">ERROR_LOGIN_VULCAN_INVALID_PIN_1_REMAINING</string>
+    <string name="error_312_reason">ERROR_LOGIN_VULCAN_INVALID_PIN_2_REMAINING</string>
+    <string name="error_321_reason">ERROR_LOGIN_VULCAN_EXPIRED_TOKEN</string>
+    <string name="error_322_reason">ERROR_LOGIN_VULCAN_OTHER</string>
+    <string name="error_330_reason">ERROR_LOGIN_VULCAN_ONLY_KINDERGARTEN</string>
+    <string name="error_331_reason">ERROR_LOGIN_VULCAN_NO_PUPILS</string>
+    <string name="error_340_reason">ERROR_VULCAN_API_MAINTENANCE</string>
+    <string name="error_341_reason">ERROR_VULCAN_API_BAD_REQUEST</string>
+    <string name="error_342_reason">ERROR_VULCAN_API_OTHER</string>
+
+    <string name="error_401_reason">ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN</string>
+    <string name="error_402_reason">ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME</string>
+    <string name="error_403_reason">ERROR_LOGIN_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED</string>
+    <string name="error_404_reason">ERROR_LOGIN_IDZIENNIK_WEB_MAINTENANCE</string>
+    <string name="error_405_reason">ERROR_LOGIN_IDZIENNIK_WEB_SERVER_ERROR</string>
+    <string name="error_410_reason">ERROR_LOGIN_IDZIENNIK_WEB_OTHER</string>
+    <string name="error_411_reason">ERROR_LOGIN_IDZIENNIK_WEB_API_NO_ACCESS</string>
+    <string name="error_420_reason">ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION</string>
+    <string name="error_421_reason">ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH</string>
+    <string name="error_422_reason">ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER</string>
+    <string name="error_430_reason">ERROR_IDZIENNIK_WEB_ACCESS_DENIED</string>
+    <string name="error_431_reason">ERROR_IDZIENNIK_WEB_OTHER</string>
+    <string name="error_432_reason">ERROR_IDZIENNIK_WEB_MAINTENANCE</string>
+    <string name="error_433_reason">ERROR_IDZIENNIK_WEB_SERVER_ERROR</string>
+    <string name="error_434_reason">ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED</string>
+    <string name="error_440_reason">ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR</string>
+    <string name="error_441_reason">ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA</string>
+    <string name="error_450_reason">ERROR_IDZIENNIK_API_ACCESS_DENIED</string>
+    <string name="error_451_reason">ERROR_IDZIENNIK_API_OTHER</string>
+
+    <string name="error_801_reason">ERROR_TEMPLATE_WEB_OTHER</string>
+
+    <string name="error_900_reason">EXCEPTION_API_TASK</string>
+    <string name="error_901_reason">EXCEPTION_LOGIN_LIBRUS_API_TOKEN</string>
+    <string name="error_902_reason">EXCEPTION_LOGIN_LIBRUS_PORTAL_TOKEN</string>
+    <string name="error_903_reason">EXCEPTION_LIBRUS_PORTAL_SYNERGIA_TOKEN</string>
+    <string name="error_904_reason">EXCEPTION_LIBRUS_API_REQUEST</string>
+    <string name="error_905_reason">EXCEPTION_LIBRUS_SYNERGIA_REQUEST</string>
+    <string name="error_906_reason">EXCEPTION_MOBIDZIENNIK_WEB_REQUEST</string>
+    <string name="error_907_reason">EXCEPTION_VULCAN_API_REQUEST</string>
+    <string name="error_910_reason">EXCEPTION_NOTIFY_AND_SYNC</string>
+    <string name="error_911_reason">EXCEPTION_LIBRUS_MESSAGES_REQUEST</string>
+    <string name="error_912_reason">EXCEPTION_IDZIENNIK_WEB_REQUEST</string>
+    <string name="error_913_reason">EXCEPTION_IDZIENNIK_WEB_API_REQUEST</string>
+    <string name="error_914_reason">EXCEPTION_IDZIENNIK_API_REQUEST</string>
+
+    <string name="error_1201_reason">Nie podano parametrów</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
new file mode 100644
index 00000000..51e1215f
--- /dev/null
+++ b/app/src/main/res/values/ids.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-24.
+  -->
+
+<resources>
+    <item name="move_card_down_action" type="id"/>
+    <item name="move_card_up_action" type="id"/>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml
index b933e932..8e7275b2 100644
--- a/app/src/main/res/values/plurals.xml
+++ b/app/src/main/res/values/plurals.xml
@@ -67,4 +67,18 @@
         <item quantity="few">%1$s - %2$d nieprzeczytane</item>
         <item quantity="other">%1$s - %2$d nieprzeczytanych</item>
     </plurals>
+
+    <plurals name="critical_errors_format">
+        <item quantity="one">%d błąd krytyczny</item>
+        <item quantity="few">%d błędy krytyczne</item>
+        <item quantity="many">%d błędów krytycznych</item>
+        <item quantity="other">%d błędów krytycznych</item>
+    </plurals>
+
+    <plurals name="normal_errors_format">
+        <item quantity="one">%d błąd</item>
+        <item quantity="few">%d błędy</item>
+        <item quantity="many">%d błędów</item>
+        <item quantity="other">%d błędów</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4179f64c..a1a84b1b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -318,6 +318,7 @@
     <string name="lesson_break">Przerwa</string>
     <string name="lesson_cancelled">Lekcja odwołana</string>
     <string name="lesson_change">Zastępstwo</string>
+    <string name="lesson_shifted">Lekcja przeniesiona</string>
     <string name="lesson_timetable_change">Zmiana planu</string>
     <string name="loading">Ładowanie…</string>
     <string name="login_allow_registration">Zezwól na rejestrację</string>
@@ -448,7 +449,7 @@
     <string name="menu_timetable">Plan lekcji</string>
     <string name="messages_attachment_cannot_download">Nie można pobrać załącznika</string>
     <string name="messages_attachment_cannot_download_text">Wystąpił błąd wewnętrzny pobierania załącznika. Może to być spowodowane słabym połączeniem internetowym.</string>
-    <string name="messages_attachment_downloading_format" translatable="false">%s (%d%%)</string>
+    <string name="messages_attachment_downloading_format" translatable="false">%s (%.2fMB)</string>
     <string name="messages_attachment_format" translatable="false">%s (%s)</string>
     <string name="messages_attachment_no_size_format" translatable="false">%s</string>
     <string name="messages_compose_menu_attachment">Dodaj załącznik</string>
@@ -488,7 +489,8 @@
     <string name="notification_absence">Nieobecność</string>
     <string name="notification_absence_excused">Nieobecność usprawiedliwiona</string>
     <string name="notification_announcement_format">Ogłoszenie szkolne: %s</string>
-    <string name="notification_attendance_format">%s na lekcji %s z %s</string>
+    <string name="notification_attendance_format">%1$s na lekcji %2$s z dnia %3$s</string>
+    <string name="notification_attendance_no_lesson_format">%1$s z dnia %3$s</string>
     <string name="notification_belated">Spóźnienie</string>
     <string name="notification_belated_excused">Spóźnienie usprawiedliwione</string>
     <string name="notification_channel_get_data_desc">Powiadomienie o pobieraniu danych dla e-dziennika</string>
@@ -500,7 +502,8 @@
     <string name="notification_channel_updates_desc">Powiadomienia o nowych wersjach aplikacji</string>
     <string name="notification_channel_updates_name">Aktualizacje</string>
     <string name="notification_downloading_update">Pobieranie aktualizacji…</string>
-    <string name="notification_event_format">%s %s z %s</string>
+    <string name="notification_event_format">%1$s dnia %2$s z %3$s</string>
+    <string name="notification_event_no_subject_format">%1$s dnia %2$s</string>
     <string name="notification_event_no_subject">nieznanego przedmiotu</string>
     <string name="notification_get_data_cancel">Przerwij</string>
     <string name="notification_get_data_error_summary">Szkolny.eu: błąd</string>
@@ -510,7 +513,8 @@
     <string name="notification_get_data_text">Pobieranie danych</string>
     <string name="notification_get_data_title">Synchronizacja</string>
     <string name="notification_grade_format">Nowa ocena (%s) z %s</string>
-    <string name="notification_homework_format">Zadanie domowe z %s na %s</string>
+    <string name="notification_homework_format">Zadanie domowe z %1$s na %2$s</string>
+    <string name="notification_homework_no_subject_format">Zadanie domowe na %2$s</string>
     <string name="notification_lesson_change_format" translatable="false">%s %s - %s</string>
     <string name="notification_lucky_number_format">Dzisiaj %d to szczęśliwy numerek.</string>
     <string name="notification_lucky_number_later_format">Szczęsliwy numerek na %s to %d.</string>
@@ -569,7 +573,7 @@
     <string name="profile_menu_open_settings">Ustawienia</string>
     <string name="profile_menu_remove">Usuń profil</string>
     <string name="profile_menu_remove_confirm">Potwierdź usunięcie</string>
-    <string name="profile_menu_remove_confirm_text_format">Zamierzasz usunąć profil %s. Oznacza to usunięcie z aplikacji wszystkich danych powiązanych z tym profilem (ocen, planu lekcji, sprawdzianów…).\n\nWiększość danych będziesz mógł pobrać na nowo poprzez ponowne zalogowanie się.\n\nCzy rzeczywiście chcesz usunąć profil %s?</string>
+    <string name="profile_menu_remove_confirm_text_format">Zamierzasz usunąć profil <b>%s</b>. Oznacza to usunięcie z aplikacji wszystkich danych powiązanych z tym profilem (ocen, planu lekcji, sprawdzianów…).\n\nWiększość danych będziesz mógł pobrać na nowo poprzez ponowne zalogowanie się.\n\nCzy rzeczywiście chcesz usunąć profil %s?</string>
     <string name="rate_snackbar_negative">Nigdy</string>
     <string name="rate_snackbar_neutral">Później</string>
     <string name="rate_snackbar_positive">Oceń teraz</string>
@@ -590,7 +594,7 @@
     <string name="settings_about_licenses_text">Licencje open-source</string>
     <string name="settings_about_privacy_policy_text">Polityka prywatności</string>
     <string name="settings_about_register_title_text">E-dziennik</string>
-    <string name="settings_about_title_subtext">© Kuba Szczodrzyński wrzesień 2018 - październik 2019</string>
+    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nwrzesień 2018 - listopad 2019</string>
     <string name="settings_about_update_subtext">Kliknij, aby sprawdzić aktualizacje</string>
     <string name="settings_about_update_text">Aktualizacja</string>
     <string name="settings_about_version_text">Wersja</string>
@@ -905,6 +909,19 @@
     <string name="settings_about_discord_text">Serwer Discord</string>
     <string name="settings_about_discord_subtext">Dołącz do naszego serwera Discord!</string>
     <string name="menu_debug">Debugowanie</string>
+    <string name="edziennik_progress_login_librus_portal">Logowanie do Portalu Librus</string>
+    <string name="edziennik_progress_login_librus_api">Logowanie do API</string>
+    <string name="edziennik_progress_login_librus_synergia">Logowanie do Librus Synergia</string>
+    <string name="edziennik_progress_login_librus_messages">Logowanie do wiadomości Librus</string>
+    <string name="edziennik_notification_api_title">Usługa synchronizacji</string>
+    <string name="edziennik_notification_api_text">Dzięki niej, aplikacja Szkolny.eu może synchronizować dane z e-dziennikiem. Możesz ją zamknąć, ponieważ w tej chwili nic nie robi.</string>
+    <string name="edziennik_notification_api_close">Zamknij</string>
+    <string name="edziennik_notification_api_cancel">Anuluj</string>
+    <string name="edziennik_notification_api_sync_title_format">Trwa synchronizacja profilu %s...</string>
+    <string name="edziennik_notification_api_error_title">Synchronizacja przerwana</string>
+    <string name="edziennik_notification_api_error_report_task">Zgłaszanie błędów...</string>
+    <string name="edziennik_notification_api_error_report_title">Zgłaszanie błędów</string>
+    <string name="edziennik_progress_endpoint_student_info">Pobieram informacje o uczniu...</string>
     <string name="sync_action_syncing_school_free_days">Pobieranie dni wolnych szkoły</string>
     <string name="homework_tab_current">Aktualne</string>
     <string name="homework_tab_past">Minione</string>
@@ -912,4 +929,129 @@
     <string name="agenda_teacher_absence">Nieobecni nauczyciele</string>
     <string name="sync_action_syncing_grade_comments">Pobieranie komentarzy ocen</string>
     <string name="settings_register_show_teacher_absences_text">Pokazuj nieobecności nauczycieli w Terminarzu</string>
+    <string name="edziennik_progress_endpoint_school_info">Pobieram informacje o szkole...</string>
+    <string name="edziennik_progress_endpoint_grades">Pobieranie ocen ucznia...</string>
+    <string name="edziennik_progress_endpoint_grade_categories">Pobieranie kategorii ocen...</string>
+    <string name="edziennik_progress_login_template_web">Logowanie do Template WEB...</string>
+    <string name="edziennik_progress_login_template_api">Logowanie do Template API...</string>
+    <string name="edziennik_progress_login_mobidziennik_web">Logowanie do MobiDziennika...</string>
+    <string name="edziennik_progress_login_mobidziennik_api">Logowanie do API MobiDziennika...</string>
+    <string name="edziennik_progress_endpoint_data">Pobieram dane...</string>
+    <string name="edziennik_progress_endpoint_messages_inbox">Pobieram wiadomości odebrane...</string>
+    <string name="edziennik_progress_endpoint_messages">Pobieram wiadomości...</string>
+    <string name="edziennik_progress_endpoint_lucky_number">Pobieram szczęśliwy numerek...</string>
+    <string name="edziennik_progress_endpoint_calendar">Pobieram kalendarz...</string>
+    <string name="edziennik_progress_endpoint_behaviour">Pobieram uwagi ucznia...</string>
+    <string name="edziennik_progress_endpoint_attendance">Pobieram frekwencję ucznia...</string>
+    <string name="edziennik_progress_login_vulcan_api">Logowanie do Vulcan API...</string>
+    <string name="edziennik_progress_login_mobidziennik_api2">Logowanie do API MobiDziennika...</string>
+    <string name="edziennik_progress_endpoint_events">Pobieranie wydarzeń kalendarza...</string>
+    <string name="edziennik_progress_endpoint_homework">Pobieranie zadań domowych...</string>
+    <string name="edziennik_progress_endpoint_attendance_types">Pobieranie kategorii obecności...</string>
+    <string name="edziennik_progress_endpoint_announcements">Pobieranie ogłoszeń szkolnych...</string>
+    <string name="edziennik_notification_api_first_login_title">Pierwsze logowanie</string>
+    <string name="edziennik_progress_endpoint_classes">Pobieranie informacji o klasie...</string>
+    <string name="edziennik_progress_endpoint_teacher_free_days">Pobieranie nieobecności nauczycieli...</string>
+    <string name="edziennik_progress_endpoint_teacher_free_day_types">Pobieranie rodzajów nieobecności nauczycieli...</string>
+    <string name="edziennik_progress_endpoint_dictionaries">Pobieranie słowników...</string>
+    <string name="toolbar_subtitle_syncing">Synchronizuję...</string>
+    <string name="toolbar_subtitle_syncing_format" translatable="false">[%d%%] %s</string>
+    <string name="edziennik_progress_endpoint_notices">Pobieranie uwag...</string>
+    <string name="edziennik_progress_endpoint_teams">Pobieranie grup klasowych...</string>
+    <string name="edziennik_progress_endpoint_units">Pobieranie informacji o jednostce...</string>
+    <string name="edziennik_progress_endpoint_teachers">Pobieranie listy nauczycieli...</string>
+    <string name="edziennik_progress_endpoint_subjects">Pobieranie listy przedmiotów...</string>
+    <string name="edziennik_progress_endpoint_classrooms">Pobieranie listy sal lekcyjnych...</string>
+    <string name="edziennik_progress_endpoint_event_types">Pobieranie kategorii wydarzeń...</string>
+    <string name="edziennik_progress_endpoint_notice_types">Pobieranie kategorii uwag...</string>
+    <string name="edziennik_progress_endpoint_pt_meetings">Pobieranie zebrań z rodzicami...</string>
+    <string name="edziennik_progress_login_idziennik_web">Logowanie do iDziennika...</string>
+    <string name="edziennik_progress_login_idziennik_api">Logowanie do iDziennika...</string>
+    <string name="edziennik_progress_endpoint_messages_outbox">Pobieranie wiadomości wysłanych...</string>
+    <string name="login_summary_account_parent">(rodzic)</string>
+    <string name="login_summary_account_child">(uczeń)</string>
+    <string name="settings_about_language_text">Język aplikacji</string>
+    <string name="settings_about_language_subtext">Polski</string>
+    <string name="settings_about_language_dialog_title">Zmień język aplikacji</string>
+    <string name="settings_about_language_dialog_text">Uwaga. Ta opcja może nie działać na niektórych urządzeniach oraz w niektórych fragmentach aplikacji.</string>
+    <string name="language_system">Według systemu</string>
+    <string name="language_polish" translatable="false">Polski</string>
+    <string name="language_english" translatable="false">English</string>
+    <string name="edziennik_progress_endpoint_timetable">Pobieranie planu lekcji...</string>
+    <string name="edziennik_progress_endpoint_proposed_grades">Pobieranie ocen proponowanych...</string>
+    <string name="edziennik_progress_endpoint_exams">Pobieranie listy sprawdzianów...</string>
+    <string name="app_manager_dialog_title">Wykryto problem z synchronizacją</string>
+    <string name="app_manager_dialog_text">Na urządzeniu prawdopodobnie zainstalowany jest menedżer aplikacji, który może powodować problemy z synchronizacją automatyczną.\n\nNależy wyłączyć w ustawieniach telefonu optymalizację baterii dla aplikacji Szkolny.eu.\n\nKliknij OK, aby przejść do ustawień telefonu.</string>
+    <string name="dont_ask_again">Nie pytaj ponownie</string>
+    <string name="app_manager_open_failed">Nie udało się otworzyć ustawień</string>
+    <string name="edziennik_notification_api_notify_title">Tworzenie powiadomień</string>
+    <string name="login_librus_captcha_title">Librus - logowanie</string>
+    <string name="timetable_today">Dzisiaj</string>
+    <string name="timetable_lesson_cancelled">Lekcja odwołana</string>
+    <string name="timetable_lesson_change">Zastępstwo</string>
+    <string name="timetable_lesson_change_format">Zastępstwo: zamiast %s</string>
+    <string name="timetable_lesson_shifted_same_day">Lekcja przeniesiona na godz. %s</string>
+    <string name="timetable_lesson_shifted_other_day">Lekcja przeniesiona na %s, godz. %s</string>
+    <string name="timetable_lesson_shifted_from_same_day">Lekcja przeniesiona z godz. %s</string>
+    <string name="timetable_lesson_shifted_from_other_day">Lekcja przeniesiona z dnia %s, godz. %s</string>
+    <string name="timetable_lesson_shifted">Lekcja przeniesiona na inny termin</string>
+    <string name="timetable_lesson_shifted_from">Lekcja przeniesiona z innego terminu</string>
+    <string name="timetable_not_public_title">Brak planu lekcji</string>
+    <string name="timetable_not_public_text">Plan lekcji nie został opublikowany przez szkołę.</string>
+    <string name="timetable_not_public_hint">Skontaktuj się z wychowawcą w celu udostępnienia planu lekcji.</string>
+    <string name="timetable_free_day_title">Dzień wolny</string>
+    <string name="timetable_free_day_text">W tym dniu nie ma lekcji:</string>
+    <string name="timetable_free_day_show">Pokaż plan lekcji</string>
+    <string name="timetable_no_lessons_title">Brak lekcji tego dnia</string>
+    <string name="timetable_no_timetable_title">Brak planu lekcji</string>
+    <string name="timetable_no_timetable_text">Nie pobrano planu lekcji na ten tydzień.</string>
+    <string name="timetable_no_timetable_sync">Pobierz plan lekcji</string>
+    <string name="timetable_no_timetable_week">na tydzień %s</string>
+    <string name="dialog_lesson_details_teacher">Nauczyciel</string>
+    <string name="dialog_lesson_details_classroom">Sala lekcyjna</string>
+    <string name="dialog_lesson_details_team">Grupa</string>
+    <string name="dialog_lesson_details_id">ID lekcji</string>
+    <string name="dialog_lesson_details_number">Nr lekcji</string>
+    <string name="dialog_lesson_details_shifted_to">Lekcja przeniesiona na %s</string>
+    <string name="dialog_lesson_details_shifted_from">Lekcja przeniesiona z %s</string>
+    <string name="dialog_event_manual_title">Dodaj wpis do terminarza</string>
+    <string name="dialog_event_manual_time">Lekcja/godzina</string>
+    <string name="dialog_event_manual_date_next_lesson">nast. lekcja %s</string>
+    <string name="dialog_event_manual_date_tomorrow">jutro (%s)</string>
+    <string name="dialog_event_manual_date_this_week">%s (%s)</string>
+    <string name="dialog_event_manual_date_other">-- inna data --</string>
+    <string name="dialog_event_manual_date_today">dzisiaj (%s)</string>
+    <string name="dialog_event_manual_date_next_week">następny %s (%s)</string>
+    <string name="dialog_event_manual_no_lessons">Nie ma lekcji tego dnia</string>
+    <string name="dialog_profile_remove_success">Profil został usunięty.</string>
+    <string name="snackbar_error_text">Wystąpił błąd</string>
+    <string name="dialog_sync_view_list_title">Synchronizacja ręczna</string>
+    <string name="timetable_no_subject_name">(brak nazwy)</string>
+    <string name="dialog_event_manual_more_options">Więcej opcji</string>
+    <string name="edziennik_progress_endpoint_grade_comments">Pobieranie komentarzy ocen...</string>
+    <string name="menu_remove_notifications">Usuń wszystkie</string>
+    <string name="menu_remove_notifications_success">Wyczyszczono powiadomienia</string>
+    <string name="timetable_select_day">Wybierz dzień</string>
+    <string name="card_action_move_up">Przesuń w górę</string>
+    <string name="card_action_move_down">Przesuń w dół</string>
+    <string name="home_lucky_number_details_click_to_set">%s • Kliknij, aby ustawić swój numerek.</string>
+    <string name="home_lucky_number_details">%s • Numer w dzienniku to %d</string>
+    <string name="home_lucky_number_no_info">Brak informacji o szczęśliwym numerku.</string>
+    <string name="home_lucky_number_yours_today">Dzisiaj to Ty masz szczęśliwy numerek!</string>
+    <string name="home_lucky_number_yours_tomorrow">Jutro to Ty masz szczęśliwy numerek!</string>
+    <string name="home_lucky_number_yours_later">Dnia %s Twój numerek jest szczęśliwy.</string>
+    <string name="home_lucky_number_later">Dnia %s szczęśliwy numerek to %d.</string>
+    <string name="home_lucky_number_today">%d to dzisiejszy szczęśliwy numerek.</string>
+    <string name="home_lucky_number_tomorrow">%d to szczęśliwy numerek na jutro.</string>
+    <string name="home_lucky_number_no_number">Nie ma dzisiaj szczęśliwego numerka.</string>
+    <string name="home_timetable_tomorrow">Jutro (%1$s)</string>
+    <string name="home_timetable_date_this_week">%1$s, %2$s</string>
+    <string name="home_timetable_date_future">%1$s, %2$s</string>
+    <string name="home_timetable_lessons_info">%d lekcji - %s do %s</string>
+    <string name="home_timetable_lesson_first">Pierwsza: %s</string>
+    <string name="home_timetable_later">Później:</string>
+    <string name="home_timetable_later_no_lessons">brak lekcji</string>
+    <string name="home_timetable_today">Dzisiaj</string>
+    <string name="home_timetable_lesson_ongoing">Teraz: %s</string>
+    <string name="home_timetable_lesson_not_started">Za chwilę: %s</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 116c7a40..c6c7da22 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="colorAccent">@color/colorAccent</item>
@@ -82,6 +82,7 @@
         <item name="colorFab">#4CAF50</item>
         <item name="colorFabIcon">#c8e6c9</item>
         <item name="colorOnFab">#ffffff</item>
+        <item name="colorIcon">#8a000000</item>
 
         <item name="md_dark_theme">false</item>
         <item name="md_title_color">?android:textColorPrimary</item>
@@ -95,6 +96,14 @@
         <item name="mal_color_secondary">?android:textColorSecondary</item>
         <item name="mal_card_background">?colorSurface</item>
         <item name="mal_divider_color">@color/dividerColor</item>
+
+        <item name="timetable_lesson_bg">@drawable/timetable_lesson_bg_light</item>
+        <item name="timetable_lesson_cancelled_color">#9f9f9f</item>
+        <item name="timetable_lesson_change_color">#ffb300</item>
+        <item name="timetable_lesson_shifted_source_color">#A1887F</item>
+        <item name="timetable_lesson_shifted_target_color">#4caf50</item>
+        <item name="hourDividerColor">#b0b0b0</item>
+        <item name="halfHourDividerColor">#e0e0e0</item>
     </style>
     <style name="AppTheme.Dark" parent="NavView.Dark">
         <item name="colorPrimary">#64b5f6</item>
@@ -106,6 +115,7 @@
         <item name="colorFab">#4CAF50</item>
         <item name="colorFabIcon">#c8e6c9</item>
         <item name="colorOnFab">#ffffff</item>
+        <item name="colorIcon">#b4ffffff</item>
 
         <item name="md_dark_theme">true</item>
         <item name="md_title_color">?android:textColorPrimary</item>
@@ -119,6 +129,14 @@
         <item name="mal_color_secondary">@color/secondaryTextDark</item>
         <item name="mal_card_background">?colorSurface</item>
         <item name="mal_divider_color">@color/dividerColor</item>
+
+        <item name="timetable_lesson_bg">@drawable/timetable_lesson_bg_dark</item>
+        <item name="timetable_lesson_cancelled_color">#838383</item>
+        <item name="timetable_lesson_change_color">#ffb300</item>
+        <item name="timetable_lesson_shifted_source_color">#A1887F</item>
+        <item name="timetable_lesson_shifted_target_color">#4caf50</item>
+        <item name="hourDividerColor">#7fffffff</item>
+        <item name="halfHourDividerColor">#40ffffff</item>
     </style>
 
 
diff --git a/build.gradle b/build.gradle
index 0ab85d27..4d0befff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
         kotlin_version = '1.3.50'
 
         release = [
-                versionName: "3.1.1",
-                versionCode: 3010199
+                versionName: "3.9.12-dev",
+                versionCode: 3091200
         ]
 
         setup = [
@@ -18,33 +18,34 @@ buildscript {
 
         versions = [
                 kotlin           : "1.3.50",
-                ktx              : "1.0.2",
+                ktx              : "1.1.0",
 
                 androidX         : '1.0.0',
                 annotation       : '1.1.0',
-                recyclerView     : '1.1.0-beta04',
-                material         : '1.1.0-alpha09',
-                appcompat        : '1.1.0-rc01',
-                constraintLayout : '2.0.0-beta2',
+                recyclerView     : '1.1.0-rc01',
+                material         : '1.2.0-alpha01',
+                appcompat        : '1.1.0',
+                constraintLayout : '2.0.0-beta3',
                 cardview         : '1.0.0',
                 gridLayout       : '1.0.0',
                 navigation       : "2.0.0",
                 navigationFragment: "1.0.0",
                 legacy           : "1.0.0",
 
-                room             : "2.2.0-beta01",
-                lifecycle        : "2.2.0-alpha04",
+                room             : "2.2.1",
+                lifecycle        : "2.2.0-rc02",
+                work             : "2.2.0",
 
                 firebase         : '17.2.0',
                 firebasemessaging: "20.0.0",
                 play_services    : "17.0.0",
 
                 materialdialogs  : "0.9.6.0",
-                materialdrawer   : "62b24da031",
+                materialdrawer   : "cad66092a6",
                 iconics          : "4.0.1-b02",
                 font_cmd         : "3.5.95.1-kotlin",
 
-                navlib           : "e4ad01dc87",
+                navlib           : "8ae5e2b87a",
 
                 gifdrawable      : "1.2.15"
         ]
@@ -58,7 +59,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath 'me.tatarka:gradle-retrolambda:3.7.0'
         classpath 'com.google.gms:google-services:4.3.1'
         classpath 'io.fabric.tools:gradle:1.28.1'
@@ -81,6 +82,7 @@ allprojects {
         jcenter()
         maven { url 'https://jitpack.io' }
         maven { url "https://kotlin.bintray.com/kotlinx/" }
+        maven { url "https://dl.bintray.com/wulkanowy/wulkanowy" }
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7ddd4838..9edbc9cb 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
\ No newline at end of file
diff --git a/mhttp/src/main/java/im/wangchao/mhttp/internal/cookie/PersistentCookieJar.java b/mhttp/src/main/java/im/wangchao/mhttp/internal/cookie/PersistentCookieJar.java
index 5be7c289..3a6b5a8c 100644
--- a/mhttp/src/main/java/im/wangchao/mhttp/internal/cookie/PersistentCookieJar.java
+++ b/mhttp/src/main/java/im/wangchao/mhttp/internal/cookie/PersistentCookieJar.java
@@ -18,6 +18,7 @@ package im.wangchao.mhttp.internal.cookie;
 
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -42,21 +43,13 @@ public class PersistentCookieJar implements ClearableCookieJar {
     }
 
     @Override
-    synchronized public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
-        //Log.d("PersistentCookieJar", "FINISHING "+url.toString());
+    synchronized public void saveFromResponse(@Nullable HttpUrl url, List<Cookie> cookies) {
         // cookies need to be reversed, in order to replace old cookies with these coming later
         // (if there are duplicate cookies in the same response)
         List<Cookie> reverseCookies = new ArrayList<>(cookies);
         Collections.reverse(reverseCookies);
-        /*for (Cookie cookie: reverseCookies) {
-            Log.d("PersistentCookieJar", "Saving cookie "+cookie.toString()+" from URL "+url.toString());
-        }*/
         cache.addAll(reverseCookies);
         persistor.saveAll(reverseCookies);
-        /*Log.d("PersistentCookieJar", "Cookies saved: ");
-        for (Cookie cookie : cache) {
-            Log.d("PersistentCookieJar", "Saving cookie " + cookie.toString() + " from URL " + url.toString());
-        }*/
     }
 
     @NonNull
@@ -65,23 +58,15 @@ public class PersistentCookieJar implements ClearableCookieJar {
         List<Cookie> removedCookies = new ArrayList<>();
         List<Cookie> validCookies = new ArrayList<>();
 
-        //Log.d("PersistentCookieJar", "REQUESTING "+url.toString());
-
         for (Iterator<Cookie> it = cache.iterator(); it.hasNext(); ) {
             Cookie currentCookie = it.next();
-            //Log.d("PersistentCookieJar", "Loading "+currentCookie.toString()+" to URL "+url.toString());
             if (isCookieExpired(currentCookie)) {
-                //Log.d("PersistentCookieJar", "Cookie expired at "+new SimpleDateFormat("dd/MM/yyyy HH:mm:ss", Locale.getDefault()).format(new Date(currentCookie.expiresAt())));
                 removedCookies.add(currentCookie);
                 it.remove();
 
             } else if (currentCookie.matches(url)) {
-                //Log.d("PersistentCookieJar", "Cookie is still valid until "+new SimpleDateFormat("dd/MM/yyyy HH:mm:ss", Locale.getDefault()).format(new Date(currentCookie.expiresAt())));
                 validCookies.add(currentCookie);
             }
-            /*else {
-                Log.d("PersistentCookieJar", "URL doesn't match");
-            }*/
         }
 
         persistor.removeAll(removedCookies);
@@ -89,6 +74,49 @@ public class PersistentCookieJar implements ClearableCookieJar {
         return validCookies;
     }
 
+    @NonNull
+    synchronized public List<Cookie> getForDomain(String domain) {
+        List<Cookie> removedCookies = new ArrayList<>();
+        List<Cookie> validCookies = new ArrayList<>();
+
+        for (Iterator<Cookie> it = cache.iterator(); it.hasNext(); ) {
+            Cookie currentCookie = it.next();
+            if (isCookieExpired(currentCookie)) {
+                removedCookies.add(currentCookie);
+                it.remove();
+
+            } else if (domain.equals(currentCookie.domain())) {
+                validCookies.add(currentCookie);
+            }
+        }
+
+        persistor.removeAll(removedCookies);
+
+        return validCookies;
+    }
+
+    @Nullable
+    synchronized public String getCookie(String domain, String name) {
+        String cookieValue = null;
+        List<Cookie> removedCookies = new ArrayList<>();
+
+        for (Iterator<Cookie> it = cache.iterator(); it.hasNext(); ) {
+            Cookie currentCookie = it.next();
+            if (isCookieExpired(currentCookie)) {
+                removedCookies.add(currentCookie);
+                it.remove();
+
+            } else if (domain.equals(currentCookie.domain()) && name.equals(currentCookie.name())) {
+                cookieValue = currentCookie.value();
+                break;
+            }
+        }
+
+        persistor.removeAll(removedCookies);
+
+        return cookieValue;
+    }
+
     private static boolean isCookieExpired(Cookie cookie) {
         return cookie.expiresAt() < System.currentTimeMillis();
     }
diff --git a/settings.gradle b/settings.gradle
index 8b001cca..0def8313 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-include ':app', ':agendacalendarview', ':MaterialDrawer', ':mhttp', ':material-about-library', ':cafebar', ':szkolny-font', ':nachos'
+include ':app', ':agendacalendarview', ':mhttp', ':material-about-library', ':cafebar', ':szkolny-font', ':nachos', ':community-material'
 /*
 include ':Navigation'
 project(':Navigation').projectDir = new File(settingsDir, '../Navigation/navlib')*/
diff --git a/szkolny-font/build.gradle b/szkolny-font/build.gradle
index 3e136e8d..02d6e56b 100644
--- a/szkolny-font/build.gradle
+++ b/szkolny-font/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Mike Penz
+ * Copyright 2019 Mike Penz
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         consumerProguardFiles 'consumer-proguard-rules.pro'
-        versionCode 1
-        versionName "1.0"
+        versionCode 11
+        versionName "1.1"
     }
     buildTypes {
         release {
@@ -47,5 +47,5 @@ if (project.hasProperty('pushall') || project.hasProperty('SzkolnyFontonly')) {
 
 dependencies {
     implementation "com.mikepenz:iconics-core:${iconics}"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
diff --git a/szkolny-font/src/main/java/com/mikepenz/iconics/typeface/library/szkolny/font/SzkolnyFont.kt b/szkolny-font/src/main/java/com/mikepenz/iconics/typeface/library/szkolny/font/SzkolnyFont.kt
index 593952fd..5e23dbd1 100644
--- a/szkolny-font/src/main/java/com/mikepenz/iconics/typeface/library/szkolny/font/SzkolnyFont.kt
+++ b/szkolny-font/src/main/java/com/mikepenz/iconics/typeface/library/szkolny/font/SzkolnyFont.kt
@@ -1,6 +1,5 @@
 /*
- * Copyright 2014 Mike Penz
- * Copyright 2015 Haruki Hasegawa
+ * Copyright 2019 Mike Penz
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,21 +18,18 @@ package com.mikepenz.iconics.typeface.library.szkolny.font
 import com.mikepenz.iconics.typeface.IIcon
 import com.mikepenz.iconics.typeface.ITypeface
 import com.mikepenz.iconics.typeface.library.szkolny.R
-import java.util.LinkedList
+import java.util.*
 
 @Suppress("EnumEntryName")
 object SzkolnyFont : ITypeface {
 
     override val fontRes: Int
-        get() = R.font.szkolny_font_font_v1_0
+        get() = R.font.szkolny_font_font_v1_1
 
     override val characters: Map<String, Char> by lazy {
-        mutableMapOf<String, Char>().apply {
-            SzkolnyFont.Icon.values().associateTo(this) { it.name to it.character }
-            //Icon2.values().associateTo(this) { it.name to it.character }
-        }
+        Icon.values().associate { it.name to it.character }
     }
-
+    
     override val mappingPrefix: String
         get() = "szf"
 
@@ -41,7 +37,7 @@ object SzkolnyFont : ITypeface {
         get() = "Szkolny Font"
 
     override val version: String
-        get() = "1.0"
+        get() = "1.1"
 
     override val iconCount: Int
         get() = characters.size
@@ -64,17 +60,28 @@ object SzkolnyFont : ITypeface {
     override val licenseUrl: String
         get() = ""
 
-    override fun getIcon(key: String): IIcon {
-        return SzkolnyFont.Icon.valueOf(key)
-    }
+    override fun getIcon(key: String): IIcon = Icon.valueOf(key)
 
     enum class Icon constructor(override val character: Char) : IIcon {
-        szf_eye_check('\ue800'),
-        szf_calendar_off('\ue801'),
-        szf_file_document_edit('\ue802'),
-        szf_message_off('\ue803'),
-        szf_numeric_0_box_multiple_outline_off('\ue804');
+        szf_alarm_bell_outline('\ue800'),
+		szf_calendar_plus_outline('\ue801'),
+		szf_calendar_today_outline('\ue802'),
+		szf_clipboard_list_outline('\ue803'),
+		szf_delete_empty_outline('\ue804'),
+		szf_discord_outline('\ue805'),
+		szf_file_code_outline('\ue806'),
+		szf_file_excel_outline('\ue807'),
+		szf_file_image_outline('\ue808'),
+		szf_file_music_outline('\ue809'),
+		szf_file_pdf_outline('\ue80a'),
+		szf_file_percent_outline('\ue80b'),
+		szf_file_powerpoint_outline('\ue80c'),
+		szf_file_video_outline('\ue80d'),
+		szf_file_word_outline('\ue80e'),
+		szf_message_processing_outline('\ue80f'),
+		szf_notebook_outline('\ue810'),
+		szf_zip_box_outline('\ue811');
 
         override val typeface: ITypeface by lazy { SzkolnyFont }
     }
-}
+}
\ No newline at end of file
diff --git a/szkolny-font/src/main/res/font/szkolny_font_font_v1_0.ttf b/szkolny-font/src/main/res/font/szkolny_font_font_v1_0.ttf
deleted file mode 100644
index 351575db..00000000
Binary files a/szkolny-font/src/main/res/font/szkolny_font_font_v1_0.ttf and /dev/null differ
diff --git a/szkolny-font/src/main/res/font/szkolny_font_font_v1_1.ttf b/szkolny-font/src/main/res/font/szkolny_font_font_v1_1.ttf
new file mode 100644
index 00000000..33ad627f
Binary files /dev/null and b/szkolny-font/src/main/res/font/szkolny_font_font_v1_1.ttf differ