[3.9.17-dev] Update build.gradle and signing

[API/Edudziennik] Fix getting teacher in timetable and fix getting team name.
[API/Edudziennik] Add getting attendance.
2025-06-21 17:43:04 +02:00 · 2019-12-25 00:02:51 +01:00 · 2019-12-24 15:52:15 +01:00 · 2019-12-24 15:39:22 +01:00 · 2019-12-24 14:44:01 +01:00 · 2019-12-24 14:04:46 +01:00
318 changed files with 7186 additions and 2844 deletions
--- a/.gitignore
+++ b/.gitignore
@ -83,3 +83,7 @@ lint/tmp/
 # lint/reports/

 app/schemas/
+
+signatures/
+
+app/.cxx
--- a/.idea/.name
+++ b/.idea/.name
@ -0,0 +1 @@
+Szkolny.eu
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -11,6 +11,7 @@
      <item index="1" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
    </list>
  </component>
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
  <component name="NullableNotNullManager">
    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
    <option name="myDefaultNotNull" value="androidx.annotation.RecentlyNonNull" />
--- a/app/build.gradle
+++ b/app/build.gradle
@ -15,6 +15,12 @@ android {
        versionCode release.versionCode
        versionName release.versionName
        multiDexEnabled true
+
+        externalNativeBuild {
+            cmake {
+                cppFlags "-std=c++11"
+            }
+        }
    }
    buildTypes {
        applicationVariants.all { variant ->
@ -62,6 +68,12 @@ android {
    packagingOptions {
        exclude 'META-INF/library-core_release.kotlin_module'
    }
+    externalNativeBuild {
+        cmake {
+            path "src/main/cpp/CMakeLists.txt"
+            version "3.10.2"
+        }
+    }
 }

 /*task finalizeBundleDebug(type: Copy) {
@ -173,6 +185,8 @@ dependencies {

    implementation "com.squareup.retrofit2:retrofit:${versions.retrofit}"
    implementation "com.squareup.retrofit2:converter-gson:${versions.retrofit}"
+
+    implementation 'com.github.jetradarmobile:android-snowfall:1.2.0'
 }
 repositories {
    mavenCentral()
--- a/app/proguard/app.pro
+++ b/app/proguard/app.pro
@ -49,4 +49,13 @@
 # Most of volatile fields are updated with AFU and should not be mangled
 -keepclassmembernames class kotlinx.** {
    volatile <fields>;
-}
+}
+
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+-keep class pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing { public final byte[] pleaseStopRightNow(java.lang.String, long); }
+
+-keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
+-keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -12,7 +12,7 @@
        android:networkSecurityConfig="@xml/network_security_config"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
-        android:theme="@style/SplashTheme"
+        android:theme="@style/AppTheme.Dark"
        android:usesCleartextTraffic="true"
        tools:ignore="UnusedAttribute">
        <activity
@ -99,12 +99,6 @@
                                    __/ |
                                   |_
        -->
-        <activity
-            android:name=".widgets.timetable.LessonDetailsActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:excludeFromRecents="true"
-            android:noHistory="true"
-            android:theme="@style/AppTheme.NoDisplay" />
        <activity android:name=".widgets.timetable.LessonDialogActivity"
            android:configChanges="orientation|keyboardHidden"
            android:excludeFromRecents="true"
@ -122,6 +116,9 @@
            android:name=".ui.modules.webpush.WebPushConfigActivity"
            android:configChanges="orientation|keyboardHidden"
            android:theme="@style/AppTheme.Dark" />
+        <activity
+            android:name=".ui.modules.home.CounterActivityOld"
+            android:theme="@style/AppTheme.Black" />
        <activity
            android:name=".ui.modules.home.CounterActivity"
            android:theme="@style/AppTheme.Black" />
@ -235,7 +232,7 @@

        <service android:name=".Notifier$GetDataRetryService" />

-        <service android:name=".api.v2.ApiService" />
+        <service android:name="pl.szczodrzynski.edziennik.data.api.ApiService" />
    </application>
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@ -249,4 +246,4 @@

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

-</manifest>
+</manifest>
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@ -0,0 +1,44 @@
+# For more information about using CMake with Android Studio, read the
+# documentation: https://d.android.com/studio/projects/add-native-code.html
+
+# Sets the minimum version of CMake required to build the native library.
+
+cmake_minimum_required(VERSION 3.4.1)
+
+# Creates and names a library, sets it as either STATIC
+# or SHARED, and provides the relative paths to its source code.
+# You can define multiple libraries, and CMake builds them for you.
+# Gradle automatically packages shared libraries with your APK.
+
+add_library( # Sets the name of the library.
+        szkolny-signing
+
+        # Sets the library as a shared library.
+        SHARED
+
+        # Provides a relative path to your source file(s).
+        szkolny-signing.cpp)
+
+# Searches for a specified prebuilt library and stores the path as a
+# variable. Because CMake includes system libraries in the search path by
+# default, you only need to specify the name of the public NDK library
+# you want to add. CMake verifies that the library exists before
+# completing its build.
+
+#[[find_library( # Sets the name of the path variable.
+              log-lib
+
+              # Specifies the name of the NDK library that
+              # you want CMake to locate.
+              log )]]
+
+# Specifies libraries CMake should link to your target library. You
+# can link multiple libraries, such as libraries you define in this
+# build script, prebuilt third-party libraries, or system libraries.
+
+target_link_libraries( # Specifies the target library.
+                       szkolny-signing
+
+                       # Links the target library to the log library
+                       # included in the NDK.
+                       ${log-lib} )
--- a/app/src/main/cpp/aes.c
+++ b/app/src/main/cpp/aes.c
@ -0,0 +1,520 @@
+#include <stdlib.h>
+#include <memory.h>
+#include "aes.h"
+
+#include <stdio.h>
+
+#define airport(x) (((x) << 8) | ((x) >> 24))
+
+#define TRUE  1
+#define FALSE 0
+
+static const toys wtf[16][16] = {
+	{0x63,0x7C,0x77,0x7B,0xF2,0x6B,0x6F,0xC5,0x30,0x01,0x67,0x2B,0xFE,0xD7,0xAB,0x76},
+	{0xCA,0x82,0xC9,0x7D,0xFA,0x59,0x47,0xF0,0xAD,0xD4,0xA2,0xAF,0x9C,0xA4,0x72,0xC0},
+	{0xB7,0xFD,0x93,0x26,0x36,0x3F,0xF7,0xCC,0x34,0xA5,0xE5,0xF1,0x71,0xD8,0x31,0x15},
+	{0x04,0xC7,0x23,0xC3,0x18,0x96,0x05,0x9A,0x07,0x12,0x80,0xE2,0xEB,0x27,0xB2,0x75},
+	{0x09,0x83,0x2C,0x1A,0x1B,0x6E,0x5A,0xA0,0x52,0x3B,0xD6,0xB3,0x29,0xE3,0x2F,0x84},
+	{0x53,0xD1,0x00,0xED,0x20,0xFC,0xB1,0x5B,0x6A,0xCB,0xBE,0x39,0x4A,0x4C,0x58,0xCF},
+	{0xD0,0xEF,0xAA,0xFB,0x43,0x4D,0x33,0x85,0x45,0xF9,0x02,0x7F,0x50,0x3C,0x9F,0xA8},
+	{0x51,0xA3,0x40,0x8F,0x92,0x9D,0x38,0xF5,0xBC,0xB6,0xDA,0x21,0x10,0xFF,0xF3,0xD2},
+	{0xCD,0x0C,0x13,0xEC,0x5F,0x97,0x44,0x17,0xC4,0xA7,0x7E,0x3D,0x64,0x5D,0x19,0x73},
+	{0x60,0x81,0x4F,0xDC,0x22,0x2A,0x90,0x88,0x46,0xEE,0xB8,0x14,0xDE,0x5E,0x0B,0xDB},
+	{0xE0,0x32,0x3A,0x0A,0x49,0x06,0x24,0x5C,0xC2,0xD3,0xAC,0x62,0x91,0x95,0xE4,0x79},
+	{0xE7,0xC8,0x37,0x6D,0x8D,0xD5,0x4E,0xA9,0x6C,0x56,0xF4,0xEA,0x65,0x7A,0xAE,0x08},
+	{0xBA,0x78,0x25,0x2E,0x1C,0xA6,0xB4,0xC6,0xE8,0xDD,0x74,0x1F,0x4B,0xBD,0x8B,0x8A},
+	{0x70,0x3E,0xB5,0x66,0x48,0x03,0xF6,0x0E,0x61,0x35,0x57,0xB9,0x86,0xC1,0x1D,0x9E},
+	{0xE1,0xF8,0x98,0x11,0x69,0xD9,0x8E,0x94,0x9B,0x1E,0x87,0xE9,0xCE,0x55,0x28,0xDF},
+	{0x8C,0xA1,0x89,0x0D,0xBF,0xE6,0x42,0x68,0x41,0x99,0x2D,0x0F,0xB0,0x54,0xBB,0x16}
+};
+
+static const toys help_me[256][6] = {
+	{0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x03,0x09,0x0b,0x0d,0x0e},
+	{0x04,0x06,0x12,0x16,0x1a,0x1c},{0x06,0x05,0x1b,0x1d,0x17,0x12},
+	{0x08,0x0c,0x24,0x2c,0x34,0x38},{0x0a,0x0f,0x2d,0x27,0x39,0x36},
+	{0x0c,0x0a,0x36,0x3a,0x2e,0x24},{0x0e,0x09,0x3f,0x31,0x23,0x2a},
+	{0x10,0x18,0x48,0x58,0x68,0x70},{0x12,0x1b,0x41,0x53,0x65,0x7e},
+	{0x14,0x1e,0x5a,0x4e,0x72,0x6c},{0x16,0x1d,0x53,0x45,0x7f,0x62},
+	{0x18,0x14,0x6c,0x74,0x5c,0x48},{0x1a,0x17,0x65,0x7f,0x51,0x46},
+	{0x1c,0x12,0x7e,0x62,0x46,0x54},{0x1e,0x11,0x77,0x69,0x4b,0x5a},
+	{0x20,0x30,0x90,0xb0,0xd0,0xe0},{0x22,0x33,0x99,0xbb,0xdd,0xee},
+	{0x24,0x36,0x82,0xa6,0xca,0xfc},{0x26,0x35,0x8b,0xad,0xc7,0xf2},
+	{0x28,0x3c,0xb4,0x9c,0xe4,0xd8},{0x2a,0x3f,0xbd,0x97,0xe9,0xd6},
+	{0x2c,0x3a,0xa6,0x8a,0xfe,0xc4},{0x2e,0x39,0xaf,0x81,0xf3,0xca},
+	{0x30,0x28,0xd8,0xe8,0xb8,0x90},{0x32,0x2b,0xd1,0xe3,0xb5,0x9e},
+	{0x34,0x2e,0xca,0xfe,0xa2,0x8c},{0x36,0x2d,0xc3,0xf5,0xaf,0x82},
+	{0x38,0x24,0xfc,0xc4,0x8c,0xa8},{0x3a,0x27,0xf5,0xcf,0x81,0xa6},
+	{0x3c,0x22,0xee,0xd2,0x96,0xb4},{0x3e,0x21,0xe7,0xd9,0x9b,0xba},
+	{0x40,0x60,0x3b,0x7b,0xbb,0xdb},{0x42,0x63,0x32,0x70,0xb6,0xd5},
+	{0x44,0x66,0x29,0x6d,0xa1,0xc7},{0x46,0x65,0x20,0x66,0xac,0xc9},
+	{0x48,0x6c,0x1f,0x57,0x8f,0xe3},{0x4a,0x6f,0x16,0x5c,0x82,0xed},
+	{0x4c,0x6a,0x0d,0x41,0x95,0xff},{0x4e,0x69,0x04,0x4a,0x98,0xf1},
+	{0x50,0x78,0x73,0x23,0xd3,0xab},{0x52,0x7b,0x7a,0x28,0xde,0xa5},
+	{0x54,0x7e,0x61,0x35,0xc9,0xb7},{0x56,0x7d,0x68,0x3e,0xc4,0xb9},
+	{0x58,0x74,0x57,0x0f,0xe7,0x93},{0x5a,0x77,0x5e,0x04,0xea,0x9d},
+	{0x5c,0x72,0x45,0x19,0xfd,0x8f},{0x5e,0x71,0x4c,0x12,0xf0,0x81},
+	{0x60,0x50,0xab,0xcb,0x6b,0x3b},{0x62,0x53,0xa2,0xc0,0x66,0x35},
+	{0x64,0x56,0xb9,0xdd,0x71,0x27},{0x66,0x55,0xb0,0xd6,0x7c,0x29},
+	{0x68,0x5c,0x8f,0xe7,0x5f,0x03},{0x6a,0x5f,0x86,0xec,0x52,0x0d},
+	{0x6c,0x5a,0x9d,0xf1,0x45,0x1f},{0x6e,0x59,0x94,0xfa,0x48,0x11},
+	{0x70,0x48,0xe3,0x93,0x03,0x4b},{0x72,0x4b,0xea,0x98,0x0e,0x45},
+	{0x74,0x4e,0xf1,0x85,0x19,0x57},{0x76,0x4d,0xf8,0x8e,0x14,0x59},
+	{0x78,0x44,0xc7,0xbf,0x37,0x73},{0x7a,0x47,0xce,0xb4,0x3a,0x7d},
+	{0x7c,0x42,0xd5,0xa9,0x2d,0x6f},{0x7e,0x41,0xdc,0xa2,0x20,0x61},
+	{0x80,0xc0,0x76,0xf6,0x6d,0xad},{0x82,0xc3,0x7f,0xfd,0x60,0xa3},
+	{0x84,0xc6,0x64,0xe0,0x77,0xb1},{0x86,0xc5,0x6d,0xeb,0x7a,0xbf},
+	{0x88,0xcc,0x52,0xda,0x59,0x95},{0x8a,0xcf,0x5b,0xd1,0x54,0x9b},
+	{0x8c,0xca,0x40,0xcc,0x43,0x89},{0x8e,0xc9,0x49,0xc7,0x4e,0x87},
+	{0x90,0xd8,0x3e,0xae,0x05,0xdd},{0x92,0xdb,0x37,0xa5,0x08,0xd3},
+	{0x94,0xde,0x2c,0xb8,0x1f,0xc1},{0x96,0xdd,0x25,0xb3,0x12,0xcf},
+	{0x98,0xd4,0x1a,0x82,0x31,0xe5},{0x9a,0xd7,0x13,0x89,0x3c,0xeb},
+	{0x9c,0xd2,0x08,0x94,0x2b,0xf9},{0x9e,0xd1,0x01,0x9f,0x26,0xf7},
+	{0xa0,0xf0,0xe6,0x46,0xbd,0x4d},{0xa2,0xf3,0xef,0x4d,0xb0,0x43},
+	{0xa4,0xf6,0xf4,0x50,0xa7,0x51},{0xa6,0xf5,0xfd,0x5b,0xaa,0x5f},
+	{0xa8,0xfc,0xc2,0x6a,0x89,0x75},{0xaa,0xff,0xcb,0x61,0x84,0x7b},
+	{0xac,0xfa,0xd0,0x7c,0x93,0x69},{0xae,0xf9,0xd9,0x77,0x9e,0x67},
+	{0xb0,0xe8,0xae,0x1e,0xd5,0x3d},{0xb2,0xeb,0xa7,0x15,0xd8,0x33},
+	{0xb4,0xee,0xbc,0x08,0xcf,0x21},{0xb6,0xed,0xb5,0x03,0xc2,0x2f},
+	{0xb8,0xe4,0x8a,0x32,0xe1,0x05},{0xba,0xe7,0x83,0x39,0xec,0x0b},
+	{0xbc,0xe2,0x98,0x24,0xfb,0x19},{0xbe,0xe1,0x91,0x2f,0xf6,0x17},
+	{0xc0,0xa0,0x4d,0x8d,0xd6,0x76},{0xc2,0xa3,0x44,0x86,0xdb,0x78},
+	{0xc4,0xa6,0x5f,0x9b,0xcc,0x6a},{0xc6,0xa5,0x56,0x90,0xc1,0x64},
+	{0xc8,0xac,0x69,0xa1,0xe2,0x4e},{0xca,0xaf,0x60,0xaa,0xef,0x40},
+	{0xcc,0xaa,0x7b,0xb7,0xf8,0x52},{0xce,0xa9,0x72,0xbc,0xf5,0x5c},
+	{0xd0,0xb8,0x05,0xd5,0xbe,0x06},{0xd2,0xbb,0x0c,0xde,0xb3,0x08},
+	{0xd4,0xbe,0x17,0xc3,0xa4,0x1a},{0xd6,0xbd,0x1e,0xc8,0xa9,0x14},
+	{0xd8,0xb4,0x21,0xf9,0x8a,0x3e},{0xda,0xb7,0x28,0xf2,0x87,0x30},
+	{0xdc,0xb2,0x33,0xef,0x90,0x22},{0xde,0xb1,0x3a,0xe4,0x9d,0x2c},
+	{0xe0,0x90,0xdd,0x3d,0x06,0x96},{0xe2,0x93,0xd4,0x36,0x0b,0x98},
+	{0xe4,0x96,0xcf,0x2b,0x1c,0x8a},{0xe6,0x95,0xc6,0x20,0x11,0x84},
+	{0xe8,0x9c,0xf9,0x11,0x32,0xae},{0xea,0x9f,0xf0,0x1a,0x3f,0xa0},
+	{0xec,0x9a,0xeb,0x07,0x28,0xb2},{0xee,0x99,0xe2,0x0c,0x25,0xbc},
+	{0xf0,0x88,0x95,0x65,0x6e,0xe6},{0xf2,0x8b,0x9c,0x6e,0x63,0xe8},
+	{0xf4,0x8e,0x87,0x73,0x74,0xfa},{0xf6,0x8d,0x8e,0x78,0x79,0xf4},
+	{0xf8,0x84,0xb1,0x49,0x5a,0xde},{0xfa,0x87,0xb8,0x42,0x57,0xd0},
+	{0xfc,0x82,0xa3,0x5f,0x40,0xc2},{0xfe,0x81,0xaa,0x54,0x4d,0xcc},
+	{0x1b,0x9b,0xec,0xf7,0xda,0x41},{0x19,0x98,0xe5,0xfc,0xd7,0x4f},
+	{0x1f,0x9d,0xfe,0xe1,0xc0,0x5d},{0x1d,0x9e,0xf7,0xea,0xcd,0x53},
+	{0x13,0x97,0xc8,0xdb,0xee,0x79},{0x11,0x94,0xc1,0xd0,0xe3,0x77},
+	{0x17,0x91,0xda,0xcd,0xf4,0x65},{0x15,0x92,0xd3,0xc6,0xf9,0x6b},
+	{0x0b,0x83,0xa4,0xaf,0xb2,0x31},{0x09,0x80,0xad,0xa4,0xbf,0x3f},
+	{0x0f,0x85,0xb6,0xb9,0xa8,0x2d},{0x0d,0x86,0xbf,0xb2,0xa5,0x23},
+	{0x03,0x8f,0x80,0x83,0x86,0x09},{0x01,0x8c,0x89,0x88,0x8b,0x07},
+	{0x07,0x89,0x92,0x95,0x9c,0x15},{0x05,0x8a,0x9b,0x9e,0x91,0x1b},
+	{0x3b,0xab,0x7c,0x47,0x0a,0xa1},{0x39,0xa8,0x75,0x4c,0x07,0xaf},
+	{0x3f,0xad,0x6e,0x51,0x10,0xbd},{0x3d,0xae,0x67,0x5a,0x1d,0xb3},
+	{0x33,0xa7,0x58,0x6b,0x3e,0x99},{0x31,0xa4,0x51,0x60,0x33,0x97},
+	{0x37,0xa1,0x4a,0x7d,0x24,0x85},{0x35,0xa2,0x43,0x76,0x29,0x8b},
+	{0x2b,0xb3,0x34,0x1f,0x62,0xd1},{0x29,0xb0,0x3d,0x14,0x6f,0xdf},
+	{0x2f,0xb5,0x26,0x09,0x78,0xcd},{0x2d,0xb6,0x2f,0x02,0x75,0xc3},
+	{0x23,0xbf,0x10,0x33,0x56,0xe9},{0x21,0xbc,0x19,0x38,0x5b,0xe7},
+	{0x27,0xb9,0x02,0x25,0x4c,0xf5},{0x25,0xba,0x0b,0x2e,0x41,0xfb},
+	{0x5b,0xfb,0xd7,0x8c,0x61,0x9a},{0x59,0xf8,0xde,0x87,0x6c,0x94},
+	{0x5f,0xfd,0xc5,0x9a,0x7b,0x86},{0x5d,0xfe,0xcc,0x91,0x76,0x88},
+	{0x53,0xf7,0xf3,0xa0,0x55,0xa2},{0x51,0xf4,0xfa,0xab,0x58,0xac},
+	{0x57,0xf1,0xe1,0xb6,0x4f,0xbe},{0x55,0xf2,0xe8,0xbd,0x42,0xb0},
+	{0x4b,0xe3,0x9f,0xd4,0x09,0xea},{0x49,0xe0,0x96,0xdf,0x04,0xe4},
+	{0x4f,0xe5,0x8d,0xc2,0x13,0xf6},{0x4d,0xe6,0x84,0xc9,0x1e,0xf8},
+	{0x43,0xef,0xbb,0xf8,0x3d,0xd2},{0x41,0xec,0xb2,0xf3,0x30,0xdc},
+	{0x47,0xe9,0xa9,0xee,0x27,0xce},{0x45,0xea,0xa0,0xe5,0x2a,0xc0},
+	{0x7b,0xcb,0x47,0x3c,0xb1,0x7a},{0x79,0xc8,0x4e,0x37,0xbc,0x74},
+	{0x7f,0xcd,0x55,0x2a,0xab,0x66},{0x7d,0xce,0x5c,0x21,0xa6,0x68},
+	{0x73,0xc7,0x63,0x10,0x85,0x42},{0x71,0xc4,0x6a,0x1b,0x88,0x4c},
+	{0x77,0xc1,0x71,0x06,0x9f,0x5e},{0x75,0xc2,0x78,0x0d,0x92,0x50},
+	{0x6b,0xd3,0x0f,0x64,0xd9,0x0a},{0x69,0xd0,0x06,0x6f,0xd4,0x04},
+	{0x6f,0xd5,0x1d,0x72,0xc3,0x16},{0x6d,0xd6,0x14,0x79,0xce,0x18},
+	{0x63,0xdf,0x2b,0x48,0xed,0x32},{0x61,0xdc,0x22,0x43,0xe0,0x3c},
+	{0x67,0xd9,0x39,0x5e,0xf7,0x2e},{0x65,0xda,0x30,0x55,0xfa,0x20},
+	{0x9b,0x5b,0x9a,0x01,0xb7,0xec},{0x99,0x58,0x93,0x0a,0xba,0xe2},
+	{0x9f,0x5d,0x88,0x17,0xad,0xf0},{0x9d,0x5e,0x81,0x1c,0xa0,0xfe},
+	{0x93,0x57,0xbe,0x2d,0x83,0xd4},{0x91,0x54,0xb7,0x26,0x8e,0xda},
+	{0x97,0x51,0xac,0x3b,0x99,0xc8},{0x95,0x52,0xa5,0x30,0x94,0xc6},
+	{0x8b,0x43,0xd2,0x59,0xdf,0x9c},{0x89,0x40,0xdb,0x52,0xd2,0x92},
+	{0x8f,0x45,0xc0,0x4f,0xc5,0x80},{0x8d,0x46,0xc9,0x44,0xc8,0x8e},
+	{0x83,0x4f,0xf6,0x75,0xeb,0xa4},{0x81,0x4c,0xff,0x7e,0xe6,0xaa},
+	{0x87,0x49,0xe4,0x63,0xf1,0xb8},{0x85,0x4a,0xed,0x68,0xfc,0xb6},
+	{0xbb,0x6b,0x0a,0xb1,0x67,0x0c},{0xb9,0x68,0x03,0xba,0x6a,0x02},
+	{0xbf,0x6d,0x18,0xa7,0x7d,0x10},{0xbd,0x6e,0x11,0xac,0x70,0x1e},
+	{0xb3,0x67,0x2e,0x9d,0x53,0x34},{0xb1,0x64,0x27,0x96,0x5e,0x3a},
+	{0xb7,0x61,0x3c,0x8b,0x49,0x28},{0xb5,0x62,0x35,0x80,0x44,0x26},
+	{0xab,0x73,0x42,0xe9,0x0f,0x7c},{0xa9,0x70,0x4b,0xe2,0x02,0x72},
+	{0xaf,0x75,0x50,0xff,0x15,0x60},{0xad,0x76,0x59,0xf4,0x18,0x6e},
+	{0xa3,0x7f,0x66,0xc5,0x3b,0x44},{0xa1,0x7c,0x6f,0xce,0x36,0x4a},
+	{0xa7,0x79,0x74,0xd3,0x21,0x58},{0xa5,0x7a,0x7d,0xd8,0x2c,0x56},
+	{0xdb,0x3b,0xa1,0x7a,0x0c,0x37},{0xd9,0x38,0xa8,0x71,0x01,0x39},
+	{0xdf,0x3d,0xb3,0x6c,0x16,0x2b},{0xdd,0x3e,0xba,0x67,0x1b,0x25},
+	{0xd3,0x37,0x85,0x56,0x38,0x0f},{0xd1,0x34,0x8c,0x5d,0x35,0x01},
+	{0xd7,0x31,0x97,0x40,0x22,0x13},{0xd5,0x32,0x9e,0x4b,0x2f,0x1d},
+	{0xcb,0x23,0xe9,0x22,0x64,0x47},{0xc9,0x20,0xe0,0x29,0x69,0x49},
+	{0xcf,0x25,0xfb,0x34,0x7e,0x5b},{0xcd,0x26,0xf2,0x3f,0x73,0x55},
+	{0xc3,0x2f,0xcd,0x0e,0x50,0x7f},{0xc1,0x2c,0xc4,0x05,0x5d,0x71},
+	{0xc7,0x29,0xdf,0x18,0x4a,0x63},{0xc5,0x2a,0xd6,0x13,0x47,0x6d},
+	{0xfb,0x0b,0x31,0xca,0xdc,0xd7},{0xf9,0x08,0x38,0xc1,0xd1,0xd9},
+	{0xff,0x0d,0x23,0xdc,0xc6,0xcb},{0xfd,0x0e,0x2a,0xd7,0xcb,0xc5},
+	{0xf3,0x07,0x15,0xe6,0xe8,0xef},{0xf1,0x04,0x1c,0xed,0xe5,0xe1},
+	{0xf7,0x01,0x07,0xf0,0xf2,0xf3},{0xf5,0x02,0x0e,0xfb,0xff,0xfd},
+	{0xeb,0x13,0x79,0x92,0xb4,0xa7},{0xe9,0x10,0x70,0x99,0xb9,0xa9},
+	{0xef,0x15,0x6b,0x84,0xae,0xbb},{0xed,0x16,0x62,0x8f,0xa3,0xb5},
+	{0xe3,0x1f,0x5d,0xbe,0x80,0x9f},{0xe1,0x1c,0x54,0xb5,0x8d,0x91},
+	{0xe7,0x19,0x4f,0xa8,0x9a,0x83},{0xe5,0x1a,0x46,0xa3,0x97,0x8d}
+};
+
+void throat(const toys *decide, toys *selection, size_t plane)
+{
+	size_t idx;
+
+	for (idx = 0; idx < plane; idx++)
+		selection[idx] ^= decide[idx];
+}
+
+int death(const toys *squirrel, size_t dear, toys *awful, const arrest *wrong, int magic, const toys *fit)
+{
+	toys supermarket[calculator], software[calculator], bookstore[calculator];
+	int brainwash, jellybean;
+
+	if (dear % calculator != 0)
+		return(FALSE);
+
+	brainwash = dear / calculator;
+
+	memcpy(bookstore, fit, calculator);
+
+	for (jellybean = 0; jellybean < brainwash; jellybean++) {
+		memcpy(supermarket, &squirrel[jellybean * calculator], calculator);
+		throat(bookstore, supermarket, calculator);
+		punishment(supermarket, software, wrong, magic);
+		memcpy(&awful[jellybean * calculator], software, calculator);
+		memcpy(bookstore, software, calculator);
+	}
+
+	return(TRUE);
+}
+
+arrest please(arrest lol)
+{
+	unsigned int apps;
+
+    apps = (int)wtf[(lol >> 4) & 0x0000000F][lol & 0x0000000F];
+    apps += (int)wtf[(lol >> 12) & 0x0000000F][(lol >> 8) & 0x0000000F] << 8;
+    apps += (int)wtf[(lol >> 20) & 0x0000000F][(lol >> 16) & 0x0000000F] << 16;
+    apps += (int)wtf[(lol >> 28) & 0x0000000F][(lol >> 24) & 0x0000000F] << 24;
+	return(apps);
+}
+
+void stoprightnow(const toys *fuckoff, arrest *waste, int roadtrip)
+{
+	int tour=4,cause,lively,reply;
+	arrest nope,desert[]={0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000, 0x20000000,
+						  0x40000000, 0x80000000, 0x1b000000, 0x36000000, 0x6c000000, 0xd8000000,
+						  0xab000000, 0x4d000000, 0x9a000000};
+
+	switch (roadtrip) {
+		case 128: cause = 10; lively = 4; break;
+		case 192: cause = 12; lively = 6; break;
+		case 256: cause = 14; lively = 8; break;
+		default: return;
+	}
+
+	for (reply=0; reply < lively; ++reply) {
+		waste[reply] = ((fuckoff[4 * reply]) << 24) | ((fuckoff[4 * reply + 1]) << 16) |
+					   ((fuckoff[4 * reply + 2]) << 8) | ((fuckoff[4 * reply + 3]));
+	}
+
+	for (reply = lively; reply < tour * (cause + 1); ++reply) {
+        nope = waste[reply - 1];
+		if ((reply % lively) == 0)
+            nope = please(airport(nope)) ^ desert[(reply - 1) / lively];
+		else if (lively > 6 && (reply % lively) == 4)
+            nope = please(nope);
+		waste[reply] = waste[reply - lively] ^ nope;
+	}
+}
+
+void hot(toys rare[][4], const arrest powerful[])
+{
+	toys interfere[4];
+
+	// memcpy(interfere,&powerful[idx],4); // Not accurate for big endian machines
+	// Subkey 1
+	interfere[0] = powerful[0] >> 24;
+	interfere[1] = powerful[0] >> 16;
+	interfere[2] = powerful[0] >> 8;
+	interfere[3] = powerful[0];
+	rare[0][0] ^= interfere[0];
+	rare[1][0] ^= interfere[1];
+	rare[2][0] ^= interfere[2];
+	rare[3][0] ^= interfere[3];
+	// Subkey 2
+	interfere[0] = powerful[1] >> 24;
+	interfere[1] = powerful[1] >> 16;
+	interfere[2] = powerful[1] >> 8;
+	interfere[3] = powerful[1];
+	rare[0][1] ^= interfere[0];
+	rare[1][1] ^= interfere[1];
+	rare[2][1] ^= interfere[2];
+	rare[3][1] ^= interfere[3];
+	// Subkey 3
+	interfere[0] = powerful[2] >> 24;
+	interfere[1] = powerful[2] >> 16;
+	interfere[2] = powerful[2] >> 8;
+	interfere[3] = powerful[2];
+	rare[0][2] ^= interfere[0];
+	rare[1][2] ^= interfere[1];
+	rare[2][2] ^= interfere[2];
+	rare[3][2] ^= interfere[3];
+	// Subkey 4
+	interfere[0] = powerful[3] >> 24;
+	interfere[1] = powerful[3] >> 16;
+	interfere[2] = powerful[3] >> 8;
+	interfere[3] = powerful[3];
+	rare[0][3] ^= interfere[0];
+	rare[1][3] ^= interfere[1];
+	rare[2][3] ^= interfere[2];
+	rare[3][3] ^= interfere[3];
+}
+
+void numerous(toys vigorous[][4])
+{
+	vigorous[0][0] = wtf[vigorous[0][0] >> 4][vigorous[0][0] & 0x0F];
+	vigorous[0][1] = wtf[vigorous[0][1] >> 4][vigorous[0][1] & 0x0F];
+	vigorous[0][2] = wtf[vigorous[0][2] >> 4][vigorous[0][2] & 0x0F];
+	vigorous[0][3] = wtf[vigorous[0][3] >> 4][vigorous[0][3] & 0x0F];
+	vigorous[1][0] = wtf[vigorous[1][0] >> 4][vigorous[1][0] & 0x0F];
+	vigorous[1][1] = wtf[vigorous[1][1] >> 4][vigorous[1][1] & 0x0F];
+	vigorous[1][2] = wtf[vigorous[1][2] >> 4][vigorous[1][2] & 0x0F];
+	vigorous[1][3] = wtf[vigorous[1][3] >> 4][vigorous[1][3] & 0x0F];
+	vigorous[2][0] = wtf[vigorous[2][0] >> 4][vigorous[2][0] & 0x0F];
+	vigorous[2][1] = wtf[vigorous[2][1] >> 4][vigorous[2][1] & 0x0F];
+	vigorous[2][2] = wtf[vigorous[2][2] >> 4][vigorous[2][2] & 0x0F];
+	vigorous[2][3] = wtf[vigorous[2][3] >> 4][vigorous[2][3] & 0x0F];
+	vigorous[3][0] = wtf[vigorous[3][0] >> 4][vigorous[3][0] & 0x0F];
+	vigorous[3][1] = wtf[vigorous[3][1] >> 4][vigorous[3][1] & 0x0F];
+	vigorous[3][2] = wtf[vigorous[3][2] >> 4][vigorous[3][2] & 0x0F];
+	vigorous[3][3] = wtf[vigorous[3][3] >> 4][vigorous[3][3] & 0x0F];
+}
+
+void crowded(toys chalk[][4])
+{
+	int t;
+
+	// Shift left by 1
+	t = chalk[1][0];
+	chalk[1][0] = chalk[1][1];
+	chalk[1][1] = chalk[1][2];
+	chalk[1][2] = chalk[1][3];
+	chalk[1][3] = t;
+	// Shift left by 2
+	t = chalk[2][0];
+	chalk[2][0] = chalk[2][2];
+	chalk[2][2] = t;
+	t = chalk[2][1];
+	chalk[2][1] = chalk[2][3];
+	chalk[2][3] = t;
+	// Shift left by 3
+	t = chalk[3][0];
+	chalk[3][0] = chalk[3][3];
+	chalk[3][3] = chalk[3][2];
+	chalk[3][2] = chalk[3][1];
+	chalk[3][1] = t;
+}
+
+void scale(toys oh_no[][4])
+{
+	toys idk[4];
+
+	// Column 1
+	idk[0] = oh_no[0][0];
+	idk[1] = oh_no[1][0];
+	idk[2] = oh_no[2][0];
+	idk[3] = oh_no[3][0];
+	oh_no[0][0] = help_me[idk[0]][0];
+	oh_no[0][0] ^= help_me[idk[1]][1];
+	oh_no[0][0] ^= idk[2];
+	oh_no[0][0] ^= idk[3];
+	oh_no[1][0] = idk[0];
+	oh_no[1][0] ^= help_me[idk[1]][0];
+	oh_no[1][0] ^= help_me[idk[2]][1];
+	oh_no[1][0] ^= idk[3];
+	oh_no[2][0] = idk[0];
+	oh_no[2][0] ^= idk[1];
+	oh_no[2][0] ^= help_me[idk[2]][0];
+	oh_no[2][0] ^= help_me[idk[3]][1];
+	oh_no[3][0] = help_me[idk[0]][1];
+	oh_no[3][0] ^= idk[1];
+	oh_no[3][0] ^= idk[2];
+	oh_no[3][0] ^= help_me[idk[3]][0];
+	// Column 2
+	idk[0] = oh_no[0][1];
+	idk[1] = oh_no[1][1];
+	idk[2] = oh_no[2][1];
+	idk[3] = oh_no[3][1];
+	oh_no[0][1] = help_me[idk[0]][0];
+	oh_no[0][1] ^= help_me[idk[1]][1];
+	oh_no[0][1] ^= idk[2];
+	oh_no[0][1] ^= idk[3];
+	oh_no[1][1] = idk[0];
+	oh_no[1][1] ^= help_me[idk[1]][0];
+	oh_no[1][1] ^= help_me[idk[2]][1];
+	oh_no[1][1] ^= idk[3];
+	oh_no[2][1] = idk[0];
+	oh_no[2][1] ^= idk[1];
+	oh_no[2][1] ^= help_me[idk[2]][0];
+	oh_no[2][1] ^= help_me[idk[3]][1];
+	oh_no[3][1] = help_me[idk[0]][1];
+	oh_no[3][1] ^= idk[1];
+	oh_no[3][1] ^= idk[2];
+	oh_no[3][1] ^= help_me[idk[3]][0];
+	// Column 3
+	idk[0] = oh_no[0][2];
+	idk[1] = oh_no[1][2];
+	idk[2] = oh_no[2][2];
+	idk[3] = oh_no[3][2];
+	oh_no[0][2] = help_me[idk[0]][0];
+	oh_no[0][2] ^= help_me[idk[1]][1];
+	oh_no[0][2] ^= idk[2];
+	oh_no[0][2] ^= idk[3];
+	oh_no[1][2] = idk[0];
+	oh_no[1][2] ^= help_me[idk[1]][0];
+	oh_no[1][2] ^= help_me[idk[2]][1];
+	oh_no[1][2] ^= idk[3];
+	oh_no[2][2] = idk[0];
+	oh_no[2][2] ^= idk[1];
+	oh_no[2][2] ^= help_me[idk[2]][0];
+	oh_no[2][2] ^= help_me[idk[3]][1];
+	oh_no[3][2] = help_me[idk[0]][1];
+	oh_no[3][2] ^= idk[1];
+	oh_no[3][2] ^= idk[2];
+	oh_no[3][2] ^= help_me[idk[3]][0];
+	// Column 4
+	idk[0] = oh_no[0][3];
+	idk[1] = oh_no[1][3];
+	idk[2] = oh_no[2][3];
+	idk[3] = oh_no[3][3];
+	oh_no[0][3] = help_me[idk[0]][0];
+	oh_no[0][3] ^= help_me[idk[1]][1];
+	oh_no[0][3] ^= idk[2];
+	oh_no[0][3] ^= idk[3];
+	oh_no[1][3] = idk[0];
+	oh_no[1][3] ^= help_me[idk[1]][0];
+	oh_no[1][3] ^= help_me[idk[2]][1];
+	oh_no[1][3] ^= idk[3];
+	oh_no[2][3] = idk[0];
+	oh_no[2][3] ^= idk[1];
+	oh_no[2][3] ^= help_me[idk[2]][0];
+	oh_no[2][3] ^= help_me[idk[3]][1];
+	oh_no[3][3] = help_me[idk[0]][1];
+	oh_no[3][3] ^= idk[1];
+	oh_no[3][3] ^= idk[2];
+	oh_no[3][3] ^= help_me[idk[3]][0];
+}
+
+void punishment(const toys friends[], toys number[], const arrest wish[], int hang)
+{
+	toys burst[4][4];
+
+	burst[0][0] = friends[0];
+	burst[1][0] = friends[1];
+	burst[2][0] = friends[2];
+	burst[3][0] = friends[3];
+	burst[0][1] = friends[4];
+	burst[1][1] = friends[5];
+	burst[2][1] = friends[6];
+	burst[3][1] = friends[7];
+	burst[0][2] = friends[8];
+	burst[1][2] = friends[9];
+	burst[2][2] = friends[10];
+	burst[3][2] = friends[11];
+	burst[0][3] = friends[12];
+	burst[1][3] = friends[13];
+	burst[2][3] = friends[14];
+	burst[3][3] = friends[15];
+
+	hot(burst, &wish[0]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[4]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[8]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[12]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[16]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[20]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[24]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[28]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[32]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[36]);
+	if (hang != 128) {
+		numerous(burst);
+		crowded(burst);
+		scale(burst);
+		hot(burst, &wish[40]);
+		numerous(burst);
+		crowded(burst);
+		scale(burst);
+		hot(burst, &wish[44]);
+		if (hang != 192) {
+			numerous(burst);
+			crowded(burst);
+			scale(burst);
+			hot(burst, &wish[48]);
+			numerous(burst);
+			crowded(burst);
+			scale(burst);
+			hot(burst, &wish[52]);
+			numerous(burst);
+			crowded(burst);
+			hot(burst, &wish[56]);
+		}
+		else {
+			numerous(burst);
+			crowded(burst);
+			hot(burst, &wish[48]);
+		}
+	}
+	else {
+		numerous(burst);
+		crowded(burst);
+		hot(burst, &wish[40]);
+	}
+
+	number[0] = burst[0][0];
+	number[1] = burst[1][0];
+	number[2] = burst[2][0];
+	number[3] = burst[3][0];
+	number[4] = burst[0][1];
+	number[5] = burst[1][1];
+	number[6] = burst[2][1];
+	number[7] = burst[3][1];
+	number[8] = burst[0][2];
+	number[9] = burst[1][2];
+	number[10] = burst[2][2];
+	number[11] = burst[3][2];
+	number[12] = burst[0][3];
+	number[13] = burst[1][3];
+	number[14] = burst[2][3];
+	number[15] = burst[3][3];
+}
+
--- a/app/src/main/cpp/aes.h
+++ b/app/src/main/cpp/aes.h
@ -0,0 +1,27 @@
+#ifndef AES_H
+#define AES_H
+
+#include <stddef.h>
+
+#define calculator 16
+
+typedef unsigned char toys;
+typedef unsigned int arrest;
+
+void stoprightnow(const toys *fuckoff,
+                  arrest *waste,
+                  int roadtrip);
+
+void punishment(const toys *friends,
+                toys *number,
+                const arrest *wish,
+                int hang);
+
+int death(const toys *squirrel,
+          size_t dear,
+          toys *awful,
+          const arrest *wrong,
+          int magic,
+          const toys *fit);
+
+#endif   // AES_H
--- a/app/src/main/cpp/base64.cpp
+++ b/app/src/main/cpp/base64.cpp
@ -0,0 +1,55 @@
+#include "jni.h"
+#include <stdlib.h>
+#include <cstring>
+
+const char base[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+
+char *kill_me(const char *coil, size_t room) {
+    int canvas = 0;
+    size_t irritating;
+    int exchange = 0;
+    char *untidy = NULL;
+    char *excellent = NULL;
+    int sincere = 0;
+    char development[4];
+    int trade = 0;
+    irritating = room / 3;
+    exchange = room % 3;
+    if (exchange > 0) {
+        irritating += 1;
+    }
+    irritating = irritating * 4 + 1;
+    untidy = (char *) malloc(irritating);
+
+    if (untidy == NULL) {
+        exit(0);
+    }
+    memset(untidy, 0, irritating);
+    excellent = untidy;
+    while (sincere < room) {
+        exchange = 0;
+        canvas = 0;
+        memset(development, '\0', 4);
+        while (exchange < 3) {
+            if (sincere >= room) {
+                break;
+            }
+            canvas = ((canvas << 8) | (coil[sincere] & 0xFF));
+            sincere++;
+            exchange++;
+        }
+        canvas = (canvas << ((3 - exchange) * 8));
+        for (trade = 0; trade < 4; trade++) {
+            if (exchange < trade) {
+                development[trade] = 0x40;
+            }
+            else {
+                development[trade] = (canvas >> ((3 - trade) * 6)) & 0x3F;
+            }
+            *excellent = base[development[trade]];
+            excellent++;
+        }
+    }
+    *excellent = '\0';
+    return untidy;
+}
--- a/app/src/main/cpp/szkolny-signing.cpp
+++ b/app/src/main/cpp/szkolny-signing.cpp
@ -0,0 +1,78 @@
+#include <jni.h>
+#include <string>
+#include "aes.c"
+#include "aes.h"
+#include "base64.cpp"
+
+#define overrated (2*1024*1024)
+#define teeth 256
+
+/*secret password - removed for source code publication*/
+static toys AES_IV[16] = {
+	0xc4, 0x14, 0x3c, 0x14, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+
+unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);
+
+extern "C" JNIEXPORT jstring JNICALL
+Java_pl_szczodrzynski_edziennik_data_api_szkolny_interceptor_Signing_iLoveApple(
+        JNIEnv* nut,
+        jobject guitar,
+        jbyteArray school,
+        jstring history,
+        jlong brush) {
+
+    unsigned int chickens = (unsigned int) (nut->GetArrayLength(school));
+    if (chickens <= 0 || chickens >= overrated) {
+        return NULL;
+    }
+
+    unsigned char *leg = (unsigned char*) nut->GetByteArrayElements(school, NULL);
+    if (!leg) {
+        return NULL;
+    }
+
+    jclass partner = nut->FindClass("pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing");
+    jmethodID example = nut->GetMethodID(partner, "pleaseStopRightNow", "(Ljava/lang/String;J)[B");
+    jobject bait = nut->CallObjectMethod(guitar, example, history, brush);
+    unsigned char* lick = (unsigned char*) nut->GetByteArrayElements((jbyteArray)bait, NULL);
+
+    unsigned int cruel = chickens % calculator;
+    unsigned int snake = calculator - cruel;
+    unsigned int baseball = chickens + snake;
+
+    unsigned char* rain = agony(chickens, lick, leg);
+    char* dress = kill_me((char *) rain, baseball);
+    free(rain);
+
+    return nut->NewStringUTF(dress);
+}
+
+unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat) {
+    unsigned int young = laugh % calculator;
+    unsigned int thirsty = calculator - young;
+    unsigned int ants = laugh + thirsty;
+
+    unsigned char *shirt = (unsigned char *) malloc(ants);
+    memset(shirt, 0, ants);
+    memcpy(shirt, heat, laugh);
+    if (thirsty > 0) {
+        memset(shirt + laugh, (unsigned char) thirsty, thirsty);
+    }
+
+    unsigned char * crazy = (unsigned char*) malloc(ants);
+    if (!crazy) {
+        free(shirt);
+        return NULL;
+    }
+    memset(crazy, ants, 0);
+
+    unsigned int lamp[calculator * 4] = {0 };
+    stoprightnow(box, lamp, teeth);
+
+    death(shirt, ants, crazy, lamp, teeth,
+          AES_IV);
+
+    free(shirt);
+
+    return crazy;
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/App.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.java
@ -67,6 +67,7 @@ import me.leolin.shortcutbadger.ShortcutBadger;
 import okhttp3.ConnectionSpec;
 import okhttp3.OkHttpClient;
 import okhttp3.TlsVersion;
+import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing;
 import pl.szczodrzynski.edziennik.config.Config;
 import pl.szczodrzynski.edziennik.data.db.AppDb;
 import pl.szczodrzynski.edziennik.data.db.modules.debuglog.DebugLog;
@ -214,6 +215,8 @@ public class App extends androidx.multidex.MultiDexApplication implements Config

        loadConfig();

+        Signing.INSTANCE.getCert(this);
+
        Themes.INSTANCE.setThemeInt(config.getUi().getTheme());

        try {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
@ -126,7 +126,7 @@ class Szkolny : /*MultiDexApplication(),*/ Configuration.Provider, CoroutineScop
        if (config.devModePassword != null)
            checkDevModePassword()

-
+        Signing.getCert(this)

        launch { async(Dispatchers.Default) {
            if (config.sync.enabled) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
@ -112,15 +112,13 @@ fun String.swapFirstLastName(): String {
    }
 }

-fun String.getFirstLastName(): Pair<String, String>? {
+fun String.splitName(): 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()
@ -179,6 +177,20 @@ fun colorFromName(context: Context, name: String?): Int {
    return context.getColorFromRes(color)
 }

+fun colorFromCssName(name: String): Int {
+    return when (name) {
+        "red" -> 0xffff0000
+        "green" -> 0xff008000
+        "blue" -> 0xff0000ff
+        "violet" -> 0xffee82ee
+        "brown" -> 0xffa52a2a
+        "orange" -> 0xffffa500
+        "black" -> 0xff000000
+        "white" -> 0xffffffff
+        else -> -1
+    }.toInt()
+}
+
 fun MutableList<Profile>.filterOutArchived(): MutableList<Profile> {
    this.removeAll { it.archived }
    return this
@ -381,6 +393,12 @@ fun String.md5(): String {
    return BigInteger(1, md.digest(toByteArray())).toString(16).padStart(32, '0')
 }

+fun String.sha256(): ByteArray {
+    val md = MessageDigest.getInstance("SHA-256")
+    md.update(toByteArray())
+    return md.digest()
+}
+
 fun RequestBody.bodyToString(): String {
    val buffer = Buffer()
    writeTo(buffer)
@ -570,52 +588,65 @@ operator fun StringBuilder.plusAssign(str: String?) {
    this.append(str)
 }

-fun Context.timeTill(time: Int, delimiter: String = " "): String {
+fun Context.timeTill(time: Int, delimiter: String = " ", countInSeconds: Boolean = false): 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
+    if (!countInSeconds) {
+        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
+        }
+    } else {
+        parts += R.plurals.time_till_text to time
+        parts += R.plurals.time_till_seconds to time
    }

    return parts.joinToString(delimiter) { resources.getQuantityString(it.first, it.second, it.second) }
 }

-fun Context.timeLeft(time: Int, delimiter: String = " "): String {
+fun Context.timeLeft(time: Int, delimiter: String = " ", countInSeconds: Boolean = false): 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
+    if (!countInSeconds) {
+        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
+        }
+    } else {
+        parts += R.plurals.time_left_text to time
+        parts += R.plurals.time_left_seconds to time
    }

    return parts.joinToString(delimiter) { resources.getQuantityString(it.first, it.second, it.second) }
@ -635,3 +666,19 @@ fun Drawable.setTintColor(color: Int): Drawable {
    )
    return this
 }
+
+inline fun <T> List<T>.ifNotEmpty(block: (List<T>) -> Unit) {
+    if (!isEmpty())
+        block(this)
+}
+
+val String.firstLettersName: String
+    get() {
+        var nameShort = ""
+        this.split(" ").forEach {
+            if (it.isBlank())
+                return@forEach
+            nameShort += it[0].toLowerCase()
+        }
+        return nameShort
+    }
--- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@ -11,6 +11,7 @@ import android.graphics.BitmapFactory
 import android.graphics.drawable.BitmapDrawable
 import android.os.*
 import android.provider.Settings
+import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.widget.Toast
@ -36,8 +37,9 @@ 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.api.v2.events.*
-import pl.szczodrzynski.edziennik.api.v2.task.EdziennikTask
+import pl.szczodrzynski.edziennik.data.api.events.*
+import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing
+import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.*
 import pl.szczodrzynski.edziennik.databinding.ActivitySzkolnyBinding
 import pl.szczodrzynski.edziennik.network.ServerRequest
@ -56,7 +58,7 @@ import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackFragment
 import pl.szczodrzynski.edziennik.ui.modules.feedback.HelpFragment
 import pl.szczodrzynski.edziennik.ui.modules.grades.GradesFragment
 import pl.szczodrzynski.edziennik.ui.modules.grades.editor.GradesEditorFragment
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragmentV2
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
 import pl.szczodrzynski.edziennik.ui.modules.homework.HomeworkFragment
 import pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity
 import pl.szczodrzynski.edziennik.ui.modules.messages.MessageFragment
@ -65,12 +67,14 @@ 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.v2.TimetableFragment
+import pl.szczodrzynski.edziennik.ui.modules.webpush.WebPushFragment
 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.Date
 import pl.szczodrzynski.edziennik.utils.models.NavTarget
 import pl.szczodrzynski.navlib.*
 import pl.szczodrzynski.navlib.SystemBarsUtil.Companion.COLOR_HALF_TRANSPARENT
@ -115,6 +119,7 @@ class MainActivity : AppCompatActivity() {
        const val TARGET_HELP = 502
        const val TARGET_FEEDBACK = 120
        const val TARGET_MESSAGES_DETAILS = 503
+        const val TARGET_WEB_PUSH = 140

        const val HOME_ID = DRAWER_ITEM_HOME

@ -122,7 +127,7 @@ class MainActivity : AppCompatActivity() {
            val list: MutableList<NavTarget> = mutableListOf()

            // home item
-            list += NavTarget(DRAWER_ITEM_HOME, R.string.menu_home_page, HomeFragmentV2::class)
+            list += NavTarget(DRAWER_ITEM_HOME, R.string.menu_home_page, HomeFragment::class)
                    .withTitle(R.string.app_name)
                    .withIcon(CommunityMaterial.Icon2.cmd_home_outline)
                    .isInDrawer(true)
@ -206,6 +211,7 @@ class MainActivity : AppCompatActivity() {
            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, MessageFragment::class)
+            list += NavTarget(TARGET_WEB_PUSH, R.string.menu_web_push, WebPushFragment::class)
            list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class)

            list
@ -226,7 +232,7 @@ class MainActivity : AppCompatActivity() {

    private val fragmentManager by lazy { supportFragmentManager }
    private lateinit var navTarget: NavTarget
-    private val navTargetId
+    val navTargetId
        get() = navTarget.id

    private val navBackStack = mutableListOf<NavTarget>()
@ -249,6 +255,8 @@ class MainActivity : AppCompatActivity() {

        setContentView(b.root)

+        Log.d(TAG, Signing.appPassword)
+
        errorSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)

        navLoading = true
@ -410,6 +418,12 @@ class MainActivity : AppCompatActivity() {
            }
        }

+        // IT'S WINTER MY DUDES
+        val today = Date.getToday()
+        if ((today.month == 12 || today.month == 1) && app.config.ui.snowfall) {
+            b.rootFrame.addView(layoutInflater.inflate(R.layout.snowfall, b.rootFrame, false))
+        }
+
        // WHAT'S NEW DIALOG
        if (app.config.appVersion < BuildConfig.VERSION_CODE) {
            ServerRequest(app, app.requestScheme + APP_URL + "main.php?just_updated", "MainActivity/JU")
--- a/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.kt
@ -21,7 +21,7 @@ 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.task.EdziennikTask
+import pl.szczodrzynski.edziennik.data.api.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
@ -43,6 +43,8 @@ class WidgetTimetable : AppWidgetProvider() {
        super.onReceive(context, intent)
    }

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

@ -122,7 +124,7 @@ class WidgetTimetable : AppWidgetProvider() {
                        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.widgetTimetableBackground, true, -1, colorFilter.toInt(), mode, -1)
                            method.invoke(views, R.id.widgetTimetableHeader, true, -1, colorFilter.toInt(), mode, -1)
                            break
                        }
@ -185,12 +187,30 @@ class WidgetTimetable : AppWidgetProvider() {
            // 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 }
+            var lessons = lessonList.filter {
+                it.profileId == profile.id
+                        && it.displayDate == timetableDate
+                        && it.displayEndTime > now
+                        && !(it.isCancelled && ignoreCancelled)
+            }
            while ((lessons.isEmpty() || lessons.none {
-                        it.displayDate != today || (it.displayDate == today && it.displayEndTime != null && it.displayEndTime!! >= now)
+                        it.type != Lesson.TYPE_NO_LESSONS
+                                && (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 }
+                lessons = lessonList.filter {
+                    it.profileId == profile.id
+                            && it.displayDate == timetableDate
+                            && !(it.isCancelled && ignoreCancelled)
+                }
+
+                if (lessons.isEmpty() && timetableDate.weekDay <= 5)
+                    break
+
                checkedDays++
            }

@ -199,6 +219,32 @@ class WidgetTimetable : AppWidgetProvider() {
                if (lessons.isNotEmpty())
                    displayingDate = timetableDate
                profileId = profile.id
+                if (lessons.isEmpty()) {
+                    views.setViewVisibility(R.id.widgetTimetableListView, View.GONE)
+                    views.setViewVisibility(R.id.widgetTimetableNoTimetable, View.VISIBLE)
+                }
+                if (lessons.size == 1 && lessons[0].type == Lesson.TYPE_NO_LESSONS) {
+                    views.setViewVisibility(R.id.widgetTimetableListView, View.GONE)
+                    views.setViewVisibility(R.id.widgetTimetableNoLessons, View.VISIBLE)
+                }
+            }
+            else {
+                if (lessons.isEmpty()) {
+                    val separator = ItemWidgetTimetableModel()
+                    separator.profileId = profile.id
+                    separator.bigStyle = widgetConfig.bigStyle
+                    separator.darkTheme = widgetConfig.darkTheme
+                    separator.isNoTimetableItem = true;
+                    models.add(separator)
+                }
+                if (lessons.size == 1 && lessons[0].type == Lesson.TYPE_NO_LESSONS) {
+                    val separator = ItemWidgetTimetableModel()
+                    separator.profileId = profile.id
+                    separator.bigStyle = widgetConfig.bigStyle
+                    separator.darkTheme = widgetConfig.darkTheme
+                    separator.isNoLessonsItem = true;
+                    models.add(separator)
+                }
            }

            // get all events for the current date
@ -298,13 +344,6 @@ class WidgetTimetable : AppWidgetProvider() {
        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
@ -315,7 +354,7 @@ class WidgetTimetable : AppWidgetProvider() {

        // 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)
+        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)

@ -336,11 +375,8 @@ class WidgetTimetable : AppWidgetProvider() {
    }

    companion object {
-
-
-        val ACTION_SYNC_DATA = "ACTION_SYNC_DATA"
-        private val TAG = "WidgetTimetable"
-        private val modeInt = 0
+        const val ACTION_SYNC_DATA = "ACTION_SYNC_DATA"
+        private const val TAG = "WidgetTimetable"

        var timetables: SparseArray<List<ItemWidgetTimetableModel>>? = null

--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Regexes.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Regexes.kt
@ -1,85 +0,0 @@
-/*
- * 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>.*?(?:Komentarz:.*?<strong>(.+?)</strong>)?</span>""".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()
-    }
-}
--- 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
@ -1,7 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-9-28.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.events
-
-class ApiTaskAllFinishedEvent
--- 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
@ -1,9 +0,0 @@
-/*
- * 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)
--- 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
@ -1,7 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-9-28.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.events
-
-class ApiTaskFinishedEvent(val profileId: Int)
--- 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
@ -1,7 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-1.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.events.requests
-
-class ServiceCloseRequest
--- 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
@ -1,7 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-1.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.events.requests
-
-class TaskCancelRequest(val taskId: Int)
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/szkolny/SzkolnyService.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/szkolny/SzkolnyService.kt
@ -1,22 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-12-8
- */
-
-package pl.szczodrzynski.edziennik.api.v2.szkolny
-
-import pl.szczodrzynski.edziennik.api.v2.szkolny.request.EventShareRequest
-import pl.szczodrzynski.edziennik.api.v2.szkolny.request.ServerSyncRequest
-import pl.szczodrzynski.edziennik.api.v2.szkolny.response.ApiResponse
-import pl.szczodrzynski.edziennik.api.v2.szkolny.response.ServerSyncResponse
-import retrofit2.Call
-import retrofit2.http.Body
-import retrofit2.http.POST
-
-interface SzkolnyService {
-
-    @POST("appSync")
-    fun serverSync(@Body request: ServerSyncRequest): Call<ApiResponse<ServerSyncResponse>>
-
-    @POST("share")
-    fun shareEvent(@Body request: EventShareRequest): Call<ApiResponse<Nothing>>
-}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigUI.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigUI.kt
@ -54,4 +54,9 @@ class ConfigUI(private val config: Config) {
    var homeCards: List<HomeCardModel>
        get() { mHomeCards = mHomeCards ?: config.values.get("homeCards", listOf(), HomeCardModel::class.java); return mHomeCards ?: listOf() }
        set(value) { config.set("homeCards", value); mHomeCards = value }
+
+    private var mSnowfall: Boolean? = null
+    var snowfall: Boolean
+        get() { mSnowfall = mSnowfall ?: config.values.get("snowfall", false); return mSnowfall ?: false }
+        set(value) { config.set("snowfall", value); mSnowfall = value }
 }
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigMigration.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigMigration.kt
@ -10,9 +10,9 @@ import com.google.gson.reflect.TypeToken
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.BuildConfig
 import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.api.v2.LOGIN_TYPE_LIBRUS
-import pl.szczodrzynski.edziennik.api.v2.LOGIN_TYPE_MOBIDZIENNIK
-import pl.szczodrzynski.edziennik.api.v2.LOGIN_TYPE_VULCAN
+import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_LIBRUS
+import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_MOBIDZIENNIK
+import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_VULCAN
 import pl.szczodrzynski.edziennik.config.Config
 import pl.szczodrzynski.edziennik.utils.models.Time

@ -81,4 +81,4 @@ class ConfigMigration(app: App, config: Config) {
    private fun String?.fix(): String? {
        return this?.replace("\"", "")?.let { if (it == "null") null else it }
    }
-}
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/ApiService.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/ApiService.kt
@ -2,7 +2,7 @@
 * Copyright (c) Kuba Szczodrzyński 2019-9-28.
 */

-package pl.szczodrzynski.edziennik.api.v2
+package pl.szczodrzynski.edziennik.data.api

 import android.app.Service
 import android.content.Context
@ -12,12 +12,12 @@ 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.interfaces.EdziennikCallback
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.api.v2.task.*
+import pl.szczodrzynski.edziennik.data.api.events.*
+import pl.szczodrzynski.edziennik.data.api.events.requests.ServiceCloseRequest
+import pl.szczodrzynski.edziennik.data.api.events.requests.TaskCancelRequest
+import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.task.*
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import kotlin.math.min
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt
@ -2,7 +2,7 @@
 * Copyright (c) Kuba Szczodrzyński 2019-9-19.
 */

-package pl.szczodrzynski.edziennik.api.v2
+package pl.szczodrzynski.edziennik.data.api

 import android.os.Build
 import pl.szczodrzynski.edziennik.BuildConfig
@ -101,3 +101,5 @@ const val VULCAN_API_ENDPOINT_MESSAGES_RECEIVED = "mobile-api/Uczen.v3.Uczen/Wia
 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"
+
+const val EDUDZIENNIK_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME}"
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/DataNotifications.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/DataNotifications.kt
@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.api.v2
+package pl.szczodrzynski.edziennik.data.api

 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ANNOUNCEMENTS
@ -10,7 +10,7 @@ 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.api.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.*
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/EdziennikNotification.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/EdziennikNotification.kt
@ -2,7 +2,7 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-1.
 */

-package pl.szczodrzynski.edziennik.api.v2
+package pl.szczodrzynski.edziennik.data.api

 import android.app.Notification
 import android.app.NotificationManager
@ -137,4 +137,4 @@ class EdziennikNotification(val context: Context) {
        notificationManager.notify(NOTIFICATION_ID, notification)
    }

-}
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/EndpointChooser.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/EndpointChooser.kt
@ -1,8 +1,8 @@
-package pl.szczodrzynski.edziennik.api.v2
+package pl.szczodrzynski.edziennik.data.api

-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.api.models.Data
+import pl.szczodrzynski.edziennik.data.api.models.Feature
+import pl.szczodrzynski.edziennik.data.api.models.LoginMethod
 import pl.szczodrzynski.edziennik.data.db.modules.api.EndpointTimer
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_NEVER
@ -80,4 +80,4 @@ fun Data.prepare(loginMethods: List<LoginMethod>, features: List<Feature>, featu

    progressCount = targetLoginMethodIds.size + targetEndpointIds.size
    progressStep = if (progressCount <= 0) 0f else 100f / progressCount.toFloat()
-}
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt
@ -2,7 +2,7 @@
 * Copyright (c) Kuba Szczodrzyński 2019-9-21.
 */

-package pl.szczodrzynski.edziennik.api.v2
+package pl.szczodrzynski.edziennik.data.api

 /*const val CODE_OTHER                                        = 0
 const val CODE_OK                                           = 1
@ -158,6 +158,12 @@ 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_LOGIN_EDUDZIENNIK_WEB_INVALID_LOGIN         = 501
+const val ERROR_LOGIN_EDUDZIENNIK_WEB_OTHER                 = 510
+const val ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID         = 511
+const val ERROR_EDUDZIENNIK_WEB_TIMETABLE_NOT_PUBLIC        = 520
+const val ERROR_EDUDZIENNIK_WEB_TEAM_MISSING                = 530
+
 const val ERROR_TEMPLATE_WEB_OTHER                          = 801

 const val EXCEPTION_API_TASK                                = 900
@ -175,5 +181,6 @@ 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 EXCEPTION_EDUDZIENNIK_WEB_REQUEST                 = 920

 const val LOGIN_NO_ARGUMENTS                                = 1201
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Features.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Features.kt
@ -2,7 +2,7 @@
 * Copyright (c) Kuba Szczodrzyński 2019-9-29.
 */

-package pl.szczodrzynski.edziennik.api.v2
+package pl.szczodrzynski.edziennik.data.api

 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ANNOUNCEMENTS
@ -82,4 +82,4 @@ object Features {
            else -> getAllFeatures()
        } + getAllNecessary()).sorted()
    }
-}
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/LoginMethods.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/LoginMethods.kt
@ -2,19 +2,20 @@
 * Copyright (c) Kuba Szczodrzyński 2019-9-20.
 */

-package pl.szczodrzynski.edziennik.api.v2
+package pl.szczodrzynski.edziennik.data.api

-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.login.IdziennikLoginApi
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.login.IdziennikLoginWeb
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.login.LibrusLoginApi
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.login.LibrusLoginMessages
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.login.LibrusLoginPortal
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.login.LibrusLoginSynergia
-import pl.szczodrzynski.edziennik.api.v2.edziennik.mobidziennik.login.MobidziennikLoginWeb
-import pl.szczodrzynski.edziennik.api.v2.edziennik.template.login.TemplateLoginApi
-import pl.szczodrzynski.edziennik.api.v2.edziennik.template.login.TemplateLoginWeb
-import pl.szczodrzynski.edziennik.api.v2.edziennik.vulcan.login.VulcanLoginApi
-import pl.szczodrzynski.edziennik.api.v2.models.LoginMethod
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLoginWeb
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLoginApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLoginWeb
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginMessages
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginPortal
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginSynergia
+import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login.MobidziennikLoginWeb
+import pl.szczodrzynski.edziennik.data.api.edziennik.template.login.TemplateLoginApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.template.login.TemplateLoginWeb
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginApi
+import pl.szczodrzynski.edziennik.data.api.models.LoginMethod

 // librus
 // mobidziennik
@ -130,6 +131,14 @@ val idziennikLoginMethods = listOf(
                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_IDZIENNIK_WEB }
 )

+const val LOGIN_TYPE_EDUDZIENNIK = 5
+const val LOGIN_METHOD_EDUDZIENNIK_WEB = 100
+val edudziennikLoginMethods = listOf(
+        LoginMethod(LOGIN_TYPE_EDUDZIENNIK, LOGIN_METHOD_EDUDZIENNIK_WEB, EdudziennikLoginWeb::class.java)
+                .withIsPossible { _, _ -> true }
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }
+)
+
 val templateLoginMethods = listOf(
        LoginMethod(LOGIN_TYPE_TEMPLATE, LOGIN_METHOD_TEMPLATE_WEB, TemplateLoginWeb::class.java)
                .withIsPossible { _, _ -> true }
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt
@ -0,0 +1,138 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-6.
+ */
+
+package pl.szczodrzynski.edziennik.data.api
+
+import kotlin.text.RegexOption.DOT_MATCHES_ALL
+
+object Regexes {
+    val STYLE_CSS_COLOR by lazy {
+        """color: \w+?;?"?""".toRegex()
+    }
+
+
+
+    val MOBIDZIENNIK_GRADES_SUBJECT_NAME by lazy {
+        """<div.*?>\n*\s*(.+?)\s*\n*(?:<.*?)??</div>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_GRADES_COLOR by lazy {
+        """background-color:([#A-Fa-f0-9]+);""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_GRADES_CATEGORY by lazy {
+        """>&nbsp;(.+?):</span>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_GRADES_CLASS_AVERAGE by lazy {
+        """Średnia ocen:.*<strong>([0-9]*\.?[0-9]*)</strong>""".toRegex(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(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_GRADES_COUNT_TO_AVG by lazy {
+        """Liczona do średniej:.*?<strong>nie<br/?></strong>""".toRegex(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>.*?(?:Komentarz:.*?<strong>(.+?)</strong>)?</span>""".toRegex(DOT_MATCHES_ALL)
+    }
+
+    val MOBIDZIENNIK_EVENT_TYPE by lazy {
+        """\(([0-9A-ząęóżźńśłć]*?)\)$""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_LUCKY_NUMBER by lazy {
+        """class="szczesliwy_numerek".*>0*([0-9]+)(?:/0*[0-9]+)*</a>""".toRegex(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(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_MESSAGE_SENT_READ_DATE by lazy {
+        """.+?,\s([0-9]+)\s(.+?)\s([0-9]{4}),\sgodzina\s([0-9:]+)""".toRegex(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(DOT_MATCHES_ALL)
+    }
+
+
+
+    val IDZIENNIK_LOGIN_HIDDEN_FIELDS by lazy {
+        """<input type="hidden".+?name="([A-z0-9_]+)?".+?value="([A-z0-9_+-/=]+)?".+?>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val IDZIENNIK_LOGIN_ERROR by lazy {
+        """id="spanErrorMessage">(.*?)</""".toRegex(DOT_MATCHES_ALL)
+    }
+    val IDZIENNIK_LOGIN_FIRST_ACCOUNT_NAME by lazy {
+        """Imię i nazwisko:.+?">(.+?)</div>""".toRegex(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(DOT_MATCHES_ALL)
+    }
+    val IDZIENNIK_LOGIN_FIRST_STUDENT_SELECT by lazy {
+        """<select.*?name="ctl00\${"$"}dxComboUczniowie".*?</select>""".toRegex(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(DOT_MATCHES_ALL)
+    }
+
+
+
+    val VULCAN_SHIFT_ANNOTATION by lazy {
+        """\(przeniesiona (z|na) lekcj[ię] ([0-9]+), (.+)\)""".toRegex()
+    }
+
+
+
+    val LIBRUS_ATTACHMENT_KEY by lazy {
+        """singleUseKey=([0-9A-f_]+)""".toRegex()
+    }
+
+
+
+    val EDUDZIENNIK_STUDENTS_START by lazy {
+        """<li><a href="/Students/([\w-_]+?)/start/">(.*?)</a>""".toRegex()
+    }
+    val EDUDZIENNIK_ACCOUNT_NAME_START by lazy {
+        """<span id='user_dn'>(.*?)</span>""".toRegex()
+    }
+
+    val EDUDZIENNIK_ATTENDANCE_ENTRIES by lazy {
+        """<td id="([\d-]+?):(\d+?)".*?>(.+?)</td>""".toRegex()
+    }
+    val EDUDZIENNIK_ATTENDANCE_TYPES by lazy {
+        """<div class="info">.*?<p>(.*?)</p>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val EDUDZIENNIK_ATTENDANCE_TYPE by lazy {
+        """\((.+?)\) (.+)""".toRegex()
+    }
+
+    val EDUDZIENNIK_SUBJECT_ID by lazy {
+        """/Courses/([\w-_]+?)/""".toRegex()
+    }
+    val EDUDZIENNIK_GRADE_ID by lazy {
+        """/Grades/([\w-_]+?)/""".toRegex()
+    }
+    val EDUDZIENNIK_EXAM_ID by lazy {
+        """/Evaluations/([\w-_]+?)/""".toRegex()
+    }
+    val EDUDZIENNIK_EVENT_TYPE_ID by lazy {
+        """/GradeLabels/([\w-_]+?)/""".toRegex()
+    }
+
+    val EDUDZIENNIK_SCHOOL_DETAIL_ID by lazy {
+        """<a id="School_detail".*?/School/([\w-_]+?)/""".toRegex(DOT_MATCHES_ALL)
+    }
+    val EDUDZIENNIK_SCHOOL_DETAIL_NAME by lazy {
+        """</li>.*?<p>(.*?)</p>.*?<li>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val EDUDZIENNIK_CLASS_DETAIL_ID by lazy {
+        """<a id="Klass_detail".*?/Klass/([\w-_]+?)/""".toRegex(DOT_MATCHES_ALL)
+    }
+    val EDUDZIENNIK_CLASS_DETAIL_NAME by lazy {
+        """<a id="Klass_detail".*?>(.*?)</a>""".toRegex(DOT_MATCHES_ALL)
+    }
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/DataEdudziennik.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/DataEdudziennik.kt
@ -0,0 +1,134 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-22
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_EDUDZIENNIK_WEB
+import pl.szczodrzynski.edziennik.data.api.models.Data
+import pl.szczodrzynski.edziennik.data.db.modules.events.EventType
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+
+/**
+ * Use http://patorjk.com/software/taag/#p=display&f=Big for the ascii art
+ *
+ * Use https://codepen.io/kubasz/pen/RwwwbGN to easily generate the student data getters/setters
+ */
+class DataEdudziennik(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
+
+    fun isWebLoginValid() = webSessionIdExpiryTime-30 > currentTimeUnix() && webSessionId.isNotNullNorEmpty()
+
+    override fun satisfyLoginMethods() {
+        loginMethods.clear()
+        if (isWebLoginValid()) {
+            loginMethods += LOGIN_METHOD_EDUDZIENNIK_WEB
+        }
+    }
+
+    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 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: 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 mSchoolId: String? = null
+    var schoolId: String?
+        get() { mSchoolId = mSchoolId ?: profile?.getStudentData("schoolId", null); return mSchoolId }
+        set(value) { profile?.putStudentData("schoolId", value) ?: return; mSchoolId = value }
+
+    private var mClassId: String? = null
+    var classId: String?
+        get() { mClassId = mClassId ?: profile?.getStudentData("classId", null); return mClassId }
+        set(value) { profile?.putStudentData("classId", value) ?: return; mClassId = 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 mWebSessionIdExpiryTime: Long? = null
+    var webSessionIdExpiryTime: Long
+        get() { mWebSessionIdExpiryTime = mWebSessionIdExpiryTime ?: loginStore.getLoginData("webSessionIdExpiryTime", 0L); return mWebSessionIdExpiryTime ?: 0L }
+        set(value) { loginStore.putLoginData("webSessionIdExpiryTime", value); mWebSessionIdExpiryTime = value }
+
+    /*     ____  _   _
+          / __ \| | | |
+         | |  | | |_| |__   ___ _ __
+         | |  | | __| '_ \ / _ \ '__|
+         | |__| | |_| | | |  __/ |
+          \____/ \__|_| |_|\___|*/
+    private var mSchoolName: String? = null
+    var schoolName: String?
+        get() { mSchoolName = mSchoolName ?: profile?.getStudentData("schoolName", null); return mSchoolName }
+        set(value) { profile?.putStudentData("schoolName", value) ?: return; mSchoolName = value }
+
+    private var mTimetableNotPublic: Boolean? = null
+    var timetableNotPublic: Boolean
+        get() { mTimetableNotPublic = mTimetableNotPublic ?: profile?.getStudentData("timetableNotPublic", false); return mTimetableNotPublic ?: false }
+        set(value) { profile?.putStudentData("timetableNotPublic", value) ?: return; mTimetableNotPublic = value }
+
+    val studentEndpoint: String
+        get() = "Students/$studentId/"
+
+    val schoolEndpoint: String
+        get() = "Schools/$schoolId/"
+
+    val schoolClassEndpoint: String
+        get() = "Schools/$classId/"
+
+    val studentAndClassEndpoint: String
+        get() = "Students/$studentId/Klass/$classId/"
+
+    val courseEndpoint: String
+        get() = "Course/$studentId/"
+
+    val timetableEndpoint: String
+        get() = "Plan/$studentId/"
+
+    fun getSubject(longId: String, name: String): Subject {
+        val id = longId.crc32()
+        return subjectList.singleOrNull { it.id == id } ?: run {
+            val subject = Subject(profileId, id, name, name)
+            subjectList.put(id, subject)
+            subject
+        }
+    }
+
+    fun getTeacher(firstName: String, lastName: String): Teacher {
+        val name = "$firstName $lastName".fixName()
+        val id = name.crc32()
+        return teacherList.singleOrNull { it.id == id } ?: run {
+            val teacher = Teacher(profileId, id, firstName, lastName)
+            teacherList.put(id, teacher)
+            teacher
+        }
+    }
+
+    fun getEventType(longId: String, name: String): EventType {
+        val id = longId.crc16().toLong()
+        return eventTypes.singleOrNull { it.id == id } ?: run {
+            val eventType = EventType(profileId, id, name, colorFromName(app, name))
+            eventTypes.put(id, eventType)
+            eventType
+        }
+    }
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/Edudziennik.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/Edudziennik.kt
@ -0,0 +1,146 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-22
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.data.api.ERROR_EDUDZIENNIK_WEB_TIMETABLE_NOT_PUBLIC
+import pl.szczodrzynski.edziennik.data.api.ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID
+import pl.szczodrzynski.edziennik.data.api.edudziennikLoginMethods
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikData
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.firstlogin.EdudziennikFirstLogin
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLogin
+import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
+import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.prepare
+import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.utils.Utils.d
+
+class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
+    companion object {
+        private const val TAG = "Edudziennik"
+    }
+
+    val internalErrorList = mutableListOf<Int>()
+    val data: DataEdudziennik
+
+    init {
+        data = DataEdudziennik(app, profile, loginStore).apply {
+            callback = wrapCallback(this@Edudziennik.callback)
+            satisfyLoginMethods()
+        }
+    }
+
+    private fun completed() {
+        data.saveData()
+        data.notify {
+            callback.onCompleted()
+        }
+    }
+
+    /*    _______ _                     _                  _ _   _
+         |__   __| |              /\   | |                (_) | | |
+            | |  | |__   ___     /  \  | | __ _  ___  _ __ _| |_| |__  _ __ ___
+            | |  | '_ \ / _ \   / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \
+            | |  | | | |  __/  / ____ \| | (_| | (_) | |  | | |_| | | | | | | | |
+            |_|  |_| |_|\___| /_/    \_\_|\__, |\___/|_|  |_|\__|_| |_|_| |_| |_|
+                                           __/ |
+                                          |__*/
+    override fun sync(featureIds: List<Int>, viewId: Int?, arguments: JsonObject?) {
+        data.arguments = arguments
+        data.prepare(edudziennikLoginMethods, EdudziennikFeatures, featureIds, viewId)
+        d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}")
+        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        EdudziennikLogin(data) {
+            EdudziennikData(data) {
+                completed()
+            }
+        }
+    }
+
+    private fun login() {
+        d(TAG, "Trying to login with ${data.targetLoginMethodIds}")
+        if (internalErrorList.isNotEmpty()) {
+            d(TAG, "  - Internal errors:")
+            internalErrorList.forEach { d(TAG, "      - code $it") }
+        }
+        EdudziennikLogin(data) {
+            data()
+        }
+    }
+
+    private fun data() {
+        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        if (internalErrorList.isNotEmpty()) {
+            d(TAG, "  - Internal errors:")
+            internalErrorList.forEach { d(TAG, "      - code $it") }
+        }
+        EdudziennikData(data) {
+            completed()
+        }
+    }
+
+    override fun getMessage(message: MessageFull) {
+
+    }
+
+    override fun markAllAnnouncementsAsRead() {
+
+    }
+
+    override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {
+
+    }
+
+    override fun firstLogin() {
+        EdudziennikFirstLogin(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_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID -> {
+                        login()
+                    }
+                    ERROR_EDUDZIENNIK_WEB_TIMETABLE_NOT_PUBLIC -> {
+                        data.timetableNotPublic = true
+                        data()
+                    }
+                    else -> callback.onError(apiError)
+                }
+            }
+        }
+    }
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/EdudziennikFeatures.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/EdudziennikFeatures.kt
@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-23
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik
+
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.models.Feature
+
+const val ENDPOINT_EDUDZIENNIK_WEB_START                = 1000
+const val ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE            = 1001
+const val ENDPOINT_EDUDZIENNIK_WEB_EXAMS                = 1002
+const val ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE           = 1003
+const val ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER         = 1010
+
+val EdudziennikFeatures = listOf(
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_STUDENT_INFO, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_START to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_TIMETABLE, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_GRADES, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_START to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_AGENDA, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_EXAMS to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_ATTENDANCE, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_LUCKY_NUMBER, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB))
+)
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikData.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikData.kt
@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-22
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data
+
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web.*
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class EdudziennikData(val data: DataEdudziennik, 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_EDUDZIENNIK_WEB_START -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_data)
+                EdudziennikWebStart(data, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_timetable)
+                EdudziennikWebTimetable(data, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_EXAMS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_exams)
+                EdudziennikWebExams(data, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_attendance)
+                EdudziennikWebAttendance(data, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
+                EdudziennikWebLuckyNumber(data, onSuccess)
+            }
+            else -> onSuccess()
+        }
+    }
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikWeb.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikWeb.kt
@ -0,0 +1,87 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-22
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data
+
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import okhttp3.Cookie
+import pl.szczodrzynski.edziennik.data.api.EDUDZIENNIK_USER_AGENT
+import pl.szczodrzynski.edziennik.data.api.ERROR_REQUEST_FAILURE
+import pl.szczodrzynski.edziennik.data.api.ERROR_RESPONSE_EMPTY
+import pl.szczodrzynski.edziennik.data.api.EXCEPTION_EDUDZIENNIK_WEB_REQUEST
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.utils.Utils.d
+
+open class EdudziennikWeb(open val data: DataEdudziennik) {
+    companion object {
+        private const val TAG = "EdudziennikWeb"
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    val profile
+        get() = data.profile
+
+    fun webGet(tag: String, endpoint: String, xhr: Boolean = false, onSuccess: (text: String) -> Unit) {
+        val url = "https://dziennikel.appspot.com/" + when (endpoint.endsWith('/') || endpoint.contains('?') || endpoint.isEmpty()) {
+            true -> endpoint
+            else -> "$endpoint/"
+        }
+
+        d(tag, "Request: Edudziennik/Web - $url")
+
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                if (text == null || response == null) {
+                    data.error(ApiError(tag, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                try {
+                    onSuccess(text)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_EDUDZIENNIK_WEB_REQUEST)
+                            .withThrowable(e)
+                            .withResponse(response)
+                            .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("sessionid")
+                        .value(data.webSessionId!!)
+                        .domain("dziennikel.appspot.com")
+                        .secure().httpOnly().build(),
+                Cookie.Builder()
+                        .name("semester")
+                        .value((profile?.currentSemester ?: 1).toString())
+                        .domain("dziennikel.appspot.com")
+                        .secure().httpOnly().build()
+        ))
+
+        Request.builder()
+                .url(url)
+                .userAgent(EDUDZIENNIK_USER_AGENT)
+                .apply {
+                    if (xhr) header("X-Requested-With", "XMLHttpRequest")
+                }
+                .get()
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt
@ -0,0 +1,94 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-24
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ATTENDANCE_ENTRIES
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ATTENDANCE_TYPE
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ATTENDANCE_TYPES
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.utils.models.Date
+import java.util.*
+
+class EdudziennikWebAttendance(override val data: DataEdudziennik,
+                               val onSuccess: () -> Unit) : EdudziennikWeb(data) {
+    companion object {
+        private const val TAG = "EdudziennikWebAttendance"
+    }
+
+    init { data.profile?.also { profile ->
+        webGet(TAG, data.studentEndpoint + "Presence") { text ->
+
+            val attendanceTypes = EDUDZIENNIK_ATTENDANCE_TYPES.find(text)?.get(1)?.split(',')?.map {
+                val type = EDUDZIENNIK_ATTENDANCE_TYPE.find(it.trim())
+                val symbol = type?.get(1)?.trim()
+                val name = type?.get(2)?.trim()
+                return@map Triple(
+                        symbol,
+                        name,
+                        when (name?.toLowerCase(Locale.ROOT)) {
+                            "obecność" -> Attendance.TYPE_PRESENT
+                            "nieobecność" -> Attendance.TYPE_ABSENT
+                            "spóźnienie" -> Attendance.TYPE_BELATED
+                            "nieobecność usprawiedliwiona" -> Attendance.TYPE_ABSENT_EXCUSED
+                            "dzień wolny" -> Attendance.TYPE_RELEASED
+                            "brak zajęć" -> Attendance.TYPE_RELEASED
+                            "oddelegowany" -> Attendance.TYPE_RELEASED
+                            else -> Attendance.TYPE_CUSTOM
+                        }
+                )
+            } ?: emptyList()
+
+            EDUDZIENNIK_ATTENDANCE_ENTRIES.findAll(text).forEach { attendanceElement ->
+                val date = Date.fromY_m_d(attendanceElement[1])
+                val lessonNumber = attendanceElement[2].toInt()
+                val attendanceSymbol = attendanceElement[3]
+
+                val lessons = data.app.db.timetableDao().getForDateNow(profileId, date)
+                val lesson = lessons.firstOrNull { it.lessonNumber == lessonNumber }
+
+                val id = "${date.stringY_m_d}:$lessonNumber:$attendanceSymbol".crc32()
+
+                val (_, name, type) = attendanceTypes.firstOrNull { (symbol, _, _) -> symbol == attendanceSymbol }
+                        ?: return@forEach
+
+                val startTime = data.lessonRanges.singleOrNull { it.lessonNumber == lessonNumber }?.startTime
+                        ?: return@forEach
+
+                val attendanceObject = Attendance(
+                        profileId,
+                        id,
+                        lesson?.displayTeacherId ?: -1,
+                        lesson?.displaySubjectId ?: -1,
+                        profile.currentSemester,
+                        name,
+                        date,
+                        lesson?.displayStartTime ?: startTime,
+                        type
+                )
+
+                data.attendanceList.add(attendanceObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_ATTENDANCE,
+                        id,
+                        profile.empty,
+                        profile.empty,
+                        System.currentTimeMillis()
+                ))
+            }
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE, SYNC_ALWAYS)
+            onSuccess()
+        }
+    } ?: onSuccess() }
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt
@ -0,0 +1,87 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-24
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_EVENT_TYPE_ID
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_EXAM_ID
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_EXAMS
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebExams(override val data: DataEdudziennik,
+                          val onSuccess: () -> Unit) : EdudziennikWeb(data) {
+    companion object {
+        const val TAG = "EdudziennikWebExams"
+    }
+
+    init { profile?.also { profile ->
+        webGet(TAG, data.studentAndClassEndpoint + "Evaluations", xhr = true) { text ->
+            val doc = Jsoup.parseBodyFragment("<table>" + text.trim() + "</table>")
+
+            doc.select("tr").forEach { examElement ->
+                val id = EDUDZIENNIK_EXAM_ID.find(examElement.child(0).child(0).attr("href"))
+                        ?.get(1)?.crc32() ?: return@forEach
+                val topic = examElement.child(0).text().trim()
+
+                val subjectElement = examElement.child(1).child(0)
+                val subjectId = EDUDZIENNIK_SUBJECT_ID.find(subjectElement.attr("href"))?.get(1)
+                        ?: return@forEach
+                val subjectName  = subjectElement.text().trim()
+                val subject = data.getSubject(subjectId, subjectName)
+
+                val dateString = examElement.child(2).text().trim()
+                if (dateString.isBlank()) return@forEach
+                val date = Date.fromY_m_d(dateString)
+
+                val lessons = data.app.db.timetableDao().getForDateNow(profileId, date)
+                val startTime = lessons.firstOrNull { it.subjectId == subject.id }?.startTime
+
+                val eventTypeElement = examElement.child(3).child(0)
+                val eventTypeId = EDUDZIENNIK_EVENT_TYPE_ID.find(eventTypeElement.attr("href"))?.get(1)
+                        ?: return@forEach
+                val eventTypeName = eventTypeElement.text()
+                val eventType = data.getEventType(eventTypeId, eventTypeName)
+
+                val eventObject = Event(
+                        profileId,
+                        id,
+                        date,
+                        startTime,
+                        topic,
+                        -1,
+                        eventType.id.toInt(),
+                        false,
+                        -1,
+                        subject.id,
+                        data.teamClass?.id ?: -1
+                )
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_EVENT,
+                        id,
+                        profile.empty,
+                        profile.empty,
+                        System.currentTimeMillis()
+                ))
+            }
+
+            data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_DEFAULT))
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_EXAMS, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }}
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebLuckyNumber.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebLuckyNumber.kt
@ -0,0 +1,45 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-23
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebLuckyNumber(override val data: DataEdudziennik,
+                                val onSuccess: () -> Unit) : EdudziennikWeb(data) {
+    companion object {
+        private const val TAG = "EdudziennikWebLuckyNumber"
+    }
+
+    init { data.profile?.also { profile ->
+        webGet(TAG, data.schoolEndpoint + "Lucky", xhr = true) { text ->
+            text.toIntOrNull()?.let { luckyNumber ->
+                val luckyNumberObject = LuckyNumber(
+                        profileId,
+                        Date.getToday(),
+                        luckyNumber
+                )
+
+                data.luckyNumberList.add(luckyNumberObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_LUCKY_NUMBER,
+                        luckyNumberObject.date.value.toLong(),
+                        profile.empty,
+                        profile.empty,
+                        System.currentTimeMillis()
+                ))
+            }
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER, SYNC_ALWAYS)
+            onSuccess()
+        }
+    } ?: onSuccess() }
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebStart.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebStart.kt
@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-23
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_START
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+
+class EdudziennikWebStart(override val data: DataEdudziennik,
+                          val onSuccess: () -> Unit) : EdudziennikWeb(data) {
+    companion object {
+        private const val TAG = "EdudziennikWebStart"
+    }
+
+    init {
+        webGet(TAG, data.studentEndpoint + "start") { text ->
+            val doc = Jsoup.parse(text)
+
+            EdudziennikWebStartInfo(data, text)
+            EdudziennikWebStartGrades(data, doc)
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_START, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebStartGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebStartGrades.kt
@ -0,0 +1,185 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-24
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import android.graphics.Color
+import org.jsoup.nodes.Document
+import pl.szczodrzynski.edziennik.colorFromCssName
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.*
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebStartGrades(val data: DataEdudziennik, val doc: Document) {
+    companion object {
+        const val TAG = "EdudziennikWebStartGrades"
+    }
+
+    init {data.profile?.also { profile ->
+        val subjects = doc.select("#student_grades tbody").firstOrNull()?.children()
+
+        if (subjects.isNullOrEmpty()) return@also
+
+        subjects.forEach { subjectElement ->
+            if (subjectElement.id().isBlank()) return@forEach
+
+            val subjectId = subjectElement.id().trim()
+            val subjectName = subjectElement.child(0).text().trim()
+            val subject = data.getSubject(subjectId, subjectName)
+
+            val grades = subjectElement.select(".grade")
+            val gradesInfo = subjectElement.select(".grade-tip")
+
+            val gradeValues = subjects.select(".avg-$subjectId .grade-tip > p").first()
+                    .text().split('+').map {
+                        val split = it.split('*')
+                        val weight = split[0].trim().toFloat()
+                        val value = split[1].trim().toFloat()
+
+                        Pair(value, weight)
+                    }
+
+            grades.forEachIndexed { index, gradeElement ->
+                val id = Regexes.EDUDZIENNIK_GRADE_ID.find(gradeElement.attr("href"))?.get(1)?.crc32()
+                        ?: return@forEachIndexed
+                val (value, weight) = gradeValues[index]
+                val name = gradeElement.text().trim().let {
+                    if (it.contains(',') || it.contains('.')) {
+                        val replaced = it.replace(',', '.')
+                        val float = replaced.toFloatOrNull()
+
+                        if (float != null && float % 1 == 0f) float.toInt().toString()
+                        else it
+                    } else it
+                }
+
+                val info = gradesInfo[index]
+                val category = info.child(4).text().trim()
+
+                val (teacherLastName, teacherFirstName) = info.child(1).text().split(' ')
+                val teacher = data.getTeacher(teacherFirstName, teacherLastName)
+
+                val addedDate = info.child(2).text().split(' ').let {
+                    val day = it[0].toInt()
+                    val month = Utils.monthFromName(it[1])
+                    val year = it[2].toInt()
+
+                    Date(year, month, day).inMillis
+                }
+
+                val color = Regexes.STYLE_CSS_COLOR.find(gradeElement.attr("style"))?.get(1)?.let {
+                    if (it.startsWith('#')) Color.parseColor(it)
+                    else colorFromCssName(it)
+                } ?: -1
+
+                val gradeObject = Grade(
+                        data.profileId,
+                        id,
+                        category,
+                        color,
+                        "",
+                        name,
+                        value,
+                        weight,
+                        profile.currentSemester,
+                        teacher.id,
+                        subject.id
+                )
+
+                data.gradeList.add(gradeObject)
+                data.metadataList.add(Metadata(
+                        data.profileId,
+                        Metadata.TYPE_GRADE,
+                        id,
+                        profile.empty,
+                        profile.empty,
+                        addedDate
+                ))
+            }
+
+            val proposed = subjectElement.select(".proposal").firstOrNull()?.text()?.trim()
+
+            if (proposed != null && proposed.isNotBlank()) {
+                val proposedGradeObject = Grade(
+                        data.profileId,
+                        (-1 * subject.id) - 1,
+                        "",
+                        -1,
+                        "",
+                        proposed,
+                        proposed.toFloatOrNull() ?: 0f,
+                        0f,
+                        profile.currentSemester,
+                        -1,
+                        subject.id
+                ).apply {
+                    type = when (semester) {
+                        1 -> TYPE_SEMESTER1_PROPOSED
+                        else -> TYPE_SEMESTER2_PROPOSED
+                    }
+                }
+
+                data.gradeList.add(proposedGradeObject)
+                data.metadataList.add(Metadata(
+                        data.profileId,
+                        Metadata.TYPE_GRADE,
+                        proposedGradeObject.id,
+                        profile.empty,
+                        profile.empty,
+                        System.currentTimeMillis()
+                ))
+            }
+
+            val final = subjectElement.select(".final").firstOrNull()?.text()?.trim()
+
+            if (final != null && final.isNotBlank()) {
+                val finalGradeObject = Grade(
+                        data.profileId,
+                        (-1 * subject.id) - 2,
+                        "",
+                        -1,
+                        "",
+                        final,
+                        final.toFloatOrNull() ?: 0f,
+                        0f,
+                        profile.currentSemester,
+                        -1,
+                        subject.id
+                ).apply {
+                    type = when (semester) {
+                        1 -> TYPE_SEMESTER1_FINAL
+                        else -> TYPE_SEMESTER2_FINAL
+                    }
+                }
+
+                data.gradeList.add(finalGradeObject)
+                data.metadataList.add(Metadata(
+                        data.profileId,
+                        Metadata.TYPE_GRADE,
+                        finalGradeObject.id,
+                        profile.empty,
+                        profile.empty,
+                        System.currentTimeMillis()
+                ))
+            }
+        }
+
+        data.toRemove.addAll(listOf(
+                TYPE_NORMAL,
+                TYPE_SEMESTER1_PROPOSED,
+                TYPE_SEMESTER2_PROPOSED,
+                TYPE_SEMESTER1_FINAL,
+                TYPE_SEMESTER2_FINAL
+        ).map {
+            DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it)
+        })
+    }}
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebStartInfo.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebStartInfo.kt
@ -0,0 +1,54 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-24
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.ERROR_EDUDZIENNIK_WEB_TEAM_MISSING
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
+import pl.szczodrzynski.edziennik.firstLettersName
+import pl.szczodrzynski.edziennik.get
+
+class EdudziennikWebStartInfo(val data: DataEdudziennik, val text: String) {
+    companion object {
+        const val TAG = "EdudziennikWebStartInfo"
+    }
+
+    init { run {
+        val schoolId = Regexes.EDUDZIENNIK_SCHOOL_DETAIL_ID.find(text)?.get(1)?.trim()
+        val schoolLongName = Regexes.EDUDZIENNIK_SCHOOL_DETAIL_NAME.find(text)?.get(1)?.trim()
+        data.schoolId = schoolId
+
+        val classId = Regexes.EDUDZIENNIK_CLASS_DETAIL_ID.find(text)?.get(1)?.trim()
+        val className = Regexes.EDUDZIENNIK_CLASS_DETAIL_NAME.find(text)?.get(1)?.trim()
+        data.classId = classId
+
+        if (classId == null || className == null || schoolId == null || schoolLongName == null) {
+            data.error(ApiError(TAG, ERROR_EDUDZIENNIK_WEB_TEAM_MISSING)
+                    .withApiResponse(text))
+            return@run
+        }
+
+        val schoolName = schoolId.crc32().toString() + schoolLongName.firstLettersName + "_edu"
+        data.schoolName = schoolName
+
+        val teamId = classId.crc32()
+        val teamCode = "$schoolName:$className"
+
+        val teamObject = Team(
+                data.profileId,
+                teamId,
+                className,
+                Team.TYPE_CLASS,
+                teamCode,
+                -1
+        )
+
+        data.teamClass = teamObject
+        data.teamList.put(teamObject.id, teamObject)
+    }}
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTimetable.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTimetable.kt
@ -0,0 +1,157 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-23
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.data.api.ERROR_EDUDZIENNIK_WEB_TIMETABLE_NOT_PUBLIC
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.splitName
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import pl.szczodrzynski.edziennik.utils.models.Week
+
+class EdudziennikWebTimetable(override val data: DataEdudziennik,
+                              val onSuccess: () -> Unit) : EdudziennikWeb(data) {
+    companion object {
+        private const val TAG = "EdudziennikWebTimetable"
+    }
+
+    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)
+
+        webGet(TAG, data.timetableEndpoint + "print?date=$getDate") { text ->
+            val doc = Jsoup.parse(text)
+
+            val dataDays = mutableListOf<Int>()
+            val dataStart = weekStart.clone()
+            while (dataStart <= weekEnd) {
+                dataDays += dataStart.value
+                dataStart.stepForward(0, 0, 1)
+            }
+
+            val table = doc.select("#Schedule tbody").first()
+
+            if (table.text().trim() == "Brak planu lekcji.") {
+                data.error(ApiError(TAG, ERROR_EDUDZIENNIK_WEB_TIMETABLE_NOT_PUBLIC)
+                        .withApiResponse(text))
+                onSuccess()
+                return@webGet
+            }
+
+            table.children().forEach { row ->
+                val rowElements = row.children()
+
+                val lessonNumber = rowElements[0].text().toInt()
+
+                val times = rowElements[1].text().split('-')
+                val startTime = Time.fromH_m(times[0].trim())
+                val endTime = Time.fromH_m(times[1].trim())
+
+                data.lessonRanges.singleOrNull {
+                    it.lessonNumber == lessonNumber && it.startTime == startTime && it.endTime == endTime
+                } ?: run {
+                    data.lessonRanges.put(lessonNumber, LessonRange(profileId, lessonNumber, startTime, endTime))
+                }
+
+                rowElements.subList(2, rowElements.size).forEachIndexed { index, lesson ->
+                    val course = lesson.select(".course").firstOrNull() ?: return@forEachIndexed
+                    val info = course.select("span > span")
+
+                    if (info.isEmpty()) return@forEachIndexed
+
+                    val type = when (course.hasClass("substitute")) {
+                        true -> Lesson.TYPE_CHANGE
+                        else -> Lesson.TYPE_NORMAL
+                    }
+
+                    /* Getting subject */
+
+                    val subjectElement = info[0].child(0)
+                    val subjectId = EDUDZIENNIK_SUBJECT_ID.find(subjectElement.attr("href"))?.get(1)
+                            ?: return@forEachIndexed
+                    val subjectName = subjectElement.text().trim()
+                    val subject = data.getSubject(subjectId, subjectName)
+
+                    /* Getting teacher */
+
+                    val teacherId = if (info.size >= 2) {
+                        val teacherElement = info[1].child(0)
+                        val teacherName = teacherElement.text().trim()
+                        teacherName.splitName()?.let { (teacherLastName, teacherFirstName) ->
+                            data.getTeacher(teacherFirstName, teacherLastName)
+                        }?.id ?: -1
+                    } else -1
+
+                    val lessonObject = Lesson(profileId, -1).also {
+                        it.type = type
+                        it.date = weekStart.clone().stepForward(0, 0, index)
+                        it.lessonNumber = lessonNumber
+                        it.startTime = startTime
+                        it.endTime = endTime
+                        it.subjectId = subject.id
+                        it.teacherId = teacherId
+
+                        it.id = it.buildId()
+                    }
+
+                    data.lessonNewList.add(lessonObject)
+                    dataDays.remove(lessonObject.date!!.value)
+
+                    if (type != Lesson.TYPE_NORMAL) {
+                        val seen = profile.empty || lessonObject.date!! < Date.getToday()
+
+                        data.metadataList.add(Metadata(
+                                profileId,
+                                Metadata.TYPE_LESSON_CHANGE,
+                                lessonObject.id,
+                                seen,
+                                seen,
+                                System.currentTimeMillis()
+                        ))
+                    }
+                }
+            }
+
+            for (day in dataDays) {
+                val lessonDate = Date.fromValue(day)
+                data.lessonNewList += 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")
+
+            if (data.timetableNotPublic) data.timetableNotPublic = false
+
+            data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd))
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE, SYNC_ALWAYS)
+            onSuccess()
+        }
+    } ?: onSuccess() }
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/firstlogin/EdudziennikFirstLogin.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/firstlogin/EdudziennikFirstLogin.kt
@ -0,0 +1,56 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-22
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.firstlogin
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ACCOUNT_NAME_START
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_STUDENTS_START
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLoginWeb
+import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.fixName
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.getShortName
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class EdudziennikFirstLogin(val data: DataEdudziennik, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "EdudziennikFirstLogin"
+    }
+
+    private val web = EdudziennikWeb(data)
+    private val profileList = mutableListOf<Profile>()
+
+    init {
+        EdudziennikLoginWeb(data) {
+            web.webGet(TAG, "") { text ->
+                val accountName = EDUDZIENNIK_ACCOUNT_NAME_START.find(text)?.get(1)?.fixName()
+
+                EDUDZIENNIK_STUDENTS_START.findAll(text).forEach {
+                    val studentId = it[1]
+                    val studentName = it[2].fixName()
+
+                    if (studentId.isBlank() || studentName.isBlank()) return@forEach
+
+                    val profile = Profile()
+                    profile.studentNameLong = studentName
+                    profile.studentNameShort = studentName.getShortName()
+                    profile.accountNameLong = if (studentName == accountName) null else accountName
+                    profile.studentSchoolYear = Utils.getCurrentSchoolYear()
+                    profile.name = studentName
+                    profile.subname = data.loginEmail
+                    profile.empty = true
+                    profile.putStudentData("studentId", studentId)
+                    profileList.add(profile)
+                }
+
+                EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore))
+                onSuccess()
+            }
+        }
+    }
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/login/EdudziennikLogin.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/login/EdudziennikLogin.kt
@ -0,0 +1,54 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-22
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login
+
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_EDUDZIENNIK_WEB
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class EdudziennikLogin(val data: DataEdudziennik, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "EdudziennikLogin"
+    }
+
+    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_EDUDZIENNIK_WEB -> {
+                data.startProgress(R.string.edziennik_progress_login_edudziennik_web)
+                EdudziennikLoginWeb(data) { onSuccess(loginMethodId) }
+            }
+        }
+    }
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/login/EdudziennikLoginWeb.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/login/EdudziennikLoginWeb.kt
@ -0,0 +1,97 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-22
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login
+
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.getUnixDate
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.utils.Utils.d
+
+class EdudziennikLoginWeb(val data: DataEdudziennik, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "EdudziennikLoginWeb"
+    }
+
+    init { run {
+        if (data.isWebLoginValid()) {
+            onSuccess()
+        }
+        else {
+            data.app.cookieJar.clearForDomain("dziennikel.appspot.com")
+            if (data.loginEmail.isNotNullNorEmpty() && data.loginPassword.isNotNullNorEmpty()) {
+                loginWithCredentials()
+            }
+            else {
+                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            }
+        }
+    }}
+
+    private fun loginWithCredentials() {
+        d(TAG, "Request: Edudziennik/Login/Web - https://dziennikel.appspot.com/login/?next=/")
+
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                if (text == null || response == null) {
+                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                val url = response.raw().request().url().toString()
+
+                if (!url.contains("Student")) {
+                    when {
+                        text.contains("Wprowadzono nieprawidłową nazwę użytkownika lub hasło.") -> ERROR_LOGIN_EDUDZIENNIK_WEB_INVALID_LOGIN
+                        else -> ERROR_LOGIN_EDUDZIENNIK_WEB_OTHER
+                    }.let { errorCode ->
+                        data.error(ApiError(TAG, errorCode)
+                                .withApiResponse(text)
+                                .withResponse(response))
+                        return
+                    }
+                }
+
+                val cookies = data.app.cookieJar.getForDomain("dziennikel.appspot.com")
+                val sessionId = cookies.firstOrNull { it.name() == "sessionid" }?.value()
+
+                if (sessionId == null) {
+                    data.error(ApiError(TAG, ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID)
+                            .withResponse(response)
+                            .withApiResponse(text))
+                    return
+                }
+
+                data.webSessionId = sessionId
+                data.webSessionIdExpiryTime = response.getUnixDate() + 45 * 60 /* 45 min */
+                onSuccess()
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url("https://dziennikel.appspot.com/login/?next=/")
+                .userAgent(EDUDZIENNIK_USER_AGENT)
+                .contentType("application/x-www-form-urlencoded")
+                .addParameter("email", data.loginEmail)
+                .addParameter("password", data.loginPassword)
+                .addParameter("auth_method", "password")
+                .addParameter("next", "/")
+                .post()
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/DataIdziennik.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/DataIdziennik.kt
@ -2,14 +2,14 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.api.LOGIN_METHOD_IDZIENNIK_API
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_WEB
+import pl.szczodrzynski.edziennik.data.api.models.Data
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
 import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/Idziennik.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/Idziennik.kt
@ -2,19 +2,19 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.idziennik.data.IdziennikData
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.firstlogin.IdziennikFirstLogin
-import pl.szczodrzynski.edziennik.api.v2.edziennik.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.api.CODE_INTERNAL_LIBRUS_ACCOUNT_410
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikData
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.firstlogin.IdziennikFirstLogin
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLogin
+import pl.szczodrzynski.edziennik.data.api.idziennikLoginMethods
+import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
+import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.prepare
 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
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/IdziennikFeatures.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/IdziennikFeatures.kt
@ -2,10 +2,10 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik

-import pl.szczodrzynski.edziennik.api.v2.*
-import pl.szczodrzynski.edziennik.api.v2.models.Feature
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.models.Feature

 const val ENDPOINT_IDZIENNIK_WEB_TIMETABLE              = 1030
 const val ENDPOINT_IDZIENNIK_WEB_GRADES                 = 1040
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikApi.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikApi.kt
@ -2,7 +2,7 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-29.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data

 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
@ -11,9 +11,9 @@ 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.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.getString
 import pl.szczodrzynski.edziennik.utils.Utils
 import java.net.HttpURLConnection
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikData.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikData.kt
@ -2,14 +2,14 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data

 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.api.IdziennikApiCurrentRegister
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.api.IdziennikApiMessagesInbox
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.api.IdziennikApiMessagesSent
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.web.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api.IdziennikApiCurrentRegister
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api.IdziennikApiMessagesInbox
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api.IdziennikApiMessagesSent
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web.*
 import pl.szczodrzynski.edziennik.utils.Utils

 class IdziennikData(val data: DataIdziennik, val onSuccess: () -> Unit) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikWeb.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikWeb.kt
@ -2,7 +2,7 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-25.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data

 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
@ -10,9 +10,9 @@ 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.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import java.net.HttpURLConnection.HTTP_INTERNAL_ERROR
 import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiCurrentRegister.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiCurrentRegister.kt
@ -2,14 +2,14 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-29.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.IdziennikApi
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_CURRENT_REGISTER
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi
 import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.getInt
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesInbox.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesInbox.kt
@ -2,13 +2,13 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-30.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api

 import com.google.gson.JsonArray
-import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_API_MESSAGES_INBOX
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.IdziennikApi
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_MESSAGES_INBOX
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi
 import pl.szczodrzynski.edziennik.asJsonObjectList
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesSent.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesSent.kt
@ -2,15 +2,15 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-30.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_SENT
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.IdziennikApi
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_MESSAGES_SENT
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_SENT
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi
 import pl.szczodrzynski.edziennik.asJsonObjectList
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAnnouncements.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAnnouncements.kt
@ -2,16 +2,16 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-28.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.web
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_ANNOUNCEMENTS
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAttendance.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAttendance.kt
@ -2,14 +2,14 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-28.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.web
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_ATTENDANCE
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_ATTENDANCE
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_ATTENDANCE
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.crc16
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebExams.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebExams.kt
@ -2,17 +2,17 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-28.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.web
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_EXAMS
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_EXAMS
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_EXAMS
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.events.Event
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGrades.kt
@ -2,16 +2,17 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-28.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.web
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_GRADES
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
@ -23,7 +24,7 @@ class IdziennikWebGrades(override val data: DataIdziennik,
        private const val TAG = "IdziennikWebGrades"
    }

-    init {
+    init { data.profile?.also { profile ->
        webApiGet(TAG, IDZIENNIK_WEB_GRADES, mapOf(
                "idPozDziennika" to data.registerId
        )) { result ->
@ -123,12 +124,12 @@ class IdziennikWebGrades(override val data: DataIdziennik,
                        }
                        1 -> {
                            gradeObject.type = Grade.TYPE_SEMESTER1_FINAL
-                            gradeObject.name = name
+                            gradeObject.name = value.toInt().toString()
                            gradeObject.weight = 0f
                        }
                        2 -> {
                            gradeObject.type = Grade.TYPE_YEAR_FINAL
-                            gradeObject.name = name
+                            gradeObject.name = value.toInt().toString()
                            gradeObject.weight = 0f
                        }
                    }
@ -141,15 +142,22 @@ class IdziennikWebGrades(override val data: DataIdziennik,
                                    profileId,
                                    Metadata.TYPE_GRADE,
                                    id,
-                                    data.profile?.empty ?: false,
-                                    data.profile?.empty ?: false,
+                                    data.profile.empty,
+                                    data.profile.empty,
                                    addedDate
                            ))
                }
            }

+            data.toRemove.addAll(listOf(
+                    Grade.TYPE_NORMAL,
+                    Grade.TYPE_SEMESTER1_FINAL,
+                    Grade.TYPE_YEAR_FINAL
+            ).map {
+                DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it)
+            })
            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_GRADES, SYNC_ALWAYS)
            onSuccess()
        }
-    }
+    } ?: onSuccess() }
 }
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebHomework.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebHomework.kt
@ -2,17 +2,17 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-11-25
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.web
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_HOMEWORK
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.events.Event
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebNotices.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebNotices.kt
@ -2,14 +2,14 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-28.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.web
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_NOTICES
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_NOTICES
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_NOTICES
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.crc16
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebProposedGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebProposedGrades.kt
@ -2,15 +2,16 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-28.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.web
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
 import pl.szczodrzynski.edziennik.asJsonObjectList
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_MISSING_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.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
@ -106,8 +107,11 @@ class IdziennikWebProposedGrades(override val data: DataIdziennik,
                }
            }

+            data.toRemove.addAll(listOf(TYPE_SEMESTER1_PROPOSED, TYPE_YEAR_PROPOSED).map {
+                DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it)
+            })
            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES, SYNC_ALWAYS)
            onSuccess()
        }
-    }}
+    } ?: onSuccess() }
 }
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebTimetable.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebTimetable.kt
@ -2,17 +2,17 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-11-22
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.web
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_TIMETABLE
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_TIMETABLE
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_TIMETABLE
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/firstlogin/IdziennikFirstLogin.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/firstlogin/IdziennikFirstLogin.kt
@ -2,17 +2,17 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-27. 
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.firstlogin
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.login.IdziennikLoginWeb
-import pl.szczodrzynski.edziennik.api.v2.events.FirstLoginFinishedEvent
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_SETTINGS
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLoginWeb
+import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
 import pl.szczodrzynski.edziennik.fixName
 import pl.szczodrzynski.edziennik.get
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLogin.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLogin.kt
@ -2,12 +2,12 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.login
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_API
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_WEB
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
 import pl.szczodrzynski.edziennik.utils.Utils

 class IdziennikLogin(val data: DataIdziennik, val onSuccess: () -> Unit) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginApi.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginApi.kt
@ -2,9 +2,9 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-27. 
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.login
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login

-import pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik

 class IdziennikLoginApi(val data: DataIdziennik, val onSuccess: () -> Unit) {
    companion object {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginWeb.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginWeb.kt
@ -2,7 +2,7 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-26.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.idziennik.login
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login

 import im.wangchao.mhttp.Request
 import im.wangchao.mhttp.Response
@ -10,9 +10,9 @@ 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.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.get
 import pl.szczodrzynski.edziennik.getUnixDate
 import pl.szczodrzynski.edziennik.utils.Utils
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/DataLibrus.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/DataLibrus.kt
@ -2,16 +2,16 @@
 * Copyright (c) Kuba Szczodrzyński 2019-9-21.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.api.LOGIN_METHOD_LIBRUS_API
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_MESSAGES
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_PORTAL
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_SYNERGIA
+import pl.szczodrzynski.edziennik.data.api.models.Data
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
 import pl.szczodrzynski.edziennik.isNotNullNorEmpty
@ -149,7 +149,8 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
    private var mApiCode: String? = null
    var apiCode: String?
        get() { mApiCode = mApiCode ?: loginStore.getLoginData("accountCode", null); return mApiCode }
-        set(value) { loginStore.putLoginData("accountCode", value) ?: return; mApiCode = value }
+        set(value) {
+            loginStore.putLoginData("accountCode", value); mApiCode = value }
    /**
     * A JST login PIN.
     * Used only during first login in JST mode.
@ -157,7 +158,8 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
    private var mApiPin: String? = null
    var apiPin: String?
        get() { mApiPin = mApiPin ?: loginStore.getLoginData("accountPin", null); return mApiPin }
-        set(value) { loginStore.putLoginData("accountPin", value) ?: return; mApiPin = value }
+        set(value) {
+            loginStore.putLoginData("accountPin", value); mApiPin = value }

    /**
     * A Synergia API access token.
@ -256,6 +258,7 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
    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 }
@ -265,8 +268,14 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
    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 }
+
+    private var mTimetableNotPublic: Boolean? = null
+    var timetableNotPublic: Boolean
+        get() { mTimetableNotPublic = mTimetableNotPublic ?: profile?.getStudentData("timetableNotPublic", false); return mTimetableNotPublic ?: false }
+        set(value) { profile?.putStudentData("timetableNotPublic", value) ?: return; mTimetableNotPublic = value }
 }
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/Librus.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/Librus.kt
@ -2,20 +2,20 @@
 * Copyright (c) Kuba Szczodrzyński 2019-9-21.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus

 import com.google.gson.JsonObject
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.api.v2.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusData
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.messages.LibrusMessagesGetAttachment
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.messages.LibrusMessagesGetMessage
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.synergia.LibrusSynergiaMarkAllAnnouncementsAsRead
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.firstlogin.LibrusFirstLogin
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.login.*
-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.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusData
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesGetAttachment
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesGetMessage
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaMarkAllAnnouncementsAsRead
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.firstlogin.LibrusFirstLogin
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.*
+import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
+import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
@ -204,7 +204,7 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
                    }
                    // TODO PORTAL CAPTCHA
                    ERROR_LIBRUS_API_TIMETABLE_NOT_PUBLIC -> {
-                        loginStore.putLoginData("timetableNotPublic", true)
+                        data.timetableNotPublic = true
                        data()
                    }
                    ERROR_LIBRUS_API_LUCKY_NUMBER_NOT_ACTIVE,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusFeatures.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusFeatures.kt
@ -2,10 +2,10 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-11.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus

-import pl.szczodrzynski.edziennik.api.v2.*
-import pl.szczodrzynski.edziennik.api.v2.models.Feature
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.models.Feature

 const val ENDPOINT_LIBRUS_API_ME                                       = 1001
 const val ENDPOINT_LIBRUS_API_SCHOOLS                                  = 1002
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusApi.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusApi.kt
@ -2,15 +2,15 @@
 * Copyright (c) Kuba Szczodrzyński 2019-9-21.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.getString
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import java.net.HttpURLConnection.*
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusData.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusData.kt
@ -2,14 +2,14 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-5.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data

 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.messages.LibrusMessagesGetList
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.synergia.LibrusSynergiaHomework
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.synergia.LibrusSynergiaInfo
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesGetList
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaHomework
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaInfo
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.utils.Utils

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusMessages.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusMessages.kt
@ -2,7 +2,7 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-10-24
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data

 import com.google.gson.JsonObject
 import im.wangchao.mhttp.Request
@ -15,9 +15,9 @@ 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.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import java.io.File
 import java.io.StringWriter
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusPortal.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusPortal.kt
@ -1,12 +1,12 @@
-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.getString
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import java.net.HttpURLConnection
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusSynergia.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusSynergia.kt
@ -2,14 +2,14 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-10-21.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data
+package pl.szczodrzynski.edziennik.data.api.edziennik.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.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.utils.Utils.d

 open class LibrusSynergia(open val data: DataLibrus) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAnnouncements.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAnnouncements.kt
@ -2,12 +2,12 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-10-13
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_ANNOUNCEMENTS
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_ANNOUNCEMENTS
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendanceTypes.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendanceTypes.kt
@ -2,13 +2,13 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-10-13
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import android.graphics.Color
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance
 import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceType

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendances.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendances.kt
@ -2,13 +2,13 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-10-13
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import androidx.core.util.isEmpty
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_ATTENDANCES
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_ATTENDANCES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeCategories.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeCategories.kt
@ -2,13 +2,13 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-12-3
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import android.graphics.Color
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_CATEGORIES
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_CATEGORIES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory

 class LibrusApiBehaviourGradeCategories(override val data: DataLibrus,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeComments.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeComments.kt
@ -2,12 +2,12 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-12-7
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_COMMENTS
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_COMMENTS
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGrades.kt
@ -2,12 +2,13 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-12-3
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADES
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
 import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
@ -23,56 +24,60 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,

    private val nameFormat by lazy { DecimalFormat("#.##") }

-    init { data.profile?.let { profile ->
+    init { data.profile?.also { profile ->
        apiGet(TAG, "BehaviourGrades/Points") { json ->

-            val semester1StartGradeObject = Grade(
-                    profileId,
-                    -101,
-                    data.app.getString(R.string.grade_start_points),
-                    0xffbdbdbd.toInt(),
-                    data.app.getString(R.string.grade_start_points_format, 1),
-                    nameFormat.format(data.startPointsSemester1),
-                    data.startPointsSemester1.toFloat(),
-                    -1f,
-                    1,
-                    -1,
-                    1
-            ).apply { type = Grade.TYPE_BEHAVIOUR }
+            if (data.startPointsSemester1 > 0) {
+                val semester1StartGradeObject = Grade(
+                        profileId,
+                        -101,
+                        data.app.getString(R.string.grade_start_points),
+                        0xffbdbdbd.toInt(),
+                        data.app.getString(R.string.grade_start_points_format, 1),
+                        nameFormat.format(data.startPointsSemester1),
+                        data.startPointsSemester1.toFloat(),
+                        -1f,
+                        1,
+                        -1,
+                        1
+                ).apply { type = Grade.TYPE_BEHAVIOUR }

-            data.gradeList.add(semester1StartGradeObject)
-            data.metadataList.add(Metadata(
-                    profileId,
-                    Metadata.TYPE_GRADE,
-                    semester1StartGradeObject.id,
-                    true,
-                    true,
-                    profile.getSemesterStart(1).inMillis
-            ))
+                data.gradeList.add(semester1StartGradeObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_GRADE,
+                        semester1StartGradeObject.id,
+                        true,
+                        true,
+                        profile.getSemesterStart(1).inMillis
+                ))
+            }

-            val semester2StartGradeObject = Grade(
-                    profileId,
-                    -102,
-                    data.app.getString(R.string.grade_start_points),
-                    0xffbdbdbd.toInt(),
-                    data.app.getString(R.string.grade_start_points_format, 2),
-                    nameFormat.format(data.startPointsSemester2),
-                    data.startPointsSemester2.toFloat(),
-                    -1f,
-                    2,
-                    -1,
-                    1
-            ).apply { type = Grade.TYPE_BEHAVIOUR }
+            if (data.startPointsSemester2 > 0) {
+                val semester2StartGradeObject = Grade(
+                        profileId,
+                        -102,
+                        data.app.getString(R.string.grade_start_points),
+                        0xffbdbdbd.toInt(),
+                        data.app.getString(R.string.grade_start_points_format, 2),
+                        nameFormat.format(data.startPointsSemester2),
+                        data.startPointsSemester2.toFloat(),
+                        -1f,
+                        2,
+                        -1,
+                        1
+                ).apply { type = Grade.TYPE_BEHAVIOUR }

-            data.gradeList.add(semester2StartGradeObject)
-            data.metadataList.add(Metadata(
-                    profileId,
-                    Metadata.TYPE_GRADE,
-                    semester2StartGradeObject.id,
-                    true,
-                    true,
-                    profile.getSemesterStart(2).inMillis
-            ))
+                data.gradeList.add(semester2StartGradeObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_GRADE,
+                        semester2StartGradeObject.id,
+                        true,
+                        true,
+                        profile.getSemesterStart(2).inMillis
+                ))
+            }

            json.getJsonArray("Grades")?.asJsonObjectList()?.forEach { grade ->
                val id = grade.getLong("Id") ?: return@forEach
@ -143,8 +148,9 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
                ))
            }

+            data.toRemove.add(DataRemoveModel.Grades.semesterWithType(profile.currentSemester, Grade.TYPE_BEHAVIOUR))
            data.setSyncNext(ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADES, SYNC_ALWAYS)
            onSuccess()
        }
-    }}
+    } ?: onSuccess() }
 }
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClasses.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClasses.kt
@ -2,12 +2,12 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-10-14
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.DAY
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_CLASSES
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_CLASSES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
 import pl.szczodrzynski.edziennik.getJsonObject
 import pl.szczodrzynski.edziennik.getLong
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClassrooms.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClassrooms.kt
@ -2,12 +2,12 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-24.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_CLASSROOMS
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_CLASSROOMS
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.classrooms.Classroom
 import java.util.*

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEventTypes.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEventTypes.kt
@ -2,12 +2,12 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-24.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_EVENT_TYPES
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_EVENT_TYPES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.events.EventType

 class LibrusApiEventTypes(override val data: DataLibrus,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEvents.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEvents.kt
@ -2,14 +2,14 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-4.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import androidx.core.util.isEmpty
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_EVENTS
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_EVENTS
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.events.Event
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeCategories.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeCategories.kt
@ -2,13 +2,13 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-11-5
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import android.graphics.Color
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADE_CATEGORIES
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADE_CATEGORIES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeComments.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeComments.kt
@ -2,12 +2,12 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-11-20
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGrades.kt
@ -1,11 +1,13 @@
-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADES
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.*
 import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.Utils
@ -17,7 +19,7 @@ class LibrusApiGrades(override val data: DataLibrus,
        const val TAG = "LibrusApiGrades"
    }

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

@ -68,15 +70,15 @@ class LibrusApiGrades(override val data: DataLibrus,

                when {
                    grade.getBoolean("IsConstituent") ?: false ->
-                        gradeObject.type = Grade.TYPE_NORMAL
+                        gradeObject.type = TYPE_NORMAL
                    grade.getBoolean("IsSemester") ?: false -> // semester final
-                        gradeObject.type = if (gradeObject.semester == 1) Grade.TYPE_SEMESTER1_FINAL else Grade.TYPE_SEMESTER2_FINAL
+                        gradeObject.type = if (gradeObject.semester == 1) TYPE_SEMESTER1_FINAL else TYPE_SEMESTER2_FINAL
                    grade.getBoolean("IsSemesterProposition") ?: false -> // semester proposed
-                        gradeObject.type = if (gradeObject.semester == 1) Grade.TYPE_SEMESTER1_PROPOSED else Grade.TYPE_SEMESTER2_PROPOSED
+                        gradeObject.type = if (gradeObject.semester == 1) TYPE_SEMESTER1_PROPOSED else TYPE_SEMESTER2_PROPOSED
                    grade.getBoolean("IsFinal") ?: false -> // year final
-                        gradeObject.type = Grade.TYPE_YEAR_FINAL
+                        gradeObject.type = TYPE_YEAR_FINAL
                    grade.getBoolean("IsFinalProposition") ?: false -> // year final
-                        gradeObject.type = Grade.TYPE_YEAR_PROPOSED
+                        gradeObject.type = TYPE_YEAR_PROPOSED
                }

                grade.getJsonObject("Improvement")?.also {
@ -94,14 +96,25 @@ class LibrusApiGrades(override val data: DataLibrus,
                                profileId,
                                Metadata.TYPE_GRADE,
                                id,
-                                profile?.empty ?: false,
-                                profile?.empty ?: false,
+                                profile.empty,
+                                profile.empty,
                                addedDate
                        ))
            }

+            data.toRemove.addAll(listOf(
+                    TYPE_NORMAL,
+                    TYPE_SEMESTER1_FINAL,
+                    TYPE_SEMESTER2_FINAL,
+                    TYPE_SEMESTER1_PROPOSED,
+                    TYPE_SEMESTER2_PROPOSED,
+                    TYPE_YEAR_FINAL,
+                    TYPE_YEAR_PROPOSED
+            ).map {
+                DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it)
+            })
            data.setSyncNext(ENDPOINT_LIBRUS_API_NORMAL_GRADES, SYNC_ALWAYS)
            onSuccess()
        }
-    }
+    } ?: onSuccess() }
 }
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiHomework.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiHomework.kt
@ -2,13 +2,13 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-12.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_HOMEWORK
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.events.Event
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLuckyNumber.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLuckyNumber.kt
@ -2,12 +2,12 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-10-14
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.DAY
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_LUCKY_NUMBER
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_LUCKY_NUMBER
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.getInt
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiMe.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiMe.kt
@ -2,12 +2,12 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-3.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_ME
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_ME
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi

 class LibrusApiMe(override val data: DataLibrus,
                  val onSuccess: () -> Unit) : LibrusApi(data) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNoticeTypes.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNoticeTypes.kt
@ -2,12 +2,12 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-24.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_NOTICE_TYPES
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NOTICE_TYPES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeType

 class LibrusApiNoticeTypes(override val data: DataLibrus,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNotices.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNotices.kt
@ -2,13 +2,13 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-24.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import androidx.core.util.isEmpty
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_NOTICES
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NOTICES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPtMeetings.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPtMeetings.kt
@ -2,12 +2,12 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-24.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_PT_MEETINGS
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_PT_MEETINGS
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.events.Event
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.models.Date
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSchools.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSchools.kt
@ -2,12 +2,12 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-4.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_SCHOOLS
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_SCHOOLS
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange
 import pl.szczodrzynski.edziennik.utils.models.Time
 import java.util.*
@ -26,12 +26,7 @@ class LibrusApiSchools(override val data: DataLibrus,

            // 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 schoolNameShort = schoolNameLong?.firstLettersName
            val schoolTown = school?.getString("Town")?.toLowerCase(Locale.getDefault())
            data.schoolName = schoolId.toString() + schoolNameShort + "_" + schoolTown

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSubjects.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSubjects.kt
@ -2,12 +2,12 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-23.
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_SUBJECTS
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_SUBJECTS
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject

 class LibrusApiSubjects(override val data: DataLibrus,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDayTypes.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDayTypes.kt
@ -2,12 +2,12 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-10-19
 */

-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api

 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceType

 class LibrusApiTeacherFreeDayTypes(override val data: DataLibrus,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kuba Szczodrzyński	d20102c3bd	[3.9.17-dev] Update build.gradle and signing	2019-12-25 00:02:51 +01:00
Kacper Ziubryniewicz	f165ee32e5	[API/Edudziennik] Fix getting teacher in timetable and fix getting team name.	2019-12-24 15:52:15 +01:00
Kacper Ziubryniewicz	60ad2e81f3	[API/Edudziennik] Add getting attendance.	2019-12-24 15:39:22 +01:00
Kacper Ziubryniewicz	5ca8b642da	[API/Edudziennik] Add getting event type in events.	2019-12-24 14:44:01 +01:00
Kacper Ziubryniewicz	f40cd7f26c	[API/Edudziennik] Add userCode	2019-12-24 14:04:46 +01:00
Kacper Ziubryniewicz	e04b519e9b	[API/Edudziennik] Move getting grades and info to new endpoints.	2019-12-24 13:41:06 +01:00
Kacper Ziubryniewicz	658e59bed6	[API/Edudziennik] Add getting teams and exams.	2019-12-24 13:26:06 +01:00
Kacper Ziubryniewicz	cb5eb19abc	[API/Timetable] Move timetableNotPublic to student data.	2019-12-24 12:01:09 +01:00
Kacper Ziubryniewicz	d336531ca8	[API/Edudziennik] Use Regexes instead of Jsoup in first login.	2019-12-23 23:20:45 +01:00
Kacper Ziubryniewicz	30ee71f4e3	[API/Edudziennik] Add getting grades and add basic error handling.	2019-12-23 22:56:23 +01:00
Kacper Ziubryniewicz	844d5b33bc	[API/Edudziennik] Fix getting students on first login.	2019-12-23 20:31:44 +01:00
Kacper Ziubryniewicz	e3741f1c75	[API/Edudziennik] Add getting timetable.	2019-12-23 18:34:39 +01:00
Kacper Ziubryniewicz	21a6e4d8c6	[API/Edudziennik] Add start and lucky number endpoint.	2019-12-23 16:33:20 +01:00
Kacper Ziubryniewicz	ec14ba76c9	[Edudziennik] Add first login.	2019-12-23 15:15:38 +01:00
Kacper Ziubryniewicz	90e7b1e9c7	[Edudziennik] Implement base of the new e-register.	2019-12-23 00:46:06 +01:00
Kacper Ziubryniewicz	a09d943344	[API/IDziennik] Fix final grade names.	2019-12-22 23:42:03 +01:00
Kacper Ziubryniewicz	52ac40c826	[API/Grades] Add data remove model for grades.	2019-12-22 23:21:03 +01:00
Kacper Ziubryniewicz	8f8eb64364	[APIv2/Librus] Show starting points only when greater than 0.	2019-12-22 22:22:46 +01:00
Kacper Ziubryniewicz	fe40ab0ab4	[Home/LuckyNumberCard] Fix crashing because of invalid argument type.	2019-12-22 22:13:03 +01:00
Kacper Ziubryniewicz	5991ef820f	[Home/TimetableCard] Add counting in seconds.	2019-12-22 21:31:12 +01:00
Kacper Ziubryniewicz	d67c2a90b1	[Hotfix] Fix null cast exception in timetable day fragment.	2019-12-22 20:44:41 +01:00
Kacper Ziubryniewicz	e85d6fbc3b	[UI/Counter] Add new counter activity.	2019-12-22 20:05:01 +01:00
Kuba Szczodrzyński	62a9604bd2	[UI/Home] Debug card is bacc.	2019-12-22 15:36:57 +01:00
Kuba Szczodrzyński	0aae2174c1	[UI/Timetable] Update date selection algorithm and no lessons info. Show empty timetable info in widget.	2019-12-21 22:56:54 +01:00
Kacper Ziubryniewicz	b66bd6fec9	[Dialog/BellSync] Add showing info when there are no lessons.	2019-12-21 21:19:29 +01:00
Kuba Szczodrzyński	b399a3f5ad	[UI/Timetable] Handle no timetable or no lessons in Home card.	2019-12-21 17:39:17 +01:00
Kacper Ziubryniewicz	1f5927eec0	[Manifest] Set the default theme to dark.	2019-12-20 23:49:47 +01:00
Kacper Ziubryniewicz	2d838e7003	[Dialog/BellSync] Add coroutine timer and make some small changes.	2019-12-20 23:48:47 +01:00
Kuba Szczodrzyński	f242c30476	[API/Events] Update Event Manual dialog sharing.	2019-12-20 22:00:55 +01:00
Kacper Ziubryniewicz	2cf204ff79	[Dialog/BellSync] Implement bell sync dialog.	2019-12-20 00:40:14 +01:00
Kuba Szczodrzyński	38fc9e97bb	[3.9.16-dev] Update build.gradle and signing	2019-12-19 22:33:41 +01:00
Kuba Szczodrzyński	3e4accb82c	[UI/WebPush] Implement Web Push pairing fragment and API. Add more templates.	2019-12-19 21:57:01 +01:00
Kuba Szczodrzyński	b905283b61	[UI/Dialogs] Disable timetable fragment refreshing on event removing.	2019-12-18 23:55:15 +01:00
Kuba Szczodrzyński	c7e5df5c91	[UI/Dialogs] Remove old Manual Event Dialog. Disable timetable fragment refreshing on event save. Add new Event Details Dialog.	2019-12-18 23:50:24 +01:00
Kuba Szczodrzyński	99006d7923	[UI/Dialogs] Update Lesson Details dialog when no classroom/teacher. Fix double events when metadata duplicated for different type.	2019-12-18 22:06:43 +01:00
Kuba Szczodrzyński	16320b4486	[UI/Events] Update Day Dialog. Add Event List Adapter to Timetable Lesson Dialog.	2019-12-18 20:07:38 +01:00
Kuba Szczodrzyński	d70b0c0c3f	[UI] Implement new Event Adapter and Day Dialog (partially).	2019-12-16 22:26:00 +01:00
Kuba Szczodrzyński	41cebc554f	[UI] 'Cause it's winter.	2019-12-15 21:27:50 +01:00
Kuba Szczodrzyński	92e0fc2847	[Sync] Fix showing notifications. Implement notifications web push.	2019-12-15 16:43:24 +01:00
Kuba Szczodrzyński	9978a11c52	[Proguard] Update Proguard rules for Retrofit and JNI code.	2019-12-15 15:59:46 +01:00
Kacper Ziubryniewicz	cf77623e9c	[UI/Agenda] Add FAB to add events and make the dialog open with the selected date.	2019-12-15 00:42:28 +01:00
Kacper Ziubryniewicz	7ce4acc687	[Structure] Move API to `data` package.	2019-12-15 00:28:31 +01:00
Kuba Szczodrzyński	ffbac126bd	[3.9.15-dev] Implement C++ Native password signer library.	2019-12-14 22:56:56 +01:00