[3.9.16-dev] Update build.gradle and signing

[UI/WebPush] Implement Web Push pairing fragment and API. Add more templates.
[UI/Dialogs] Disable timetable fragment refreshing on event removing.
2025-06-14 14:40:17 +02:00 · 2019-12-19 22:33:41 +01:00 · 2019-12-19 21:57:01 +01:00 · 2019-12-18 23:55:15 +01:00 · 2019-12-18 23:50:24 +01:00 · 2019-12-18 22:06:43 +01:00
258 changed files with 3497 additions and 2025 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
@ -235,7 +235,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 +249,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] = {
+	0x97, 0x0e, 0x93, 0xd3, 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
@ -381,6 +381,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)
--- 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
@ -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

@ -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
--- 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
--- 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
--- 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,19 @@
 * 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.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
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt
@ -2,7 +2,7 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-6.
 */

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

 object Regexes {
    val MOBIDZIENNIK_GRADES_SUBJECT_NAME by lazy {
--- 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,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 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.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
--- 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,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_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.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.asJsonObjectList
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
--- 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,15 +2,15 @@
 * 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.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.currentTimeUnix
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
--- 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
--- 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,12 @@
 * 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.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
 import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
--- 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,9 +1,9 @@
-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.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
 import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
--- 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.*
--- 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/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDays.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDays.kt
@ -2,14 +2,14 @@
 * Copyright (c) Kacper Ziubryniewicz 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.MainActivity.Companion.DRAWER_ITEM_AGENDA
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS
-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_DAYS
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsence
 import pl.szczodrzynski.edziennik.utils.models.Date
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTemplate.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTemplate.kt
@ -2,10 +2,10 @@
 * 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.api.v2.edziennik.librus.DataLibrus
-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.data.LibrusApi

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

-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 com.google.gson.JsonObject
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_API_TIMETABLES
-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_TIMETABLES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUnits.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUnits.kt
@ -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_UNITS
-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_UNITS
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi

 class LibrusApiUnits(override val data: DataLibrus,
                       val onSuccess: () -> Unit) : LibrusApi(data) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUsers.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUsers.kt
@ -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_USERS
-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_USERS
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher

 class LibrusApiUsers(override val data: DataLibrus,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiVirtualClasses.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiVirtualClasses.kt
@ -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_VIRTUAL_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_VIRTUAL_CLASSES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.teams.Team

 class LibrusApiVirtualClasses(override val data: DataLibrus,
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetAttachment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetAttachment.kt
@ -2,19 +2,19 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-11-24
 */

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

 import kotlinx.coroutines.*
 import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.api.v2.ERROR_FILE_DOWNLOAD
-import pl.szczodrzynski.edziennik.api.v2.EXCEPTION_LIBRUS_MESSAGES_REQUEST
-import pl.szczodrzynski.edziennik.api.v2.Regexes
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusMessages
-import pl.szczodrzynski.edziennik.api.v2.events.AttachmentGetEvent
-import pl.szczodrzynski.edziennik.api.v2.events.AttachmentGetEvent.Companion.TYPE_FINISHED
-import pl.szczodrzynski.edziennik.api.v2.events.AttachmentGetEvent.Companion.TYPE_PROGRESS
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.ERROR_FILE_DOWNLOAD
+import pl.szczodrzynski.edziennik.data.api.EXCEPTION_LIBRUS_MESSAGES_REQUEST
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
+import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
+import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent.Companion.TYPE_FINISHED
+import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent.Companion.TYPE_PROGRESS
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.get
 import pl.szczodrzynski.edziennik.getString
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetList.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetList.kt
@ -2,15 +2,15 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-10-24
 */

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

 import pl.szczodrzynski.edziennik.DAY
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
-import pl.szczodrzynski.edziennik.api.v2.ERROR_NOT_IMPLEMENTED
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_MESSAGES_RECEIVED
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_MESSAGES_SENT
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusMessages
+import pl.szczodrzynski.edziennik.data.api.ERROR_NOT_IMPLEMENTED
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_MESSAGES_RECEIVED
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_MESSAGES_SENT
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetMessage.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetMessage.kt
@ -2,13 +2,13 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-11-11
 */

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

 import android.util.Base64
 import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusMessages
-import pl.szczodrzynski.edziennik.api.v2.events.MessageGetEvent
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
+import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesTemplate.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesTemplate.kt
@ -2,10 +2,10 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-10-25
 */

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

-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusMessages
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages

 class LibrusMessagesTemplate(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusMessages(data) {
    companion object {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomework.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomework.kt
@ -2,16 +2,16 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-10-22.
 */

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

 import org.jsoup.Jsoup
 import pl.szczodrzynski.edziennik.HOUR
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOMEWORK
-import pl.szczodrzynski.edziennik.api.v2.POST
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusSynergia
-import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.api.POST
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.modules.events.Event
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.get
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaInfo.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaInfo.kt
@ -2,13 +2,13 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-10-23
 */

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

 import org.jsoup.Jsoup
 import pl.szczodrzynski.edziennik.MONTH
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.ENDPOINT_LIBRUS_SYNERGIA_INFO
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusSynergia
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_SYNERGIA_INFO
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia

 class LibrusSynergiaInfo(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusSynergia(data) {
    companion object {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaMarkAllAnnouncementsAsRead.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaMarkAllAnnouncementsAsRead.kt
@ -2,10 +2,10 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-10-26
 */

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

-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusSynergia
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia

 class LibrusSynergiaMarkAllAnnouncementsAsRead(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusSynergia(data) {
    companion object {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaTemplate.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaTemplate.kt
@ -2,10 +2,10 @@
 * Copyright (c) Kacper Ziubryniewicz 2019-10-23
 */

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

-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusSynergia
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia

 class LibrusSynergiaTemplate(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusSynergia(data) {
    companion object {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/firstlogin/LibrusFirstLogin.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/firstlogin/LibrusFirstLogin.kt
@ -1,20 +1,20 @@
-package pl.szczodrzynski.edziennik.api.v2.edziennik.librus.firstlogin
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.firstlogin

 import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.ERROR_NO_STUDENTS_IN_ACCOUNT
-import pl.szczodrzynski.edziennik.api.v2.FAKE_LIBRUS_ACCOUNTS
-import pl.szczodrzynski.edziennik.api.v2.LIBRUS_ACCOUNTS_URL
-import pl.szczodrzynski.edziennik.api.v2.LOGIN_MODE_LIBRUS_EMAIL
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.data.LibrusPortal
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.login.LibrusLoginApi
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.login.LibrusLoginPortal
-import pl.szczodrzynski.edziennik.api.v2.events.FirstLoginFinishedEvent
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.api.v2.models.AppError.CODE_LIBRUS_DISCONNECTED
-import pl.szczodrzynski.edziennik.api.v2.models.AppError.CODE_SYNERGIA_NOT_ACTIVATED
+import pl.szczodrzynski.edziennik.data.api.ERROR_NO_STUDENTS_IN_ACCOUNT
+import pl.szczodrzynski.edziennik.data.api.FAKE_LIBRUS_ACCOUNTS
+import pl.szczodrzynski.edziennik.data.api.LIBRUS_ACCOUNTS_URL
+import pl.szczodrzynski.edziennik.data.api.LOGIN_MODE_LIBRUS_EMAIL
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusPortal
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginPortal
+import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.models.AppError.CODE_LIBRUS_DISCONNECTED
+import pl.szczodrzynski.edziennik.data.api.models.AppError.CODE_SYNERGIA_NOT_ACTIVATED
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile

 class LibrusFirstLogin(val data: DataLibrus, val onSuccess: () -> Unit) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLogin.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLogin.kt
@ -2,14 +2,14 @@
 * Copyright (c) Kuba Szczodrzyński 2019-10-5.
 */

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

 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_LIBRUS_API
-import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_LIBRUS_MESSAGES
-import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_LIBRUS_PORTAL
-import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_LIBRUS_SYNERGIA
-import pl.szczodrzynski.edziennik.api.v2.edziennik.librus.DataLibrus
+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.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.utils.Utils

 class LibrusLogin(val data: DataLibrus, val onSuccess: () -> Unit) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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