diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index cb2f41195..d66c3361f 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -4,16 +4,7 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
         </value>
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
diff --git a/.travis.yml b/.travis.yml
index 5dbd9e366..d858cf3e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.20.5
+    - 0.18.1
 
 android:
  licenses:
diff --git a/README.en.md b/README.en.md
index 28cce1c34..7444cccae 100644
--- a/README.en.md
+++ b/README.en.md
@@ -47,6 +47,7 @@ You can also download a [development version](https://wulkanowy.github.io/#downl
 
 
 * [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
+* [RxJava 2](https://github.com/ReactiveX/RxJava)
 * [Dagger 2](https://github.com/google/dagger)
 * [Room](https://developer.android.com/topic/libraries/architecture/room)
 * [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
diff --git a/README.md b/README.md
index 02e1900c8..61b13444a 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,7 @@ Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#downloa
 ## Zbudowana za pomocą
 
 * [Wulkanowy SDK](https://github.com/wulkanowy/SDK)
+* [RxJava 2](https://github.com/ReactiveX/RxJava)
 * [Dagger 2](https://github.com/google/dagger)
 * [Room](https://developer.android.com/topic/libraries/architecture/room)
 * [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
diff --git a/app/build.gradle b/app/build.gradle
index 11a82fbd0..31cada744 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'dagger.hilt.android.plugin'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.github.triplet.play'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
@@ -18,8 +17,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 69
-        versionName "0.20.5"
+        versionCode 60
+        versionName "0.18.1"
         multiDexEnabled true
         resValue "string", "app_name", "Wulkanowy"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -29,7 +28,7 @@ android {
         ]
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments += [
+                arguments = [
                         "room.schemaLocation": "$projectDir/schemas".toString(),
                         "room.incremental"   : "true"
                 ]
@@ -78,8 +77,8 @@ android {
         }
     }
 
-    buildFeatures {
-        viewBinding = true
+    viewBinding {
+        enabled = true
     }
 
     lintOptions {
@@ -87,14 +86,12 @@ android {
     }
 
     compileOptions {
-        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
         jvmTarget = "1.8"
-        freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
     }
 
     packagingOptions {
@@ -115,10 +112,11 @@ play {
 }
 
 ext {
-    work_manager = "2.4.0"
+    work_manager = "2.3.4"
     room = "2.2.5"
+    dagger = "2.27"
     chucker = "3.2.0"
-    mockk = "1.10.0"
+    mockk = "1.9.2"
 }
 
 configurations.all {
@@ -126,65 +124,68 @@ configurations.all {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:0.20.5"
-
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
+    implementation "io.github.wulkanowy:sdk:0.18.1"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
-
-    implementation "androidx.core:core-ktx:1.3.1"
+    implementation "androidx.core:core-ktx:1.2.0"
     implementation "androidx.activity:activity-ktx:1.1.0"
-    implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation "androidx.appcompat:appcompat-resources:1.2.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.5"
+    implementation "androidx.appcompat:appcompat:1.2.0-rc01"
+    implementation "androidx.appcompat:appcompat-resources:1.1.0"
+    implementation "androidx.fragment:fragment-ktx:1.2.4"
     implementation "androidx.annotation:annotation:1.1.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation "androidx.viewpager:viewpager:1.0.0"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.1"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01"
+    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.2.1"
-    implementation "com.github.wulkanowy:material-chips-input:2.1.1"
+    implementation "com.google.android.material:material:1.1.0"
+    implementation "com.github.wulkanowy:material-chips-input:2.0.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation "me.zhanghai.android.materialprogressbar:library:1.6.1"
 
     implementation "androidx.work:work-runtime-ktx:$work_manager"
+    implementation "androidx.work:work-rxjava2:$work_manager"
     implementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0"
+    implementation 'com.github.PaulinaSadowska:RxWorkManagerObservers:1.0.0'
 
     implementation "androidx.room:room-runtime:$room"
+    implementation "androidx.room:room-rxjava2:$room"
     implementation "androidx.room:room-ktx:$room"
     kapt "androidx.room:room-compiler:$room"
 
-    implementation "com.google.dagger:hilt-android:$hilt_version"
-    kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
-    implementation 'androidx.hilt:hilt-work:1.0.0-alpha02'
-    kapt 'androidx.hilt:hilt-compiler:1.0.0-alpha02'
+    implementation "com.google.dagger:dagger-android-support:$dagger"
+    kapt "com.google.dagger:dagger-compiler:$dagger"
+    kapt "com.google.dagger:dagger-android-processor:$dagger"
+    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.2"
+    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.2"
 
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
     implementation "com.ncapdevi:frag-nav:3.3.0"
     implementation "com.github.YarikSOffice:lingver:1.2.2"
 
+    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.8"
+    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.19"
+
     implementation "com.google.code.gson:gson:2.8.6"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.4"
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
     implementation "fr.bipi.treessence:treessence:0.3.2"
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
     implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
-    implementation "io.coil-kt:coil:1.0.0-rc2"
+    implementation "io.coil-kt:coil:0.11.0"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
-    implementation 'me.xdrop:fuzzywuzzy:1.3.1'
 
-    playImplementation 'com.google.firebase:firebase-analytics:17.5.0'
-    playImplementation 'com.google.firebase:firebase-inappmessaging-display-ktx:19.1.1'
-    playImplementation "com.google.firebase:firebase-inappmessaging-ktx:19.1.1"
-    playImplementation 'com.google.firebase:firebase-messaging:20.2.4'
-    playImplementation 'com.google.firebase:firebase-crashlytics:17.2.1'
+    playImplementation 'com.google.firebase:firebase-analytics:17.4.2'
+    playImplementation 'com.google.firebase:firebase-inappmessaging-display-ktx:19.0.7'
+    playImplementation "com.google.firebase:firebase-inappmessaging-ktx:19.0.7"
+    playImplementation 'com.google.firebase:firebase-messaging:20.2.0'
+    playImplementation 'com.google.firebase:firebase-crashlytics:17.0.0'
     playImplementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
@@ -194,14 +195,16 @@ dependencies {
 
     testImplementation "junit:junit:4.13"
     testImplementation "io.mockk:mockk:$mockk"
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9'
+    testImplementation "org.threeten:threetenbp:1.4.4"
+    testImplementation "org.mockito:mockito-inline:3.3.3"
 
-    androidTestImplementation "androidx.test:core:1.3.0"
-    androidTestImplementation "androidx.test:runner:1.3.0"
-    androidTestImplementation "androidx.test.ext:junit:1.1.2"
+    androidTestImplementation "androidx.test:core:1.2.0"
+    androidTestImplementation "androidx.test:runner:1.2.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.1"
     androidTestImplementation "io.mockk:mockk-android:$mockk"
     androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    androidTestImplementation "org.mockito:mockito-android:3.3.3"
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 7c7962575..1a8b8c329 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -30,6 +30,13 @@
 -dontwarn javax.annotation.**
 
 
+#Config for ReactiveNetwork
+-dontwarn com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+-dontwarn io.reactivex.functions.Function
+-dontwarn rx.internal.util.**
+-dontwarn sun.misc.Unsafe
+
+
 #Config for MPAndroidChart
 -keep class com.github.mikephil.charting.** { *; }
 
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
index 474824df6..e99a11d4a 100644
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
@@ -1741,4 +1741,4 @@
       "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd101f5a26a024f62e6fee161e421b882')"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/26.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/26.json
deleted file mode 100644
index 21005f9c6..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/26.json
+++ /dev/null
@@ -1,1768 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 26,
-    "identityHash": "43f8777ffe95a5a2850ee981db3dbe2e",
-    "entities": [
-      {
-        "tableName": "Students",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "scrapperBaseUrl",
-            "columnName": "scrapper_base_url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mobileBaseUrl",
-            "columnName": "mobile_base_url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginType",
-            "columnName": "login_type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginMode",
-            "columnName": "login_mode",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "certificateKey",
-            "columnName": "certificate_key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privateKey",
-            "columnName": "private_key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isParent",
-            "columnName": "is_parent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "email",
-            "columnName": "email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "symbol",
-            "columnName": "symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userLoginId",
-            "columnName": "user_login_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentName",
-            "columnName": "student_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolSymbol",
-            "columnName": "school_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolShortName",
-            "columnName": "school_short",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolName",
-            "columnName": "school_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "className",
-            "columnName": "class_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isCurrent",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "registrationDate",
-            "columnName": "registration_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Students_email_symbol_student_id_school_id_class_id",
-            "unique": true,
-            "columnNames": [
-              "email",
-              "symbol",
-              "student_id",
-              "school_id",
-              "class_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Semesters",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "current",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryName",
-            "columnName": "diary_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolYear",
-            "columnName": "school_year",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterName",
-            "columnName": "semester_name",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Semesters_student_id_diary_id_semester_id",
-            "unique": true,
-            "columnNames": [
-              "student_id",
-              "diary_id",
-              "semester_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Exams",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Timetable",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectOld",
-            "columnName": "subjectOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "room",
-            "columnName": "room",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomOld",
-            "columnName": "roomOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherOld",
-            "columnName": "teacherOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "info",
-            "columnName": "info",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isStudentPlan",
-            "columnName": "student_plan",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "changes",
-            "columnName": "changes",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "canceled",
-            "columnName": "canceled",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Attendance",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timeId",
-            "columnName": "time_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excused",
-            "columnName": "excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deleted",
-            "columnName": "deleted",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excusable",
-            "columnName": "excusable",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excuseStatus",
-            "columnName": "excuse_status",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "AttendanceSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectId",
-            "columnName": "subject_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "month",
-            "columnName": "month",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceExcused",
-            "columnName": "absence_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceForSchoolReasons",
-            "columnName": "absence_for_school_reasons",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "latenessExcused",
-            "columnName": "lateness_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Grades",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entry",
-            "columnName": "entry",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "modifier",
-            "columnName": "modifier",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "comment",
-            "columnName": "comment",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gradeSymbol",
-            "columnName": "grade_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weight",
-            "columnName": "weight",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weightValue",
-            "columnName": "weightValue",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isPredictedGradeNotified",
-            "columnName": "is_predicted_grade_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isFinalGradeNotified",
-            "columnName": "is_final_grade_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "predictedGradeLastChange",
-            "columnName": "predicted_grade_last_change",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalGradeLastChange",
-            "columnName": "final_grade_last_change",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "position",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "predictedGrade",
-            "columnName": "predicted_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalGrade",
-            "columnName": "final_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "proposedPoints",
-            "columnName": "proposed_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalPoints",
-            "columnName": "final_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pointsSum",
-            "columnName": "points_sum",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "average",
-            "columnName": "average",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "grade",
-            "columnName": "grade",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "amount",
-            "columnName": "amount",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semester",
-            "columnName": "is_semester",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesPointsStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "others",
-            "columnName": "others",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "student",
-            "columnName": "student",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL, `has_attachments` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sender",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "recipient",
-            "columnName": "recipient_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "folderId",
-            "columnName": "folder_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "removed",
-            "columnName": "removed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hasAttachments",
-            "columnName": "has_attachments",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "MessageAttachments",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `one_drive_id` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
-        "fields": [
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "oneDriveId",
-            "columnName": "one_drive_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filename",
-            "columnName": "filename",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "real_id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Notes",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "category",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "categoryType",
-            "columnName": "category_type",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isPointsShow",
-            "columnName": "is_points_show",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "points",
-            "columnName": "points",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Homework",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `attachments` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDone",
-            "columnName": "is_done",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "attachments",
-            "columnName": "attachments",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Subjects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LuckyNumbers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "luckyNumber",
-            "columnName": "lucky_number",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "CompletedLesson",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "topic",
-            "columnName": "topic",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "substitution",
-            "columnName": "substitution",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "resources",
-            "columnName": "resources",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "ReportingUnits",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderName",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roles",
-            "columnName": "roles",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Recipients",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realName",
-            "columnName": "real_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginId",
-            "columnName": "login_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "role",
-            "columnName": "role",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hash",
-            "columnName": "hash",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "MobileDevices",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deviceId",
-            "columnName": "device_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Teachers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short_name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "School",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address",
-            "columnName": "address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "contact",
-            "columnName": "contact",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "headmaster",
-            "columnName": "headmaster",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pedagogue",
-            "columnName": "pedagogue",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '43f8777ffe95a5a2850ee981db3dbe2e')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/27.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/27.json
deleted file mode 100644
index 46b777513..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/27.json
+++ /dev/null
@@ -1,1774 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 27,
-    "identityHash": "b24d2d9662e26dd31f2eea78a297558c",
-    "entities": [
-      {
-        "tableName": "Students",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `user_name` TEXT NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "scrapperBaseUrl",
-            "columnName": "scrapper_base_url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mobileBaseUrl",
-            "columnName": "mobile_base_url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginType",
-            "columnName": "login_type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginMode",
-            "columnName": "login_mode",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "certificateKey",
-            "columnName": "certificate_key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privateKey",
-            "columnName": "private_key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isParent",
-            "columnName": "is_parent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "email",
-            "columnName": "email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "symbol",
-            "columnName": "symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userLoginId",
-            "columnName": "user_login_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userName",
-            "columnName": "user_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentName",
-            "columnName": "student_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolSymbol",
-            "columnName": "school_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolShortName",
-            "columnName": "school_short",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolName",
-            "columnName": "school_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "className",
-            "columnName": "class_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isCurrent",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "registrationDate",
-            "columnName": "registration_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Students_email_symbol_student_id_school_id_class_id",
-            "unique": true,
-            "columnNames": [
-              "email",
-              "symbol",
-              "student_id",
-              "school_id",
-              "class_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Semesters",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "current",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryName",
-            "columnName": "diary_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolYear",
-            "columnName": "school_year",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterName",
-            "columnName": "semester_name",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Semesters_student_id_diary_id_semester_id",
-            "unique": true,
-            "columnNames": [
-              "student_id",
-              "diary_id",
-              "semester_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Exams",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Timetable",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectOld",
-            "columnName": "subjectOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "room",
-            "columnName": "room",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomOld",
-            "columnName": "roomOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherOld",
-            "columnName": "teacherOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "info",
-            "columnName": "info",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isStudentPlan",
-            "columnName": "student_plan",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "changes",
-            "columnName": "changes",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "canceled",
-            "columnName": "canceled",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Attendance",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timeId",
-            "columnName": "time_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excused",
-            "columnName": "excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deleted",
-            "columnName": "deleted",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excusable",
-            "columnName": "excusable",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excuseStatus",
-            "columnName": "excuse_status",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "AttendanceSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectId",
-            "columnName": "subject_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "month",
-            "columnName": "month",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceExcused",
-            "columnName": "absence_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceForSchoolReasons",
-            "columnName": "absence_for_school_reasons",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "latenessExcused",
-            "columnName": "lateness_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Grades",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entry",
-            "columnName": "entry",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "modifier",
-            "columnName": "modifier",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "comment",
-            "columnName": "comment",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gradeSymbol",
-            "columnName": "grade_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weight",
-            "columnName": "weight",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weightValue",
-            "columnName": "weightValue",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isPredictedGradeNotified",
-            "columnName": "is_predicted_grade_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isFinalGradeNotified",
-            "columnName": "is_final_grade_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "predictedGradeLastChange",
-            "columnName": "predicted_grade_last_change",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalGradeLastChange",
-            "columnName": "final_grade_last_change",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "position",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "predictedGrade",
-            "columnName": "predicted_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalGrade",
-            "columnName": "final_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "proposedPoints",
-            "columnName": "proposed_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalPoints",
-            "columnName": "final_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pointsSum",
-            "columnName": "points_sum",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "average",
-            "columnName": "average",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "grade",
-            "columnName": "grade",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "amount",
-            "columnName": "amount",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semester",
-            "columnName": "is_semester",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesPointsStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "others",
-            "columnName": "others",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "student",
-            "columnName": "student",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL, `has_attachments` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sender",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "recipient",
-            "columnName": "recipient_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "folderId",
-            "columnName": "folder_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "removed",
-            "columnName": "removed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hasAttachments",
-            "columnName": "has_attachments",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "MessageAttachments",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `one_drive_id` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
-        "fields": [
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "oneDriveId",
-            "columnName": "one_drive_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filename",
-            "columnName": "filename",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "real_id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Notes",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "category",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "categoryType",
-            "columnName": "category_type",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isPointsShow",
-            "columnName": "is_points_show",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "points",
-            "columnName": "points",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Homework",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `attachments` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDone",
-            "columnName": "is_done",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "attachments",
-            "columnName": "attachments",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Subjects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LuckyNumbers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "luckyNumber",
-            "columnName": "lucky_number",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "CompletedLesson",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "topic",
-            "columnName": "topic",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "substitution",
-            "columnName": "substitution",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "resources",
-            "columnName": "resources",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "ReportingUnits",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderName",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roles",
-            "columnName": "roles",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Recipients",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realName",
-            "columnName": "real_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginId",
-            "columnName": "login_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "role",
-            "columnName": "role",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hash",
-            "columnName": "hash",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "MobileDevices",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deviceId",
-            "columnName": "device_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Teachers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short_name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "School",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address",
-            "columnName": "address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "contact",
-            "columnName": "contact",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "headmaster",
-            "columnName": "headmaster",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pedagogue",
-            "columnName": "pedagogue",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'b24d2d9662e26dd31f2eea78a297558c')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/TestDispatchersProvider.kt b/app/src/androidTest/java/io/github/wulkanowy/data/TestDispatchersProvider.kt
deleted file mode 100644
index 8c4354d9a..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/TestDispatchersProvider.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.github.wulkanowy.data
-
-import io.github.wulkanowy.utils.DispatchersProvider
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-
-class TestDispatchersProvider : DispatchersProvider() {
-
-    override val backgroundThread: CoroutineDispatcher
-        get() = Dispatchers.Unconfined
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
index b312048d5..0bbcc4271 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
@@ -4,7 +4,6 @@ import android.content.ContentValues
 import android.database.sqlite.SQLiteDatabase.CONFLICT_FAIL
 import androidx.sqlite.db.SupportSQLiteDatabase
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.junit.runner.RunWith
 import kotlin.test.assertEquals
@@ -30,7 +29,7 @@ class Migration12Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
 
         val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
+        val students = db.studentDao.loadAll().blockingGet()
 
         assertEquals(2, students.size)
 
@@ -59,7 +58,7 @@ class Migration12Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
 
         val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
+        val students = db.studentDao.loadAll().blockingGet()
 
         assertEquals(1, students.size)
 
@@ -85,7 +84,7 @@ class Migration12Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
 
         val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
+        val students = db.studentDao.loadAll().blockingGet()
 
         assertEquals(3, students.size)
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
index 15e99f5f9..6f9406f6d 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
@@ -5,11 +5,10 @@ import android.database.sqlite.SQLiteDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
 import io.github.wulkanowy.data.db.Converters
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import java.time.LocalDate.of
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
@@ -27,7 +26,7 @@ class Migration13Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
         val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
+        val students = db.studentDao.loadAll().blockingGet()
 
         assertEquals(3, students.size)
 
@@ -61,7 +60,7 @@ class Migration13Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
         val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
+        val students = db.studentDao.loadAll().blockingGet()
 
         assertEquals(2, students.size)
 
@@ -121,23 +120,23 @@ class Migration13Test : AbstractMigrationTest() {
             assertEquals(2, first.diaryId)
         }
 
-        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let { semesters ->
-            assertTrue { semesters.single { it.second }.second }
-            assertEquals(1970, semesters[0].first.schoolYear)
-            assertEquals(of(1970, 1, 1), semesters[0].first.end)
-            assertEquals(of(1970, 1, 1), semesters[0].first.start)
-            assertFalse(semesters[0].second)
-            assertFalse(semesters[1].second)
-            assertFalse(semesters[2].second)
-            assertTrue(semesters[3].second)
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
+            assertTrue { it.single { it.second }.second }
+            assertEquals(1970, it[0].first.schoolYear)
+            assertEquals(of(1970, 1, 1), it[0].first.end)
+            assertEquals(of(1970, 1, 1), it[0].first.start)
+            assertFalse(it[0].second)
+            assertFalse(it[1].second)
+            assertFalse(it[2].second)
+            assertTrue(it[3].second)
         }
 
-        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let { semesters ->
-            assertTrue { semesters.single { it.second }.second }
-            assertFalse(semesters[0].second)
-            assertFalse(semesters[1].second)
-            assertFalse(semesters[2].second)
-            assertTrue(semesters[3].second)
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
+            assertTrue { it.single { it.second }.second }
+            assertFalse(it[0].second)
+            assertFalse(it[1].second)
+            assertFalse(it[2].second)
+            assertTrue(it[3].second)
         }
     }
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt
deleted file mode 100644
index 759552589..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import android.content.ContentValues
-import android.database.sqlite.SQLiteDatabase
-import androidx.sqlite.db.SupportSQLiteDatabase
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import kotlin.random.Random
-
-class Migration27Test : AbstractMigrationTest() {
-
-    @Test
-    fun userWithoutCorrespondingUnit() {
-        with(helper.createDatabase(dbName, 26)) {
-            createStudent(this, 321, 123, "Jan Student")
-            createUnit(this, 9999, "Unit Jan")
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 27, true, Migration27())
-
-        val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
-
-        assertEquals(1, students.size)
-
-        with(students[0]) {
-            assertEquals(321, id)
-            assertEquals(123, userLoginId)
-            assertEquals("Student Jan", userName)
-        }
-    }
-
-    @Test
-    fun userWithCorrespondingUnit() {
-        with(helper.createDatabase(dbName, 26)) {
-            createStudent(this, 1, 2, "Jan Kowalski Student")
-            createUnit(this, 2, "Unit Jan")
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 27, true, Migration27())
-
-        val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
-
-        assertEquals(1, students.size)
-
-        with(students[0]) {
-            assertEquals(1, id)
-            assertEquals(2, userLoginId)
-            assertEquals("Unit Jan", userName)
-        }
-    }
-
-    @Test
-    fun studentAccountAndParentAccountWithCorrespondingUnits() {
-        with(helper.createDatabase(dbName, 26)) {
-            createStudent(this, 1, 222, "Jan Student")
-            createStudent(this, 2, 333, "Jan Parent")
-            createUnit(this, 222, "Unit Jan")
-            createUnit(this, 333, "Unit Tomasz")
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 27, true, Migration27())
-
-        val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
-
-        assertEquals(2, students.size)
-
-        with(students[0]) {
-            assertEquals(1, id)
-            assertEquals(222, userLoginId)
-            assertEquals("Unit Jan", userName)
-        }
-        with(students[1]) {
-            assertEquals(2, id)
-            assertEquals(333, userLoginId)
-            assertEquals("Unit Tomasz", userName)
-        }
-    }
-
-    private fun createStudent(db: SupportSQLiteDatabase, id: Long, userLoginId: Int, studentName: String) {
-        db.insert("Students", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
-            put("id", id)
-            put("scrapper_base_url", "https://fakelog.cf")
-            put("mobile_base_url", "")
-            put("login_mode", "SCRAPPER")
-            put("login_type", "STANDARD")
-            put("certificate_key", "")
-            put("private_key", "")
-            put("is_parent", false)
-            put("email", "jan@fakelog.cf")
-            put("password", "******")
-            put("symbol", "Default")
-            put("school_short", "")
-            put("class_name", "")
-            put("student_id", Random.nextInt())
-            put("class_id", Random.nextInt())
-            put("school_id", "123")
-            put("school_name", "Wulkan first class school")
-            put("is_current", false)
-            put("registration_date", "0")
-
-            put("user_login_id", userLoginId)
-            put("student_name", studentName)
-        })
-    }
-
-    private fun createUnit(db: SupportSQLiteDatabase, senderId: Int, senderName: String) {
-        db.insert("ReportingUnits", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
-            put("student_id", Random.nextInt())
-            put("real_id", Random.nextInt())
-            put("short", "SHORT")
-            put("roles", "[0]")
-
-            put("sender_id", senderId)
-            put("sender_name", senderName)
-        })
-    }
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt
index 04d13be4b..bbbfd83dd 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt
@@ -1,9 +1,7 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import java.time.LocalDate.now
-import java.time.LocalDateTime
+import org.threeten.bp.LocalDateTime
 
 fun getStudent(): Student {
     return Student(
@@ -13,7 +11,6 @@ fun getStudent(): Student {
         scrapperBaseUrl = "fakelog.cf",
         loginType = "AUTO",
         isCurrent = true,
-        userName = "",
         studentName = "",
         schoolShortName = "",
         schoolName = "",
@@ -30,16 +27,3 @@ fun getStudent(): Student {
         isParent = false
     )
 }
-
-fun getSemester() = Semester(
-    semesterId = 1,
-    studentId = 1,
-    classId = 1,
-    diaryId = 2,
-    diaryName = "",
-    end = now(),
-    schoolYear = 2019,
-    semesterName = 1,
-    start = now(),
-    unitId = 1
-)
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt
new file mode 100644
index 000000000..7dc93c4a4
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.data.repositories
+
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingStrategy
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error.ErrorHandler
+import io.reactivex.Observable
+import io.reactivex.Single
+
+class TestInternetObservingStrategy : InternetObservingStrategy {
+
+    override fun checkInternetConnectivity(host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Single<Boolean> {
+        return Single.just(true)
+    }
+
+    override fun observeInternetConnectivity(initialIntervalInMs: Int, intervalInMs: Int, host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Observable<Boolean> {
+        return Observable.just(true)
+    }
+
+    override fun getDefaultPingHost() = "localhost"
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
index fa1289869..c7ede6ae5 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
@@ -6,15 +6,12 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDate.now
-import java.time.LocalDate.of
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -37,47 +34,20 @@ class AttendanceLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        val list = listOf(
-            getAttendanceEntity(
-                of(2018, 9, 10),
-                SentExcuseStatus.ACCEPTED
-            ),
-            getAttendanceEntity(
-                of(2018, 9, 14),
-                SentExcuseStatus.WAITING
-            ),
-            getAttendanceEntity(
-                of(2018, 9, 17),
-                SentExcuseStatus.ACCEPTED
-            )
-        )
-        runBlocking { attendanceLocal.saveAttendance(list) }
+        attendanceLocal.saveAttendance(listOf(
+            Attendance(1, 2, 3, of(2018, 9, 10), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name),
+            Attendance(1, 2, 3, of(2018, 9, 14), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.WAITING.name),
+            Attendance(1, 2, 3, of(2018, 9, 17), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name)
+        ))
 
-        val semester = Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1)
-        val attendance = runBlocking { attendanceLocal.getAttendance(semester, of(2018, 9, 10), of(2018, 9, 14)).first() }
+        val attendance = attendanceLocal
+            .getAttendance(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
         assertEquals(2, attendance.size)
         assertEquals(attendance[0].date, of(2018, 9, 10))
         assertEquals(attendance[1].date, of(2018, 9, 14))
     }
-
-    private fun getAttendanceEntity(
-        date: LocalDate,
-        excuseStatus: SentExcuseStatus
-    ) = Attendance(
-        studentId = 1,
-        diaryId = 2,
-        timeId = 3,
-        date = date,
-        number = 0,
-        subject = "",
-        name = "",
-        presence = false,
-        absence = false,
-        exemption = false,
-        lateness = false,
-        excused = false,
-        deleted = false,
-        excusable = false,
-        excuseStatus = excuseStatus.name
-    )
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
index ca7d0b1be..50badc468 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
@@ -6,15 +6,13 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDate.now
-import java.time.LocalDate.of
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -26,8 +24,7 @@ class CompletedLessonsLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room
-            .inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
         completedLessonsLocal = CompletedLessonsLocal(testDb.completedLessonsDao)
     }
@@ -39,15 +36,18 @@ class CompletedLessonsLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        val list = listOf(
+        completedLessonsLocal.saveCompletedLessons(listOf(
             getCompletedLesson(of(2018, 9, 10), 1),
             getCompletedLesson(of(2018, 9, 14), 2),
             getCompletedLesson(of(2018, 9, 17), 3)
-        )
-        runBlocking { completedLessonsLocal.saveCompletedLessons(list) }
+        ))
 
-        val semester = Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1)
-        val completed = runBlocking { completedLessonsLocal.getCompletedLessons(semester, of(2018, 9, 10), of(2018, 9, 14)).first() }
+        val completed = completedLessonsLocal
+            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
         assertEquals(2, completed.size)
         assertEquals(completed[0].date, of(2018, 9, 10))
         assertEquals(completed[1].date, of(2018, 9, 14))
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
index 14b29c9f6..98dfc88eb 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
@@ -6,14 +6,12 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate.now
-import java.time.LocalDate.of
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -36,15 +34,18 @@ class ExamLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        val list = listOf(
+        examLocal.saveExams(listOf(
             Exam(1, 2, of(2018, 9, 10), now(), "", "", "", "", "", ""),
             Exam(1, 2, of(2018, 9, 14), now(), "", "", "", "", "", ""),
             Exam(1, 2, of(2018, 9, 17), now(), "", "", "", "", "", "")
-        )
-        runBlocking { examLocal.saveExams(list) }
+        ))
 
-        val semester = Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1)
-        val exams = runBlocking { examLocal.getExams(semester, of(2018, 9, 10), of(2018, 9, 14)).first() }
+        val exams = examLocal
+            .getExams(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
         assertEquals(2, exams.size)
         assertEquals(exams[0].date, of(2018, 9, 10))
         assertEquals(exams[1].date, of(2018, 9, 14))
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
index 946ebf8ea..eb1a55480 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
@@ -5,14 +5,12 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDate.now
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -24,8 +22,7 @@ class GradeLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room
-            .inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
         gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
     }
@@ -37,16 +34,17 @@ class GradeLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        val list = listOf(
+        gradeLocal.saveGrades(listOf(
             createGradeLocal(5, 3.0, LocalDate.of(2018, 9, 10), "", 1),
             createGradeLocal(4, 4.0, LocalDate.of(2019, 2, 27), "", 2),
             createGradeLocal(3, 5.0, LocalDate.of(2019, 2, 28), "", 2)
-        )
-        runBlocking { gradeLocal.saveGrades(list) }
+        ))
 
         val semester = Semester(1, 2, "", 2019, 2, 1, now(), now(), 1, 1)
 
-        val grades = runBlocking { gradeLocal.getGradesDetails(semester).first() }
+        val grades = gradeLocal
+            .getGradesDetails(semester)
+            .blockingGet()
 
         assertEquals(2, grades.size)
         assertEquals(grades[0].date, LocalDate.of(2019, 2, 27))
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
index 5cf9c2196..cdd514772 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
@@ -5,25 +5,23 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
-import io.github.wulkanowy.data.Status
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.Grade
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate.of
-import java.time.LocalDateTime
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDateTime
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
@@ -33,11 +31,18 @@ import kotlin.test.assertTrue
 class GradeRepositoryTest {
 
     @MockK
-    private lateinit var semesterMock: Semester
+    private lateinit var mockSdk: Sdk
 
-    private lateinit var studentMock: Student
+    private val settings = InternetObservingSettings.builder()
+        .strategy(TestInternetObservingStrategy())
+        .build()
 
     @MockK
+    private lateinit var semesterMock: Semester
+
+    @MockK
+    private lateinit var studentMock: Student
+
     private lateinit var gradeRemote: GradeRemote
 
     private lateinit var gradeLocal: GradeLocal
@@ -49,12 +54,14 @@ class GradeRepositoryTest {
         MockKAnnotations.init(this)
         testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
         gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
-        studentMock = getStudentMock()
+        gradeRemote = GradeRemote(mockSdk)
 
+        every { studentMock.registrationDate } returns LocalDateTime.of(2019, 2, 27, 12, 0)
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
         every { semesterMock.schoolYear } returns 2019
         every { semesterMock.semesterId } returns 1
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
     }
 
     @After
@@ -64,18 +71,15 @@ class GradeRepositoryTest {
 
     @Test
     fun markOlderThanRegisterDateAsRead() {
-        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
-            createGradeLocal(5, 4.0, of(2019, 2, 25), "Ocena pojawiła się"),
-            createGradeLocal(5, 4.0, of(2019, 2, 26), "przed zalogowanie w aplikacji"),
-            createGradeLocal(5, 4.0, of(2019, 2, 27), "Ocena z dnia logowania"),
-            createGradeLocal(5, 4.0, of(2019, 2, 28), "Ocena jeszcze nowsza")
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 4.0, of(2019, 2, 25), "Ocena pojawiła się"),
+            createGradeApi(5, 4.0, of(2019, 2, 26), "przed zalogowanie w aplikacji"),
+            createGradeApi(5, 4.0, of(2019, 2, 27), "Ocena z dnia logowania"),
+            createGradeApi(5, 4.0, of(2019, 2, 28), "Ocena jeszcze nowsza")
         ) to emptyList())
 
-        val grades = runBlocking {
-            GradeRepository(gradeLocal, gradeRemote)
-                .getGrades(studentMock, semesterMock, true)
-                .filter { it.status == Status.SUCCESS }.first().data!!.first.sortedByDescending { it.date }
-        }
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet().first.sortedByDescending { it.date }
 
         assertFalse { grades[0].isRead }
         assertFalse { grades[1].isRead }
@@ -85,25 +89,21 @@ class GradeRepositoryTest {
 
     @Test
     fun mitigateOldGradesNotifications() {
-        val list = listOf(
+        gradeLocal.saveGrades(listOf(
             createGradeLocal(5, 3.0, of(2019, 2, 25), "Jedna ocena"),
             createGradeLocal(4, 4.0, of(2019, 2, 26), "Druga"),
             createGradeLocal(3, 5.0, of(2019, 2, 27), "Trzecia")
-        )
-        runBlocking { gradeLocal.saveGrades(list) }
+        ))
 
-        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
-            createGradeLocal(5, 2.0, of(2019, 2, 25), "Ocena ma datę, jest inna, ale nie zostanie powiadomiona"),
-            createGradeLocal(4, 3.0, of(2019, 2, 26), "starszą niż ostatnia lokalnie"),
-            createGradeLocal(3, 4.0, of(2019, 2, 27), "Ta jest z tego samego dnia co ostatnia lokalnie"),
-            createGradeLocal(2, 5.0, of(2019, 2, 28), "Ta jest już w ogóle nowa")
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 2.0, of(2019, 2, 25), "Ocena ma datę, jest inna, ale nie zostanie powiadomiona"),
+            createGradeApi(4, 3.0, of(2019, 2, 26), "starszą niż ostatnia lokalnie"),
+            createGradeApi(3, 4.0, of(2019, 2, 27), "Ta jest z tego samego dnia co ostatnia lokalnie"),
+            createGradeApi(2, 5.0, of(2019, 2, 28), "Ta jest już w ogóle nowa")
         ) to emptyList())
 
-        val grades = runBlocking {
-            GradeRepository(gradeLocal, gradeRemote)
-                .getGrades(studentMock, semesterMock, true)
-                .filter { it.status == Status.SUCCESS }.first().data!!.first.sortedByDescending { it.date }
-        }
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet().first.sortedByDescending { it.date }
 
         assertFalse { grades[0].isRead }
         assertFalse { grades[1].isRead }
@@ -113,109 +113,70 @@ class GradeRepositoryTest {
 
     @Test
     fun subtractLocaleDuplicateGrades() {
-        val list = listOf(
+        gradeLocal.saveGrades(listOf(
             createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        )
-        runBlocking { gradeLocal.saveGrades(list) }
+        ))
 
-        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
-            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         ) to emptyList())
 
-        val grades = runBlocking {
-            GradeRepository(gradeLocal, gradeRemote)
-                .getGrades(studentMock, semesterMock, true)
-                .filter { it.status == Status.SUCCESS }.first().data!!
-        }
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
 
         assertEquals(2, grades.first.size)
     }
 
     @Test
     fun subtractRemoteDuplicateGrades() {
-        val list = listOf(
+        gradeLocal.saveGrades(listOf(
             createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        )
-        runBlocking { gradeLocal.saveGrades(list) }
+        ))
 
-        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
-            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         ) to emptyList())
 
-        val grades = runBlocking {
-            GradeRepository(gradeLocal, gradeRemote)
-                .getGrades(studentMock, semesterMock, true)
-                .filter { it.status == Status.SUCCESS }.first().data!!
-        }
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
 
         assertEquals(3, grades.first.size)
     }
 
     @Test
     fun emptyLocal() {
-        runBlocking { gradeLocal.saveGrades(listOf()) }
+        gradeLocal.saveGrades(listOf())
 
-        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
-            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         ) to emptyList())
 
-        val grades = runBlocking {
-            GradeRepository(gradeLocal, gradeRemote)
-                .getGrades(studentMock, semesterMock, true)
-                .filter { it.status == Status.SUCCESS }.first().data!!
-        }
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
 
         assertEquals(3, grades.first.size)
     }
 
     @Test
     fun emptyRemote() {
-        val list = listOf(
+        gradeLocal.saveGrades(listOf(
             createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        )
-        runBlocking { gradeLocal.saveGrades(list) }
+        ))
 
-        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (emptyList<Grade>() to emptyList())
+        every { mockSdk.getGrades(1) } returns Single.just(emptyList<Grade>() to emptyList())
 
-        val grades = runBlocking {
-            GradeRepository(gradeLocal, gradeRemote)
-                .getGrades(studentMock, semesterMock, true)
-                .filter { it.status == Status.SUCCESS }.first().data!!
-        }
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
 
         assertEquals(0, grades.first.size)
     }
-
-    private fun getStudentMock() = Student(
-        scrapperBaseUrl = "http://fakelog.cf",
-        email = "jan@fakelog.cf",
-        certificateKey = "",
-        classId = 0,
-        className = "",
-        isCurrent = false,
-        isParent = false,
-        loginMode = Sdk.Mode.SCRAPPER.name,
-        loginType = "STANDARD",
-        mobileBaseUrl = "",
-        password = "",
-        privateKey = "",
-        registrationDate = LocalDateTime.of(2019, 2, 27, 12, 0),
-        schoolName = "",
-        schoolShortName = "test",
-        schoolSymbol = "",
-        studentId = 0,
-        studentName = "",
-        symbol = "",
-        userLoginId = 0,
-        userName = ""
-    )
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
index 629c24321..9146934bf 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.data.repositories.grade
 
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 import io.github.wulkanowy.sdk.pojo.Grade as GradeRemote
 import io.github.wulkanowy.data.db.entities.Grade as GradeLocal
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
index 197d2d0ec..bd3635fea 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
@@ -7,13 +7,11 @@ import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate.now
+import org.threeten.bp.LocalDate.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -37,44 +35,40 @@ class GradeStatisticsLocalTest {
 
     @Test
     fun saveAndRead_subject() {
-        val list = listOf(
+        gradeStatisticsLocal.saveGradesStatistics(listOf(
             getGradeStatistics("Matematyka", 2, 1),
             getGradeStatistics("Fizyka", 1, 2)
-        )
-        runBlocking { gradeStatisticsLocal.saveGradesStatistics(list) }
+        ))
 
-        val stats = runBlocking { gradeStatisticsLocal.getGradesStatistics(getSemester(), false).first() }
+        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Matematyka").blockingGet()
         assertEquals(1, stats.size)
         assertEquals(stats[0].subject, "Matematyka")
     }
 
     @Test
     fun saveAndRead_all() {
-        val list = listOf(
+        gradeStatisticsLocal.saveGradesStatistics(listOf(
             getGradeStatistics("Matematyka", 2, 1),
             getGradeStatistics("Chemia", 2, 1),
             getGradeStatistics("Fizyka", 1, 2)
-        )
-        runBlocking { gradeStatisticsLocal.saveGradesStatistics(list) }
+        ))
 
-        val stats = runBlocking { gradeStatisticsLocal.getGradesStatistics(getSemester(), false).first() }
-        assertEquals(2, stats.size)
-//        assertEquals(3, stats.size)
-//        assertEquals(stats[0].subject, "Wszystkie") // now in main repo
-        assertEquals(stats[0].subject, "Matematyka")
-        assertEquals(stats[1].subject, "Chemia")
+        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Wszystkie").blockingGet()
+        assertEquals(3, stats.size)
+        assertEquals(stats[0].subject, "Wszystkie")
+        assertEquals(stats[1].subject, "Matematyka")
+        assertEquals(stats[2].subject, "Chemia")
     }
 
     @Test
     fun saveAndRead_points() {
-        val list = listOf(
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf(
             getGradePointsStatistics("Matematyka", 2, 1),
             getGradePointsStatistics("Chemia", 2, 1),
             getGradePointsStatistics("Fizyka", 1, 2)
-        )
-        runBlocking { gradeStatisticsLocal.saveGradesPointsStatistics(list) }
+        ))
 
-        val stats = runBlocking { gradeStatisticsLocal.getGradesPointsStatistics(getSemester()).first() }
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
         with(stats[0]) {
             assertEquals(subject, "Matematyka")
             assertEquals(others, 5.0)
@@ -84,18 +78,18 @@ class GradeStatisticsLocalTest {
 
     @Test
     fun saveAndRead_subjectEmpty() {
-        runBlocking { gradeStatisticsLocal.saveGradesPointsStatistics(listOf()) }
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
 
-        val stats = runBlocking { gradeStatisticsLocal.getGradesPointsStatistics(getSemester()).first() }
-        assertEquals(emptyList(), stats)
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
+        assertEquals(null, stats)
     }
 
     @Test
     fun saveAndRead_allEmpty() {
-        runBlocking { gradeStatisticsLocal.saveGradesPointsStatistics(listOf()) }
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
 
-        val stats = runBlocking { gradeStatisticsLocal.getGradesPointsStatistics(getSemester()).first() }
-        assertEquals(emptyList(), stats)
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Wszystkie").blockingGet()
+        assertEquals(null, stats)
     }
 
     private fun getSemester(): Semester {
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
index ca38b1fee..65ef1fcbf 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
@@ -5,15 +5,14 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDateTime.now
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -25,8 +24,7 @@ class LuckyNumberLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room
-            .inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
         luckyNumberLocal = LuckyNumberLocal(testDb.luckyNumberDao)
     }
@@ -38,14 +36,14 @@ class LuckyNumberLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        val number = LuckyNumber(1, LocalDate.of(2019, 1, 20), 14)
-        runBlocking { luckyNumberLocal.saveLuckyNumber(number) }
+        luckyNumberLocal.saveLuckyNumber(LuckyNumber(1, LocalDate.of(2019, 1, 20), 14))
 
-        val student = Student("", "", "", "", "", "", false, "", "", "", 1, 1, "", "", "", "", "", "", 1, false, now())
-        val luckyNumber = runBlocking { luckyNumberLocal.getLuckyNumber(student, LocalDate.of(2019, 1, 20)).first() }
+        val luckyNumber = luckyNumberLocal.getLuckyNumber(Student("", "", "", "", "", "", false, "", "", "", 1, 1, "", "", "", "", "", 1, false, now()),
+            LocalDate.of(2019, 1, 20)
+        ).blockingGet()
 
-        assertEquals(1, luckyNumber?.studentId)
-        assertEquals(LocalDate.of(2019, 1, 20), luckyNumber?.date)
-        assertEquals(14, luckyNumber?.luckyNumber)
+        assertEquals(1, luckyNumber.studentId)
+        assertEquals(LocalDate.of(2019, 1, 20), luckyNumber.date)
+        assertEquals(14, luckyNumber.luckyNumber)
     }
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
index 6bd1959bd..22578e41e 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
@@ -7,12 +7,11 @@ import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDateTime
+import org.threeten.bp.LocalDateTime
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -36,21 +35,17 @@ class RecipientLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        val list = listOf(
+        recipientLocal.saveRecipients(listOf(
             Recipient(1, "2rPracownik", "Kowalski Jan", "Kowalski Jan [KJ] - Pracownik (Fake123456)", 3, 4, 2, "hash"),
             Recipient(1, "3rPracownik", "Kowalska Karolina", "Kowalska Karolina [KK] - Pracownik (Fake123456)", 4, 4, 2, "hash"),
             Recipient(1, "4rPracownik", "Krupa Stanisław", "Krupa Stanisław [KS] - Uczeń (Fake123456)", 5, 4, 1, "hash")
-        )
-        runBlocking { recipientLocal.saveRecipients(list) }
+        ))
 
-        val student = Student("fakelog.cf", "AUTO", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", "", "", 1, true, LocalDateTime.now())
-        val recipients = runBlocking {
-            recipientLocal.getRecipients(
-                student = student,
-                role = 2,
-                unit = ReportingUnit(1, 4, "", 0, "", emptyList())
-            )
-        }
+        val recipients = recipientLocal.getRecipients(
+            Student("fakelog.cf", "AUTO", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", "", 1, true, LocalDateTime.now()),
+            2,
+            ReportingUnit(1, 4, "", 0, "", emptyList())
+        ).blockingGet()
 
         assertEquals(2, recipients.size)
         assertEquals(1, recipients[0].studentId)
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
index d68f15a80..530bfb3f7 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
@@ -4,10 +4,8 @@ import android.content.Context
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.TestDispatchersProvider
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.repositories.getStudent
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
@@ -28,7 +26,7 @@ class StudentLocalTest {
         val context = ApplicationProvider.getApplicationContext<Context>()
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .build()
-        studentLocal = StudentLocal(testDb.studentDao, TestDispatchersProvider(), context)
+        studentLocal = StudentLocal(testDb.studentDao, context)
     }
 
     @After
@@ -38,9 +36,9 @@ class StudentLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        runBlocking { studentLocal.saveStudents(listOf(student)) }
+        studentLocal.saveStudents(listOf(student)).blockingGet()
 
-        val student = runBlocking { studentLocal.getCurrentStudent(true) }
-        assertEquals("23", student?.schoolSymbol)
+        val student = studentLocal.getCurrentStudent(true).blockingGet()
+        assertEquals("23", student.schoolSymbol)
     }
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
index dddf6464c..aa35fe790 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
@@ -1,7 +1,7 @@
 package io.github.wulkanowy.data.repositories.timetable
 
-import java.time.LocalDateTime
-import java.time.LocalDateTime.now
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.now
 import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal
 import io.github.wulkanowy.sdk.pojo.Timetable as TimetableRemote
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
index e793212e6..a66e5843c 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
@@ -5,14 +5,12 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDateTime.of
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -36,21 +34,17 @@ class TimetableLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        val list = listOf(
+        timetableDb.saveTimetable(listOf(
             createTimetableLocal(of(2018, 9, 10, 0, 0, 0), 1),
             createTimetableLocal(of(2018, 9, 14, 0, 0, 0), 1),
             createTimetableLocal(of(2018, 9, 17, 0, 0, 0), 1)
-        )
-        runBlocking { timetableDb.saveTimetable(list) }
+        ))
 
-        val semester = Semester(1, 2, "", 1, 1, 2019, LocalDate.now(), LocalDate.now(), 1, 1)
-        val exams = runBlocking {
-            timetableDb.getTimetable(
-                semester = semester,
-                startDate = LocalDate.of(2018, 9, 10),
-                endDate = LocalDate.of(2018, 9, 14)
-            ).first()
-        }
+        val exams = timetableDb.getTimetable(
+            Semester(1, 2, "", 1, 1, 2019, LocalDate.now(), LocalDate.now(), 1, 1),
+            LocalDate.of(2018, 9, 10),
+            LocalDate.of(2018, 9, 14)
+        ).blockingGet()
 
         assertEquals(2, exams.size)
         assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
index 1bd3c4679..75f2f0b83 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
@@ -5,48 +5,74 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
-import io.github.wulkanowy.data.Status
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.repositories.getSemester
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
 import io.github.wulkanowy.data.repositories.getStudent
 import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
+import io.github.wulkanowy.sdk.Sdk
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
+import io.mockk.mockk
+import io.reactivex.Single
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDateTime.of
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime.of
 import kotlin.test.assertEquals
 
 @SdkSuppress(minSdkVersion = P)
 @RunWith(AndroidJUnit4::class)
 class TimetableRepositoryTest {
 
-    @MockK(relaxed = true)
-    private lateinit var timetableNotificationSchedulerHelper: TimetableNotificationSchedulerHelper
+    @MockK
+    private lateinit var mockSdk: Sdk
+
+    private val settings = InternetObservingSettings.builder()
+        .strategy(TestInternetObservingStrategy())
+        .build()
 
     @MockK
+    private lateinit var studentMock: Student
+
+    private val student = getStudent()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    @MockK
+    private lateinit var timetableNotificationSchedulerHelper: TimetableNotificationSchedulerHelper
+
     private lateinit var timetableRemote: TimetableRemote
 
     private lateinit var timetableLocal: TimetableLocal
 
     private lateinit var testDb: AppDatabase
 
-    private val student = getStudent()
-
-    private val semester = getSemester()
-
     @Before
     fun initApi() {
         MockKAnnotations.init(this)
         testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
         timetableLocal = TimetableLocal(testDb.timetableDao)
+        timetableRemote = TimetableRemote(mockSdk)
+
+        every { timetableNotificationSchedulerHelper.scheduleNotifications(any(), any()) } returns mockk()
+        every { timetableNotificationSchedulerHelper.cancelScheduled(any(), any()) } returns mockk()
+
+        every { studentMock.studentId } returns 1
+        every { studentMock.studentName } returns "Jan Kowalski"
+
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.diaryId } returns 2
+        every { semesterMock.schoolYear } returns 2019
+        every { semesterMock.semesterId } returns 1
+
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
     }
 
     @After
@@ -56,31 +82,23 @@ class TimetableRepositoryTest {
 
     @Test
     fun copyRoomToCompletedFromPrevious() {
-        runBlocking {
-            timetableLocal.saveTimetable(listOf(
-                createTimetableLocal(of(2019, 3, 5, 8, 0), 1, "123", "Przyroda"),
-                createTimetableLocal(of(2019, 3, 5, 8, 50), 2, "321", "Religia"),
-                createTimetableLocal(of(2019, 3, 5, 9, 40), 3, "213", "W-F"),
-                createTimetableLocal(of(2019, 3, 5, 10, 30), 3, "213", "W-F", "Jan Kowalski")
-            ))
-        }
+        timetableLocal.saveTimetable(listOf(
+            createTimetableLocal(of(2019, 3, 5, 8, 0), 1, "123", "Przyroda"),
+            createTimetableLocal(of(2019, 3, 5, 8, 50), 2, "321", "Religia"),
+            createTimetableLocal(of(2019, 3, 5, 9, 40), 3, "213", "W-F"),
+            createTimetableLocal(of(2019, 3, 5, 10, 30),3, "213", "W-F", "Jan Kowalski")
+        ))
 
-        coEvery { timetableRemote.getTimetable(student, semester, any(), any()) } returns listOf(
-            createTimetableLocal(of(2019, 3, 5, 8, 0), 1, "", "Przyroda"),
-            createTimetableLocal(of(2019, 3, 5, 8, 50), 2, "", "Religia"),
-            createTimetableLocal(of(2019, 3, 5, 9, 40), 3, "", "W-F"),
-            createTimetableLocal(of(2019, 3, 5, 10, 30), 4, "", "W-F")
-        )
+        every { mockSdk.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(of(2019, 3, 5, 8, 0), 1, "", "Przyroda"),
+            createTimetableRemote(of(2019, 3, 5, 8, 50), 2, "", "Religia"),
+            createTimetableRemote(of(2019, 3, 5, 9, 40), 3, "", "W-F"),
+            createTimetableRemote(of(2019, 3, 5, 10, 30), 4, "", "W-F")
+        ))
 
-        val lessons = runBlocking {
-            TimetableRepository(timetableLocal, timetableRemote, timetableNotificationSchedulerHelper).getTimetable(
-                student = student,
-                semester = semester,
-                start = LocalDate.of(2019, 3, 5),
-                end = LocalDate.of(2019, 3, 5),
-                forceRefresh = true
-            ).filter { it.status == Status.SUCCESS }.first().data.orEmpty()
-        }
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote, timetableNotificationSchedulerHelper)
+            .getTimetable(student, semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
+            .blockingGet()
 
         assertEquals(4, lessons.size)
         assertEquals("123", lessons[0].room)
@@ -90,7 +108,7 @@ class TimetableRepositoryTest {
 
     @Test
     fun copyTeacherToCompletedFromPrevious() {
-        val list = listOf(
+        timetableLocal.saveTimetable(listOf(
             createTimetableLocal(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
             createTimetableLocal(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Paweł Poniedziałkowski", false),
             createTimetableLocal(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Wtorkowska", true),
@@ -105,35 +123,28 @@ class TimetableRepositoryTest {
             createTimetableLocal(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "", false),
             createTimetableLocal(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "", true),
             createTimetableLocal(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "", true)
-        )
-        runBlocking { timetableLocal.saveTimetable(list) }
+        ))
 
-        coEvery { timetableRemote.getTimetable(student, semester, any(), any()) } returns listOf(
-            createTimetableLocal(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
-            createTimetableLocal(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Jakub Wtorkowski", true),
-            createTimetableLocal(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Poniedziałkowska", false),
-            createTimetableLocal(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
+        every { mockSdk.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
+            createTimetableRemote(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Jakub Wtorkowski", true),
+            createTimetableRemote(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Poniedziałkowska", false),
+            createTimetableRemote(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
 
-            createTimetableLocal(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "", false),
-            createTimetableLocal(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "", true),
-            createTimetableLocal(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "", false),
-            createTimetableLocal(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "", true),
+            createTimetableRemote(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "", false),
+            createTimetableRemote(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "", true),
+            createTimetableRemote(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "", false),
+            createTimetableRemote(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "", true),
 
-            createTimetableLocal(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "Paweł Środowski", false),
-            createTimetableLocal(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "Paweł Czwartkowski", true),
-            createTimetableLocal(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "Paweł Środowski", false),
-            createTimetableLocal(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true)
-        )
+            createTimetableRemote(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "Paweł Środowski", false),
+            createTimetableRemote(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "Paweł Czwartkowski", true),
+            createTimetableRemote(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "Paweł Środowski", false),
+            createTimetableRemote(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true)
+        ))
 
-        val lessons = runBlocking {
-            TimetableRepository(timetableLocal, timetableRemote, timetableNotificationSchedulerHelper).getTimetable(
-                student = student,
-                semester = semester,
-                start = LocalDate.of(2019, 12, 23),
-                end = LocalDate.of(2019, 12, 25),
-                forceRefresh = true
-            ).filter { it.status == Status.SUCCESS }.first().data.orEmpty()
-        }
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote, timetableNotificationSchedulerHelper)
+            .getTimetable(student, semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true)
+            .blockingGet()
 
         assertEquals(12, lessons.size)
 
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
index d03a319a2..6351997d0 100644
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@@ -2,6 +2,7 @@
 
 package io.github.wulkanowy.utils
 
+import android.content.Context
 import timber.log.Timber
 
 open class TimberTreeNoOp : Timber.Tree() {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4ec2f7816..802cf1ad2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,8 @@
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
+        tools:replace="android:supportsRtl,android:allowBackup">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:screenOrientation="portrait"
diff --git a/app/src/main/assets/message-print-page.html b/app/src/main/assets/message-print-page.html
deleted file mode 100644
index 8da7dec6e..000000000
--- a/app/src/main/assets/message-print-page.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!doctype html>
-<html lang="pl">
-<head>
-    <meta charset="UTF-8">
-    <title>%SUBJECT% | Wulkanowy</title>
-    <style>
-        @page {
-            margin: 2.5cm;
-            size: A4;
-        }
-
-        body {
-            margin: 0;
-            font-family: sans-serif;
-        }
-
-        .title {
-            line-height: 1.5;
-            letter-spacing: 1pt;
-            font-size: 24pt;
-            font-weight: 200;
-            margin: 0 0 0.5cm;
-        }
-
-        .info {
-            margin: 0.5cm 0;
-        }
-
-        .info div {
-            font-size: 14pt;
-            font-weight: 400;
-            margin: 0.5cm 0;
-        }
-
-        h4 {
-            font-weight: 200;
-            text-transform: uppercase;
-            letter-spacing: 1pt;
-            font-size: 10pt;
-            margin: 0;
-            margin-bottom: 0.25cm;
-            font-family: sans-serif;
-        }
-
-        .content {
-            margin-top: 0.5cm;
-            font-size: 14pt;
-            font-weight: 400;
-            text-align: justify;
-            font-family: serif;
-            line-height: 1.5;
-        }
-
-        .content p {
-            page-break-after: auto;
-            page-break-inside: auto;
-            margin-bottom: 0.6cm;
-        }
-
-        .footer {
-            font-size: 11pt;
-            font-weight: 200;
-            display: flex;
-            align-items: center;
-            color: rgba(0, 0, 0, 0.5)
-            margin: 0;
-            margin-bottom: 0.5cm;
-        }
-        
-        .footer .logo {
-            height: 0.5cm;
-            width: 0.5cm;
-            display: block;
-            margin-right: 0.2cm;
-        }
-    </style>
-</head>
-<body>
-<h1 class="title">%SUBJECT%</h1>
-<hr>
-<div class="info">
-    %INFO%
-</div>
-<div class="footer">
-    <img src="wulkanowy-logo-black.svg" class="logo">
-    Wulkanowy Dzienniczek
-</div>
-<hr>
-<div class="content">
-    <h4>Treść wiadomości</h4>
-    %CONTENT%
-</div>
-</body>
-</html>
diff --git a/app/src/main/assets/wulkanowy-logo-black.svg b/app/src/main/assets/wulkanowy-logo-black.svg
deleted file mode 100644
index 9bfbe2c02..000000000
--- a/app/src/main/assets/wulkanowy-logo-black.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 1024 1024"
-   xml:space="preserve"
-   width="1024"
-   height="1024"><metadata
-     id="metadata15"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs13" /><style
-     type="text/css"
-     id="style2">
-	.st0{fill:#D32F2F;}
-	.st1{fill:#AD2A2A;}
-	.st2{fill:#FFFFFF;}
-</style><g
-     id="layer4"
-     style="display:none;fill:#808080"><rect
-       id="XMLID_57_"
-       x="0"
-       y="0"
-       class="st0"
-       width="3584"
-       height="1024"
-       style="display:inline;fill:#808080;stroke-width:1.02195609" /></g><g
-     id="layer3"
-     style="display:none;fill:#808080"><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="M 3046.8164,390.66602 3134.3164,542 v 91.33398 L 3524.9824,1024 H 3584 V 732.18359 L 3242.4824,390.66602 h -23.666 l -53.0352,94.63086 -94.6308,-94.63086 z"
-       id="path18992" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="m 2746.9824,390.66602 62,242.66796 L 3199.6484,1024 H 3584 V 940.68359 L 3033.9824,390.66602 h -21 l -21.9043,90.92773 -90.9277,-90.92773 h -18.5 l -25.4043,88.26367 -88.2637,-88.26367 z"
-       id="path18990" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="m 2620.8164,387.33398 c -18.6667,0 -35.1667,4.60982 -49.5,13.83204 -14.3333,9.11111 -25.4451,22.22287 -33.334,39.33398 -7.7778,17 -11.666,36.5549 -11.666,58.66602 v 25 c 0,34.44444 8.7216,61.83463 26.166,82.16796 L 2970.1484,1024 h 323.168 l -623.166,-623.16602 c -14.2222,-9 -30.6673,-13.5 -49.334,-13.5 z"
-       id="path18988" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="M 2293.4824,390.66602 V 633.33398 L 2684.1484,1024 h 423.336 l -633.334,-633.33398 h -20.334 v 139.66601 l -139.666,-139.66601 z"
-       id="path18984" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="M 1864.8164,390.66602 V 633.33398 L 2255.4824,1024 h 413.334 l -633.334,-633.33398 h -25.832 l -60.584,63.75 -63.75,-63.75 z"
-       id="path18978" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="M 1684.8164,390.66602 V 633.33398 L 2075.4824,1024 h 263.334 l -633.334,-633.33398 z"
-       id="path18976" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="m 1133.6504,390.66602 62,242.66796 L 1586.3164,1024 h 467.668 l -633.334,-633.33398 h -21 l -21.9043,90.92773 -90.9277,-90.92773 h -18.5 l -25.4043,88.26367 -88.2637,-88.26367 z"
-       id="path19059" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="m 1456.4824,390.66602 v 167.16796 c 0.5556,24.66667 8.5007,44 23.834,58 L 1888.4824,1024 h 372.168 l -633.334,-633.33398 h -20.666 V 520.5 l -129.834,-129.83398 z"
-       id="path18966" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="M 2146.3164,390.66602 2054.4824,633.33398 2445.1484,1024 h 354.002 l -633.334,-633.33398 z"
-       id="path18982" /><path
-       style="display:inline;fill:#808080;stroke-width:0.78179646"
-       d="M 637.15234,214.95703 487.75,364.35742 466.01562,386.0918 c 0.31273,0.31271 0.54872,0.54666 0.70508,0.85937 0.0782,0.23454 0.23432,0.54671 0.3125,0.78125 0.31272,0.54726 0.47071,1.17339 0.47071,1.79883 0.0782,0.54726 -0.0799,1.01725 -0.31446,1.48633 -0.23454,0.54725 -0.70285,1.40597 -1.09375,1.79687 l 150.8086,149.71485 -23.68946,23.6875 -12.74414,-12.74219 -13.44726,-13.44727 -78.80469,-78.80664 -11.17969,-11.17968 -7.5039,-7.50391 -35.41602,-35.17969 -3.08984,-0.98047 -4.33594,4.26367 v 0.46876 c 0,7.34888 0.38998,15.00865 -1.48633,22.20117 -0.85998,3.28355 -2.34444,6.25595 -4.14258,8.91406 -0.15636,0.15636 -0.23627,0.23426 -0.31445,0.39062 -1.87631,2.57993 -4.06471,4.84619 -6.48828,6.95704 -5.3944,4.53442 -11.25752,8.67896 -17.27734,12.50976 -0.15637,0.0782 -0.23427,0.1562 -0.39063,0.23438 -2.11085,1.40723 -4.3012,2.7354 -6.49023,4.06445 -8.91248,5.39439 -18.37192,10.08772 -28.37891,13.13672 -1.25087,0.31272 -2.42317,-0.001 -3.36133,-0.70508 l -6.01953,5.94141 c 1.25087,0.62543 2.03136,1.87776 1.875,3.51953 -10e-6,0.15636 -0.0762,0.23231 -0.0762,0.38867 0,0.0782 -0.0781,0.23628 -0.0781,0.31445 -1.32905,4.45624 -2.34505,8.98897 -3.2832,13.60156 -0.15636,0.70363 -0.23622,1.33154 -0.39258,2.03516 -0.85997,4.37806 -1.64209,8.83288 -2.3457,13.21094 0.23453,5.3944 0.39263,11.0234 0.31445,16.65234 v 0.39258 c -0.0782,7.66161 -0.78373,15.32114 -2.8164,22.51367 -2.26721,8.28704 -6.64376,15.63728 -10.55274,23.22071 -0.0782,0.15636 -0.15815,0.23426 -0.23633,0.39062 -1.25088,2.42357 -2.49924,4.92399 -3.59375,7.50391 -4.84714,11.33605 -7.42749,23.92328 -10.55468,35.88476 -0.23454,0.70362 -0.39046,1.48578 -0.625,2.26758 0,0.15636 -0.0801,0.23427 -0.0801,0.39063 -2.97082,11.10151 -6.09819,22.28173 -10.94532,32.75781 -1.40724,2.97082 -2.81531,5.86322 -4.3789,8.75586 -0.15636,0.23454 -0.23231,0.46858 -0.38867,0.70312 -0.62544,1.09451 -1.25152,2.26871 -1.87696,3.44141 -0.0782,0.15636 -0.15619,0.23426 -0.23437,0.39062 -3.51809,6.25438 -7.27098,12.43118 -10.78906,18.68555 -5.0035,8.8343 -8.99075,18.13635 -13.83789,27.04883 -0.0782,0.15636 -0.1562,0.23426 -0.23438,0.39062 -0.70362,1.32905 -1.48579,2.65728 -2.26758,3.98633 -5.0035,8.20887 -10.63256,16.0279 -16.57422,23.61133 -0.15635,0.15636 -0.23426,0.3124 -0.39062,0.46875 -0.7818,1.01634 -1.48578,1.95443 -2.26758,2.89258 -3.90898,4.92532 -7.97378,9.85009 -11.96094,14.77539 -0.0782,0.15637 -0.23432,0.23622 -0.3125,0.39258 -8.75612,10.71061 -17.35628,21.49761 -24.54883,33.30273 0,0.70362 -0.15602,1.33159 -0.46874,1.95703 -1.25087,2.42357 -2.65734,4.68971 -3.90821,7.11328 -0.0782,0.15636 0.62511,1.24989 0.46875,1.40625 L 429.86133,1024 H 1463.0215 L 661.85547,222.92969 c -0.93816,2.11087 -5.23681,1.40935 -7.34766,-0.23242 -1.71995,-1.32906 -3.12603,-3.05147 -4.45508,-4.84961 -0.62544,-0.31271 -1.25168,-0.62288 -1.64257,-0.85743 -2.89265,-1.40723 -6.09933,-1.48632 -9.30469,-1.48632 -0.7818,-0.0782 -1.40588,-0.23416 -1.95313,-0.54688 z m -206.12304,191.41992 0.11914,-0.11523 -0.23438,0.0781 z"
-       id="XMLID_64_" /></g><g
-     id="layer2"
-     style="display:inline;fill:#000000;fill-opacity:0.49803922"><path
-       id="XMLID_42_"
-       d="m 295.17362,965.05417 c 1.0692,3.47527 0.5346,7.21786 -1.3367,10.29214 l -25.7972,41.83679 c -2.5396,4.1436 -7.2178,6.8169 -12.297,6.8169 H 14.345318 C 3.1176178,1024 -3.6991822,1012.2376 2.3157178,1003.4158 L 157.76692,774.44928 c 0.9356,-1.33663 1.4704,-2.80694 1.8713,-4.27723 l 71.2428,-304.21933 c 0.8021,-3.60893 3.2081,-6.6832 6.6833,-8.55449 l 96.5054,-52.93096 c 3.4753,-1.8713 5.8812,-4.94557 6.6832,-8.68816 l 12.9654,-56.53988 c 2.6733,-11.76242 19.5151,-14.30205 26.1981,-4.00991 l 4.6783,7.48519 c 2.0049,3.20793 2.5396,7.21785 1.2031,10.82678 l -87.9511,254.22895 c -0.6683,2.00497 -0.9355,4.1436 -0.5346,6.28223 l 21.9209,121.63426 c 0.401,2.40595 0.1334,4.94556 -0.9357,7.21785 l -52.2625,117.357 c -1.203,2.80696 -1.4704,5.88123 -0.5347,8.68817 z M 1009.7413,1024 H 843.46322 c -4.8117,0 -9.2228,-2.4059 -11.8959,-6.1485 L 719.69042,860.52891 c -0.6683,-1.0693 -1.3366,-2.13861 -1.7375,-3.3416 l -55.4707,-162.00078 c -1.0692,-3.20793 -3.6088,-6.01489 -6.8169,-7.61886 l -135.8026,-68.56965 c -3.7426,-1.87127 -6.4159,-5.34655 -7.2179,-9.22281 l -20.0495,-99.44603 c -0.2674,-1.60396 -0.9357,-3.20793 -2.005,-4.67824 l -46.1141,-67.76766 c -2.5396,-3.74259 -2.9405,-8.28717 -1.0693,-12.2971 l 28.0694,-60.01513 c 2.1387,-4.54457 6.817,-7.61886 12.1634,-7.88619 l 52.129,-3.07427 c 3.0742,-0.1337 5.8812,-1.20296 8.1536,-3.07427 l 38.3615,-29.80707 c 7.2178,-5.61388 18.1784,-3.20794 22.0546,4.67824 l 132.1937,268.93201 c 0.5346,1.20297 0.9357,2.40595 1.2029,3.60894 l 16.3072,108.13418 c 0.4009,2.53963 1.4701,4.8119 3.2079,6.6832 l 263.31808,288.17958 c 7.7525,8.5545 1.203,22.0546 -10.8269,22.0546 z M 363.20852,182.58501 c 0,-30.60907 19.3812,-56.94088 47.1834,-69.23798 -2.005,-3.3416 -3.2079,-6.95052 -3.2079,-10.82678 0,-14.836705 17.109,-26.866465 38.0942,-26.866465 0.5346,0 0.9356,0 1.4704,0 8.688,-14.43572 25.2624,-24.19318 44.2426,-24.19318 1.3367,0 2.6733,0 4.01,0.1337 1.7377,0.13369 3.4753,-0.66833 4.4109,-2.00497 14.0347,-21.38624 49.5894,-36.62394 91.159,-36.62394 15.3712,0 29.9406,2.13863 42.906,5.74756 3.0744,-5.07924 9.8911,-8.5545 17.7773,-8.5545 8.9556,0 16.5744,4.54458 18.8466,10.82678 10.9606,-12.69809 29.5398,-20.98524 50.6587,-20.98524 33.6834,0 60.9508,21.25257 60.9508,47.45072 0,3.20793 -0.401,6.2822 -1.203,9.35647 -0.5346,2.13864 0.6683,4.27725 2.9407,5.07924 21.5199,7.88618 36.0893,22.85655 36.0893,39.965535 0,19.51495 -18.8466,36.22296 -45.4458,42.77249 -2.1387,0.53466 -3.4753,2.40595 -3.4753,4.41092 0,0.1337 0,0.26731 0,0.40098 0,15.10404 -14.9704,27.5348 -34.218,28.87144 0.1333,0.66833 0.1333,1.33663 0.1333,2.13862 0,29.00509 -55.2031,52.3963 -123.2382,52.3963 -14.7029,0 -28.7377,-1.06932 -41.7031,-3.07427 0,0.26733 0,0.40099 0,0.66832 0,12.02975 -15.5051,21.78723 -34.4854,21.78723 -1.0692,0 -2.0049,0 -2.9405,-0.13369 1.3367,2.9406 2.005,6.01487 2.005,9.22281 0,18.71296 -23.6586,33.81699 -52.9311,33.81699 -3.2079,0 -6.2821,-0.1337 -9.3563,-0.53466 -2.4061,-0.26731 -4.6783,1.20299 -5.2131,3.47529 -2.5396,9.35647 -10.693,16.17333 -20.4504,16.17333 -11.7625,0 -21.119,-10.0248 -21.119,-22.32189 0,-5.74755 2.005,-10.96045 5.3466,-14.83671 1.203,-1.33663 1.6039,-3.20793 0.8019,-4.81191 -1.8713,-3.47526 -2.6733,-7.08419 -2.6733,-10.96044 v 0 c 0,-2.13862 -1.7376,-3.87626 -3.8763,-4.4109 -36.2228,-8.01985 -63.4903,-38.22792 -63.4903,-74.3172 z m 306.8925,726.06294 c 0.5348,1.60398 0.6683,3.20796 0.6683,4.94558 l -7.7525,97.97577 c -0.5346,6.9505 -6.6832,12.4307 -14.1683,12.4307 h -250.219 c -5.3466,0 -10.2921,-3.0743 -12.6982,-7.4852 l -41.3021,-76.72312 c -0.2673,-0.401 -0.401,-0.80199 -0.5347,-1.20298 l -38.8962,-94.23313 c -1.4702,-3.3416 -1.203,-7.21785 0.4011,-10.42581 l 64.5596,-126.31249 c 1.604,-3.07427 1.8712,-6.6832 0.6683,-9.89114 l -31.5447,-87.41626 c -1.0693,-3.07428 -0.9356,-6.54955 0.4011,-9.49015 l 52.6636,-112.14412 c 5.3464,-11.22778 22.8565,-10.29212 26.5991,1.47031 l 16.4407,51.05965 50.124,134.19868 c 1.3367,3.7426 4.5446,6.6832 8.5545,8.01985 l 106.9312,36.49027 c 4.1435,1.47032 7.3516,4.54458 8.6881,8.42084 z"
-       style="fill:#000000;stroke-width:0.78179646;fill-opacity:0.49803922" /><g
-       aria-label="WULKANOWY"
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:0.49803922;stroke:none"
-       id="text4752" /></g></svg>
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
index 649958582..0e094f699 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -1,30 +1,34 @@
 package io.github.wulkanowy
 
-import android.app.Application
 import android.content.Context
 import android.util.Log.DEBUG
 import android.util.Log.INFO
 import android.util.Log.VERBOSE
-import androidx.hilt.work.HiltWorkerFactory
 import androidx.multidex.MultiDex
 import androidx.work.Configuration
+import com.jakewharton.threetenabp.AndroidThreeTen
 import com.yariksoffice.lingver.Lingver
-import dagger.hilt.android.HiltAndroidApp
+import dagger.android.AndroidInjector
+import dagger.android.support.DaggerApplication
 import fr.bipi.tressence.file.FileLoggerTree
+import io.github.wulkanowy.di.DaggerAppComponent
+import io.github.wulkanowy.services.sync.SyncWorkerFactory
 import io.github.wulkanowy.ui.base.ThemeManager
 import io.github.wulkanowy.utils.ActivityLifecycleLogger
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.CrashlyticsExceptionTree
 import io.github.wulkanowy.utils.CrashlyticsTree
 import io.github.wulkanowy.utils.DebugLogTree
+import io.reactivex.exceptions.UndeliverableException
+import io.reactivex.plugins.RxJavaPlugins
 import timber.log.Timber
+import java.io.IOException
 import javax.inject.Inject
 
-@HiltAndroidApp
-class WulkanowyApp : Application(), Configuration.Provider {
+class WulkanowyApp : DaggerApplication(), Configuration.Provider {
 
     @Inject
-    lateinit var workerFactory: HiltWorkerFactory
+    lateinit var workerFactory: SyncWorkerFactory
 
     @Inject
     lateinit var themeManager: ThemeManager
@@ -39,6 +43,8 @@ class WulkanowyApp : Application(), Configuration.Provider {
 
     override fun onCreate() {
         super.onCreate()
+        AndroidThreeTen.init(this)
+        RxJavaPlugins.setErrorHandler(::onError)
         Lingver.init(this)
         themeManager.applyDefaultTheme()
 
@@ -62,6 +68,18 @@ class WulkanowyApp : Application(), Configuration.Provider {
         registerActivityLifecycleCallbacks(ActivityLifecycleLogger())
     }
 
+    private fun onError(error: Throwable) {
+        //RxJava's too deep stack traces may cause SOE on older android devices
+        val cause = error.cause
+        if (error is UndeliverableException && cause is IOException || cause is InterruptedException || cause is StackOverflowError) {
+            Timber.e(cause, "An undeliverable error occurred")
+        } else throw error
+    }
+
+    override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
+        return DaggerAppComponent.factory().create(this)
+    }
+
     override fun getWorkManagerConfiguration() = Configuration.Builder()
         .setWorkerFactory(workerFactory)
         .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
diff --git a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
index 3370d0ac3..9540372fc 100644
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
@@ -1,18 +1,19 @@
 package io.github.wulkanowy.data
 
+import android.app.AlarmManager
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.res.AssetManager
 import android.content.res.Resources
+import androidx.core.content.getSystemService
 import androidx.preference.PreferenceManager
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.WalledGardenInternetObservingStrategy
 import com.chuckerteam.chucker.api.ChuckerCollector
 import com.chuckerteam.chucker.api.ChuckerInterceptor
 import com.chuckerteam.chucker.api.RetentionManager
 import dagger.Module
 import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ApplicationComponent
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -21,12 +22,19 @@ import timber.log.Timber
 import javax.inject.Singleton
 
 @Module
-@InstallIn(ApplicationComponent::class)
 internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideSdk(chuckerCollector: ChuckerCollector, @ApplicationContext context: Context): Sdk {
+    fun provideInternetObservingSettings(): InternetObservingSettings {
+        return InternetObservingSettings.builder()
+            .strategy(WalledGardenInternetObservingStrategy())
+            .build()
+    }
+
+    @Singleton
+    @Provides
+    fun provideSdk(chuckerCollector: ChuckerCollector, context: Context): Sdk {
         return Sdk().apply {
             androidVersion = android.os.Build.VERSION.RELEASE
             buildTag = android.os.Build.MODEL
@@ -39,7 +47,7 @@ internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideChuckerCollector(@ApplicationContext context: Context, prefRepository: PreferencesRepository): ChuckerCollector {
+    fun provideChuckerCollector(context: Context, prefRepository: PreferencesRepository): ChuckerCollector {
         return ChuckerCollector(
             context = context,
             showNotification = prefRepository.isDebugNotificationEnable,
@@ -49,19 +57,19 @@ internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideDatabase(@ApplicationContext context: Context, sharedPrefProvider: SharedPrefProvider) = AppDatabase.newInstance(context, sharedPrefProvider)
+    fun provideDatabase(context: Context, sharedPrefProvider: SharedPrefProvider) = AppDatabase.newInstance(context, sharedPrefProvider)
 
     @Singleton
     @Provides
-    fun provideResources(@ApplicationContext context: Context): Resources = context.resources
+    fun provideResources(context: Context): Resources = context.resources
 
     @Singleton
     @Provides
-    fun provideAssets(@ApplicationContext context: Context): AssetManager = context.assets
+    fun provideAssets(context: Context): AssetManager = context.assets
 
     @Singleton
     @Provides
-    fun provideSharedPref(@ApplicationContext context: Context): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+    fun provideSharedPref(context: Context): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
 
     @Singleton
     @Provides
diff --git a/app/src/main/java/io/github/wulkanowy/data/Resource.kt b/app/src/main/java/io/github/wulkanowy/data/Resource.kt
deleted file mode 100644
index 406440c83..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/Resource.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.github.wulkanowy.data
-
-data class Resource<T>(val status: Status, val data: T?, val error: Throwable?) {
-    companion object {
-        fun <T> success(data: T?): Resource<T> {
-            return Resource(Status.SUCCESS, data, null)
-        }
-
-        fun <T> error(error: Throwable?, data: T? = null): Resource<T> {
-            return Resource(Status.ERROR, data, error)
-        }
-
-        fun <T> loading(data: T? = null): Resource<T> {
-            return Resource(Status.LOADING, data, null)
-        }
-    }
-}
-
-enum class Status {
-    LOADING,
-    SUCCESS,
-    ERROR
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index ebd5119fa..762c52f8f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@@ -68,8 +68,6 @@ import io.github.wulkanowy.data.db.migrations.Migration22
 import io.github.wulkanowy.data.db.migrations.Migration23
 import io.github.wulkanowy.data.db.migrations.Migration24
 import io.github.wulkanowy.data.db.migrations.Migration25
-import io.github.wulkanowy.data.db.migrations.Migration26
-import io.github.wulkanowy.data.db.migrations.Migration27
 import io.github.wulkanowy.data.db.migrations.Migration3
 import io.github.wulkanowy.data.db.migrations.Migration4
 import io.github.wulkanowy.data.db.migrations.Migration5
@@ -112,7 +110,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 27
+        const val VERSION_SCHEMA = 25
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider): Array<Migration> {
             return arrayOf(
@@ -139,9 +137,7 @@ abstract class AppDatabase : RoomDatabase() {
                 Migration22(),
                 Migration23(),
                 Migration24(),
-                Migration25(),
-                Migration26(),
-                Migration27(),
+                Migration25()
             )
         }
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
index b21c4834f..294f73d3d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
@@ -3,18 +3,19 @@ package io.github.wulkanowy.data.db
 import androidx.room.TypeConverter
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import java.time.Instant
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.Month
-import java.time.ZoneOffset
+import org.threeten.bp.DateTimeUtils
+import org.threeten.bp.Instant
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.Month
+import org.threeten.bp.ZoneOffset
 import java.util.Date
 
 class Converters {
 
     @TypeConverter
     fun timestampToDate(value: Long?): LocalDate? = value?.run {
-        Date(value).toInstant().atZone(ZoneOffset.UTC).toLocalDate()
+        DateTimeUtils.toInstant(Date(value)).atZone(ZoneOffset.UTC).toLocalDate()
     }
 
     @TypeConverter
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
index 8ef3fd446..3eb57473d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Attendance
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface AttendanceDao : BaseDao<Attendance> {
 
     @Query("SELECT * FROM Attendance WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<Attendance>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Attendance>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt
index 4218855ca..fd58533f1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt
@@ -3,11 +3,11 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 
 @Dao
 interface AttendanceSummaryDao : BaseDao<AttendanceSummary> {
 
     @Query("SELECT * FROM AttendanceSummary WHERE diary_id = :diaryId AND student_id = :studentId AND subject_id = :subjectId")
-    fun loadAll(diaryId: Int, studentId: Int, subjectId: Int): Flow<List<AttendanceSummary>>
+    fun loadAll(diaryId: Int, studentId: Int, subjectId: Int): Maybe<List<AttendanceSummary>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt
index 048e9e3cd..32dbadb86 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt
@@ -7,11 +7,11 @@ import androidx.room.Update
 interface BaseDao<T> {
 
     @Insert
-    suspend fun insertAll(items: List<T>): List<Long>
+    fun insertAll(items: List<T>): List<Long>
 
     @Update
-    suspend fun updateAll(items: List<T>)
+    fun updateAll(items: List<T>)
 
     @Delete
-    suspend fun deleteAll(items: List<T>)
+    fun deleteAll(items: List<T>)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
index 8c03609d6..e13e569b6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.CompletedLesson
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface CompletedLessonsDao : BaseDao<CompletedLesson> {
 
     @Query("SELECT * FROM CompletedLesson WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<CompletedLesson>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
index 311eeb9c5..ca6b32dfc 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Exam
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface ExamDao : BaseDao<Exam> {
 
     @Query("SELECT * FROM Exams WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<Exam>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Exam>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
index 12e70bde6..c74d1937f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Grade
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +11,6 @@ import javax.inject.Singleton
 interface GradeDao : BaseDao<Grade> {
 
     @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId")
-    fun loadAll(semesterId: Int, studentId: Int): Flow<List<Grade>>
+    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Grade>>
+
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt
index e8074f003..da1828666 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,8 +11,8 @@ import javax.inject.Singleton
 interface GradePointsStatisticsDao : BaseDao<GradePointsStatistics> {
 
     @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName")
-    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String): Flow<List<GradePointsStatistics>>
+    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String): Maybe<List<GradePointsStatistics>>
 
     @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId")
-    fun loadAll(semesterId: Int, studentId: Int): Flow<List<GradePointsStatistics>>
+    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradePointsStatistics>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
index b462ad5db..6faa35d0b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.GradeStatistics
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,8 +11,8 @@ import javax.inject.Singleton
 interface GradeStatisticsDao : BaseDao<GradeStatistics> {
 
     @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName AND is_semester = :isSemester")
-    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String, isSemester: Boolean): Flow<List<GradeStatistics>>
+    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String, isSemester: Boolean): Maybe<List<GradeStatistics>>
 
     @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND is_semester = :isSemester")
-    fun loadAll(semesterId: Int, studentId: Int, isSemester: Boolean): Flow<List<GradeStatistics>>
+    fun loadAll(semesterId: Int, studentId: Int, isSemester: Boolean): Maybe<List<GradeStatistics>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
index fc9ad66ed..1165ef07f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +11,5 @@ import javax.inject.Singleton
 interface GradeSummaryDao : BaseDao<GradeSummary> {
 
     @Query("SELECT * FROM GradesSummary WHERE student_id = :studentId AND semester_id = :semesterId")
-    fun loadAll(semesterId: Int, studentId: Int): Flow<List<GradeSummary>>
+    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradeSummary>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
index 2092de49d..1947a0dfe 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Homework
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface HomeworkDao : BaseDao<Homework> {
 
     @Query("SELECT * FROM Homework WHERE semester_id = :semesterId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(semesterId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<Homework>>
+    fun loadAll(semesterId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Homework>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
index 57f3005ad..f16c28d9e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface LuckyNumberDao : BaseDao<LuckyNumber> {
 
     @Query("SELECT * FROM LuckyNumbers WHERE student_id = :studentId AND date = :date")
-    fun load(studentId: Int, date: LocalDate): Flow<LuckyNumber?>
+    fun load(studentId: Int, date: LocalDate): Maybe<LuckyNumber>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt
index b69083a1a..3c511a277 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt
@@ -9,5 +9,5 @@ import io.github.wulkanowy.data.db.entities.MessageAttachment
 interface MessageAttachmentDao : BaseDao<MessageAttachment> {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertAttachments(items: List<MessageAttachment>): List<Long>
+    fun insertAttachments(items: List<MessageAttachment>): List<Long>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
index 729ba6a68..7a69e2707 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
@@ -5,15 +5,19 @@ import androidx.room.Query
 import androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
+import io.reactivex.Single
 
 @Dao
 interface MessagesDao : BaseDao<Message> {
 
     @Transaction
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND message_id = :messageId")
-    fun loadMessageWithAttachment(studentId: Int, messageId: Int): Flow<MessageWithAttachment?>
+    fun loadMessageWithAttachment(studentId: Int, messageId: Int): Single<MessageWithAttachment>
 
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder ORDER BY date DESC")
-    fun loadAll(studentId: Int, folder: Int): Flow<List<Message>>
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder AND removed = 0 ORDER BY date DESC")
+    fun loadAll(studentId: Int, folder: Int): Maybe<List<Message>>
+
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND removed = 1 ORDER BY date DESC")
+    fun loadDeleted(studentId: Int): Maybe<List<Message>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
index 8baba2c30..b05b2d9cc 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
@@ -3,11 +3,11 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.MobileDevice
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 
 @Dao
 interface MobileDeviceDao : BaseDao<MobileDevice> {
 
     @Query("SELECT * FROM MobileDevices WHERE student_id = :studentId ORDER BY date DESC")
-    fun loadAll(studentId: Int): Flow<List<MobileDevice>>
+    fun loadAll(studentId: Int): Maybe<List<MobileDevice>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
index e89a4135a..ea2fc6eb2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Note
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +11,5 @@ import javax.inject.Singleton
 interface NoteDao : BaseDao<Note> {
 
     @Query("SELECT * FROM Notes WHERE student_id = :studentId")
-    fun loadAll(studentId: Int): Flow<List<Note>>
+    fun loadAll(studentId: Int): Maybe<List<Note>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
index 419efde0d..afb941b1a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Recipient
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -10,5 +11,5 @@ import javax.inject.Singleton
 interface RecipientDao : BaseDao<Recipient> {
 
     @Query("SELECT * FROM Recipients WHERE student_id = :studentId AND role = :role AND unit_id = :unitId")
-    suspend fun load(studentId: Int, role: Int, unitId: Int): List<Recipient>
+    fun load(studentId: Int, role: Int, unitId: Int): Maybe<List<Recipient>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
index ca697eda8..6ddfd4941 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -10,8 +11,8 @@ import javax.inject.Singleton
 interface ReportingUnitDao : BaseDao<ReportingUnit> {
 
     @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId")
-    suspend fun load(studentId: Int): List<ReportingUnit>
+    fun load(studentId: Int): Maybe<List<ReportingUnit>>
 
     @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId AND real_id = :unitId")
-    suspend fun loadOne(studentId: Int, unitId: Int): ReportingUnit?
+    fun loadOne(studentId: Int, unitId: Int): Maybe<ReportingUnit>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt
index f39791f63..e9bd67557 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.School
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +11,5 @@ import javax.inject.Singleton
 interface SchoolDao : BaseDao<School> {
 
     @Query("SELECT * FROM School WHERE student_id = :studentId AND class_id = :classId")
-    fun load(studentId: Int, classId: Int): Flow<School?>
+    fun load(studentId: Int, classId: Int): Maybe<School>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
index 4d171907c..654b80f38 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
@@ -1,19 +1,15 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
 @Dao
 interface SemesterDao : BaseDao<Semester> {
 
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
-    suspend fun insertSemesters(items: List<Semester>): List<Long>
-
     @Query("SELECT * FROM Semesters WHERE student_id = :studentId AND class_id = :classId")
-    suspend fun loadAll(studentId: Int, classId: Int): List<Semester>
+    fun loadAll(studentId: Int, classId: Int): Maybe<List<Semester>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
index d7237ea8a..901ddc73f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
@@ -5,9 +5,8 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy.ABORT
 import androidx.room.Query
-import androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -15,27 +14,23 @@ import javax.inject.Singleton
 interface StudentDao {
 
     @Insert(onConflict = ABORT)
-    suspend fun insertAll(student: List<Student>): List<Long>
+    fun insertAll(student: List<Student>): List<Long>
 
     @Delete
-    suspend fun delete(student: Student)
+    fun delete(student: Student)
 
     @Query("SELECT * FROM Students WHERE is_current = 1")
-    suspend fun loadCurrent(): Student?
+    fun loadCurrent(): Maybe<Student>
 
     @Query("SELECT * FROM Students WHERE id = :id")
-    suspend fun loadById(id: Int): Student?
+    fun loadById(id: Int): Maybe<Student>
 
     @Query("SELECT * FROM Students")
-    suspend fun loadAll(): List<Student>
-
-    @Transaction
-    @Query("SELECT * FROM Students")
-    suspend fun loadStudentsWithSemesters(): List<StudentWithSemesters>
+    fun loadAll(): Maybe<List<Student>>
 
     @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
-    suspend fun updateCurrent(id: Long)
+    fun updateCurrent(id: Long)
 
     @Query("UPDATE Students SET is_current = 0")
-    suspend fun resetCurrent()
+    fun resetCurrent()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt
index 4cd742b56..525a7129a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt
@@ -3,11 +3,11 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Subject
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 
 @Dao
 interface SubjectDao : BaseDao<Subject> {
 
     @Query("SELECT * FROM Subjects WHERE diary_id = :diaryId AND student_id = :studentId")
-    fun loadAll(diaryId: Int, studentId: Int): Flow<List<Subject>>
+    fun loadAll(diaryId: Int, studentId: Int): Maybe<List<Subject>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt
index 6adac220d..5ea237a84 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Teacher
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +11,5 @@ import javax.inject.Singleton
 interface TeacherDao : BaseDao<Teacher> {
 
     @Query("SELECT * FROM Teachers WHERE student_id = :studentId AND class_id = :classId")
-    fun loadAll(studentId: Int, classId: Int): Flow<List<Teacher>>
+    fun loadAll(studentId: Int, classId: Int): Maybe<List<Teacher>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
index 5e6eec668..6b62cc82a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Timetable
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface TimetableDao : BaseDao<Timetable> {
 
     @Query("SELECT * FROM Timetable WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<Timetable>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Timetable>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
index f141d5d52..aa8da8db7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
 import java.io.Serializable
-import java.time.LocalDate
 
 @Entity(tableName = "Attendance")
 data class Attendance(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt
index 7d628ebaa..d2e1f174e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.Month
 import java.io.Serializable
-import java.time.Month
 
 @Entity(tableName = "AttendanceSummary")
 data class AttendanceSummary(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt
index e305d467a..775f3f558 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
 import java.io.Serializable
-import java.time.LocalDate
 
 @Entity(tableName = "CompletedLesson")
 data class CompletedLesson(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
index 50ed343a9..9ae795e71 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
 import java.io.Serializable
-import java.time.LocalDate
 
 @Entity(tableName = "Exams")
 data class Exam(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
index a0f1c3a6d..3f69c61b1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
 import java.io.Serializable
-import java.time.LocalDate
 
 @Entity(tableName = "Grades")
 data class Grade(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
index fb7b60bbc..6e29112b2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import java.time.LocalDateTime
 
 @Entity(tableName = "GradesSummary")
 data class GradeSummary(
@@ -37,16 +36,4 @@ data class GradeSummary(
 ) {
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
-
-    @ColumnInfo(name = "is_predicted_grade_notified")
-    var isPredictedGradeNotified: Boolean = true
-
-    @ColumnInfo(name = "is_final_grade_notified")
-    var isFinalGradeNotified: Boolean = true
-
-    @ColumnInfo(name = "predicted_grade_last_change")
-    var predictedGradeLastChange: LocalDateTime = LocalDateTime.now()
-
-    @ColumnInfo(name = "final_grade_last_change")
-    var finalGradeLastChange: LocalDateTime = LocalDateTime.now()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
index 5b21445b4..cd7d153e9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
 import java.io.Serializable
-import java.time.LocalDate
 
 @Entity(tableName = "Homework")
 data class Homework(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt
index 7c24c8f5c..5b9130f5d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
 import java.io.Serializable
-import java.time.LocalDate
 
 @Entity(tableName = "LuckyNumbers")
 data class LuckyNumber (
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
index 1f10a1645..058298415 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDateTime
 import java.io.Serializable
-import java.time.LocalDateTime
 
 @Entity(tableName = "Messages")
 data class Message(
@@ -29,6 +29,8 @@ data class Message(
 
     val subject: String,
 
+    var content: String,
+
     val date: LocalDateTime,
 
     @ColumnInfo(name = "folder_id")
@@ -36,6 +38,12 @@ data class Message(
 
     var unread: Boolean,
 
+    @ColumnInfo(name = "unread_by")
+    val unreadBy: Int,
+
+    @ColumnInfo(name = "read_by")
+    val readBy: Int,
+
     val removed: Boolean,
 
     @ColumnInfo(name = "has_attachments")
@@ -47,12 +55,4 @@ data class Message(
 
     @ColumnInfo(name = "is_notified")
     var isNotified: Boolean = true
-
-    @ColumnInfo(name = "unread_by")
-    var unreadBy: Int = 0
-
-    @ColumnInfo(name = "read_by")
-    var readBy: Int = 0
-
-    var content: String = ""
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
index 9d8f11625..f67ed599f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDateTime
 import java.io.Serializable
-import java.time.LocalDateTime
 
 @Entity(tableName = "MobileDevices")
 data class MobileDevice(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
index cfd549625..6f707a66a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
 import java.io.Serializable
-import java.time.LocalDate
 
 @Entity(tableName = "Notes")
 data class Note(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
index 3b1f0add5..0641e0b6d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
@@ -4,8 +4,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import java.io.Serializable
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 @Entity(tableName = "Semesters", indices = [Index(value = ["student_id", "diary_id", "semester_id"], unique = true)])
 data class Semester(
@@ -37,7 +36,7 @@ data class Semester(
 
     @ColumnInfo(name = "unit_id")
     val unitId: Int
-): Serializable {
+) {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
index b6c75ff8f..905979f99 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
@@ -4,8 +4,8 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDateTime
 import java.io.Serializable
-import java.time.LocalDateTime
 
 @Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id", "class_id"], unique = true)])
 data class Student(
@@ -43,9 +43,6 @@ data class Student(
     @ColumnInfo(name = "user_login_id")
     val userLoginId: Int,
 
-    @ColumnInfo(name = "user_name")
-    val userName: String,
-
     @ColumnInfo(name = "student_name")
     val studentName: String,
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentWithSemesters.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentWithSemesters.kt
deleted file mode 100644
index 9362a954e..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentWithSemesters.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.Embedded
-import androidx.room.Relation
-import java.io.Serializable
-
-data class StudentWithSemesters(
-    @Embedded
-    val student: Student,
-
-    @Relation(parentColumn = "student_id", entityColumn = "student_id")
-    val semesters: List<Semester>
-) : Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
index 1bf159efd..cad3b7c69 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
@@ -3,9 +3,9 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
 import java.io.Serializable
-import java.time.LocalDate
-import java.time.LocalDateTime
 
 @Entity(tableName = "Timetable")
 data class Timetable(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration26.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration26.kt
deleted file mode 100644
index 7130d86d8..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration26.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration26 : Migration(25, 26) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN is_predicted_grade_notified INTEGER NOT NULL DEFAULT 1")
-        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN is_final_grade_notified INTEGER NOT NULL DEFAULT 1")
-        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN predicted_grade_last_change INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN final_grade_last_change INTEGER NOT NULL DEFAULT 0")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration27.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration27.kt
deleted file mode 100644
index 6592228a1..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration27.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration27 : Migration(26, 27) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN user_name TEXT NOT NULL DEFAULT \"\"")
-
-        val students = getStudentsIdsAndNames(database)
-        val units = getReportingUnits(database)
-
-        students.forEach { (id, userLoginId, studentName) ->
-            val userNameFromUnits = units.singleOrNull { (senderId, _) -> senderId == userLoginId }?.second
-            val normalizedStudentName = studentName.split(" ").asReversed().joinToString(" ")
-
-            val userName = userNameFromUnits ?: normalizedStudentName
-            database.execSQL("UPDATE Students SET user_name = '$userName' WHERE id = '$id'")
-        }
-    }
-
-    private fun getStudentsIdsAndNames(database: SupportSQLiteDatabase): MutableList<Triple<Long, Int, String>> {
-        val students = mutableListOf<Triple<Long, Int, String>>()
-        val studentsCursor = database.query("SELECT id, user_login_id, student_name FROM Students")
-        if (studentsCursor.moveToFirst()) {
-            do {
-                students.add(Triple(studentsCursor.getLong(0), studentsCursor.getInt(1), studentsCursor.getString(2)))
-            } while (studentsCursor.moveToNext())
-        }
-        return students
-    }
-
-    private fun getReportingUnits(database: SupportSQLiteDatabase): MutableList<Pair<Int, String>> {
-        val units = mutableListOf<Pair<Int, String>>()
-        val unitsCursor = database.query("SELECT sender_id, sender_name FROM ReportingUnits")
-        if (unitsCursor.moveToFirst()) {
-            do {
-                units.add(unitsCursor.getInt(0) to unitsCursor.getString(1))
-            } while (unitsCursor.moveToNext())
-        }
-
-        return units
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt
index dbcd916ba..fe0dec48f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt
@@ -2,8 +2,8 @@ package io.github.wulkanowy.data.db.migrations
 
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
-import java.time.LocalDateTime.now
-import java.time.ZoneOffset
+import org.threeten.bp.LocalDateTime.now
+import org.threeten.bp.ZoneOffset
 
 class Migration5 : Migration(4, 5) {
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/SemesterMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/SemesterMapper.kt
deleted file mode 100644
index acd93a91a..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/SemesterMapper.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.sdk.pojo.Semester as SdkSemester
-
-fun List<SdkSemester>.mapToEntities(studentId: Int) = map {
-    Semester(
-        studentId = studentId,
-        diaryId = it.diaryId,
-        diaryName = it.diaryName,
-        schoolYear = it.schoolYear,
-        semesterId = it.semesterId,
-        semesterName = it.semesterNumber,
-        start = it.start,
-        end = it.end,
-        classId = it.classId,
-        unitId = it.unitId
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/StudentMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/StudentMapper.kt
deleted file mode 100644
index 67f56c628..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/StudentMapper.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import java.time.LocalDateTime
-import io.github.wulkanowy.sdk.pojo.Student as SdkStudent
-
-fun List<SdkStudent>.mapToEntities(password: String = "") = map {
-    StudentWithSemesters(
-        student = Student(
-            email = it.email,
-            password = password,
-            isParent = it.isParent,
-            symbol = it.symbol,
-            studentId = it.studentId,
-            userLoginId = it.userLoginId,
-            userName = it.userName,
-            studentName = it.studentName + " " + it.studentSurname,
-            schoolSymbol = it.schoolSymbol,
-            schoolShortName = it.schoolShortName,
-            schoolName = it.schoolName,
-            className = it.className,
-            classId = it.classId,
-            scrapperBaseUrl = it.scrapperBaseUrl,
-            loginType = it.loginType.name,
-            isCurrent = false,
-            registrationDate = LocalDateTime.now(),
-            mobileBaseUrl = it.mobileBaseUrl,
-            privateKey = it.privateKey,
-            certificateKey = it.certificateKey,
-            loginMode = it.loginMode.name
-        ),
-        semesters = it.semesters.mapToEntities(it.studentId)
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
index d19565579..6a0b2d32e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
@@ -3,21 +3,18 @@ package io.github.wulkanowy.data.repositories.appcreator
 import android.content.res.AssetManager
 import com.google.gson.Gson
 import io.github.wulkanowy.data.pojos.Contributor
-import io.github.wulkanowy.utils.DispatchersProvider
-import kotlinx.coroutines.withContext
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class AppCreatorRepository @Inject constructor(
-    private val assets: AssetManager,
-    private val dispatchers: DispatchersProvider
-) {
-
-    suspend fun getAppCreators() = withContext(dispatchers.backgroundThread) {
-        Gson().fromJson(
-            assets.open("contributors.json").bufferedReader().use { it.readText() },
-            Array<Contributor>::class.java
-        ).toList()
+class AppCreatorRepository @Inject constructor(private val assets: AssetManager) {
+    fun getAppCreators(): Single<List<Contributor>> {
+        return Single.fromCallable<List<Contributor>> {
+            Gson().fromJson(
+                assets.open("contributors.json").bufferedReader().use { it.readText() },
+                Array<Contributor>::class.java
+            ).toList()
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
index 9aaa52304..0f5873766 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
@@ -3,23 +3,23 @@ package io.github.wulkanowy.data.repositories.attendance
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceLocal @Inject constructor(private val attendanceDb: AttendanceDao) {
 
-    suspend fun saveAttendance(attendance: List<Attendance>) {
+    fun saveAttendance(attendance: List<Attendance>) {
         attendanceDb.insertAll(attendance)
     }
 
-    suspend fun deleteAttendance(attendance: List<Attendance>) {
+    fun deleteAttendance(attendance: List<Attendance>) {
         attendanceDb.deleteAll(attendance)
     }
 
-    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow<List<Attendance>> {
-        return attendanceDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
+    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Attendance>> {
+        return attendanceDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
index 870690ec0..f64d920db 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
@@ -6,40 +6,43 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Absent
 import io.github.wulkanowy.utils.init
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalTime
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalTime
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getAttendance(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List<Attendance> {
+    fun getAttendance(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Attendance>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getAttendance(startDate, endDate, semester.semesterId)
-            .map {
-                Attendance(
-                    studentId = semester.studentId,
-                    diaryId = semester.diaryId,
-                    date = it.date,
-                    timeId = it.timeId,
-                    number = it.number,
-                    subject = it.subject,
-                    name = it.name,
-                    presence = it.presence,
-                    absence = it.absence,
-                    exemption = it.exemption,
-                    lateness = it.lateness,
-                    excused = it.excused,
-                    deleted = it.deleted,
-                    excusable = it.excusable,
-                    excuseStatus = it.excuseStatus?.name
-                )
+            .map { attendance ->
+                attendance.map {
+                    Attendance(
+                        studentId = semester.studentId,
+                        diaryId = semester.diaryId,
+                        date = it.date,
+                        timeId = it.timeId,
+                        number = it.number,
+                        subject = it.subject,
+                        name = it.name,
+                        presence = it.presence,
+                        absence = it.absence,
+                        exemption = it.exemption,
+                        lateness = it.lateness,
+                        excused = it.excused,
+                        deleted = it.deleted,
+                        excusable = it.excusable,
+                        excuseStatus = it.excuseStatus?.name
+                    )
+                }
             }
     }
 
-    suspend fun excuseAbsence(student: Student, semester: Semester, absenceList: List<Attendance>, reason: String?): Boolean {
+    fun excuseAbsence(student: Student, semester: Semester, absenceList: List<Attendance>, reason: String?): Single<Boolean> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).excuseForAbsence(absenceList.map { attendance ->
             Absent(
                 date = LocalDateTime.of(attendance.date, LocalTime.of(0, 0)),
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
index 60f864f27..68e7c5f12 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
@@ -1,34 +1,45 @@
 package io.github.wulkanowy.data.repositories.attendance
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
-import java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: AttendanceLocal,
     private val remote: AttendanceRemote
 ) {
 
-    fun getAttendance(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getAttendance(semester, start.monday, end.sunday) },
-        fetch = { remote.getAttendance(student, semester, start.monday, end.sunday) },
-        saveFetchResult = { old, new ->
-            local.deleteAttendance(old uniqueSubtract new)
-            local.saveAttendance(new uniqueSubtract old)
-        },
-        filterResult = { it.filter { item -> item.date in start..end } }
-    )
+    fun getAttendance(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean): Single<List<Attendance>> {
+        return local.getAttendance(semester, start.monday, end.sunday).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+                if (it) remote.getAttendance(student, semester, start.monday, end.sunday)
+                else Single.error(UnknownHostException())
+            }.flatMap { newAttendance ->
+                local.getAttendance(semester, start.monday, end.sunday)
+                    .toSingle(emptyList())
+                    .doOnSuccess { oldAttendance ->
+                        local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
+                        local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
+                    }
+            }.flatMap {
+                local.getAttendance(semester, start.monday, end.sunday)
+                    .toSingle(emptyList())
+            }).map { list -> list.filter { it.date in start..end } }
+    }
 
-    suspend fun excuseForAbsence(student: Student, semester: Semester, attendanceList: List<Attendance>, reason: String? = null) {
-        remote.excuseAbsence(student, semester, attendanceList, reason)
+    fun excuseForAbsence(student: Student, semester: Semester, attendanceList: List<Attendance>, reason: String? = null): Single<Boolean> {
+        return remote.excuseAbsence(student, semester, attendanceList, reason)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
index 703bc9474..2e9a10067 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
@@ -3,22 +3,22 @@ package io.github.wulkanowy.data.repositories.attendancesummary
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceSummaryLocal @Inject constructor(private val attendanceDb: AttendanceSummaryDao) {
 
-    suspend fun saveAttendanceSummary(attendance: List<AttendanceSummary>) {
+    fun saveAttendanceSummary(attendance: List<AttendanceSummary>) {
         attendanceDb.insertAll(attendance)
     }
 
-    suspend fun deleteAttendanceSummary(attendance: List<AttendanceSummary>) {
+    fun deleteAttendanceSummary(attendance: List<AttendanceSummary>) {
         attendanceDb.deleteAll(attendance)
     }
 
-    fun getAttendanceSummary(semester: Semester, subjectId: Int): Flow<List<AttendanceSummary>> {
-        return attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId)
+    fun getAttendanceSummary(semester: Semester, subjectId: Int): Maybe<List<AttendanceSummary>> {
+        return attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
index 29a0b9a7b..8fef5c391 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
@@ -5,29 +5,32 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceSummaryRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int): List<AttendanceSummary> {
+    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int): Single<List<AttendanceSummary>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getAttendanceSummary(subjectId)
-            .map {
-                AttendanceSummary(
-                    studentId = semester.studentId,
-                    diaryId = semester.diaryId,
-                    subjectId = subjectId,
-                    month = it.month,
-                    presence = it.presence,
-                    absence = it.absence,
-                    absenceExcused = it.absenceExcused,
-                    absenceForSchoolReasons = it.absenceForSchoolReasons,
-                    lateness = it.lateness,
-                    latenessExcused = it.latenessExcused,
-                    exemption = it.exemption
-                )
+            .map { attendance ->
+                attendance.map {
+                    AttendanceSummary(
+                        studentId = semester.studentId,
+                        diaryId = semester.diaryId,
+                        subjectId = subjectId,
+                        month = it.month,
+                        presence = it.presence,
+                        absence = it.absence,
+                        absenceExcused = it.absenceExcused,
+                        absenceForSchoolReasons = it.absenceForSchoolReasons,
+                        lateness = it.lateness,
+                        latenessExcused = it.latenessExcused,
+                        exemption = it.exemption
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
index 5dbe1ab05..5f0b2b346 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
@@ -1,25 +1,35 @@
 package io.github.wulkanowy.data.repositories.attendancesummary
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceSummaryRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: AttendanceSummaryLocal,
     private val remote: AttendanceSummaryRemote
 ) {
 
-    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getAttendanceSummary(semester, subjectId) },
-        fetch = { remote.getAttendanceSummary(student, semester, subjectId) },
-        saveFetchResult = { old, new ->
-            local.deleteAttendanceSummary(old uniqueSubtract new)
-            local.saveAttendanceSummary(new uniqueSubtract old)
-        }
-    )
+    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int, forceRefresh: Boolean = false): Single<List<AttendanceSummary>> {
+        return local.getAttendanceSummary(semester, subjectId).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getAttendanceSummary(student, semester, subjectId)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getAttendanceSummary(semester, subjectId).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteAttendanceSummary(old.uniqueSubtract(new))
+                            local.saveAttendanceSummary(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getAttendanceSummary(semester, subjectId).toSingle(emptyList()) })
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
index 51a1bdbfc..9b275908e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
@@ -3,23 +3,23 @@ package io.github.wulkanowy.data.repositories.completedlessons
 import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class CompletedLessonsLocal @Inject constructor(private val completedLessonsDb: CompletedLessonsDao) {
 
-    suspend fun saveCompletedLessons(completedLessons: List<CompletedLesson>) {
+    fun saveCompletedLessons(completedLessons: List<CompletedLesson>) {
         completedLessonsDb.insertAll(completedLessons)
     }
 
-    suspend fun deleteCompleteLessons(completedLessons: List<CompletedLesson>) {
+    fun deleteCompleteLessons(completedLessons: List<CompletedLesson>) {
         completedLessonsDb.deleteAll(completedLessons)
     }
 
-    fun getCompletedLessons(semester: Semester, start: LocalDate, end: LocalDate): Flow<List<CompletedLesson>> {
-        return completedLessonsDb.loadAll(semester.diaryId, semester.studentId, start, end)
+    fun getCompletedLessons(semester: Semester, start: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>> {
+        return completedLessonsDb.loadAll(semester.diaryId, semester.studentId, start, end).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
index d15a27623..bb115111e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
@@ -5,31 +5,34 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
-import java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class CompletedLessonsRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getCompletedLessons(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List<CompletedLesson> {
+    fun getCompletedLessons(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<CompletedLesson>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getCompletedLessons(startDate, endDate)
-            .map {
-                it.absence
-                CompletedLesson(
-                    studentId = semester.studentId,
-                    diaryId = semester.diaryId,
-                    date = it.date,
-                    number = it.number,
-                    subject = it.subject,
-                    topic = it.topic,
-                    teacher = it.teacher,
-                    teacherSymbol = it.teacherSymbol,
-                    substitution = it.substitution,
-                    absence = it.absence,
-                    resources = it.resources
-                )
+            .map { lessons ->
+                lessons.map {
+                    it.absence
+                    CompletedLesson(
+                        studentId = semester.studentId,
+                        diaryId = semester.diaryId,
+                        date = it.date,
+                        number = it.number,
+                        subject = it.subject,
+                        topic = it.topic,
+                        teacher = it.teacher,
+                        teacherSymbol = it.teacherSymbol,
+                        substitution = it.substitution,
+                        absence = it.absence,
+                        resources = it.resources
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
index 61268a66a..72cc93eb4 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
@@ -1,29 +1,42 @@
 package io.github.wulkanowy.data.repositories.completedlessons
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
-import java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class CompletedLessonsRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: CompletedLessonsLocal,
     private val remote: CompletedLessonsRemote
 ) {
 
-    fun getCompletedLessons(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getCompletedLessons(semester, start.monday, end.sunday) },
-        fetch = { remote.getCompletedLessons(student, semester, start.monday, end.sunday) },
-        saveFetchResult = { old, new ->
-            local.deleteCompleteLessons(old uniqueSubtract new)
-            local.saveCompletedLessons(new uniqueSubtract old)
-        },
-        filterResult = { it.filter { item -> item.date in start..end } }
-    )
+    fun getCompletedLessons(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<CompletedLesson>> {
+        return local.getCompletedLessons(semester, start.monday, end.sunday).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getCompletedLessons(student, semester, start.monday, end.sunday)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getCompletedLessons(semester, start.monday, end.sunday)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteCompleteLessons(old.uniqueSubtract(new))
+                            local.saveCompletedLessons(new.uniqueSubtract(old))
+                        }
+                }.flatMap {
+                    local.getCompletedLessons(semester, start.monday, end.sunday)
+                        .toSingle(emptyList())
+                }).map { list -> list.filter { it.date in start..end } }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
index acc55b5ec..0f484d323 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
@@ -3,23 +3,24 @@ package io.github.wulkanowy.data.repositories.exam
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ExamLocal @Inject constructor(private val examDb: ExamDao) {
 
-    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow<List<Exam>> {
+    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Exam>> {
         return examDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
+                .filter { !it.isEmpty() }
     }
 
-    suspend fun saveExams(exams: List<Exam>) {
+    fun saveExams(exams: List<Exam>) {
         examDb.insertAll(exams)
     }
 
-    suspend fun deleteExams(exams: List<Exam>) {
+    fun deleteExams(exams: List<Exam>) {
         examDb.deleteAll(exams)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
index ac4aa93d7..fb105ceee 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
@@ -5,29 +5,32 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
-import java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ExamRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getExams(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List<Exam> {
+    fun getExams(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Exam>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getExams(startDate, endDate, semester.semesterId)
-            .map {
-                Exam(
-                    studentId = semester.studentId,
-                    diaryId = semester.diaryId,
-                    date = it.date,
-                    entryDate = it.entryDate,
-                    subject = it.subject,
-                    group = it.group,
-                    type = it.type,
-                    description = it.description,
-                    teacher = it.teacher,
-                    teacherSymbol = it.teacherSymbol
-                )
+            .map { exams ->
+                exams.map {
+                    Exam(
+                        studentId = semester.studentId,
+                        diaryId = semester.diaryId,
+                        date = it.date,
+                        entryDate = it.entryDate,
+                        subject = it.subject,
+                        group = it.group,
+                        type = it.type,
+                        description = it.description,
+                        teacher = it.teacher,
+                        teacherSymbol = it.teacherSymbol
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
index 3f4591a25..f29e4fdf8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
@@ -1,29 +1,42 @@
 package io.github.wulkanowy.data.repositories.exam
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.endExamsDay
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.startExamsDay
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
-import java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ExamRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: ExamLocal,
     private val remote: ExamRemote
 ) {
 
-    fun getExams(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getExams(semester, start.startExamsDay, start.endExamsDay) },
-        fetch = { remote.getExams(student, semester, start.startExamsDay, start.endExamsDay) },
-        saveFetchResult = { old, new ->
-            local.deleteExams(old uniqueSubtract new)
-            local.saveExams(new uniqueSubtract old)
-        },
-        filterResult = { it.filter { item -> item.date in start..end } }
-    )
+    fun getExams(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Exam>> {
+        return local.getExams(semester, start.monday, end.sunday).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getExams(student, semester, start.monday, end.sunday)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getExams(semester, start.monday, end.sunday)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteExams(old.uniqueSubtract(new))
+                            local.saveExams(new.uniqueSubtract(old))
+                        }
+                }.flatMap {
+                    local.getExams(semester, start.monday, end.sunday)
+                        .toSingle(emptyList())
+                }).map { list -> list.filter { it.date in start..end } }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
index ed3635423..944ed34ae 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
@@ -5,7 +5,7 @@ import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -15,35 +15,31 @@ class GradeLocal @Inject constructor(
     private val gradeSummaryDb: GradeSummaryDao
 ) {
 
-    suspend fun saveGrades(grades: List<Grade>) {
+    fun saveGrades(grades: List<Grade>) {
         gradeDb.insertAll(grades)
     }
 
-    suspend fun deleteGrades(grades: List<Grade>) {
+    fun deleteGrades(grades: List<Grade>) {
         gradeDb.deleteAll(grades)
     }
 
-    suspend fun updateGrades(grades: List<Grade>) {
+    fun updateGrades(grades: List<Grade>) {
         gradeDb.updateAll(grades)
     }
 
-    suspend fun updateGradesSummary(gradesSummary: List<GradeSummary>) {
-        gradeSummaryDb.updateAll(gradesSummary)
+    fun getGradesDetails(semester: Semester): Maybe<List<Grade>> {
+        return gradeDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
     }
 
-    fun getGradesDetails(semester: Semester): Flow<List<Grade>> {
-        return gradeDb.loadAll(semester.semesterId, semester.studentId)
-    }
-
-    suspend fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
+    fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
         gradeSummaryDb.insertAll(gradesSummary)
     }
 
-    suspend fun deleteGradesSummary(gradesSummary: List<GradeSummary>) {
+    fun deleteGradesSummary(gradesSummary: List<GradeSummary>) {
         gradeSummaryDb.deleteAll(gradesSummary)
     }
 
-    fun getGradesSummary(semester: Semester): Flow<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)
+    fun getGradesSummary(semester: Semester): Maybe<List<GradeSummary>> {
+        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
index 9534a8910..abb2f98c9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
@@ -6,48 +6,48 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class GradeRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getGrades(student: Student, semester: Semester): Pair<List<Grade>, List<GradeSummary>> {
-        val (details, summary) = sdk
-            .init(student)
-            .switchDiary(semester.diaryId, semester.schoolYear)
+    fun getGrades(student: Student, semester: Semester): Single<Pair<List<Grade>, List<GradeSummary>>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getGrades(semester.semesterId)
-
-        return details.map {
-            Grade(
-                studentId = semester.studentId,
-                semesterId = semester.semesterId,
-                subject = it.subject,
-                entry = it.entry,
-                value = it.value,
-                modifier = it.modifier,
-                comment = it.comment,
-                color = it.color,
-                gradeSymbol = it.symbol,
-                description = it.description,
-                weight = it.weight,
-                weightValue = it.weightValue,
-                date = it.date,
-                teacher = it.teacher
-            )
-        } to summary.map {
-            GradeSummary(
-                semesterId = semester.semesterId,
-                studentId = semester.studentId,
-                position = 0,
-                subject = it.name,
-                predictedGrade = it.predicted,
-                finalGrade = it.final,
-                pointsSum = it.pointsSum,
-                proposedPoints = it.proposedPoints,
-                finalPoints = it.finalPoints,
-                average = it.average
-            )
-        }
+            .map { (details, summary) ->
+                details.map {
+                    Grade(
+                        studentId = semester.studentId,
+                        semesterId = semester.semesterId,
+                        subject = it.subject,
+                        entry = it.entry,
+                        value = it.value,
+                        modifier = it.modifier,
+                        comment = it.comment,
+                        color = it.color,
+                        gradeSymbol = it.symbol,
+                        description = it.description,
+                        weight = it.weight,
+                        weightValue = it.weightValue,
+                        date = it.date,
+                        teacher = it.teacher
+                    )
+                } to summary.map {
+                    GradeSummary(
+                        semesterId = semester.semesterId,
+                        studentId = semester.studentId,
+                        position = 0,
+                        subject = it.name,
+                        predictedGrade = it.predicted,
+                        finalGrade = it.final,
+                        pointsSum = it.pointsSum,
+                        proposedPoints = it.proposedPoints,
+                        finalPoints = it.finalPoints,
+                        average = it.average
+                    )
+                }
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
index 8cbbfdfb0..e28350a51 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
@@ -1,98 +1,73 @@
 package io.github.wulkanowy.data.repositories.grade
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.map
-import java.time.LocalDateTime
+import io.reactivex.Completable
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class GradeRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: GradeLocal,
     private val remote: GradeRemote
 ) {
 
-    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
-        shouldFetch = { (details, summaries) -> details.isEmpty() || summaries.isEmpty() || forceRefresh },
-        query = { local.getGradesDetails(semester).combine(local.getGradesSummary(semester)) { details, summaries -> details to summaries } },
-        fetch = { remote.getGrades(student, semester) },
-        saveFetchResult = { old, new ->
-            refreshGradeDetails(student, old.first, new.first, notify)
-            refreshGradeSummaries(old.second, new.second, notify)
-        }
-    )
-
-    private suspend fun refreshGradeDetails(student: Student, oldGrades: List<Grade>, newDetails: List<Grade>, notify: Boolean) {
-        val notifyBreakDate = oldGrades.maxByOrNull { it.date }?.date ?: student.registrationDate.toLocalDate()
-        local.deleteGrades(oldGrades uniqueSubtract newDetails)
-        local.saveGrades((newDetails uniqueSubtract oldGrades).onEach {
-            if (it.date >= notifyBreakDate) it.apply {
-                isRead = false
-                if (notify) isNotified = false
-            }
-        })
+    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<Pair<List<Grade>, List<GradeSummary>>> {
+        return local.getGradesDetails(semester).flatMap { details ->
+            local.getGradesSummary(semester).map { summary -> details to summary }
+        }.filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+                if (it) remote.getGrades(student, semester)
+                else Single.error(UnknownHostException())
+            }.flatMap { (newDetails, newSummary) ->
+                local.getGradesDetails(semester).toSingle(emptyList())
+                    .doOnSuccess { old ->
+                        val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
+                        local.deleteGrades(old.uniqueSubtract(newDetails))
+                        local.saveGrades(newDetails.uniqueSubtract(old)
+                            .onEach {
+                                if (it.date >= notifyBreakDate) it.apply {
+                                    isRead = false
+                                    if (notify) isNotified = false
+                                }
+                            })
+                    }.flatMap {
+                        local.getGradesSummary(semester).toSingle(emptyList())
+                            .doOnSuccess { old ->
+                                local.deleteGradesSummary(old.uniqueSubtract(newSummary))
+                                local.saveGradesSummary(newSummary.uniqueSubtract(old))
+                            }
+                    }
+            }.flatMap {
+                local.getGradesDetails(semester).toSingle(emptyList()).flatMap { details ->
+                    local.getGradesSummary(semester).toSingle(emptyList()).map { summary ->
+                        details to summary
+                    }
+                }
+            })
     }
 
-    private suspend fun refreshGradeSummaries(oldSummaries: List<GradeSummary>, newSummary: List<GradeSummary>, notify: Boolean) {
-        local.deleteGradesSummary(oldSummaries uniqueSubtract newSummary)
-        local.saveGradesSummary((newSummary uniqueSubtract oldSummaries).onEach { summary ->
-            val oldSummary = oldSummaries.find { oldSummary -> oldSummary.subject == summary.subject }
-            summary.isPredictedGradeNotified = when {
-                summary.predictedGrade.isEmpty() -> true
-                notify && oldSummary?.predictedGrade != summary.predictedGrade -> false
-                else -> true
-            }
-            summary.isFinalGradeNotified = when {
-                summary.finalGrade.isEmpty() -> true
-                notify && oldSummary?.finalGrade != summary.finalGrade -> false
-                else -> true
-            }
-
-            summary.predictedGradeLastChange = when {
-                oldSummary == null -> LocalDateTime.now()
-                summary.predictedGrade != oldSummary.predictedGrade -> LocalDateTime.now()
-                else -> oldSummary.predictedGradeLastChange
-            }
-            summary.finalGradeLastChange = when {
-                oldSummary == null -> LocalDateTime.now()
-                summary.finalGrade != oldSummary.finalGrade -> LocalDateTime.now()
-                else -> oldSummary.finalGradeLastChange
-            }
-        })
+    fun getUnreadGrades(semester: Semester): Single<List<Grade>> {
+        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isRead } }.toSingle(emptyList())
     }
 
-    fun getUnreadGrades(semester: Semester): Flow<List<Grade>> {
-        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isRead } }
+    fun getNotNotifiedGrades(semester: Semester): Single<List<Grade>> {
+        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isNotified } }.toSingle(emptyList())
     }
 
-    fun getNotNotifiedGrades(semester: Semester): Flow<List<Grade>> {
-        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isNotified } }
+    fun updateGrade(grade: Grade): Completable {
+        return Completable.fromCallable { local.updateGrades(listOf(grade)) }
     }
 
-    fun getNotNotifiedPredictedGrades(semester: Semester): Flow<List<GradeSummary>> {
-        return local.getGradesSummary(semester).map { it.filter { gradeSummary -> !gradeSummary.isPredictedGradeNotified } }
-    }
-
-    fun getNotNotifiedFinalGrades(semester: Semester): Flow<List<GradeSummary>> {
-        return local.getGradesSummary(semester).map { it.filter { gradeSummary -> !gradeSummary.isFinalGradeNotified } }
-    }
-
-    suspend fun updateGrade(grade: Grade) {
-        return local.updateGrades(listOf(grade))
-    }
-
-    suspend fun updateGrades(grades: List<Grade>) {
-        return local.updateGrades(grades)
-    }
-
-    suspend fun updateGradesSummary(gradesSummary: List<GradeSummary>) {
-        return local.updateGradesSummary(gradesSummary)
+    fun updateGrades(grades: List<Grade>): Completable {
+        return Completable.fromCallable { local.updateGrades(grades) }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
index e0e2cd4db..7994bd758 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
@@ -5,7 +5,7 @@ import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -15,27 +15,46 @@ class GradeStatisticsLocal @Inject constructor(
     private val gradePointsStatisticsDb: GradePointsStatisticsDao
 ) {
 
-    fun getGradesStatistics(semester: Semester, isSemester: Boolean): Flow<List<GradeStatistics>> {
-        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester)
+    fun getGradesStatistics(semester: Semester, isSemester: Boolean): Maybe<List<GradeStatistics>> {
+        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).filter { it.isNotEmpty() }
     }
 
-    fun getGradesPointsStatistics(semester: Semester): Flow<List<GradePointsStatistics>> {
-        return gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId)
+    fun getGradesPointsStatistics(semester: Semester): Maybe<List<GradePointsStatistics>> {
+        return gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
     }
 
-    suspend fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {
+    fun getGradesStatistics(semester: Semester, isSemester: Boolean, subjectName: String): Maybe<List<GradeStatistics>> {
+        return when (subjectName) {
+            "Wszystkie" -> gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).map { list ->
+                list.groupBy { it.grade }.map {
+                    GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key,
+                        it.value.fold(0) { acc, e -> acc + e.amount }, false)
+                } + list
+            }
+            else -> gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)
+        }.filter { it.isNotEmpty() }
+    }
+
+    fun getGradesPointsStatistics(semester: Semester, subjectName: String): Maybe<List<GradePointsStatistics>> {
+        return when (subjectName) {
+            "Wszystkie" -> gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId)
+            else -> gradePointsStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName)
+        }.filter { it.isNotEmpty() }
+    }
+
+    fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {
         gradeStatisticsDb.insertAll(gradesStatistics)
     }
 
-    suspend fun saveGradesPointsStatistics(gradePointsStatistics: List<GradePointsStatistics>) {
+    fun saveGradesPointsStatistics(gradePointsStatistics: List<GradePointsStatistics>) {
         gradePointsStatisticsDb.insertAll(gradePointsStatistics)
     }
 
-    suspend fun deleteGradesStatistics(gradesStatistics: List<GradeStatistics>) {
+    fun deleteGradesStatistics(gradesStatistics: List<GradeStatistics>) {
         gradeStatisticsDb.deleteAll(gradesStatistics)
     }
 
-    suspend fun deleteGradesPointsStatistics(gradesPointsStatistics: List<GradePointsStatistics>) {
+    fun deleteGradesPointsStatistics(gradesPointsStatistics: List<GradePointsStatistics>) {
         gradePointsStatisticsDb.deleteAll(gradesPointsStatistics)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
index 1ff8132fc..99e0cb987 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
@@ -6,39 +6,44 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class GradeStatisticsRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getGradeStatistics(student: Student, semester: Semester, isSemester: Boolean): List<GradeStatistics> {
+    fun getGradeStatistics(student: Student, semester: Semester, isSemester: Boolean): Single<List<GradeStatistics>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).let {
             if (isSemester) it.getGradesAnnualStatistics(semester.semesterId)
             else it.getGradesPartialStatistics(semester.semesterId)
-        }.map {
-            GradeStatistics(
-                semesterId = semester.semesterId,
-                studentId = semester.studentId,
-                subject = it.subject,
-                grade = it.gradeValue,
-                amount = it.amount,
-                semester = isSemester
-            )
-        }
-    }
-
-    suspend fun getGradePointsStatistics(student: Student, semester: Semester): List<GradePointsStatistics> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getGradesPointsStatistics(semester.semesterId)
-            .map {
-                GradePointsStatistics(
+        }.map { gradeStatistics ->
+            gradeStatistics.map {
+                GradeStatistics(
                     semesterId = semester.semesterId,
                     studentId = semester.studentId,
                     subject = it.subject,
-                    others = it.others,
-                    student = it.student
+                    grade = it.gradeValue,
+                    amount = it.amount,
+                    semester = isSemester
                 )
             }
+        }
+    }
+
+    fun getGradePointsStatistics(student: Student, semester: Semester): Single<List<GradePointsStatistics>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getGradesPointsStatistics(semester.semesterId)
+            .map { gradePointsStatistics ->
+                gradePointsStatistics.map {
+                    GradePointsStatistics(
+                        semesterId = semester.semesterId,
+                        studentId = semester.studentId,
+                        subject = it.subject,
+                        others = it.others,
+                        student = it.student
+                    )
+                }
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
index 52ca705f7..8d96d2f57 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
@@ -1,72 +1,75 @@
 package io.github.wulkanowy.data.repositories.gradestatistics
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.GradeStatisticsItem
 import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class GradeStatisticsRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: GradeStatisticsLocal,
     private val remote: GradeStatisticsRemote
 ) {
 
-    fun getGradesStatistics(student: Student, semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getGradesStatistics(semester, isSemester) },
-        fetch = { remote.getGradeStatistics(student, semester, isSemester) },
-        saveFetchResult = { old, new ->
-            local.deleteGradesStatistics(old uniqueSubtract new)
-            local.saveGradesStatistics(new uniqueSubtract old)
-        },
-        mapResult = { items ->
-            when (subjectName) {
-                "Wszystkie" -> items.groupBy { it.grade }.map {
-                    GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key,
-                        it.value.fold(0) { acc, e -> acc + e.amount }, false)
-                } + items
-                else -> items.filter { it.subject == subjectName }
-            }.mapToStatisticItems()
-        }
-    )
-
-    fun getGradesPointsStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getGradesPointsStatistics(semester) },
-        fetch = { remote.getGradePointsStatistics(student, semester) },
-        saveFetchResult = { old, new ->
-            local.deleteGradesPointsStatistics(old uniqueSubtract new)
-            local.saveGradesPointsStatistics(new uniqueSubtract old)
-        },
-        mapResult = { items ->
-            when (subjectName) {
-                "Wszystkie" -> items
-                else -> items.filter { it.subject == subjectName }
-            }.mapToStatisticsItem()
-        }
-    )
-
-    private fun List<GradeStatistics>.mapToStatisticItems() = groupBy { it.subject }.map {
-        GradeStatisticsItem(
-            type = ViewType.PARTIAL,
-            partial = it.value
-                .sortedByDescending { item -> item.grade }
-                .filter { item -> item.amount != 0 },
-            points = null
-        )
+    fun getGradesStatistics(student: Student, semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false): Single<List<GradeStatisticsItem>> {
+        return local.getGradesStatistics(semester, isSemester, subjectName).map { it.mapToStatisticItems() }.filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getGradeStatistics(student, semester, isSemester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getGradesStatistics(semester, isSemester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteGradesStatistics(old.uniqueSubtract(new))
+                            local.saveGradesStatistics(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).map { it.mapToStatisticItems() }.toSingle(emptyList()) })
     }
 
-    private fun List<GradePointsStatistics>.mapToStatisticsItem() = map {
-        GradeStatisticsItem(
-            type = ViewType.POINTS,
-            partial = emptyList(),
-            points = it
-        )
+    fun getGradesPointsStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean): Single<List<GradeStatisticsItem>> {
+        return local.getGradesPointsStatistics(semester, subjectName).map { it.mapToStatisticsItem() }.filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getGradePointsStatistics(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getGradesPointsStatistics(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteGradesPointsStatistics(old.uniqueSubtract(new))
+                            local.saveGradesPointsStatistics(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getGradesPointsStatistics(semester, subjectName).map { it.mapToStatisticsItem() }.toSingle(emptyList()) })
+    }
+
+    private fun List<GradeStatistics>.mapToStatisticItems(): List<GradeStatisticsItem> {
+        return groupBy { it.subject }.map {
+            GradeStatisticsItem(
+                type = ViewType.PARTIAL,
+                partial = it.value
+                    .sortedByDescending { item -> item.grade }
+                    .filter { item -> item.amount != 0 },
+                points = null
+            )
+        }
+    }
+
+    private fun List<GradePointsStatistics>.mapToStatisticsItem(): List<GradeStatisticsItem> {
+        return map {
+            GradeStatisticsItem(
+                type = ViewType.POINTS,
+                partial = emptyList(),
+                points = it
+            )
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
index f2cbb8031..fdae45182 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
@@ -3,27 +3,28 @@ package io.github.wulkanowy.data.repositories.homework
 import io.github.wulkanowy.data.db.dao.HomeworkDao
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class HomeworkLocal @Inject constructor(private val homeworkDb: HomeworkDao) {
 
-    suspend fun saveHomework(homework: List<Homework>) {
+    fun saveHomework(homework: List<Homework>) {
         homeworkDb.insertAll(homework)
     }
 
-    suspend fun deleteHomework(homework: List<Homework>) {
+    fun deleteHomework(homework: List<Homework>) {
         homeworkDb.deleteAll(homework)
     }
 
-    suspend fun updateHomework(homework: List<Homework>) {
+    fun updateHomework(homework: List<Homework>) {
         homeworkDb.updateAll(homework)
     }
 
-    fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow<List<Homework>> {
+    fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Homework>> {
         return homeworkDb.loadAll(semester.semesterId, semester.studentId, startDate, endDate)
+            .filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
index 32109877a..20ffee99c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
@@ -5,28 +5,31 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
-import java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class HomeworkRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getHomework(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List<Homework> {
+    fun getHomework(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Homework>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getHomework(startDate, endDate)
-            .map {
-                Homework(
-                    semesterId = semester.semesterId,
-                    studentId = semester.studentId,
-                    date = it.date,
-                    entryDate = it.entryDate,
-                    subject = it.subject,
-                    content = it.content,
-                    teacher = it.teacher,
-                    teacherSymbol = it.teacherSymbol,
-                    attachments = it.attachments.map { attachment -> attachment.url to attachment.name }
-                )
+            .map { homework ->
+                homework.map {
+                    Homework(
+                        semesterId = semester.semesterId,
+                        studentId = semester.studentId,
+                        date = it.date,
+                        entryDate = it.entryDate,
+                        subject = it.subject,
+                        content = it.content,
+                        teacher = it.teacher,
+                        teacherSymbol = it.teacherSymbol,
+                        attachments = it.attachments.map { attachment -> attachment.url to attachment.name }
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
index 54397ea02..7e8fd5c30 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
@@ -1,35 +1,49 @@
 package io.github.wulkanowy.data.repositories.homework
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
-import java.time.LocalDate
+import io.reactivex.Completable
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class HomeworkRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: HomeworkLocal,
     private val remote: HomeworkRemote
 ) {
 
-    fun getHomework(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getHomework(semester, start.monday, end.sunday) },
-        fetch = { remote.getHomework(student, semester, start.monday, end.sunday) },
-        saveFetchResult = { old, new ->
-            local.deleteHomework(old uniqueSubtract new)
-            local.saveHomework(new uniqueSubtract old)
+    fun getHomework(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Homework>> {
+        return Single.fromCallable { start.monday to end.sunday }.flatMap { (monday, friday) ->
+            local.getHomework(semester, monday, friday).filter { !forceRefresh }
+                .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                    .flatMap {
+                        if (it) remote.getHomework(student, semester, monday, friday)
+                        else Single.error(UnknownHostException())
+                    }.flatMap { new ->
+                        local.getHomework(semester, monday, friday).toSingle(emptyList())
+                            .doOnSuccess { old ->
+                                local.deleteHomework(old.uniqueSubtract(new))
+                                local.saveHomework(new.uniqueSubtract(old))
+                            }
+                    }.flatMap { local.getHomework(semester, monday, friday).toSingle(emptyList()) })
         }
-    )
+    }
 
-    suspend fun toggleDone(homework: Homework) {
-        local.updateHomework(listOf(homework.apply {
-            isDone = !isDone
-        }))
+    fun toggleDone(homework: Homework): Completable {
+        return Completable.fromCallable {
+            local.updateHomework(listOf(homework.apply {
+                isDone = !isDone
+            }))
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt
index 85168fee5..be6ad2f48 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt
@@ -1,28 +1,29 @@
 package io.github.wulkanowy.data.repositories.logger
 
 import android.content.Context
-import dagger.hilt.android.qualifiers.ApplicationContext
-import io.github.wulkanowy.utils.DispatchersProvider
-import kotlinx.coroutines.withContext
+import io.reactivex.Single
 import java.io.File
 import java.io.FileNotFoundException
 import javax.inject.Inject
 
-class LoggerRepository @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val dispatchers: DispatchersProvider
-) {
+class LoggerRepository @Inject constructor(private val context: Context) {
 
-    suspend fun getLastLogLines() = getLastModified().readText().split("\n")
-
-    suspend fun getLogFiles() = withContext(dispatchers.backgroundThread) {
-        File(context.filesDir.absolutePath).listFiles(File::isFile)?.filter {
-            it.name.endsWith(".log")
-        }!!
+    fun getLastLogLines(): Single<List<String>> {
+        return getLastModified()
+            .map { it.readText() }
+            .map { it.split("\n") }
     }
 
-    private suspend fun getLastModified(): File {
-        return withContext(dispatchers.backgroundThread) {
+    fun getLogFiles(): Single<List<File>> {
+        return Single.fromCallable {
+            File(context.filesDir.absolutePath).listFiles(File::isFile)?.filter {
+                it.name.endsWith(".log")
+            }
+        }
+    }
+
+    private fun getLastModified(): Single<File> {
+        return Single.fromCallable {
             var lastModifiedTime = Long.MIN_VALUE
             var chosenFile: File? = null
             File(context.filesDir.absolutePath).listFiles(File::isFile)?.forEach { file ->
@@ -32,7 +33,7 @@ class LoggerRepository @Inject constructor(
                 }
             }
             if (chosenFile == null) throw FileNotFoundException("Log file not found")
-            chosenFile!!
+            chosenFile
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
index 0c3156d1e..0f4f79c84 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
@@ -3,27 +3,27 @@ package io.github.wulkanowy.data.repositories.luckynumber
 import io.github.wulkanowy.data.db.dao.LuckyNumberDao
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Student
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class LuckyNumberLocal @Inject constructor(private val luckyNumberDb: LuckyNumberDao) {
 
-    suspend fun saveLuckyNumber(luckyNumber: LuckyNumber?) {
-        luckyNumberDb.insertAll(listOfNotNull(luckyNumber))
+    fun saveLuckyNumber(luckyNumber: LuckyNumber) {
+        luckyNumberDb.insertAll(listOf(luckyNumber))
     }
 
-    suspend fun updateLuckyNumber(luckyNumber: LuckyNumber?) {
-        luckyNumberDb.updateAll(listOfNotNull(luckyNumber))
+    fun updateLuckyNumber(luckyNumber: LuckyNumber) {
+        luckyNumberDb.updateAll(listOf(luckyNumber))
     }
 
-    suspend fun deleteLuckyNumber(luckyNumber: LuckyNumber?) {
-        luckyNumberDb.deleteAll(listOfNotNull(luckyNumber))
+    fun deleteLuckyNumber(luckyNumber: LuckyNumber) {
+        luckyNumberDb.deleteAll(listOf(luckyNumber))
     }
 
-    fun getLuckyNumber(student: Student, date: LocalDate): Flow<LuckyNumber?> {
+    fun getLuckyNumber(student: Student, date: LocalDate): Maybe<LuckyNumber> {
         return luckyNumberDb.load(student.studentId, date)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
index 2872957d0..0c71897a6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
@@ -4,15 +4,16 @@ import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class LuckyNumberRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getLuckyNumber(student: Student): LuckyNumber? {
-        return sdk.init(student).getLuckyNumber(student.schoolShortName)?.let {
+    fun getLuckyNumber(student: Student): Maybe<LuckyNumber> {
+        return sdk.init(student).getLuckyNumber(student.schoolShortName).map {
             LuckyNumber(
                 studentId = student.studentId,
                 date = LocalDate.now(),
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
index 173ce7e45..374b9a294 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
@@ -1,36 +1,54 @@
 package io.github.wulkanowy.data.repositories.luckynumber
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
-import java.time.LocalDate.now
+import io.reactivex.Completable
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class LuckyNumberRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: LuckyNumberLocal,
     private val remote: LuckyNumberRemote
 ) {
 
-    fun getLuckyNumber(student: Student, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
-        shouldFetch = { it == null || forceRefresh },
-        query = { local.getLuckyNumber(student, now()) },
-        fetch = { remote.getLuckyNumber(student) },
-        saveFetchResult = { old, new ->
-            if (new != old) {
-                old?.let { local.deleteLuckyNumber(it) }
-                local.saveLuckyNumber(new?.apply {
-                    if (notify) isNotified = false
-                })
-            }
-        }
-    )
+    fun getLuckyNumber(student: Student, forceRefresh: Boolean = false, notify: Boolean = false): Maybe<LuckyNumber> {
+        return local.getLuckyNumber(student, LocalDate.now()).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMapMaybe {
+                    if (it) remote.getLuckyNumber(student)
+                    else Maybe.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getLuckyNumber(student, LocalDate.now())
+                        .doOnSuccess { old ->
+                            if (new != old) {
+                                local.deleteLuckyNumber(old)
+                                local.saveLuckyNumber(new.apply {
+                                    if (notify) isNotified = false
+                                })
+                            }
+                        }
+                        .doOnComplete {
+                            local.saveLuckyNumber(new.apply {
+                                if (notify) isNotified = false
+                            })
+                        }
+                }.flatMap({ local.getLuckyNumber(student, LocalDate.now()) }, { Maybe.error(it) },
+                    { local.getLuckyNumber(student, LocalDate.now()) })
+            )
+    }
 
-    suspend fun getNotNotifiedLuckyNumber(student: Student) =
-        local.getLuckyNumber(student, now()).map { if (it?.isNotified == false) it else null }.first()
+    fun getNotNotifiedLuckyNumber(student: Student): Maybe<LuckyNumber> {
+        return local.getLuckyNumber(student, LocalDate.now()).filter { !it.isNotified }
+    }
 
-    suspend fun updateLuckyNumber(luckyNumber: LuckyNumber?) = local.updateLuckyNumber(luckyNumber)
+    fun updateLuckyNumber(luckyNumber: LuckyNumber): Completable {
+        return Completable.fromCallable { local.updateLuckyNumber(luckyNumber) }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
index f1c8eaf08..53cf0a983 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
@@ -6,7 +6,9 @@ import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.db.entities.Student
-import kotlinx.coroutines.flow.Flow
+import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
+import io.reactivex.Maybe
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -16,27 +18,30 @@ class MessageLocal @Inject constructor(
     private val messageAttachmentDao: MessageAttachmentDao
 ) {
 
-    suspend fun saveMessages(messages: List<Message>) {
+    fun saveMessages(messages: List<Message>) {
         messagesDb.insertAll(messages)
     }
 
-    suspend fun updateMessages(messages: List<Message>) {
+    fun updateMessages(messages: List<Message>) {
         messagesDb.updateAll(messages)
     }
 
-    suspend fun deleteMessages(messages: List<Message>) {
+    fun deleteMessages(messages: List<Message>) {
         messagesDb.deleteAll(messages)
     }
 
-    fun getMessageWithAttachment(student: Student, message: Message): Flow<MessageWithAttachment?> {
+    fun getMessageWithAttachment(student: Student, message: Message): Single<MessageWithAttachment> {
         return messagesDb.loadMessageWithAttachment(student.id.toInt(), message.messageId)
     }
 
-    suspend fun saveMessageAttachments(attachments: List<MessageAttachment>) {
+    fun saveMessageAttachments(attachments: List<MessageAttachment>) {
         messageAttachmentDao.insertAttachments(attachments)
     }
 
-    fun getMessages(student: Student, folder: MessageFolder): Flow<List<Message>> {
-        return messagesDb.loadAll(student.id.toInt(), folder.id)
+    fun getMessages(student: Student, folder: MessageFolder): Maybe<List<Message>> {
+        return when (folder) {
+            TRASHED -> messagesDb.loadDeleted(student.id.toInt())
+            else -> messagesDb.loadAll(student.id.toInt(), folder.id)
+        }.filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
index 044a13a28..1808c048b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
@@ -9,7 +9,8 @@ import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
 import io.github.wulkanowy.sdk.pojo.SentMessage
 import io.github.wulkanowy.utils.init
-import java.time.LocalDateTime.now
+import io.reactivex.Single
+import org.threeten.bp.LocalDateTime.now
 import javax.inject.Inject
 import javax.inject.Singleton
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
@@ -17,31 +18,32 @@ import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 @Singleton
 class MessageRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getMessages(student: Student, semester: Semester, folder: MessageFolder): List<Message> {
-        return sdk.init(student).getMessages(Folder.valueOf(folder.name), now().minusMonths(3), now()).map {
-            Message(
-                studentId = student.id.toInt(),
-                realId = it.id ?: 0,
-                messageId = it.messageId ?: 0,
-                sender = it.sender?.name.orEmpty(),
-                senderId = it.sender?.loginId ?: 0,
-                recipient = it.recipients.singleOrNull()?.name ?: "Wielu adresatów",
-                subject = it.subject.trim(),
-                date = it.date ?: now(),
-                folderId = it.folderId,
-                unread = it.unread ?: false,
-                removed = it.removed,
-                hasAttachments = it.hasAttachments
-            ).apply {
-                content = it.content.orEmpty()
-                unreadBy = it.unreadBy ?: 0
-                readBy = it.readBy ?: 0
+    fun getMessages(student: Student, semester: Semester, folder: MessageFolder): Single<List<Message>> {
+        return sdk.init(student).getMessages(Folder.valueOf(folder.name), semester.start.atStartOfDay(), semester.end.atStartOfDay()).map { messages ->
+            messages.map {
+                Message(
+                    studentId = student.id.toInt(),
+                    realId = it.id ?: 0,
+                    messageId = it.messageId ?: 0,
+                    sender = it.sender.orEmpty(),
+                    senderId = it.senderId ?: 0,
+                    recipient = it.recipient.orEmpty(),
+                    subject = it.subject.trim(),
+                    date = it.date ?: now(),
+                    content = it.content.orEmpty(),
+                    folderId = it.folderId,
+                    unread = it.unread ?: false,
+                    unreadBy = it.unreadBy ?: 0,
+                    readBy = it.readBy ?: 0,
+                    removed = it.removed,
+                    hasAttachments = it.hasAttachments
+                )
             }
         }
     }
 
-    suspend fun getMessagesContentDetails(student: Student, message: Message, markAsRead: Boolean = false): Pair<String, List<MessageAttachment>> {
-        return sdk.init(student).getMessageDetails(message.messageId, message.folderId, markAsRead, message.realId).let { details ->
+    fun getMessagesContentDetails(student: Student, message: Message, markAsRead: Boolean = false): Single<Pair<String, List<MessageAttachment>>> {
+        return sdk.init(student).getMessageDetails(message.messageId, message.folderId, markAsRead, message.realId).map { details ->
             details.content to details.attachments.map {
                 MessageAttachment(
                     realId = it.id,
@@ -54,7 +56,7 @@ class MessageRemote @Inject constructor(private val sdk: Sdk) {
         }
     }
 
-    suspend fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): SentMessage {
+    fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
         return sdk.init(student).sendMessage(
             subject = subject,
             content = content,
@@ -72,7 +74,7 @@ class MessageRemote @Inject constructor(private val sdk: Sdk) {
         )
     }
 
-    suspend fun deleteMessage(student: Student, message: Message): Boolean {
-        return sdk.init(student).deleteMessages(listOf(message.messageId), message.folderId)
+    fun deleteMessage(student: Student, message: Message): Single<Boolean> {
+        return sdk.init(student).deleteMessages(listOf(Pair(message.realId, message.folderId)))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
index bb9326992..2d2c0430c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
@@ -1,76 +1,105 @@
 package io.github.wulkanowy.data.repositories.message
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
 import io.github.wulkanowy.sdk.pojo.SentMessage
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
+import io.reactivex.Completable
+import io.reactivex.Single
 import timber.log.Timber
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MessageRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: MessageLocal,
     private val remote: MessageRemote
 ) {
 
-    fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getMessages(student, folder) },
-        fetch = { remote.getMessages(student, semester, folder) },
-        saveFetchResult = { old, new ->
-            local.deleteMessages(old uniqueSubtract new)
-            local.saveMessages((new uniqueSubtract old).onEach {
-                it.isNotified = !notify
-            })
-        }
-    )
-
-    fun getMessage(student: Student, message: Message, markAsRead: Boolean = false) = networkBoundResource(
-        shouldFetch = {
-            checkNotNull(it, { "This message no longer exist!" })
-            Timber.d("Message content in db empty: ${it.message.content.isEmpty()}")
-            it.message.unread || it.message.content.isEmpty()
-        },
-        query = { local.getMessageWithAttachment(student, message) },
-        fetch = { remote.getMessagesContentDetails(student, it!!.message, markAsRead) },
-        saveFetchResult = { old, (downloadedMessage, attachments) ->
-            checkNotNull(old, { "Fetched message no longer exist!" })
-            local.updateMessages(listOf(old.message.copy(unread = !markAsRead).apply {
-                id = old.message.id
-                content = content.ifBlank { downloadedMessage }
-            }))
-            local.saveMessageAttachments(attachments)
-            Timber.d("Message ${message.messageId} with blank content: ${old.message.content.isBlank()}, marked as read")
-        }
-    )
-
-    fun getNotNotifiedMessages(student: Student): Flow<List<Message>> {
-        return local.getMessages(student, RECEIVED).map { it.filter { message -> !message.isNotified && message.unread } }
+    fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Message>> {
+        return local.getMessages(student, folder).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getMessages(student, semester, folder)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getMessages(student, folder).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteMessages(old.uniqueSubtract(new))
+                            local.saveMessages(new.uniqueSubtract(old)
+                                .onEach {
+                                    it.isNotified = !notify
+                                })
+                        }
+                }.flatMap { local.getMessages(student, folder).toSingle(emptyList()) }
+            )
     }
 
-    suspend fun updateMessages(messages: List<Message>) {
-        return local.updateMessages(messages)
+    fun getMessage(student: Student, message: Message, markAsRead: Boolean = false): Single<MessageWithAttachment> {
+        return local.getMessageWithAttachment(student, message)
+            .filter {
+                it.message.content.isNotEmpty().also { status ->
+                    Timber.d("Message content in db empty: ${!status}")
+                } && !it.message.unread
+            }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) local.getMessageWithAttachment(student, message)
+                    else Single.error(UnknownHostException())
+                }
+                .flatMap { dbMessage ->
+                    remote.getMessagesContentDetails(student, dbMessage.message, markAsRead).doOnSuccess { (downloadedMessage, attachments) ->
+                        local.updateMessages(listOf(dbMessage.message.copy(unread = !markAsRead).apply {
+                            id = dbMessage.message.id
+                            content = content.ifBlank { downloadedMessage }
+                        }))
+                        local.saveMessageAttachments(attachments)
+                        Timber.d("Message ${message.messageId} with blank content: ${dbMessage.message.content.isBlank()}, marked as read")
+                    }
+                }.flatMap {
+                    local.getMessageWithAttachment(student, message)
+                }
+            )
     }
 
-    suspend fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): SentMessage {
-        return remote.sendMessage(student, subject, content, recipients)
+    fun getNotNotifiedMessages(student: Student): Single<List<Message>> {
+        return local.getMessages(student, RECEIVED)
+            .map { it.filter { message -> !message.isNotified && message.unread } }
+            .toSingle(emptyList())
     }
 
-    suspend fun deleteMessage(student: Student, message: Message) {
-        val isDeleted = remote.deleteMessage(student, message)
+    fun updateMessages(messages: List<Message>): Completable {
+        return Completable.fromCallable { local.updateMessages(messages) }
+    }
 
-        if (message.folderId != MessageFolder.TRASHED.id) {
-            if (isDeleted) local.updateMessages(listOf(message.copy(folderId = MessageFolder.TRASHED.id).apply {
-                id = message.id
-                content = message.content
-            }))
-        } else local.deleteMessages(listOf(message))
+    fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.sendMessage(student, subject, content, recipients)
+                else Single.error(UnknownHostException())
+            }
+    }
+
+    fun deleteMessage(student: Student, message: Message): Single<Boolean> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.deleteMessage(student, message)
+                else Single.error(UnknownHostException())
+            }
+            .doOnSuccess {
+                if (!message.removed) local.updateMessages(listOf(message.copy(removed = true).apply {
+                    id = message.id
+                    content = message.content
+                }))
+                else local.deleteMessages(listOf(message))
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt
index 0ccb3d7ef..473ffa7fe 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt
@@ -3,22 +3,22 @@ package io.github.wulkanowy.data.repositories.mobiledevice
 import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MobileDeviceLocal @Inject constructor(private val mobileDb: MobileDeviceDao) {
 
-    suspend fun saveDevices(devices: List<MobileDevice>) {
+    fun saveDevices(devices: List<MobileDevice>) {
         mobileDb.insertAll(devices)
     }
 
-    suspend fun deleteDevices(devices: List<MobileDevice>) {
+    fun deleteDevices(devices: List<MobileDevice>) {
         mobileDb.deleteAll(devices)
     }
 
-    fun getDevices(semester: Semester): Flow<List<MobileDevice>> {
-        return mobileDb.loadAll(semester.studentId)
+    fun getDevices(semester: Semester): Maybe<List<MobileDevice>> {
+        return mobileDb.loadAll(semester.studentId).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
index 907e965ce..800f95971 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
@@ -6,34 +6,37 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MobileDeviceRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getDevices(student: Student, semester: Semester): List<MobileDevice> {
+    fun getDevices(student: Student, semester: Semester): Single<List<MobileDevice>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getRegisteredDevices()
-            .map {
-                MobileDevice(
-                    studentId = semester.studentId,
-                    date = it.createDate,
-                    deviceId = it.id,
-                    name = it.name
-                )
+            .map { devices ->
+                devices.map {
+                    MobileDevice(
+                        studentId = semester.studentId,
+                        date = it.createDate,
+                        deviceId = it.id,
+                        name = it.name
+                    )
+                }
             }
     }
 
-    suspend fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Boolean {
+    fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Single<Boolean> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .unregisterDevice(device.deviceId)
     }
 
-    suspend fun getToken(student: Student, semester: Semester): MobileDeviceToken {
+    fun getToken(student: Student, semester: Semester): Single<MobileDeviceToken> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getToken()
-            .let {
+            .map {
                 MobileDeviceToken(
                     token = it.token,
                     symbol = it.symbol,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
index 65526ef86..545846e85 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
@@ -1,36 +1,53 @@
 package io.github.wulkanowy.data.repositories.mobiledevice
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MobileDeviceRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: MobileDeviceLocal,
     private val remote: MobileDeviceRemote
 ) {
 
-    fun getDevices(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getDevices(semester) },
-        fetch = { remote.getDevices(student, semester) },
-        saveFetchResult = { old, new ->
-            local.deleteDevices(old uniqueSubtract new)
-            local.saveDevices(new uniqueSubtract old)
-        }
-    )
-
-    suspend fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice) {
-        remote.unregisterDevice(student, semester, device)
-        local.deleteDevices(listOf(device))
+    fun getDevices(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<MobileDevice>> {
+        return local.getDevices(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getDevices(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getDevices(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteDevices(old uniqueSubtract new)
+                            local.saveDevices(new uniqueSubtract old)
+                        }
+                }
+            ).flatMap { local.getDevices(semester).toSingle(emptyList()) }
     }
 
-    suspend fun getToken(student: Student, semester: Semester): MobileDeviceToken {
-        return remote.getToken(student, semester)
+    fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Single<Boolean> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.unregisterDevice(student, semester, device)
+                else Single.error(UnknownHostException())
+            }
+    }
+
+    fun getToken(student: Student, semester: Semester): Single<MobileDeviceToken> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.getToken(student, semester)
+                else Single.error(UnknownHostException())
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
index 85ba5e223..784e61f0f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
@@ -3,26 +3,26 @@ package io.github.wulkanowy.data.repositories.note
 import io.github.wulkanowy.data.db.dao.NoteDao
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Student
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class NoteLocal @Inject constructor(private val noteDb: NoteDao) {
 
-    suspend fun saveNotes(notes: List<Note>) {
+    fun saveNotes(notes: List<Note>) {
         noteDb.insertAll(notes)
     }
 
-    suspend fun updateNotes(notes: List<Note>) {
+    fun updateNotes(notes: List<Note>) {
         noteDb.updateAll(notes)
     }
 
-    suspend fun deleteNotes(notes: List<Note>) {
+    fun deleteNotes(notes: List<Note>) {
         noteDb.deleteAll(notes)
     }
 
-    fun getNotes(student: Student): Flow<List<Note>> {
-        return noteDb.loadAll(student.studentId)
+    fun getNotes(student: Student): Maybe<List<Note>> {
+        return noteDb.loadAll(student.studentId).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
index 0e488b7d9..2c62b608d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
@@ -5,27 +5,30 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class NoteRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getNotes(student: Student, semester: Semester): List<Note> {
+    fun getNotes(student: Student, semester: Semester): Single<List<Note>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getNotes(semester.semesterId)
-            .map {
-                Note(
-                    studentId = semester.studentId,
-                    date = it.date,
-                    teacher = it.teacher,
-                    teacherSymbol = it.teacherSymbol,
-                    category = it.category,
-                    categoryType = it.categoryType.id,
-                    isPointsShow = it.showPoints,
-                    points = it.points,
-                    content = it.content
-                )
+            .map { notes ->
+                notes.map {
+                    Note(
+                        studentId = semester.studentId,
+                        date = it.date,
+                        teacher = it.teacher,
+                        teacherSymbol = it.teacherSymbol,
+                        category = it.category,
+                        categoryType = it.categoryType.id,
+                        isPointsShow = it.showPoints,
+                        points = it.points,
+                        content = it.content
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
index 6cf62ba22..e155e2bad 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
@@ -1,45 +1,54 @@
 package io.github.wulkanowy.data.repositories.note
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
+import io.reactivex.Completable
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class NoteRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: NoteLocal,
     private val remote: NoteRemote
 ) {
 
-    fun getNotes(student: Student, semester: Semester, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getNotes(student) },
-        fetch = { remote.getNotes(student, semester) },
-        saveFetchResult = { old, new ->
-            local.deleteNotes(old uniqueSubtract new)
-            local.saveNotes((new uniqueSubtract old).onEach {
-                if (it.date >= student.registrationDate.toLocalDate()) it.apply {
-                    isRead = false
-                    if (notify) isNotified = false
-                }
-            })
-        }
-    )
-
-    fun getNotNotifiedNotes(student: Student): Flow<List<Note>> {
-        return local.getNotes(student).map { it.filter { note -> !note.isNotified } }
+    fun getNotes(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Note>> {
+        return local.getNotes(student).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getNotes(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getNotes(student).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteNotes(old.uniqueSubtract(new))
+                            local.saveNotes(new.uniqueSubtract(old)
+                                .onEach {
+                                    if (it.date >= student.registrationDate.toLocalDate()) it.apply {
+                                        isRead = false
+                                        if (notify) isNotified = false
+                                    }
+                                })
+                        }
+                }.flatMap { local.getNotes(student).toSingle(emptyList()) })
     }
 
-    suspend fun updateNote(note: Note) {
-        local.updateNotes(listOf(note))
+    fun getNotNotifiedNotes(student: Student): Single<List<Note>> {
+        return local.getNotes(student).map { it.filter { note -> !note.isNotified } }.toSingle(emptyList())
     }
 
-    suspend fun updateNotes(notes: List<Note>) {
-        return local.updateNotes(notes)
+    fun updateNote(note: Note): Completable {
+        return Completable.fromCallable { local.updateNotes(listOf(note)) }
+    }
+
+    fun updateNotes(notes: List<Note>): Completable {
+        return Completable.fromCallable { local.updateNotes(notes) }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
index 1d5e57f8a..6b13563a4 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
@@ -2,16 +2,14 @@ package io.github.wulkanowy.data.repositories.preferences
 
 import android.content.Context
 import android.content.SharedPreferences
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
-import io.github.wulkanowy.ui.modules.grade.GradeAverageMode
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class PreferencesRepository @Inject constructor(
     private val sharedPref: SharedPreferences,
-    @ApplicationContext val context: Context
+    val context: Context
 ) {
     val startMenuIndex: Int
         get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt()
@@ -19,8 +17,8 @@ class PreferencesRepository @Inject constructor(
     val isShowPresent: Boolean
         get() = getBoolean(R.string.pref_key_attendance_present, R.bool.pref_default_attendance_present)
 
-    val gradeAverageMode: GradeAverageMode
-        get() = GradeAverageMode.getByValue(getString(R.string.pref_key_grade_average_mode, R.string.pref_default_grade_average_mode))
+    val gradeAverageMode: String
+        get() = getString(R.string.pref_key_grade_average_mode, R.string.pref_default_grade_average_mode)
 
     val gradeAverageForceCalc: Boolean
         get() = getBoolean(R.string.pref_key_grade_average_force_calc, R.bool.pref_default_grade_average_force_calc)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
index fac1645e4..9b1d4ac2f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
@@ -4,21 +4,22 @@ import io.github.wulkanowy.data.db.dao.RecipientDao
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class RecipientLocal @Inject constructor(private val recipientDb: RecipientDao) {
 
-    suspend fun getRecipients(student: Student, role: Int, unit: ReportingUnit): List<Recipient> {
-        return recipientDb.load(student.studentId, role, unit.realId)
+    fun getRecipients(student: Student, role: Int, unit: ReportingUnit): Maybe<List<Recipient>> {
+        return recipientDb.load(student.studentId, role, unit.realId).filter { !it.isEmpty() }
     }
 
-    suspend fun saveRecipients(recipients: List<Recipient>): List<Long> {
+    fun saveRecipients(recipients: List<Recipient>): List<Long> {
         return recipientDb.insertAll(recipients)
     }
 
-    suspend fun deleteRecipients(recipients: List<Recipient>) {
+    fun deleteRecipients(recipients: List<Recipient>) {
         recipientDb.deleteAll(recipients)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
index a5318e77f..e5b16a156 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
@@ -13,14 +14,18 @@ import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 @Singleton
 class RecipientRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getRecipients(student: Student, role: Int, unit: ReportingUnit): List<Recipient> {
+    fun getRecipients(student: Student, role: Int, unit: ReportingUnit): Single<List<Recipient>> {
         return sdk.init(student).getRecipients(unit.realId, role)
-            .map { it.toRecipient() }
+            .map { recipients ->
+                recipients.map { it.toRecipient() }
+            }
     }
 
-    suspend fun getMessageRecipients(student: Student, message: Message): List<Recipient> {
+    fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
         return sdk.init(student).getMessageRecipients(message.messageId, message.senderId)
-            .map { it.toRecipient() }
+            .map { recipients ->
+                recipients.map { it.toRecipient() }
+            }
     }
 
     private fun SdkRecipient.toRecipient(): Recipient {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
index f5e876b03..6f8a72af2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
@@ -1,36 +1,47 @@
 package io.github.wulkanowy.data.repositories.recipient
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class RecipientRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: RecipientLocal,
     private val remote: RecipientRemote
 ) {
 
-    suspend fun refreshRecipients(student: Student, role: Int, unit: ReportingUnit) {
-        val new = remote.getRecipients(student, role, unit)
-        val old = local.getRecipients(student, role, unit)
-
-        local.deleteRecipients(old uniqueSubtract new)
-        local.saveRecipients(new uniqueSubtract old)
+    fun getRecipients(student: Student, role: Int, unit: ReportingUnit, forceRefresh: Boolean = false): Single<List<Recipient>> {
+        return local.getRecipients(student, role, unit).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getRecipients(student, role, unit)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getRecipients(student, role, unit).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteRecipients(old.uniqueSubtract(new))
+                            local.saveRecipients(new.uniqueSubtract(old))
+                        }
+                }.flatMap {
+                    local.getRecipients(student, role, unit).toSingle(emptyList())
+                }
+            )
     }
 
-    suspend fun getRecipients(student: Student, role: Int, unit: ReportingUnit): List<Recipient> {
-        return local.getRecipients(student, role, unit).ifEmpty {
-            refreshRecipients(student, role, unit)
-
-            local.getRecipients(student, role, unit)
-        }
-    }
-
-    suspend fun getMessageRecipients(student: Student, message: Message): List<Recipient> {
-        return remote.getMessageRecipients(student, message)
+    fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.getMessageRecipients(student, message)
+                else Single.error(UnknownHostException())
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt
index 11eac71e0..f27891250 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt
@@ -1,17 +1,18 @@
 package io.github.wulkanowy.data.repositories.recover
 
 import io.github.wulkanowy.sdk.Sdk
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class RecoverRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getReCaptchaSiteKey(host: String, symbol: String): Pair<String, String> {
+    fun getReCaptchaSiteKey(host: String, symbol: String): Single<Pair<String, String>> {
         return sdk.getPasswordResetCaptchaCode(host, symbol)
     }
 
-    suspend fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): String {
+    fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): Single<String> {
         return sdk.sendPasswordResetRequest(url, symbol, email, reCaptchaResponse)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt
index 3117a606a..86d4ba1b3 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt
@@ -1,16 +1,26 @@
 package io.github.wulkanowy.data.repositories.recover
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class RecoverRepository @Inject constructor(private val remote: RecoverRemote) {
+class RecoverRepository @Inject constructor(private val settings: InternetObservingSettings, private val remote: RecoverRemote) {
 
-    suspend fun getReCaptchaSiteKey(host: String, symbol: String): Pair<String, String> {
-        return remote.getReCaptchaSiteKey(host, symbol)
+    fun getReCaptchaSiteKey(host: String, symbol: String): Single<Pair<String, String>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getReCaptchaSiteKey(host, symbol)
+            else Single.error(UnknownHostException())
+        }
     }
 
-    suspend fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): String {
-        return remote.sendRecoverRequest(url, symbol, email, reCaptchaResponse)
+    fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): Single<String> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.sendRecoverRequest(url, symbol, email, reCaptchaResponse)
+            else Single.error(UnknownHostException())
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
index 737f1a04f..6f9eec3fc 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
@@ -3,25 +3,26 @@ package io.github.wulkanowy.data.repositories.reportingunit
 import io.github.wulkanowy.data.db.dao.ReportingUnitDao
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ReportingUnitLocal @Inject constructor(private val reportingUnitDb: ReportingUnitDao) {
 
-    suspend fun getReportingUnits(student: Student): List<ReportingUnit> {
-        return reportingUnitDb.load(student.studentId)
+    fun getReportingUnits(student: Student): Maybe<List<ReportingUnit>> {
+        return reportingUnitDb.load(student.studentId).filter { !it.isEmpty() }
     }
 
-    suspend fun getReportingUnit(student: Student, unitId: Int): ReportingUnit? {
+    fun getReportingUnit(student: Student, unitId: Int): Maybe<ReportingUnit> {
         return reportingUnitDb.loadOne(student.studentId, unitId)
     }
 
-    suspend fun saveReportingUnits(reportingUnits: List<ReportingUnit>): List<Long> {
+    fun saveReportingUnits(reportingUnits: List<ReportingUnit>): List<Long> {
         return reportingUnitDb.insertAll(reportingUnits)
     }
 
-    suspend fun deleteReportingUnits(reportingUnits: List<ReportingUnit>) {
+    fun deleteReportingUnits(reportingUnits: List<ReportingUnit>) {
         reportingUnitDb.deleteAll(reportingUnits)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
index 6b11c2cc9..1fd8b08e3 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
@@ -4,22 +4,25 @@ import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ReportingUnitRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getReportingUnits(student: Student): List<ReportingUnit> {
-        return sdk.init(student).getReportingUnits().map { unit ->
-            ReportingUnit(
-                studentId = sdk.studentId,
-                realId = unit.id,
-                roles = unit.roles,
-                senderId = unit.senderId,
-                senderName = unit.senderName,
-                shortName = unit.short
-            )
+    fun getReportingUnits(student: Student): Single<List<ReportingUnit>> {
+        return sdk.init(student).getReportingUnits().map {
+            it.map { unit ->
+                ReportingUnit(
+                    studentId = sdk.studentId,
+                    realId = unit.id,
+                    roles = unit.roles,
+                    senderId = unit.senderId,
+                    senderName = unit.senderName,
+                    shortName = unit.short
+                )
+            }
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
index ff5839460..ee5440984 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
@@ -1,38 +1,48 @@
 package io.github.wulkanowy.data.repositories.reportingunit
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Maybe
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ReportingUnitRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: ReportingUnitLocal,
     private val remote: ReportingUnitRemote
 ) {
 
-    suspend fun refreshReportingUnits(student: Student) {
-        val new = remote.getReportingUnits(student)
-        val old = local.getReportingUnits(student)
-
-        local.deleteReportingUnits(old.uniqueSubtract(new))
-        local.saveReportingUnits(new.uniqueSubtract(old))
+    fun getReportingUnits(student: Student, forceRefresh: Boolean = false): Single<List<ReportingUnit>> {
+        return local.getReportingUnits(student).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getReportingUnits(student)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getReportingUnits(student).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteReportingUnits(old.uniqueSubtract(new))
+                            local.saveReportingUnits(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getReportingUnits(student).toSingle(emptyList()) }
+            )
     }
 
-    suspend fun getReportingUnits(student: Student): List<ReportingUnit> {
-        return local.getReportingUnits(student).ifEmpty {
-            refreshReportingUnits(student)
-
-            local.getReportingUnits(student)
-        }
-    }
-
-    suspend fun getReportingUnit(student: Student, unitId: Int): ReportingUnit? {
-        return local.getReportingUnit(student, unitId) ?: run {
-            refreshReportingUnits(student)
-
-            return local.getReportingUnit(student, unitId)
-        }
+    fun getReportingUnit(student: Student, unitId: Int): Maybe<ReportingUnit> {
+        return local.getReportingUnit(student, unitId)
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) getReportingUnits(student, true)
+                    else Single.error(UnknownHostException())
+                }.flatMapMaybe {
+                    local.getReportingUnit(student, unitId)
+                }
+            )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt
index bc1b2f446..d87272875 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt
@@ -3,20 +3,20 @@ package io.github.wulkanowy.data.repositories.school
 import io.github.wulkanowy.data.db.dao.SchoolDao
 import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 
 class SchoolLocal @Inject constructor(private val schoolDb: SchoolDao) {
 
-    suspend fun saveSchool(school: School) {
+    fun saveSchool(school: School) {
         schoolDb.insertAll(listOf(school))
     }
 
-    suspend fun deleteSchool(school: School) {
+    fun deleteSchool(school: School) {
         schoolDb.deleteAll(listOf(school))
     }
 
-    fun getSchool(semester: Semester): Flow<School?> {
+    fun getSchool(semester: Semester): Maybe<School> {
         return schoolDb.load(semester.studentId, semester.classId)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
index 4d2e0cd6c..6a95a446b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
@@ -5,14 +5,15 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 
 class SchoolRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getSchoolInfo(student: Student, semester: Semester): School {
+    fun getSchoolInfo(student: Student, semester: Semester): Single<School> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getSchool()
-            .let {
+            .map {
                 School(
                     studentId = semester.studentId,
                     classId = semester.classId,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
index 4c84c3194..1715a28d5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
@@ -1,27 +1,42 @@
 package io.github.wulkanowy.data.repositories.school
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
+import io.reactivex.Maybe
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SchoolRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: SchoolLocal,
     private val remote: SchoolRemote
 ) {
 
-    fun getSchoolInfo(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it == null || forceRefresh },
-        query = { local.getSchool(semester) },
-        fetch = { remote.getSchoolInfo(student, semester) },
-        saveFetchResult = { old, new ->
-            if (new != old && old != null) {
-                local.deleteSchool(old)
-                local.saveSchool(new)
-            }
-            local.saveSchool(new)
-        }
-    )
+    fun getSchoolInfo(student: Student, semester: Semester, forceRefresh: Boolean = false): Maybe<School> {
+        return local.getSchool(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getSchoolInfo(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMapMaybe { new ->
+                    local.getSchool(semester)
+                        .doOnSuccess { old ->
+                            if (new != old) {
+                                local.deleteSchool(old)
+                                local.saveSchool(new)
+                            }
+                        }
+                        .doOnComplete {
+                            local.saveSchool(new)
+                        }
+                }.flatMap({ local.getSchool(semester) }, { Maybe.error(it) },
+                    { local.getSchool(semester) })
+            )
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
index 8ecf1595a..3d98785cd 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
@@ -3,21 +3,22 @@ package io.github.wulkanowy.data.repositories.semester
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SemesterLocal @Inject constructor(private val semesterDb: SemesterDao) {
 
-    suspend fun saveSemesters(semesters: List<Semester>) {
-        semesterDb.insertSemesters(semesters)
+    fun saveSemesters(semesters: List<Semester>) {
+        semesterDb.insertAll(semesters)
     }
 
-    suspend fun deleteSemesters(semesters: List<Semester>) {
+    fun deleteSemesters(semesters: List<Semester>) {
         semesterDb.deleteAll(semesters)
     }
 
-    suspend fun getSemesters(student: Student): List<Semester> {
-        return semesterDb.loadAll(student.studentId, student.classId)
+    fun getSemesters(student: Student): Maybe<List<Semester>> {
+        return semesterDb.loadAll(student.studentId, student.classId).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
index e1a920b6f..90f0e1d71 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
@@ -4,26 +4,29 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SemesterRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getSemesters(student: Student): List<Semester> {
-        return sdk.init(student).getSemesters().map {
-            Semester(
-                studentId = student.studentId,
-                diaryId = it.diaryId,
-                diaryName = it.diaryName,
-                schoolYear = it.schoolYear,
-                semesterId = it.semesterId,
-                semesterName = it.semesterNumber,
-                start = it.start,
-                end = it.end,
-                classId = it.classId,
-                unitId = it.unitId
-            )
+    fun getSemesters(student: Student): Single<List<Semester>> {
+        return sdk.init(student).getSemesters().map { semesters ->
+            semesters.map {
+                Semester(
+                    studentId = student.studentId,
+                    diaryId = it.diaryId,
+                    diaryName = it.diaryName,
+                    schoolYear = it.schoolYear,
+                    semesterId = it.semesterId,
+                    semesterName = it.semesterNumber,
+                    start = it.start,
+                    end = it.end,
+                    classId = it.classId,
+                    unitId = it.unitId
+                )
+            }
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
index 2748f1df5..68946beef 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
@@ -1,14 +1,15 @@
 package io.github.wulkanowy.data.repositories.semester
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.DispatchersProvider
 import io.github.wulkanowy.utils.getCurrentOrLast
 import io.github.wulkanowy.utils.isCurrent
 import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.withContext
-import timber.log.Timber
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -16,40 +17,31 @@ import javax.inject.Singleton
 class SemesterRepository @Inject constructor(
     private val remote: SemesterRemote,
     private val local: SemesterLocal,
-    private val dispatchers: DispatchersProvider
+    private val settings: InternetObservingSettings
 ) {
 
-    suspend fun getSemesters(student: Student, forceRefresh: Boolean = false, refreshOnNoCurrent: Boolean = false) = withContext(dispatchers.backgroundThread) {
-        val semesters = local.getSemesters(student)
+    fun getSemesters(student: Student, forceRefresh: Boolean = false, refreshOnNoCurrent: Boolean = false): Single<List<Semester>> {
+        return local.getSemesters(student).filter { !forceRefresh }.filter { semesters ->
+            when {
+                Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API -> semesters.firstOrNull { it.isCurrent }?.diaryId != 0
+                refreshOnNoCurrent -> semesters.any { semester -> semester.isCurrent }
+                else -> true
+            }
+        }.switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.getSemesters(student)
+                else Single.error(UnknownHostException())
+            }.flatMap { new ->
+                if (new.isEmpty()) throw IllegalArgumentException("Empty semester list!")
 
-        if (isShouldFetch(student, semesters, forceRefresh, refreshOnNoCurrent)) {
-            refreshSemesters(student)
-            local.getSemesters(student)
-        } else semesters
+                local.getSemesters(student).toSingle(emptyList()).doOnSuccess { old ->
+                    local.deleteSemesters(old.uniqueSubtract(new))
+                    local.saveSemesters(new.uniqueSubtract(old))
+                }
+            }.flatMap { local.getSemesters(student).toSingle(emptyList()) })
     }
 
-    private fun isShouldFetch(student: Student, semesters: List<Semester>, forceRefresh: Boolean, refreshOnNoCurrent: Boolean): Boolean {
-        val isNoSemesters = semesters.isEmpty()
-
-        val isRefreshOnModeChangeRequired = if (Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
-            semesters.firstOrNull { it.isCurrent }?.diaryId == 0
-        } else false
-
-        val isRefreshOnNoCurrentAppropriate = refreshOnNoCurrent && !semesters.any { semester -> semester.isCurrent }
-
-        return forceRefresh || isNoSemesters || isRefreshOnModeChangeRequired || isRefreshOnNoCurrentAppropriate
-    }
-
-    private suspend fun refreshSemesters(student: Student) {
-        val new = remote.getSemesters(student)
-        if (new.isEmpty()) return Timber.i("Empty semester list!")
-
-        val old = local.getSemesters(student)
-        local.deleteSemesters(old.uniqueSubtract(new))
-        local.saveSemesters(new.uniqueSubtract(old))
-    }
-
-    suspend fun getCurrentSemester(student: Student, forceRefresh: Boolean = false) = withContext(dispatchers.backgroundThread) {
-        getSemesters(student, forceRefresh).getCurrentOrLast()
+    fun getCurrentSemester(student: Student, forceRefresh: Boolean = false): Single<Semester> {
+        return getSemesters(student, forceRefresh).map { it.getCurrentOrLast() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
index c01d1d049..06b9bb4ac 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
@@ -1,59 +1,64 @@
 package io.github.wulkanowy.data.repositories.student
 
 import android.content.Context
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.DispatchersProvider
 import io.github.wulkanowy.utils.security.decrypt
 import io.github.wulkanowy.utils.security.encrypt
-import kotlinx.coroutines.withContext
+import io.reactivex.Completable
+import io.reactivex.Maybe
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class StudentLocal @Inject constructor(
     private val studentDb: StudentDao,
-    private val dispatchers: DispatchersProvider,
-    @ApplicationContext private val context: Context
+    private val context: Context
 ) {
 
-    suspend fun saveStudents(students: List<Student>) = withContext(dispatchers.backgroundThread) {
-        studentDb.insertAll(students.map {
-            if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.API) it.copy(password = encrypt(it.password, context))
-            else it
-        })
+    fun saveStudents(students: List<Student>): Single<List<Long>> {
+        return Single.fromCallable {
+            studentDb.insertAll(students.map {
+                if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.API) it.copy(password = encrypt(it.password, context))
+                else it
+            })
+        }
     }
 
-    suspend fun getStudents(decryptPass: Boolean) = withContext(dispatchers.backgroundThread) {
-        studentDb.loadStudentsWithSemesters().map {
+    fun getStudents(decryptPass: Boolean): Maybe<List<Student>> {
+        return studentDb.loadAll()
+            .map { list -> list.map { it.apply { if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password) } } }
+            .filter { it.isNotEmpty() }
+    }
+
+    fun getStudentById(id: Int): Maybe<Student> {
+        return studentDb.loadById(id).map {
             it.apply {
-                if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) student.password = decrypt(student.password)
+                if (Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
             }
         }
     }
 
-    suspend fun getStudentById(id: Int) = withContext(dispatchers.backgroundThread) {
-        studentDb.loadById(id)?.apply {
-            if (Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
+    fun getCurrentStudent(decryptPass: Boolean): Maybe<Student> {
+        return studentDb.loadCurrent().map {
+            it.apply {
+                if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
+            }
         }
     }
 
-    suspend fun getCurrentStudent(decryptPass: Boolean) = withContext(dispatchers.backgroundThread) {
-        studentDb.loadCurrent()?.apply {
-            if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
+    fun setCurrentStudent(student: Student): Completable {
+        return Completable.fromCallable {
+            studentDb.run {
+                resetCurrent()
+                updateCurrent(student.id)
+            }
         }
     }
 
-    suspend fun setCurrentStudent(student: Student) = withContext(dispatchers.backgroundThread) {
-        studentDb.run {
-            resetCurrent()
-            updateCurrent(student.id)
-        }
-    }
-
-    suspend fun logoutStudent(student: Student) = withContext(dispatchers.backgroundThread) {
-        studentDb.delete(student)
+    fun logoutStudent(student: Student): Completable {
+        return Completable.fromCallable { studentDb.delete(student) }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
index dcb126233..15c336505 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
@@ -1,23 +1,52 @@
 package io.github.wulkanowy.data.repositories.student
 
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
+import io.reactivex.Single
+import org.threeten.bp.LocalDateTime.now
 import javax.inject.Inject
 import javax.inject.Singleton
+import io.github.wulkanowy.sdk.pojo.Student as SdkStudent
 
 @Singleton
 class StudentRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getStudentsMobileApi(token: String, pin: String, symbol: String): List<StudentWithSemesters> {
-        return sdk.getStudentsFromMobileApi(token, pin, symbol, "").mapToEntities()
+    private fun mapStudents(students: List<SdkStudent>, email: String, password: String): List<Student> {
+        return students.map { student ->
+            Student(
+                email = email,
+                password = password,
+                isParent = student.isParent,
+                symbol = student.symbol,
+                studentId = student.studentId,
+                userLoginId = student.userLoginId,
+                studentName = student.studentName,
+                schoolSymbol = student.schoolSymbol,
+                schoolShortName = student.schoolShortName,
+                schoolName = student.schoolName,
+                className = student.className,
+                classId = student.classId,
+                scrapperBaseUrl = student.scrapperBaseUrl,
+                loginType = student.loginType.name,
+                isCurrent = false,
+                registrationDate = now(),
+                mobileBaseUrl = student.mobileBaseUrl,
+                privateKey = student.privateKey,
+                certificateKey = student.certificateKey,
+                loginMode = student.loginMode.name
+            )
+        }
     }
 
-    suspend fun getStudentsScrapper(email: String, password: String, scrapperBaseUrl: String, symbol: String): List<StudentWithSemesters> {
-        return sdk.getStudentsFromScrapper(email, password, scrapperBaseUrl, symbol).mapToEntities(password)
+    fun getStudentsMobileApi(token: String, pin: String, symbol: String): Single<List<Student>> {
+        return sdk.getStudentsFromMobileApi(token, pin, symbol, "").map { mapStudents(it, "", "") }
     }
 
-    suspend fun getStudentsHybrid(email: String, password: String, scrapperBaseUrl: String, symbol: String): List<StudentWithSemesters> {
-        return sdk.getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol).mapToEntities(password)
+    fun getStudentsScrapper(email: String, password: String, scrapperBaseUrl: String, symbol: String): Single<List<Student>> {
+        return sdk.getStudentsFromScrapper(email, password, scrapperBaseUrl, symbol).map { mapStudents(it, email, password) }
+    }
+
+    fun getStudentsHybrid(email: String, password: String, scrapperBaseUrl: String, symbol: String): Single<List<Student>> {
+        return sdk.getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol).map { mapStudents(it, email, password) }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
index 19e0e2086..bebd1eb9c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
@@ -1,57 +1,73 @@
 package io.github.wulkanowy.data.repositories.student
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.data.repositories.semester.SemesterLocal
+import io.reactivex.Completable
+import io.reactivex.Maybe
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class StudentRepository @Inject constructor(
     private val local: StudentLocal,
-    private val semestersLocal: SemesterLocal,
-    private val remote: StudentRemote
+    private val remote: StudentRemote,
+    private val settings: InternetObservingSettings
 ) {
 
-    suspend fun isStudentSaved(): Boolean = local.getStudents(false).isNotEmpty()
+    fun isStudentSaved(): Single<Boolean> = local.getStudents(false).isEmpty.map { !it }
 
-    suspend fun isCurrentStudentSet(): Boolean = local.getCurrentStudent(false)?.isCurrent ?: false
+    fun isCurrentStudentSet(): Single<Boolean> = local.getCurrentStudent(false).isEmpty.map { !it }
 
-    suspend fun getStudentsApi(pin: String, symbol: String, token: String): List<StudentWithSemesters> {
-        return remote.getStudentsMobileApi(token, pin, symbol)
+    fun getStudentsApi(pin: String, symbol: String, token: String): Single<List<Student>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getStudentsMobileApi(token, pin, symbol)
+            else Single.error(UnknownHostException("No internet connection"))
+        }
     }
 
-    suspend fun getStudentsScrapper(email: String, password: String, endpoint: String, symbol: String): List<StudentWithSemesters> {
-        return remote.getStudentsScrapper(email, password, endpoint, symbol)
+    fun getStudentsScrapper(email: String, password: String, endpoint: String, symbol: String): Single<List<Student>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getStudentsScrapper(email, password, endpoint, symbol)
+            else Single.error(UnknownHostException("No internet connection"))
+        }
     }
 
-    suspend fun getStudentsHybrid(email: String, password: String, endpoint: String, symbol: String): List<StudentWithSemesters> {
-        return remote.getStudentsHybrid(email, password, endpoint, symbol)
+    fun getStudentsHybrid(email: String, password: String, endpoint: String, symbol: String): Single<List<Student>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getStudentsHybrid(email, password, endpoint, symbol)
+            else Single.error(UnknownHostException("No internet connection"))
+        }
     }
 
-    suspend fun getSavedStudents(decryptPass: Boolean = true): List<StudentWithSemesters> {
-        return local.getStudents(decryptPass)
+    fun getSavedStudents(decryptPass: Boolean = true): Single<List<Student>> {
+        return local.getStudents(decryptPass).toSingle(emptyList())
     }
 
-    suspend fun getStudentById(id: Int): Student {
-        return local.getStudentById(id) ?: throw NoCurrentStudentException()
+    fun getStudentById(id: Int): Single<Student> {
+        return local.getStudentById(id)
+            .switchIfEmpty(Maybe.error(NoCurrentStudentException()))
+            .toSingle()
     }
 
-    suspend fun getCurrentStudent(decryptPass: Boolean = true): Student {
-        return local.getCurrentStudent(decryptPass) ?: throw NoCurrentStudentException()
+    fun getCurrentStudent(decryptPass: Boolean = true): Single<Student> {
+        return local.getCurrentStudent(decryptPass)
+            .switchIfEmpty(Maybe.error(NoCurrentStudentException()))
+            .toSingle()
     }
 
-    suspend fun saveStudents(studentsWithSemesters: List<StudentWithSemesters>): List<Long> {
-        semestersLocal.saveSemesters(studentsWithSemesters.flatMap { it.semesters })
-        return local.saveStudents(studentsWithSemesters.map { it.student })
+    fun saveStudents(students: List<Student>): Single<List<Long>> {
+        return local.saveStudents(students)
     }
 
-    suspend fun switchStudent(studentWithSemesters: StudentWithSemesters) {
-        return local.setCurrentStudent(studentWithSemesters.student)
+    fun switchStudent(student: Student): Completable {
+        return local.setCurrentStudent(student)
     }
 
-    suspend fun logoutStudent(student: Student) {
+    fun logoutStudent(student: Student): Completable {
         return local.logoutStudent(student)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
index e225a381e..f8c13e6c2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
@@ -3,22 +3,23 @@ package io.github.wulkanowy.data.repositories.subject
 import io.github.wulkanowy.data.db.dao.SubjectDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Subject
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SubjectLocal @Inject constructor(private val subjectDao: SubjectDao) {
 
-    fun getSubjects(semester: Semester): Flow<List<Subject>> {
+    fun getSubjects(semester: Semester): Maybe<List<Subject>> {
         return subjectDao.loadAll(semester.diaryId, semester.studentId)
+            .filter { it.isNotEmpty() }
     }
 
-    suspend fun saveSubjects(subjects: List<Subject>) {
+    fun saveSubjects(subjects: List<Subject>) {
         subjectDao.insertAll(subjects)
     }
 
-    suspend fun deleteSubjects(subjects: List<Subject>) {
+    fun deleteSubjects(subjects: List<Subject>) {
         subjectDao.deleteAll(subjects)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
index 624a5a00a..d30232f82 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
@@ -5,22 +5,25 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SubjectRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getSubjects(student: Student, semester: Semester): List<Subject> {
+    fun getSubjects(student: Student, semester: Semester): Single<List<Subject>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getSubjects()
-            .map {
-                Subject(
-                    studentId = semester.studentId,
-                    diaryId = semester.diaryId,
-                    name = it.name,
-                    realId = it.id
-                )
+            .map { subjects ->
+                subjects.map {
+                    Subject(
+                        studentId = semester.studentId,
+                        diaryId = semester.diaryId,
+                        name = it.name,
+                        realId = it.id
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
index 60a0c3e71..649904da1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
@@ -1,25 +1,38 @@
 package io.github.wulkanowy.data.repositories.subject
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SubjectRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: SubjectLocal,
     private val remote: SubjectRemote
 ) {
 
-    fun getSubjects(student: Student, semester: Semester, forceRefresh: Boolean = false) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getSubjects(semester) },
-        fetch = { remote.getSubjects(student, semester) },
-        saveFetchResult = { old, new ->
-            local.deleteSubjects(old uniqueSubtract new)
-            local.saveSubjects(new uniqueSubtract old)
-        }
-    )
+    fun getSubjects(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<Subject>> {
+        return local.getSubjects(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getSubjects(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getSubjects(semester)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteSubjects(old.uniqueSubtract(new))
+                            local.saveSubjects(new.uniqueSubtract(old))
+                        }
+                }.flatMap {
+                    local.getSubjects(semester).toSingle(emptyList())
+                })
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt
index 908f45a1a..dd2be5e58 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt
@@ -3,20 +3,20 @@ package io.github.wulkanowy.data.repositories.teacher
 import io.github.wulkanowy.data.db.dao.TeacherDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Teacher
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 
 class TeacherLocal @Inject constructor(private val teacherDb: TeacherDao) {
 
-    suspend fun saveTeachers(teachers: List<Teacher>) {
+    fun saveTeachers(teachers: List<Teacher>) {
         teacherDb.insertAll(teachers)
     }
 
-    suspend fun deleteTeachers(teachers: List<Teacher>) {
+    fun deleteTeachers(teachers: List<Teacher>) {
         teacherDb.deleteAll(teachers)
     }
 
-    fun getTeachers(semester: Semester): Flow<List<Teacher>> {
-        return teacherDb.loadAll(semester.studentId, semester.classId)
+    fun getTeachers(semester: Semester): Maybe<List<Teacher>> {
+        return teacherDb.loadAll(semester.studentId, semester.classId).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
index 1d1caa686..01552f748 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
@@ -5,23 +5,26 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class TeacherRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getTeachers(student: Student, semester: Semester): List<Teacher> {
+    fun getTeachers(student: Student, semester: Semester): Single<List<Teacher>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getTeachers(semester.semesterId)
-            .map {
-                Teacher(
-                    studentId = semester.studentId,
-                    name = it.name,
-                    subject = it.subject,
-                    shortName = it.short,
-                    classId = semester.classId
-                )
+            .map { teachers ->
+                teachers.map {
+                    Teacher(
+                        studentId = semester.studentId,
+                        name = it.name,
+                        subject = it.subject,
+                        shortName = it.short,
+                        classId = semester.classId
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
index df25a53ec..3c10be73f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
@@ -1,25 +1,35 @@
 package io.github.wulkanowy.data.repositories.teacher
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class TeacherRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: TeacherLocal,
     private val remote: TeacherRemote
 ) {
 
-    fun getTeachers(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getTeachers(semester) },
-        fetch = { remote.getTeachers(student, semester) },
-        saveFetchResult = { old, new ->
-            local.deleteTeachers(old uniqueSubtract new)
-            local.saveTeachers(new uniqueSubtract old)
-        }
-    )
+    fun getTeachers(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<Teacher>> {
+        return local.getTeachers(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getTeachers(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getTeachers(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteTeachers(old.uniqueSubtract(new))
+                            local.saveTeachers(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getTeachers(semester).toSingle(emptyList()) })
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
index df4bfb20a..e074ce2a1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
@@ -3,23 +3,23 @@ package io.github.wulkanowy.data.repositories.timetable
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Timetable
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class TimetableLocal @Inject constructor(private val timetableDb: TimetableDao) {
 
-    suspend fun saveTimetable(timetables: List<Timetable>) {
+    fun saveTimetable(timetables: List<Timetable>) {
         timetableDb.insertAll(timetables)
     }
 
-    suspend fun deleteTimetable(timetables: List<Timetable>) {
+    fun deleteTimetable(timetables: List<Timetable>) {
         timetableDb.deleteAll(timetables)
     }
 
-    fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow<List<Timetable>> {
-        return timetableDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
+    fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Timetable>> {
+        return timetableDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
index eef8729e8..22cb947db 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
@@ -5,36 +5,39 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
-import java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class TimetableRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getTimetable(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List<Timetable> {
+    fun getTimetable(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Timetable>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getTimetable(startDate, endDate)
-            .map {
-                Timetable(
-                    studentId = semester.studentId,
-                    diaryId = semester.diaryId,
-                    number = it.number,
-                    start = it.start,
-                    end = it.end,
-                    date = it.date,
-                    subject = it.subject,
-                    subjectOld = it.subjectOld,
-                    group = it.group,
-                    room = it.room,
-                    roomOld = it.roomOld,
-                    teacher = it.teacher,
-                    teacherOld = it.teacherOld,
-                    info = it.info,
-                    isStudentPlan = it.studentPlan,
-                    changes = it.changes,
-                    canceled = it.canceled
-                )
+            .map { lessons ->
+                lessons.map {
+                    Timetable(
+                        studentId = semester.studentId,
+                        diaryId = semester.diaryId,
+                        number = it.number,
+                        start = it.start,
+                        end = it.end,
+                        date = it.date,
+                        subject = it.subject,
+                        subjectOld = it.subjectOld,
+                        group = it.group,
+                        room = it.room,
+                        roomOld = it.roomOld,
+                        teacher = it.teacher,
+                        teacherOld = it.teacherOld,
+                        info = it.info,
+                        isStudentPlan = it.studentPlan,
+                        changes = it.changes,
+                        canceled = it.canceled
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
index ee2734aaf..4a7a0eb24 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
@@ -1,41 +1,53 @@
 package io.github.wulkanowy.data.repositories.timetable
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.flow.map
-import java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class TimetableRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: TimetableLocal,
     private val remote: TimetableRemote,
     private val schedulerHelper: TimetableNotificationSchedulerHelper
 ) {
 
-    fun getTimetable(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getTimetable(semester, start.monday, end.sunday).map { schedulerHelper.scheduleNotifications(it, student); it } },
-        fetch = { remote.getTimetable(student, semester, start.monday, end.sunday) },
-        saveFetchResult = { old, new ->
-            local.deleteTimetable(old.uniqueSubtract(new).also { schedulerHelper.cancelScheduled(it) })
-            local.saveTimetable(new.uniqueSubtract(old).also { schedulerHelper.scheduleNotifications(it, student) }.map { item ->
-                item.also { new ->
-                    old.singleOrNull { new.start == it.start }?.let { old ->
-                        return@map new.copy(
-                            room = if (new.room.isEmpty()) old.room else new.room,
-                            teacher = if (new.teacher.isEmpty() && !new.changes && !old.changes) old.teacher else new.teacher
-                        )
-                    }
-                }
-            })
-        },
-        filterResult = { it.filter { item -> item.date in start..end } }
-    )
+    fun getTimetable(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Timetable>> {
+        return Single.fromCallable { start.monday to end.sunday }.flatMap { (monday, sunday) ->
+            local.getTimetable(semester, monday, sunday).filter { !forceRefresh }
+                .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+                    if (it) remote.getTimetable(student, semester, monday, sunday)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getTimetable(semester, monday, sunday)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteTimetable(old.uniqueSubtract(new).also { schedulerHelper.cancelScheduled(it) })
+                            local.saveTimetable(new.uniqueSubtract(old).also { schedulerHelper.scheduleNotifications(it, student) }.map { item ->
+                                item.also { new ->
+                                    old.singleOrNull { new.start == it.start }?.let { old ->
+                                        return@map new.copy(
+                                            room = if (new.room.isEmpty()) old.room else new.room,
+                                            teacher = if (new.teacher.isEmpty() && !new.changes && !old.changes) old.teacher else new.teacher
+                                        )
+                                    }
+                                }
+                            })
+                        }
+                }.flatMap {
+                    local.getTimetable(semester, monday, sunday).toSingle(emptyList())
+                }).map { list -> list.filter { it.date in start..end }.also { schedulerHelper.scheduleNotifications(it, student) } }
+        }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
new file mode 100644
index 000000000..c0329f7d7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
@@ -0,0 +1,22 @@
+package io.github.wulkanowy.di
+
+import dagger.Component
+import dagger.android.AndroidInjector
+import dagger.android.support.AndroidSupportInjectionModule
+import io.github.wulkanowy.WulkanowyApp
+import io.github.wulkanowy.data.RepositoryModule
+import io.github.wulkanowy.services.ServicesModule
+import javax.inject.Singleton
+
+@Singleton
+@Component(modules = [
+    AndroidSupportInjectionModule::class,
+    AppModule::class,
+    RepositoryModule::class,
+    ServicesModule::class,
+    BindingModule::class])
+interface AppComponent : AndroidInjector<WulkanowyApp> {
+
+    @Component.Factory
+    interface Factory : AndroidInjector.Factory<WulkanowyApp>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
index 9133c34ed..db5ff59b3 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
@@ -5,23 +5,29 @@ import android.content.Context
 import com.yariksoffice.lingver.Lingver
 import dagger.Module
 import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ApplicationComponent
-import dagger.hilt.android.qualifiers.ApplicationContext
-import io.github.wulkanowy.utils.DispatchersProvider
+import io.github.wulkanowy.WulkanowyApp
+import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Singleton
 
 @Module
-@InstallIn(ApplicationComponent::class)
 internal class AppModule {
 
     @Singleton
     @Provides
-    fun provideDispatchersProvider() = DispatchersProvider()
+    fun provideContext(app: WulkanowyApp): Context = app
 
     @Singleton
     @Provides
-    fun provideAppWidgetManager(@ApplicationContext context: Context): AppWidgetManager = AppWidgetManager.getInstance(context)
+    fun provideSchedulersProvider() = SchedulersProvider()
+
+    @Singleton
+    @Provides
+    fun provideAppWidgetManager(context: Context): AppWidgetManager = AppWidgetManager.getInstance(context)
+
+    @Singleton
+    @Provides
+    fun provideAppInfo() = AppInfo()
 
     @Singleton
     @Provides
diff --git a/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt b/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
new file mode 100644
index 000000000..1b462964d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
@@ -0,0 +1,55 @@
+package io.github.wulkanowy.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import io.github.wulkanowy.di.scopes.PerActivity
+import io.github.wulkanowy.ui.base.ErrorDialog
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.ui.modules.login.LoginModule
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainModule
+import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
+import io.github.wulkanowy.ui.modules.splash.SplashActivity
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureActivity
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider
+
+@Suppress("unused")
+@Module
+internal abstract class BindingModule {
+
+    @ContributesAndroidInjector
+    abstract fun bindErrorDialog(): ErrorDialog
+
+    @PerActivity
+    @ContributesAndroidInjector
+    abstract fun bindSplashActivity(): SplashActivity
+
+    @PerActivity
+    @ContributesAndroidInjector(modules = [LoginModule::class])
+    abstract fun bindLoginActivity(): LoginActivity
+
+    @PerActivity
+    @ContributesAndroidInjector(modules = [MainModule::class])
+    abstract fun bindMainActivity(): MainActivity
+
+    @ContributesAndroidInjector
+    abstract fun bindMessageSendActivity(): SendMessageActivity
+
+    @ContributesAndroidInjector
+    abstract fun bindTimetableWidgetAccountActivity(): TimetableWidgetConfigureActivity
+
+    @ContributesAndroidInjector
+    abstract fun bindTimetableWidgetProvider(): TimetableWidgetProvider
+
+    @ContributesAndroidInjector
+    abstract fun bindLuckyNumberWidgetAccountActivity(): LuckyNumberWidgetConfigureActivity
+
+    @ContributesAndroidInjector
+    abstract fun bindLuckyNumberWidgetProvider(): LuckyNumberWidgetProvider
+
+    @ContributesAndroidInjector
+    abstract fun bindTimetableNotificationReceiver(): TimetableNotificationReceiver
+}
diff --git a/app/src/main/java/io/github/wulkanowy/di/scopes/PerActivity.kt b/app/src/main/java/io/github/wulkanowy/di/scopes/PerActivity.kt
new file mode 100644
index 000000000..c1b4352a4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/scopes/PerActivity.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.di.scopes
+
+import javax.inject.Scope
+
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+annotation class PerActivity
diff --git a/app/src/main/java/io/github/wulkanowy/di/scopes/PerChildFragment.kt b/app/src/main/java/io/github/wulkanowy/di/scopes/PerChildFragment.kt
new file mode 100644
index 000000000..08884dac5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/scopes/PerChildFragment.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.di.scopes
+
+import javax.inject.Scope
+
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+annotation class PerChildFragment
diff --git a/app/src/main/java/io/github/wulkanowy/di/scopes/PerFragment.kt b/app/src/main/java/io/github/wulkanowy/di/scopes/PerFragment.kt
new file mode 100644
index 000000000..1203d7d88
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/scopes/PerFragment.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.di.scopes
+
+import javax.inject.Scope
+
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+annotation class PerFragment
diff --git a/app/src/main/java/io/github/wulkanowy/services/HiltBroadcastReceiver.kt b/app/src/main/java/io/github/wulkanowy/services/HiltBroadcastReceiver.kt
deleted file mode 100644
index 1e795d439..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/HiltBroadcastReceiver.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.github.wulkanowy.services
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-
-abstract class HiltBroadcastReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {}
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
index ac5a84e8f..b87f0e683 100644
--- a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
@@ -5,12 +5,11 @@ import android.content.Context
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.getSystemService
 import androidx.work.WorkManager
+import com.squareup.inject.assisted.dagger2.AssistedModule
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ApplicationComponent
-import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.android.ContributesAndroidInjector
 import dagger.multibindings.IntoSet
 import io.github.wulkanowy.services.sync.channels.Channel
 import io.github.wulkanowy.services.sync.channels.DebugChannel
@@ -18,8 +17,8 @@ import io.github.wulkanowy.services.sync.channels.LuckyNumberChannel
 import io.github.wulkanowy.services.sync.channels.NewGradesChannel
 import io.github.wulkanowy.services.sync.channels.NewMessagesChannel
 import io.github.wulkanowy.services.sync.channels.NewNotesChannel
-import io.github.wulkanowy.services.sync.channels.PushChannel
 import io.github.wulkanowy.services.sync.channels.UpcomingLessonsChannel
+import io.github.wulkanowy.services.sync.channels.PushChannel
 import io.github.wulkanowy.services.sync.works.AttendanceSummaryWork
 import io.github.wulkanowy.services.sync.works.AttendanceWork
 import io.github.wulkanowy.services.sync.works.CompletedLessonWork
@@ -34,27 +33,31 @@ import io.github.wulkanowy.services.sync.works.RecipientWork
 import io.github.wulkanowy.services.sync.works.TeacherWork
 import io.github.wulkanowy.services.sync.works.TimetableWork
 import io.github.wulkanowy.services.sync.works.Work
+import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import javax.inject.Singleton
 
 @Suppress("unused")
-@Module
-@InstallIn(ApplicationComponent::class)
+@AssistedModule
+@Module(includes = [AssistedInject_ServicesModule::class])
 abstract class ServicesModule {
 
     companion object {
 
         @Provides
-        fun provideWorkManager(@ApplicationContext context: Context) = WorkManager.getInstance(context)
+        fun provideWorkManager(context: Context) = WorkManager.getInstance(context)
 
         @Singleton
         @Provides
-        fun provideNotificationManager(@ApplicationContext context: Context) = NotificationManagerCompat.from(context)
+        fun provideNotificationManager(context: Context) = NotificationManagerCompat.from(context)
 
         @Singleton
         @Provides
-        fun provideAlarmManager(@ApplicationContext context: Context): AlarmManager = context.getSystemService()!!
+        fun provideAlarmManager(context: Context): AlarmManager = context.getSystemService()!!
     }
 
+    @ContributesAndroidInjector
+    abstract fun bindTimetableWidgetService(): TimetableWidgetService
+
     @Binds
     @IntoSet
     abstract fun provideGradeWork(work: GradeWork): Work
diff --git a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
index 592d0919e..0130f4673 100644
--- a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
@@ -3,35 +3,33 @@ package io.github.wulkanowy.services.alarm
 import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Build.VERSION_CODES.N
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.android.AndroidInjection
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.services.HiltBroadcastReceiver
 import io.github.wulkanowy.services.sync.channels.UpcomingLessonsChannel.Companion.CHANNEL_ID
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.getCompatColor
 import io.github.wulkanowy.utils.toLocalDateTime
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class TimetableNotificationReceiver : HiltBroadcastReceiver() {
+class TimetableNotificationReceiver : BroadcastReceiver() {
 
     @Inject
     lateinit var studentRepository: StudentRepository
 
+    @Inject
+    lateinit var schedulers: SchedulersProvider
+
     companion object {
         const val NOTIFICATION_TYPE_CURRENT = 1
         const val NOTIFICATION_TYPE_UPCOMING = 2
@@ -52,17 +50,17 @@ class TimetableNotificationReceiver : HiltBroadcastReceiver() {
 
     @SuppressLint("CheckResult")
     override fun onReceive(context: Context, intent: Intent) {
-        super.onReceive(context, intent)
         Timber.d("Receiving intent... ${intent.toUri(0)}")
+        AndroidInjection.inject(this, context)
 
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent(false)
-            val studentId = intent.getIntExtra(STUDENT_ID, 0)
-            if (student.studentId == studentId) prepareNotification(context, intent)
-            else Timber.d("Notification studentId($studentId) differs from current(${student.studentId})")
-        }.onEach {
-            if (it.status == Status.ERROR) Timber.e(it.error!!)
-        }.launchIn(GlobalScope)
+        studentRepository.getCurrentStudent(false)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                val studentId = intent.getIntExtra(STUDENT_ID, 0)
+                if (it.studentId == studentId) prepareNotification(context, intent)
+                else Timber.d("Notification studentId($studentId) differs from current(${it.studentId})")
+            }, { Timber.e(it) })
     }
 
     private fun prepareNotification(context: Context, intent: Intent) {
diff --git a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
index 5c4b916bc..5374c4767 100644
--- a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
@@ -3,12 +3,11 @@ package io.github.wulkanowy.services.alarm
 import android.app.AlarmManager
 import android.app.AlarmManager.RTC_WAKEUP
 import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.app.PendingIntent.FLAG_CANCEL_CURRENT
 import android.content.Context
 import android.content.Intent
 import androidx.core.app.AlarmManagerCompat
 import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -26,19 +25,16 @@ import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companio
 import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.STUDENT_ID
 import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.STUDENT_NAME
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.DispatchersProvider
 import io.github.wulkanowy.utils.toTimestamp
-import kotlinx.coroutines.withContext
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.now
 import timber.log.Timber
-import java.time.LocalDateTime
-import java.time.LocalDateTime.now
 import javax.inject.Inject
 
 class TimetableNotificationSchedulerHelper @Inject constructor(
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val alarmManager: AlarmManager,
-    private val preferencesRepository: PreferencesRepository,
-    private val dispatchersProvider: DispatchersProvider,
+    private val preferencesRepository: PreferencesRepository
 ) {
 
     private fun getRequestCode(time: LocalDateTime, studentId: Int) = (time.toTimestamp() * studentId).toInt()
@@ -47,49 +43,45 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
         return day.getOrNull(index - 1)?.end ?: lesson.start.minusMinutes(30)
     }
 
-    suspend fun cancelScheduled(lessons: List<Timetable>, studentId: Int = 1) {
-        withContext(dispatchersProvider.backgroundThread) {
-            lessons.sortedBy { it.start }.forEachIndexed { index, lesson ->
-                val upcomingTime = getUpcomingLessonTime(index, lessons, lesson)
-                cancelScheduledTo(upcomingTime..lesson.start, getRequestCode(upcomingTime, studentId))
-                cancelScheduledTo(lesson.start..lesson.end, getRequestCode(lesson.start, studentId))
+    fun cancelScheduled(lessons: List<Timetable>, studentId: Int = 1) {
+        lessons.sortedBy { it.start }.forEachIndexed { index, lesson ->
+            val upcomingTime = getUpcomingLessonTime(index, lessons, lesson)
+            cancelScheduledTo(upcomingTime..lesson.start, getRequestCode(upcomingTime, studentId))
+            cancelScheduledTo(lesson.start..lesson.end, getRequestCode(lesson.start, studentId))
 
-                Timber.d("TimetableNotification canceled: type 1 & 2, subject: ${lesson.subject}, start: ${lesson.start}, student: $studentId")
-            }
+            Timber.d("TimetableNotification canceled: type 1 & 2, subject: ${lesson.subject}, start: ${lesson.start}, student: $studentId")
         }
     }
 
     private fun cancelScheduledTo(range: ClosedRange<LocalDateTime>, requestCode: Int) {
         if (now() in range) cancelNotification()
-        alarmManager.cancel(PendingIntent.getBroadcast(context, requestCode, Intent(), FLAG_UPDATE_CURRENT))
+        alarmManager.cancel(PendingIntent.getBroadcast(context, requestCode, Intent(), FLAG_CANCEL_CURRENT))
     }
 
     fun cancelNotification() = NotificationManagerCompat.from(context).cancel(MainView.Section.TIMETABLE.id)
 
-    suspend fun scheduleNotifications(lessons: List<Timetable>, student: Student) {
+    fun scheduleNotifications(lessons: List<Timetable>, student: Student) {
         if (!preferencesRepository.isUpcomingLessonsNotificationsEnable) return cancelScheduled(lessons, student.studentId)
 
-        withContext(dispatchersProvider.backgroundThread) {
-            lessons.groupBy { it.date }
-                .map { it.value.sortedBy { lesson -> lesson.start } }
-                .map { it.filter { lesson -> !lesson.canceled && lesson.isStudentPlan } }
-                .map { day ->
-                    day.forEachIndexed { index, lesson ->
-                        val intent = createIntent(student, lesson, day.getOrNull(index + 1))
+        lessons.groupBy { it.date }
+            .map { it.value.sortedBy { lesson -> lesson.start } }
+            .map { it.filter { lesson -> !lesson.canceled && lesson.isStudentPlan } }
+            .map { day ->
+                day.forEachIndexed { index, lesson ->
+                    val intent = createIntent(student, lesson, day.getOrNull(index + 1))
 
-                        if (lesson.start > now()) {
-                            scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_UPCOMING, getUpcomingLessonTime(index, day, lesson))
-                        }
+                    if (lesson.start > now()) {
+                        scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_UPCOMING, getUpcomingLessonTime(index, day, lesson))
+                    }
 
-                        if (lesson.end > now()) {
-                            scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_CURRENT, lesson.start)
-                            if (day.lastIndex == index) {
-                                scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION, lesson.end)
-                            }
+                    if (lesson.end > now()) {
+                        scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_CURRENT, lesson.start)
+                        if (day.lastIndex == index) {
+                            scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION, lesson.end)
                         }
                     }
                 }
-        }
+            }
     }
 
     private fun createIntent(student: Student, lesson: Timetable, nextLesson: Timetable?): Intent {
@@ -110,7 +102,7 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
             PendingIntent.getBroadcast(context, getRequestCode(time, studentId), intent.also {
                 it.putExtra(NOTIFICATION_ID, MainView.Section.TIMETABLE.id)
                 it.putExtra(LESSON_TYPE, notificationType)
-            }, FLAG_UPDATE_CURRENT)
+            }, FLAG_CANCEL_CURRENT)
         )
         Timber.d("TimetableNotification scheduled: type: $notificationType, subject: ${intent.getStringExtra(LESSON_TITLE)}, start: $time, student: $studentId")
     }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
index 47a949273..965ed0ad9 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.services.sync
 import android.os.Build.VERSION.SDK_INT
 import android.os.Build.VERSION_CODES.O
 import androidx.core.app.NotificationManagerCompat
-import androidx.lifecycle.asFlow
 import androidx.work.BackoffPolicy.EXPONENTIAL
 import androidx.work.Constraints
 import androidx.work.Data
@@ -16,15 +15,16 @@ import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
+import com.paulinasadowska.rxworkmanagerobservers.extensions.getWorkInfoByIdObservable
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.SharedPrefProvider.Companion.APP_VERSION_CODE_KEY
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.Channel
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.isHolidays
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Observable
+import org.threeten.bp.LocalDate.now
 import timber.log.Timber
-import java.time.LocalDate.now
 import java.util.concurrent.TimeUnit.MINUTES
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -44,7 +44,6 @@ class SyncManager @Inject constructor(
 
         if (SDK_INT >= O) {
             channels.forEach { it.create() }
-            notificationManager.deleteNotificationChannel("lesson_channel")
             notificationManager.deleteNotificationChannel("new_entries_channel")
         }
 
@@ -68,7 +67,7 @@ class SyncManager @Inject constructor(
         }
     }
 
-    fun startOneTimeSyncWorker(): Flow<WorkInfo> {
+    fun startOneTimeSyncWorker(): Observable<WorkInfo> {
         val work = OneTimeWorkRequestBuilder<SyncWorker>()
             .setInputData(
                 Data.Builder()
@@ -78,8 +77,7 @@ class SyncManager @Inject constructor(
             .build()
 
         workManager.enqueueUniqueWork("${SyncWorker::class.java.simpleName}_one_time", ExistingWorkPolicy.REPLACE, work)
-
-        return workManager.getWorkInfoByIdLiveData(work.id).asFlow()
+        return workManager.getWorkInfoByIdObservable(work.id)
     }
 
     fun stopSyncWorker() {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
index 13326ca06..126d856aa 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
@@ -5,25 +5,27 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.BigTextStyle
 import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
 import androidx.core.app.NotificationManagerCompat
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
-import androidx.work.CoroutineWorker
 import androidx.work.Data
+import androidx.work.ListenableWorker
+import androidx.work.RxWorker
 import androidx.work.WorkerParameters
+import com.squareup.inject.assisted.Assisted
+import com.squareup.inject.assisted.AssistedInject
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
 import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
-import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
 import io.github.wulkanowy.services.sync.channels.DebugChannel
 import io.github.wulkanowy.services.sync.works.Work
 import io.github.wulkanowy.utils.getCompatColor
-import kotlinx.coroutines.coroutineScope
+import io.reactivex.Completable
+import io.reactivex.Single
 import timber.log.Timber
 import kotlin.random.Random
 
-class SyncWorker @WorkerInject constructor(
+class SyncWorker @AssistedInject constructor(
     @Assisted appContext: Context,
     @Assisted workerParameters: WorkerParameters,
     private val studentRepository: StudentRepository,
@@ -31,46 +33,45 @@ class SyncWorker @WorkerInject constructor(
     private val works: Set<@JvmSuppressWildcards Work>,
     private val preferencesRepository: PreferencesRepository,
     private val notificationManager: NotificationManagerCompat
-) : CoroutineWorker(appContext, workerParameters) {
+) : RxWorker(appContext, workerParameters) {
 
-    override suspend fun doWork() = coroutineScope {
+    override fun createWork(): Single<Result> {
         Timber.i("SyncWorker is starting")
-
-        if (!studentRepository.isCurrentStudentSet()) return@coroutineScope Result.failure()
-
-        val student = studentRepository.getCurrentStudent()
-        val semester = semesterRepository.getCurrentSemester(student, true)
-
-        val exceptions = works.mapNotNull { work ->
-            try {
-                Timber.i("${work::class.java.simpleName} is starting")
-                work.doWork(student, semester)
-                Timber.i("${work::class.java.simpleName} result: Success")
-                null
-            } catch (e: Throwable) {
-                Timber.w("${work::class.java.simpleName} result: An exception ${e.message} occurred")
-                if (e is FeatureDisabledException || e is FeatureNotAvailableException) null
-                else {
-                    Timber.e(e)
-                    e
+        return studentRepository.isCurrentStudentSet()
+            .filter { true }
+            .flatMap { studentRepository.getCurrentStudent().toMaybe() }
+            .flatMapCompletable { student ->
+                semesterRepository.getCurrentSemester(student, true)
+                    .flatMapCompletable { semester ->
+                        Completable.mergeDelayError(works.map { work ->
+                            work.create(student, semester)
+                                .onErrorResumeNext {
+                                    if (it is FeatureDisabledException || it is FeatureNotAvailableException) Completable.complete()
+                                    else Completable.error(it)
+                                }
+                                .doOnSubscribe { Timber.i("${work::class.java.simpleName} is starting") }
+                                .doOnError { Timber.i("${work::class.java.simpleName} result: An exception occurred") }
+                                .doOnComplete { Timber.i("${work::class.java.simpleName} result: Success") }
+                        })
+                    }
+            }
+            .toSingleDefault(Result.success())
+            .onErrorReturn {
+                Timber.e(it, "There was an error during synchronization")
+                when {
+                    inputData.getBoolean("one_time", false) -> {
+                        Result.failure(Data.Builder()
+                            .putString("error", it.toString())
+                            .build()
+                        )
+                    }
+                    else -> Result.retry()
                 }
             }
-        }
-        val result = when {
-            exceptions.isNotEmpty() && inputData.getBoolean("one_time", false) -> {
-                Result.failure(Data.Builder()
-                    .putString("error", exceptions.map { it.stackTraceToString() }.toString())
-                    .build()
-                )
+            .doOnSuccess {
+                if (preferencesRepository.isDebugNotificationEnable) notify(it)
+                Timber.i("SyncWorker result: $it")
             }
-            exceptions.isNotEmpty() -> Result.retry()
-            else -> Result.success()
-        }
-
-        if (preferencesRepository.isDebugNotificationEnable) notify(result)
-        Timber.i("SyncWorker result: $result")
-
-        result
     }
 
     private fun notify(result: Result) {
@@ -83,4 +84,10 @@ class SyncWorker @WorkerInject constructor(
             .setPriority(PRIORITY_DEFAULT)
             .build())
     }
+
+    @AssistedInject.Factory
+    interface Factory {
+
+        fun create(appContext: Context, workerParameters: WorkerParameters): ListenableWorker
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt
new file mode 100644
index 000000000..aadfc27f4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt
@@ -0,0 +1,20 @@
+package io.github.wulkanowy.services.sync
+
+import android.content.Context
+import androidx.work.ListenableWorker
+import androidx.work.WorkerFactory
+import androidx.work.WorkerParameters
+import timber.log.Timber
+import javax.inject.Inject
+
+class SyncWorkerFactory @Inject constructor(private val syncWorkerFactory: SyncWorker.Factory) : WorkerFactory() {
+
+    override fun createWorker(appContext: Context, workerClassName: String, workerParameters: WorkerParameters): ListenableWorker? {
+        return if (workerClassName == SyncWorker::class.java.name) {
+            syncWorkerFactory.create(appContext, workerParameters)
+        } else {
+            Timber.e(IllegalArgumentException("Unknown worker class name: $workerClassName"))
+            null
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
index 2c7565195..a67350550 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
@@ -6,7 +6,6 @@ import android.app.NotificationChannel
 import android.app.NotificationManager.IMPORTANCE_DEFAULT
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
@@ -14,7 +13,7 @@ import javax.inject.Inject
 @TargetApi(26)
 class DebugChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val appInfo: AppInfo
 ) : Channel {
 
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt
index 8025bd76c..ae228edd7 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt
@@ -6,14 +6,13 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import javax.inject.Inject
 
 @TargetApi(26)
 class LuckyNumberChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context
+    private val context: Context
 ) : Channel {
 
     companion object {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt
index 5d5727d35..7d6f275d9 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt
@@ -6,14 +6,13 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import javax.inject.Inject
 
 @TargetApi(26)
 class NewGradesChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context
+    private val context: Context
 ) : Channel {
 
     companion object {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt
index 962fbfa24..49f39c6be 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt
@@ -6,14 +6,13 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import javax.inject.Inject
 
 @TargetApi(26)
 class NewMessagesChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context
+    private val context: Context
 ) : Channel {
 
     companion object {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
index c6e79b393..d80d43dc5 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
@@ -6,14 +6,13 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import javax.inject.Inject
 
 @TargetApi(26)
 class NewNotesChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context
+    private val context: Context
 ) : Channel {
 
     companion object {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt
index 1d7376b92..a0e24ab45 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt
@@ -6,14 +6,13 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import javax.inject.Inject
 
 @TargetApi(26)
 class PushChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context
+    private val context: Context
 ) : Channel {
 
     companion object {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt
index 63b3a4f91..a292c8b53 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt
@@ -6,18 +6,17 @@ import android.app.NotificationChannel
 import android.app.NotificationManager.IMPORTANCE_DEFAULT
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import javax.inject.Inject
 
 @TargetApi(26)
 class UpcomingLessonsChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context
+    private val context: Context
 ) : Channel {
 
     companion object {
-        const val CHANNEL_ID = "upcoming_lesson_channel"
+        const val CHANNEL_ID = "lesson_channel"
     }
 
     override fun create() {
@@ -26,7 +25,6 @@ class UpcomingLessonsChannel @Inject constructor(
                 lockscreenVisibility = VISIBILITY_PUBLIC
                 setShowBadge(false)
                 enableVibration(false)
-                setSound(null, null)
             }
         )
     }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
index 9e4ab9025..5f7d7efa2 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
@@ -3,14 +3,15 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.attendancesummary.AttendanceSummaryRepository
-import io.github.wulkanowy.utils.waitForResult
+import io.reactivex.Completable
 import javax.inject.Inject
 
 class AttendanceSummaryWork @Inject constructor(
     private val attendanceSummaryRepository: AttendanceSummaryRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        attendanceSummaryRepository.getAttendanceSummary(student, semester, -1, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return attendanceSummaryRepository.getAttendanceSummary(student, semester, -1, true).ignoreElement()
     }
 }
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
index ecf0be018..063b74825 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
@@ -3,15 +3,16 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
-import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.waitForResult
-import java.time.LocalDate.now
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
 import javax.inject.Inject
 
 class AttendanceWork @Inject constructor(private val attendanceRepository: AttendanceRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        attendanceRepository.getAttendance(student, semester, now().monday, now().sunday, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return attendanceRepository.getAttendance(student, semester, now().monday, now().sunday, true)
+            .ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
index 212ea6327..26f79a0d5 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
@@ -3,17 +3,19 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository
-import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.waitForResult
-import java.time.LocalDate.now
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
 import javax.inject.Inject
 
 class CompletedLessonWork @Inject constructor(
     private val completedLessonsRepository: CompletedLessonsRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        completedLessonsRepository.getCompletedLessons(student, semester, now().monday, now().sunday, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return completedLessonsRepository.getCompletedLessons(student, semester, now().monday, now().sunday, true)
+            .ignoreElement()
     }
 }
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
index 899d45cba..1ef97f59c 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
@@ -3,13 +3,15 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.exam.ExamRepository
-import io.github.wulkanowy.utils.waitForResult
-import java.time.LocalDate.now
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
 import javax.inject.Inject
 
 class ExamWork @Inject constructor(private val examRepository: ExamRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        examRepository.getExams(student, semester, now(), now(), true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return examRepository.getExams(student, semester, now().monday, now().sunday, true).ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
index 3d61a423b..327c71740 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
@@ -3,18 +3,14 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.gradestatistics.GradeStatisticsRepository
-import io.github.wulkanowy.utils.waitForResult
+import io.reactivex.Completable
 import javax.inject.Inject
 
-class GradeStatisticsWork @Inject constructor(
-    private val gradeStatisticsRepository: GradeStatisticsRepository
-) : Work {
+class GradeStatisticsWork @Inject constructor(private val gradeStatisticsRepository: GradeStatisticsRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        with(gradeStatisticsRepository) {
-            getGradesStatistics(student, semester, "Wszystkie", isSemester = true, forceRefresh = true).waitForResult()
-            getGradesStatistics(student, semester, "Wszystkie", isSemester = false, forceRefresh = true).waitForResult()
-            getGradesPointsStatistics(student, semester, "Wszystkie", forceRefresh = true).waitForResult()
-        }
+    override fun create(student: Student, semester: Semester): Completable {
+        return gradeStatisticsRepository.getGradesStatistics(student, semester, "Wszystkie", false, true)
+            .ignoreElement()
     }
 }
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
index 00bce109e..6e90826ad 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
@@ -7,10 +7,8 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.DEFAULT_ALL
 import androidx.core.app.NotificationCompat.PRIORITY_HIGH
 import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
@@ -19,39 +17,30 @@ import io.github.wulkanowy.services.sync.channels.NewGradesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
-import io.github.wulkanowy.utils.waitForResult
-import kotlinx.coroutines.flow.first
+import io.reactivex.Completable
 import javax.inject.Inject
 import kotlin.random.Random
 
 class GradeWork @Inject constructor(
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val gradeRepository: GradeRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        gradeRepository.getGrades(student, semester, true, preferencesRepository.isNotificationsEnable).waitForResult()
-
-        gradeRepository.getNotNotifiedGrades(semester).first().let {
-            if (it.isNotEmpty()) notifyDetails(it)
-            gradeRepository.updateGrades(it.onEach { grade -> grade.isNotified = true })
-        }
-
-        gradeRepository.getNotNotifiedPredictedGrades(semester).first().let {
-            if (it.isNotEmpty()) notifyPredicted(it)
-            gradeRepository.updateGradesSummary(it.onEach { grade -> grade.isPredictedGradeNotified = true })
-        }
-
-        gradeRepository.getNotNotifiedFinalGrades(semester).first().let {
-            if (it.isNotEmpty()) notifyFinal(it)
-            gradeRepository.updateGradesSummary(it.onEach { grade -> grade.isFinalGradeNotified = true })
-        }
+    override fun create(student: Student, semester: Semester): Completable {
+        return gradeRepository.getGrades(student, semester, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { gradeRepository.getNotNotifiedGrades(semester) }
+            .flatMapCompletable {
+                if (it.isNotEmpty()) notify(it)
+                gradeRepository.updateGrades(it.onEach { grade -> grade.isNotified = true })
+            }
     }
 
-    private fun getNotificationBuilder(): NotificationCompat.Builder {
-        return NotificationCompat.Builder(context, NewGradesChannel.CHANNEL_ID)
+    private fun notify(grades: List<Grade>) {
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewGradesChannel.CHANNEL_ID)
+            .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items, grades.size, grades.size))
+            .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items, grades.size, grades.size))
             .setSmallIcon(R.drawable.ic_stat_grade)
             .setAutoCancel(true)
             .setPriority(PRIORITY_HIGH)
@@ -60,12 +49,6 @@ class GradeWork @Inject constructor(
             .setContentIntent(
                 PendingIntent.getActivity(context, MainView.Section.GRADE.id,
                     MainActivity.getStartIntent(context, MainView.Section.GRADE, true), FLAG_UPDATE_CURRENT))
-    }
-
-    private fun notifyDetails(grades: List<Grade>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), getNotificationBuilder()
-            .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items, grades.size, grades.size))
-            .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items, grades.size, grades.size))
             .setStyle(NotificationCompat.InboxStyle().run {
                 setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, grades.size, grades.size))
                 grades.forEach { addLine("${it.subject}: ${it.entry}") }
@@ -74,30 +57,4 @@ class GradeWork @Inject constructor(
             .build()
         )
     }
-
-    private fun notifyPredicted(gradesSummary: List<GradeSummary>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), getNotificationBuilder()
-            .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items_predicted, gradesSummary.size, gradesSummary.size))
-            .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items_predicted, gradesSummary.size, gradesSummary.size))
-            .setStyle(NotificationCompat.InboxStyle().run {
-                setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, gradesSummary.size, gradesSummary.size))
-                gradesSummary.forEach { addLine("${it.subject}: ${it.predictedGrade}") }
-                this
-            })
-            .build()
-        )
-    }
-
-    private fun notifyFinal(gradesSummary: List<GradeSummary>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), getNotificationBuilder()
-            .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items_final, gradesSummary.size, gradesSummary.size))
-            .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items_final, gradesSummary.size, gradesSummary.size))
-            .setStyle(NotificationCompat.InboxStyle().run {
-                setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, gradesSummary.size, gradesSummary.size))
-                gradesSummary.forEach { addLine("${it.subject}: ${it.finalGrade}") }
-                this
-            })
-            .build()
-        )
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
index a07f11073..186d57b03 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
@@ -3,15 +3,15 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
-import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.waitForResult
-import java.time.LocalDate.now
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
 import javax.inject.Inject
 
 class HomeworkWork @Inject constructor(private val homeworkRepository: HomeworkRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        homeworkRepository.getHomework(student, semester, now().monday, now().sunday, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return homeworkRepository.getHomework(student, semester, now().monday, now().sunday, true).ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
index 7b9f5ab30..f19af4df6 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
@@ -7,7 +7,6 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.DEFAULT_ALL
 import androidx.core.app.NotificationCompat.PRIORITY_HIGH
 import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Semester
@@ -18,24 +17,24 @@ import io.github.wulkanowy.services.sync.channels.LuckyNumberChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
-import io.github.wulkanowy.utils.waitForResult
+import io.reactivex.Completable
 import javax.inject.Inject
 import kotlin.random.Random
 
 class LuckyNumberWork @Inject constructor(
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val luckyNumberRepository: LuckyNumberRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        luckyNumberRepository.getLuckyNumber(student, true, preferencesRepository.isNotificationsEnable).waitForResult()
-
-        luckyNumberRepository.getNotNotifiedLuckyNumber(student)?.let {
-            notify(it)
-            luckyNumberRepository.updateLuckyNumber(it.apply { isNotified = true })
-        }
+    override fun create(student: Student, semester: Semester): Completable {
+        return luckyNumberRepository.getLuckyNumber(student, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { luckyNumberRepository.getNotNotifiedLuckyNumber(student) }
+            .flatMapCompletable {
+                notify(it)
+                luckyNumberRepository.updateLuckyNumber(it.apply { isNotified = true })
+            }
     }
 
     private fun notify(luckyNumber: LuckyNumber) {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
index 7b32f13bb..b8773dbca 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
@@ -7,7 +7,6 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.DEFAULT_ALL
 import androidx.core.app.NotificationCompat.PRIORITY_HIGH
 import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Semester
@@ -19,25 +18,24 @@ import io.github.wulkanowy.services.sync.channels.NewMessagesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
-import io.github.wulkanowy.utils.waitForResult
-import kotlinx.coroutines.flow.first
+import io.reactivex.Completable
 import javax.inject.Inject
 import kotlin.random.Random
 
 class MessageWork @Inject constructor(
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val messageRepository: MessageRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        messageRepository.getMessages(student, semester, RECEIVED, true, preferencesRepository.isNotificationsEnable).waitForResult()
-
-        messageRepository.getNotNotifiedMessages(student).first().let {
-            if (it.isNotEmpty()) notify(it)
-            messageRepository.updateMessages(it.onEach { message -> message.isNotified = true })
-        }
+    override fun create(student: Student, semester: Semester): Completable {
+        return messageRepository.getMessages(student, semester, RECEIVED, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { messageRepository.getNotNotifiedMessages(student) }
+            .flatMapCompletable {
+                if (it.isNotEmpty()) notify(it)
+                messageRepository.updateMessages(it.onEach { message -> message.isNotified = true })
+            }
     }
 
     private fun notify(messages: List<Message>) {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
index 84b806795..4fc92ffcc 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
@@ -7,7 +7,6 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.DEFAULT_ALL
 import androidx.core.app.NotificationCompat.PRIORITY_HIGH
 import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
@@ -18,25 +17,24 @@ import io.github.wulkanowy.services.sync.channels.NewNotesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
-import io.github.wulkanowy.utils.waitForResult
-import kotlinx.coroutines.flow.first
+import io.reactivex.Completable
 import javax.inject.Inject
 import kotlin.random.Random
 
 class NoteWork @Inject constructor(
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val noteRepository: NoteRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        noteRepository.getNotes(student, semester, true, preferencesRepository.isNotificationsEnable).waitForResult()
-
-        noteRepository.getNotNotifiedNotes(student).first().let {
-            if (it.isNotEmpty()) notify(it)
-            noteRepository.updateNotes(it.onEach { note -> note.isNotified = true })
-        }
+    override fun create(student: Student, semester: Semester): Completable {
+        return noteRepository.getNotes(student, semester, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { noteRepository.getNotNotifiedNotes(student) }
+            .flatMapCompletable {
+                if (it.isNotEmpty()) notify(it)
+                noteRepository.updateNotes(it.onEach { note -> note.isNotified = true })
+            }
     }
 
     private fun notify(notes: List<Note>) {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
index c433c0ac8..fa610dee4 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
@@ -4,6 +4,7 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.recipient.RecipientRepository
 import io.github.wulkanowy.data.repositories.reportingunit.ReportingUnitRepository
+import io.reactivex.Completable
 import javax.inject.Inject
 
 class RecipientWork @Inject constructor(
@@ -11,13 +12,13 @@ class RecipientWork @Inject constructor(
     private val recipientRepository: RecipientRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        reportingUnitRepository.refreshReportingUnits(student)
-
-        reportingUnitRepository.getReportingUnits(student).let { units ->
-            units.map {
-                recipientRepository.refreshRecipients(student, 2, it)
+    override fun create(student: Student, semester: Semester): Completable {
+        return reportingUnitRepository.getReportingUnits(student, true)
+            .flatMapCompletable { units ->
+                Completable.mergeDelayError(units.map {
+                    recipientRepository.getRecipients(student, 2, it, true).ignoreElement()
+                })
             }
-        }
     }
 }
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
index a9abdaa72..5a7a41d8d 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
@@ -3,12 +3,12 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.teacher.TeacherRepository
-import io.github.wulkanowy.utils.waitForResult
+import io.reactivex.Completable
 import javax.inject.Inject
 
 class TeacherWork @Inject constructor(private val teacherRepository: TeacherRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        teacherRepository.getTeachers(student, semester, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return teacherRepository.getTeachers(student, semester, true).ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
index 3b8c6f5dc..d79d24033 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
@@ -3,17 +3,16 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
-import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.waitForResult
-import java.time.LocalDate.now
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
 import javax.inject.Inject
 
-class TimetableWork @Inject constructor(
-    private val timetableRepository: TimetableRepository
-) : Work {
+class TimetableWork @Inject constructor(private val timetableRepository: TimetableRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        timetableRepository.getTimetable(student, semester, now().monday, now().sunday, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return timetableRepository.getTimetable(student, semester, now().monday, now().sunday, true)
+            .ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt
index c41f41ce2..1601a103b 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt
@@ -2,8 +2,10 @@ package io.github.wulkanowy.services.sync.works
 
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Completable
 
 interface Work {
 
-    suspend fun doWork(student: Student, semester: Semester)
+    fun create(student: Student, semester: Semester): Completable
 }
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
index 42c6d3bfd..e5ccf963c 100644
--- a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
@@ -2,17 +2,16 @@ package io.github.wulkanowy.services.widgets
 
 import android.content.Intent
 import android.widget.RemoteViewsService
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.android.AndroidInjection
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetFactory
-import timber.log.Timber
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class TimetableWidgetService : RemoteViewsService() {
 
     @Inject
@@ -30,8 +29,11 @@ class TimetableWidgetService : RemoteViewsService() {
     @Inject
     lateinit var sharedPref: SharedPrefProvider
 
+    @Inject
+    lateinit var schedulers: SchedulersProvider
+
     override fun onGetViewFactory(intent: Intent?): RemoteViewsFactory {
-        Timber.d("TimetableWidgetFactory created")
-        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, prefRepository, sharedPref, applicationContext, intent)
+        AndroidInjection.inject(this)
+        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, prefRepository, sharedPref, schedulers, applicationContext, intent)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
index 86b6701b3..f20fb22f3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
@@ -14,6 +14,9 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.viewbinding.ViewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
+import dagger.android.AndroidInjection
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.HasAndroidInjector
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.FragmentLifecycleLogger
@@ -22,10 +25,13 @@ import io.github.wulkanowy.utils.lifecycleAwareVariable
 import javax.inject.Inject
 
 abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
-    AppCompatActivity(), BaseView {
+    AppCompatActivity(), BaseView, HasAndroidInjector {
 
     protected var binding: VB by lifecycleAwareVariable()
 
+    @Inject
+    lateinit var androidInjector: DispatchingAndroidInjector<Any>
+
     @Inject
     lateinit var fragmentLifecycleLogger: FragmentLifecycleLogger
 
@@ -36,7 +42,8 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
 
     abstract var presenter: T
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
         themeManager.applyActivityTheme(this)
         super.onCreate(savedInstanceState)
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleLogger, true)
@@ -84,4 +91,6 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
         invalidateOptionsMenu()
         presenter.onDetachView()
     }
+
+    override fun androidInjector() = androidInjector
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
index 18cd58b41..0279dccf4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
@@ -1,11 +1,11 @@
 package io.github.wulkanowy.ui.base
 
 import android.widget.Toast
-import androidx.fragment.app.DialogFragment
 import androidx.viewbinding.ViewBinding
+import dagger.android.support.DaggerAppCompatDialogFragment
 import io.github.wulkanowy.utils.lifecycleAwareVariable
 
-abstract class BaseDialogFragment<VB : ViewBinding> : DialogFragment(), BaseView {
+abstract class BaseDialogFragment<VB : ViewBinding> : DaggerAppCompatDialogFragment(), BaseView {
 
     protected var binding: VB by lifecycleAwareVariable()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
index c6a2e1d1c..83f787654 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
@@ -2,14 +2,14 @@ package io.github.wulkanowy.ui.base
 
 import android.view.View
 import androidx.annotation.LayoutRes
-import androidx.fragment.app.Fragment
 import androidx.viewbinding.ViewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
+import dagger.android.support.DaggerFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.utils.lifecycleAwareVariable
 
-abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : Fragment(layoutId),
+abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : DaggerFragment(layoutId),
     BaseView {
 
     protected var binding: VB by lifecycleAwareVariable()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
index ba8bfd85f..9f0b4047c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
@@ -1,34 +1,22 @@
 package io.github.wulkanowy.ui.base
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Completable
+import io.reactivex.disposables.CompositeDisposable
 import timber.log.Timber
-import kotlin.coroutines.CoroutineContext
 
 open class BasePresenter<T : BaseView>(
     protected val errorHandler: ErrorHandler,
-    protected val studentRepository: StudentRepository
-) : CoroutineScope {
+    protected val studentRepository: StudentRepository,
+    protected val schedulers: SchedulersProvider
+) {
 
-    private var job: Job = Job()
-
-    private val jobs = mutableMapOf<String, Job>()
-
-    override val coroutineContext: CoroutineContext
-        get() = Dispatchers.Main + job
+    val disposable = CompositeDisposable()
 
     var view: T? = null
 
     open fun onAttachView(view: T) {
-        job = Job()
         this.view = view
         errorHandler.apply {
             showErrorMessage = view::showError
@@ -38,47 +26,30 @@ open class BasePresenter<T : BaseView>(
     }
 
     fun onExpiredLoginSelected() {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent(false)
-            studentRepository.logoutStudent(student)
-
-            val students = studentRepository.getSavedStudents(false)
-            if (students.isNotEmpty()) {
-                Timber.i("Switching current student")
-                studentRepository.switchStudent(students[0])
+        Timber.i("Attempt to switch the student after the session expires")
+        disposable.add(studentRepository.getCurrentStudent(false)
+            .flatMapCompletable { studentRepository.logoutStudent(it) }
+            .andThen(studentRepository.getSavedStudents(false))
+            .flatMapCompletable {
+                if (it.isNotEmpty()) {
+                    Timber.i("Switching current student")
+                    studentRepository.switchStudent(it[0])
+                } else Completable.complete()
             }
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Attempt to switch the student after the session expires")
-                Status.SUCCESS -> {
-                    Timber.i("Switch student result: Open login view")
-                    view?.openClearLoginView()
-                }
-                Status.ERROR -> {
-                    Timber.i("Switch student result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.launch("expired")
-    }
-
-    fun <T> Flow<T>.launch(individualJobTag: String = "load"): Job {
-        jobs[individualJobTag]?.cancel()
-        val job = catch { errorHandler.dispatch(it) }.launchIn(this@BasePresenter)
-        jobs[individualJobTag] = job
-        Timber.d("Job $individualJobTag launched in ${this@BasePresenter.javaClass.simpleName}: $job")
-        return job
-    }
-
-    fun cancelJobs(vararg names: String) {
-        names.forEach {
-            jobs[it]?.cancel()
-        }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Switch student result: Open login view")
+                view?.openClearLoginView()
+            }, {
+                Timber.i("Switch student result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
     }
 
     open fun onDetachView() {
         view = null
-        job.cancel()
+        disposable.clear()
         errorHandler.clear()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
index 8d6739a15..896e4ff1c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
@@ -11,12 +11,11 @@ import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.getSystemService
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.DialogErrorBinding
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
 import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
-import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
-import io.github.wulkanowy.sdk.scrapper.exception.ServiceUnavailableException
+import io.github.wulkanowy.sdk.exception.ServiceUnavailableException
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.getString
 import io.github.wulkanowy.utils.openAppInMarket
@@ -29,7 +28,6 @@ import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
 
     private lateinit var error: Throwable
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
index 946e661b1..f746b36f8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.ui.base
 import android.content.res.Resources
 import com.chuckerteam.chucker.api.ChuckerCollector
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
-import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException
+import io.github.wulkanowy.sdk.exception.BadCredentialsException
 import io.github.wulkanowy.utils.getString
 import io.github.wulkanowy.utils.security.ScramblerException
 import timber.log.Timber
@@ -24,10 +24,10 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources,
     }
 
     protected open fun proceed(error: Throwable) {
-        showErrorMessage(resources.getString(error), error)
         when (error) {
             is ScramblerException, is BadCredentialsException -> onSessionExpired()
             is NoCurrentStudentException -> onNoCurrentStudent()
+            else -> showErrorMessage(resources.getString(error), error)
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
index 5ec1a66e3..d85d01e9e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
@@ -4,7 +4,6 @@ import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.FragmentAboutBinding
 import io.github.wulkanowy.ui.base.BaseFragment
@@ -20,7 +19,6 @@ import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about), AboutView,
     MainView.TitledView {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
index 24e59d36b..ee892adfc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
@@ -5,15 +5,17 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class AboutPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val appInfo: AppInfo,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<AboutView>(errorHandler, studentRepository) {
+) : BasePresenter<AboutView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: AboutView) {
         super.onAttachView(view)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt
index b6755c6a7..215cd27db 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.ui.modules.about.contributor
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import coil.load
+import coil.api.load
 import coil.transform.RoundedCornersTransformation
 import io.github.wulkanowy.data.pojos.Contributor
 import io.github.wulkanowy.databinding.ItemContributorBinding
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt
index 5d7e076c7..42eebd347 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt
@@ -5,7 +5,6 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.pojos.Contributor
 import io.github.wulkanowy.databinding.FragmentContributorBinding
@@ -15,7 +14,6 @@ import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.openInternetBrowser
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class ContributorFragment : BaseFragment<FragmentContributorBinding>(R.layout.fragment_contributor),
     ContributorView, MainView.TitledView {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt
index 78fdb43a1..416a59ce5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt
@@ -1,20 +1,19 @@
 package io.github.wulkanowy.ui.modules.about.contributor
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.pojos.Contributor
 import io.github.wulkanowy.data.repositories.appcreator.AppCreatorRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class ContributorPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val appCreatorRepository: AppCreatorRepository
-) : BasePresenter<ContributorView>(errorHandler, studentRepository) {
+) : BasePresenter<ContributorView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: ContributorView) {
         super.onAttachView(view)
@@ -31,15 +30,10 @@ class ContributorPresenter @Inject constructor(
     }
 
     private fun loadData() {
-        flowWithResource { appCreatorRepository.getAppCreators() }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.showProgress(true)
-                Status.SUCCESS -> view?.run {
-                    showProgress(false)
-                    updateData(it.data!!)
-                }
-                Status.ERROR -> errorHandler.dispatch(it.error!!)
-            }
-        }.launch()
+        disposable.add(appCreatorRepository.getAppCreators()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally { view?.showProgress(false) }
+            .subscribe({ view?.run { updateData(it) } }, { errorHandler.dispatch(it) }))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt
index 6ae06bbe7..07025c09f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt
@@ -24,7 +24,7 @@ class LicenseAdapter @Inject constructor() : RecyclerView.Adapter<LicenseAdapter
 
         with(holder.binding) {
             licenseItemName.text = item.libraryName
-            licenseItemSummary.text = item.licenses?.firstOrNull()?.licenseName?.takeIf { it.isNotBlank() } ?: item.libraryVersion
+            licenseItemSummary.text = item.license?.licenseName?.takeIf { it.isNotBlank() } ?: item.libraryVersion
 
             root.setOnClickListener { onClickListener(item) }
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
index cdd29b41b..f6c3b5698 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
@@ -9,14 +9,13 @@ import androidx.core.text.parseAsHtml
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.entity.Library
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.Lazy
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.FragmentLicenseBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_license),
     LicenseView, MainView.TitledView {
 
@@ -26,13 +25,14 @@ class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_l
     @Inject
     lateinit var licenseAdapter: LicenseAdapter
 
-    private val libs by lazy { Libs(requireContext()) }
+    @Inject
+    lateinit var libs: Lazy<Libs>
 
     override val titleStringId get() = R.string.license_title
 
     override val appLibraries: ArrayList<Library>?
         get() = context?.let {
-            libs.prepareLibraries(it, emptyArray(), emptyArray(), autoDetect = true, checkCachedDetection = true, sort = true)
+            libs.get().prepareLibraries(it, emptyArray(), emptyArray(), autoDetect = true, checkCachedDetection = true, sort = true)
         }
 
     companion object {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt
new file mode 100644
index 000000000..0ffc3d90e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt
@@ -0,0 +1,15 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import android.content.Context
+import com.mikepenz.aboutlibraries.Libs
+import dagger.Module
+import dagger.Provides
+import io.github.wulkanowy.di.scopes.PerFragment
+
+@Module
+class LicenseModule {
+
+    @PerFragment
+    @Provides
+    fun provideLibs(context: Context) = Libs(context)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
index 18d257eed..d0f6d69e0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
@@ -1,23 +1,18 @@
 package io.github.wulkanowy.ui.modules.about.license
 
 import com.mikepenz.aboutlibraries.entity.Library
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.DispatchersProvider
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.withContext
-import timber.log.Timber
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Single
 import javax.inject.Inject
 
 class LicensePresenter @Inject constructor(
-    private val dispatchers: DispatchersProvider,
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<LicenseView>(errorHandler, studentRepository) {
+) : BasePresenter<LicenseView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: LicenseView) {
         super.onAttachView(view)
@@ -26,22 +21,14 @@ class LicensePresenter @Inject constructor(
     }
 
     fun onItemSelected(library: Library) {
-        view?.run { library.licenses?.firstOrNull()?.licenseDescription?.let { openLicense(it) } }
+        view?.run { library.license?.licenseDescription?.let { openLicense(it) } }
     }
 
     private fun loadData() {
-        flowWithResource {
-            withContext(dispatchers.backgroundThread) {
-                view?.appLibraries.orEmpty()
-            }
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("License data load started")
-                Status.SUCCESS -> view?.updateData(it.data!!)
-                Status.ERROR -> errorHandler.dispatch(it.error!!)
-            }
-        }.afterLoading {
-            view?.showProgress(false)
-        }.launch()
+        disposable.add(Single.fromCallable { view?.appLibraries.orEmpty() }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnEvent { _, _ -> view?.showProgress(false) }
+            .subscribe({ view?.run { updateData(it) } }, { errorHandler.dispatch(it) }))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt
index cf40975e7..08f91aff1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt
@@ -14,7 +14,6 @@ import android.view.MenuItem
 import android.view.View
 import androidx.core.content.FileProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.BuildConfig.APPLICATION_ID
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.FragmentLogviewerBinding
@@ -23,7 +22,6 @@ import io.github.wulkanowy.ui.modules.main.MainView
 import java.io.File
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LogViewerFragment : BaseFragment<FragmentLogviewerBinding>(R.layout.fragment_logviewer),
     LogViewerView, MainView.TitledView {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt
index 85eae8e6e..4485cb3eb 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt
@@ -1,20 +1,19 @@
 package io.github.wulkanowy.ui.modules.about.logviewer
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.logger.LoggerRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class LogViewerPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val loggerRepository: LoggerRepository
-) : BasePresenter<LogViewerView>(errorHandler, studentRepository) {
+) : BasePresenter<LogViewerView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: LogViewerView) {
         super.onAttachView(view)
@@ -23,19 +22,16 @@ class LogViewerPresenter @Inject constructor(
     }
 
     fun onShareLogsSelected(): Boolean {
-        flowWithResource { loggerRepository.getLogFiles() }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Loading logs files started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading logs files result: ${it.data!!.joinToString { file -> file.name }}")
-                    view?.shareLogs(it.data)
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading logs files result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.launch("share")
+        disposable.add(loggerRepository.getLogFiles()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Loading logs files result: ${it.joinToString { it.name }}")
+                view?.shareLogs(it)
+            }, {
+                Timber.i("Loading logs files result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
         return true
     }
 
@@ -44,18 +40,15 @@ class LogViewerPresenter @Inject constructor(
     }
 
     private fun loadLogFile() {
-        flowWithResource { loggerRepository.getLastLogLines() }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Loading last log file started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading last log file result: load ${it.data!!.size} lines")
-                    view?.setLines(it.data)
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading last log file result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.launch("file")
+        disposable.add(loggerRepository.getLastLogLines()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Loading last log file result: load ${it.size} lines")
+                view?.setLines(it)
+            }, {
+                Timber.i("Loading last log file result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/Account.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/Account.kt
deleted file mode 100644
index dbcb499e8..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/Account.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package io.github.wulkanowy.ui.modules.account
-
-data class Account(val email: String, val isParent: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt
index 7ecb41399..7df0ca378 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt
@@ -3,77 +3,33 @@ package io.github.wulkanowy.ui.modules.account
 import android.annotation.SuppressLint
 import android.graphics.PorterDuff
 import android.view.LayoutInflater
-import android.view.View.GONE
-import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.databinding.HeaderAccountBinding
 import io.github.wulkanowy.databinding.ItemAccountBinding
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.getThemeAttrColor
 import javax.inject.Inject
 
-class AccountAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class AccountAdapter @Inject constructor() : RecyclerView.Adapter<AccountAdapter.ItemViewHolder>() {
 
-    var items = emptyList<AccountItem<*>>()
+    var items = emptyList<Student>()
 
-    var onClickListener: (StudentWithSemesters) -> Unit = {}
+    var onClickListener: (Student) -> Unit = {}
 
     override fun getItemCount() = items.size
 
-    override fun getItemViewType(position: Int) = items[position].viewType.id
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            AccountItem.ViewType.HEADER.id -> HeaderViewHolder(HeaderAccountBinding.inflate(inflater, parent, false))
-            AccountItem.ViewType.ITEM.id -> ItemViewHolder(ItemAccountBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding, items[position].value as Account)
-            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position].value as StudentWithSemesters)
-        }
-    }
-
-    private fun bindHeaderViewHolder(binding: HeaderAccountBinding, account: Account) {
-        with(binding) {
-            accountHeaderEmail.text = account.email
-            accountHeaderType.setText(if (account.isParent) R.string.account_type_parent else R.string.account_type_student)
-        }
-    }
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemAccountBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
 
     @SuppressLint("SetTextI18n")
-    private fun bindItemViewHolder(binding: ItemAccountBinding, studentWithSemesters: StudentWithSemesters) {
-        val student = studentWithSemesters.student
-        val semesters = studentWithSemesters.semesters
-        val diary = semesters.maxByOrNull { it.semesterId }
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val student = items[position]
 
-        with(binding) {
-            accountItemName.text = "${student.studentName} ${diary?.diaryName.orEmpty()}"
-            accountItemSchool.text = studentWithSemesters.student.schoolName
-            with(accountItemLoginMode) {
-                visibility = when (Sdk.Mode.valueOf(student.loginMode)) {
-                    Sdk.Mode.API -> {
-                        setText(R.string.account_login_mobile_api)
-                        VISIBLE
-                    }
-                    Sdk.Mode.HYBRID -> {
-                        setText(R.string.account_login_hybrid)
-                        VISIBLE
-                    }
-                    Sdk.Mode.SCRAPPER -> {
-                        GONE
-                    }
-                }
-            }
+        with(holder.binding) {
+            accountItemName.text = "${student.studentName} ${student.className}"
+            accountItemSchool.text = student.schoolName
 
             with(accountItemImage) {
                 val colorImage = if (student.isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
@@ -82,12 +38,9 @@ class AccountAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.V
                 setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
             }
 
-            root.setOnClickListener { onClickListener(studentWithSemesters) }
+            root.setOnClickListener { onClickListener(student) }
         }
     }
 
-    class HeaderViewHolder(val binding: HeaderAccountBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
     class ItemViewHolder(val binding: ItemAccountBinding) : RecyclerView.ViewHolder(binding.root)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
index 1fa87268b..ce811e0b0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
@@ -8,14 +8,13 @@ import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.DialogAccountBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class AccountDialog : BaseDialogFragment<DialogAccountBinding>(), AccountView {
 
     @Inject
@@ -55,7 +54,7 @@ class AccountDialog : BaseDialogFragment<DialogAccountBinding>(), AccountView {
         }
     }
 
-    override fun updateData(data: List<AccountItem<*>>) {
+    override fun updateData(data: List<Student>) {
         with(accountAdapter) {
             items = data
             notifyDataSetChanged()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
deleted file mode 100644
index 05a4a69ce..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.github.wulkanowy.ui.modules.account
-
-data class AccountItem<out T>(val value: T, val viewType: ViewType) {
-
-    enum class ViewType(val id: Int) {
-        HEADER(1),
-        ITEM(2)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
index 4eaee4291..3416a043f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
@@ -1,22 +1,21 @@
 package io.github.wulkanowy.ui.modules.account
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Single
 import timber.log.Timber
 import javax.inject.Inject
 
 class AccountPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val syncManager: SyncManager
-) : BasePresenter<AccountView>(errorHandler, studentRepository) {
+) : BasePresenter<AccountView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: AccountView) {
         super.onAttachView(view)
@@ -36,20 +35,20 @@ class AccountPresenter @Inject constructor(
     }
 
     fun onLogoutConfirm() {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent(false)
-            studentRepository.logoutStudent(student)
-
-            val students = studentRepository.getSavedStudents(false)
-            if (students.isNotEmpty()) {
-                studentRepository.switchStudent(students[0])
+        Timber.i("Attempt to logout current user ")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMapCompletable { studentRepository.logoutStudent(it) }
+            .andThen(studentRepository.getSavedStudents(false))
+            .flatMap {
+                if (it.isNotEmpty()) studentRepository.switchStudent(it[0]).toSingle { it }
+                else Single.just(it)
             }
-            students
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Attempt to logout current user ")
-                Status.SUCCESS -> view?.run {
-                    if (it.data!!.isEmpty()) {
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally { view?.dismissView() }
+            .subscribe({
+                view?.apply {
+                    if (it.isEmpty()) {
                         Timber.i("Logout result: Open login view")
                         syncManager.stopSyncWorker()
                         openClearLoginView()
@@ -58,58 +57,43 @@ class AccountPresenter @Inject constructor(
                         recreateMainView()
                     }
                 }
-                Status.ERROR -> {
-                    Timber.i("Logout result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.dismissView()
-        }.launch("logout")
+            }, {
+                Timber.i("Logout result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
     }
 
-    fun onItemSelected(studentWithSemesters: StudentWithSemesters) {
-        Timber.i("Select student item ${studentWithSemesters.student.id}")
-        if (studentWithSemesters.student.isCurrent) {
+    fun onItemSelected(student: Student) {
+        Timber.i("Select student item ${student.id}")
+        if (student.isCurrent) {
             view?.dismissView()
-        } else flowWithResource { studentRepository.switchStudent(studentWithSemesters) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Attempt to change a student")
-                Status.SUCCESS -> {
+        } else {
+            Timber.i("Attempt to change a student")
+            disposable.add(studentRepository.switchStudent(student)
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally { view?.dismissView() }
+                .subscribe({
                     Timber.i("Change a student result: Success")
                     view?.recreateMainView()
-                }
-                Status.ERROR -> {
+                }, {
                     Timber.i("Change a student result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.dismissView()
-        }.launch("switch")
-    }
-
-    private fun createAccountItems(items: List<StudentWithSemesters>): List<AccountItem<*>> {
-        return items.groupBy { Account(it.student.email, it.student.isParent) }.map { (account, students) ->
-            listOf(AccountItem(account, AccountItem.ViewType.HEADER)) + students.map { student ->
-                AccountItem(student, AccountItem.ViewType.ITEM)
-            }
-        }.flatten()
+                    errorHandler.dispatch(it)
+                }))
+        }
     }
 
     private fun loadData() {
-        flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading account data started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading account result: Success")
-                    view?.updateData(createAccountItems(it.data!!))
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading account result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.launch()
+        Timber.i("Loading account data started")
+        disposable.add(studentRepository.getSavedStudents(false)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Loading account result: Success")
+                view?.updateData(it)
+            }, {
+                Timber.i("Loading account result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
index a1f8086cd..abb9e1d27 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
@@ -1,12 +1,13 @@
 package io.github.wulkanowy.ui.modules.account
 
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface AccountView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<AccountItem<*>>)
+    fun updateData(data: List<Student>)
 
     fun dismissView()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
index 8e8a6149d..a63d5045a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
@@ -9,7 +9,6 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.repositories.attendance.SentExcuseStatus
 import io.github.wulkanowy.databinding.ItemAttendanceBinding
-import io.github.wulkanowy.utils.description
 import javax.inject.Inject
 
 class AttendanceAdapter @Inject constructor() :
@@ -35,7 +34,7 @@ class AttendanceAdapter @Inject constructor() :
         with(holder.binding) {
             attendanceItemNumber.text = item.number.toString()
             attendanceItemSubject.text = item.subject
-            attendanceItemDescription.setText(item.description)
+            attendanceItemDescription.text = item.name
             attendanceItemAlert.visibility = item.run { if (absence && !excused) View.VISIBLE else View.INVISIBLE }
             attendanceItemNumber.visibility = View.GONE
             attendanceItemExcuseInfo.visibility = View.GONE
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
index d5e2fe122..97b76e812 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.databinding.DialogAttendanceBinding
-import io.github.wulkanowy.utils.description
 import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
 
@@ -44,7 +43,7 @@ class AttendanceDialog : DialogFragment() {
 
         with(binding) {
             attendanceDialogSubject.text = attendance.subject
-            attendanceDialogDescription.setText(attendance.description)
+            attendanceDialogDescription.text = attendance.name
             attendanceDialogDate.text = attendance.date.toFormattedString()
             attendanceDialogNumber.text = attendance.number.toString()
             attendanceDialogClose.setOnClickListener { dismiss() }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
index c7caef069..6599243dd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
@@ -14,22 +14,20 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.view.ActionMode
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.databinding.DialogExcuseBinding
 import io.github.wulkanowy.databinding.FragmentAttendanceBinding
 import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.SchooldaysRangeLimiter
 import io.github.wulkanowy.utils.dpToPx
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.fragment_attendance), AttendanceView, MainView.MainChildView,
     MainView.TitledView {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index 158f08ba3..437e06c92 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
@@ -1,7 +1,6 @@
 package io.github.wulkanowy.ui.modules.attendance
 
 import android.annotation.SuppressLint
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -10,32 +9,29 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.previousOrSameSchoolDay
 import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-import java.time.LocalDate
-import java.time.LocalDate.now
-import java.time.LocalDate.ofEpochDay
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class AttendancePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val attendanceRepository: AttendanceRepository,
     private val semesterRepository: SemesterRepository,
     private val prefRepository: PreferencesRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<AttendanceView>(errorHandler, studentRepository) {
+) : BasePresenter<AttendanceView>(errorHandler, studentRepository, schedulers) {
 
     private var baseDate: LocalDate = now().previousOrSameSchoolDay
 
@@ -172,93 +168,100 @@ class AttendancePresenter @Inject constructor(
     }
 
     private fun setBaseDateOnHolidays() {
-        flow {
-            val student = studentRepository.getCurrentStudent()
-            emit(semesterRepository.getCurrentSemester(student))
-        }.catch {
-            Timber.i("Loading semester result: An exception occurred")
-        }.onEach {
-            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-            currentDate = baseDate
-            reloadNavigation()
-        }.launch("holidays")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading attendance data started")
         currentDate = date
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            attendanceRepository.getAttendance(student, semester, date, date, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.showExcuseButton(false)
-                Status.SUCCESS -> {
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        attendanceRepository.getAttendance(student, semester, date, date, forceRefresh)
+                    }
+                }
+                .map { list ->
+                    if (prefRepository.isShowPresent) list
+                    else list.filter { !it.presence }
+                }
+                .map { items -> items.sortedBy { it.number } }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading attendance result: Success")
                     view?.apply {
-                        updateData(it.data!!.let { items ->
-                            if (prefRepository.isShowPresent) items
-                            else items.filter { item -> !item.presence }
-                        }.sortedBy { item -> item.number })
-                        showEmpty(it.data.isEmpty())
+                        updateData(it)
+                        showEmpty(it.isEmpty())
                         showErrorView(false)
-                        showContent(it.data.isNotEmpty())
-                        showExcuseButton(it.data.any { item -> item.excusable })
+                        showContent(it.isNotEmpty())
+                        showExcuseButton(it.any { item -> item.excusable })
                     }
                     analytics.logEvent(
                         "load_data",
                         "type" to "attendance",
-                        "items" to it.data!!.size
+                        "items" to it.size,
+                        "force_refresh" to forceRefresh
                     )
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Loading attendance result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+                    errorHandler.dispatch(it)
                 }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+            )
+        }
     }
 
     private fun excuseAbsence(reason: String?, toExcuseList: List<Attendance>) {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            attendanceRepository.excuseForAbsence(student, semester, toExcuseList, reason)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    Timber.i("Excusing absence started")
-                    showProgress(true)
-                    showContent(false)
-                    showExcuseButton(false)
+        Timber.i("Excusing absence started")
+        disposable.apply {
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        attendanceRepository.excuseForAbsence(student, semester, toExcuseList, reason)
+                    }
                 }
-                Status.SUCCESS -> {
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.apply {
+                        showProgress(true)
+                        showContent(false)
+                        showExcuseButton(false)
+                    }
+                }
+                .subscribe({
                     Timber.i("Excusing for absence result: Success")
                     analytics.logEvent("excuse_absence", "items" to attendanceToExcuseList.size)
                     attendanceToExcuseList.clear()
-                    view?.run {
+                    view?.apply {
                         showExcuseButton(false)
                         showMessage(excuseSuccessString)
-                        showContent(true)
-                        showProgress(false)
                     }
-                    loadData(currentDate, forceRefresh = true)
-                }
-                Status.ERROR -> {
+                    loadData(currentDate, true)
+                }) {
                     Timber.i("Excusing for absence result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                    loadData(currentDate)
-                }
-            }
-        }.launch("excuse")
+                    view?.showProgress(false)
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
index d54fb8bf1..484070a2e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.attendance
 
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.ui.base.BaseView
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 interface AttendanceView : BaseView {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt
index 4250a9109..236c3da16 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt
@@ -9,7 +9,7 @@ import io.github.wulkanowy.databinding.ItemAttendanceSummaryBinding
 import io.github.wulkanowy.databinding.ScrollableHeaderAttendanceSummaryBinding
 import io.github.wulkanowy.utils.calculatePercentage
 import io.github.wulkanowy.utils.getFormattedName
-import java.time.Month
+import org.threeten.bp.Month
 import java.util.Locale
 import javax.inject.Inject
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
index 2f8622374..1b9fe08ef 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
@@ -8,7 +8,6 @@ import android.view.View.VISIBLE
 import android.widget.ArrayAdapter
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.databinding.FragmentAttendanceSummaryBinding
@@ -18,7 +17,6 @@ import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemSelectedListener
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class AttendanceSummaryFragment :
     BaseFragment<FragmentAttendanceSummaryBinding>(R.layout.fragment_attendance_summary),
     AttendanceSummaryView, MainView.TitledView {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
index e5dce9ac8..33e18c2e7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.attendance.summary
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.data.repositories.attendancesummary.AttendanceSummaryRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -9,21 +8,20 @@ import io.github.wulkanowy.data.repositories.subject.SubjectRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
+import org.threeten.bp.Month
 import timber.log.Timber
-import java.time.Month
 import javax.inject.Inject
 
 class AttendanceSummaryPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val attendanceSummaryRepository: AttendanceSummaryRepository,
     private val subjectRepository: SubjectRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<AttendanceSummaryView>(errorHandler, studentRepository) {
+) : BasePresenter<AttendanceSummaryView>(errorHandler, studentRepository, schedulers) {
 
     private var subjects = emptyList<Subject>()
 
@@ -74,43 +72,46 @@ class AttendanceSummaryPresenter @Inject constructor(
     }
 
     private fun loadData(subjectId: Int, forceRefresh: Boolean = false) {
+        Timber.i("Loading attendance summary data started")
         currentSubjectId = subjectId
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            attendanceSummaryRepository.getAttendanceSummary(student, semester, subjectId, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading attendance summary data started")
-                Status.SUCCESS -> {
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap {
+                        attendanceSummaryRepository.getAttendanceSummary(student, it, subjectId, forceRefresh)
+                    }
+                }
+                .map { items -> items.sortedByDescending { if (it.month.value <= Month.JUNE.value) it.month.value + 12 else it.month.value } }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading attendance summary result: Success")
                     view?.apply {
-                        showEmpty(it.data!!.isEmpty())
-                        showContent(it.data.isNotEmpty())
-                        updateDataSet(it.data.sortedByDescending { item ->
-                            if (item.month.value <= Month.JUNE.value) item.month.value + 12 else item.month.value
-                        })
+                        showEmpty(it.isEmpty())
+                        showContent(it.isNotEmpty())
+                        updateDataSet(it)
                     }
                     analytics.logEvent(
                         "load_data",
                         "type" to "attendance_summary",
-                        "items" to it.data!!.size,
+                        "items" to it.size,
+                        "force_refresh" to forceRefresh,
                         "item_id" to subjectId
                     )
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Loading attendance summary result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+                    errorHandler.dispatch(it)
                 }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+            )
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -125,27 +126,27 @@ class AttendanceSummaryPresenter @Inject constructor(
     }
 
     private fun loadSubjects() {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            subjectRepository.getSubjects(student, semester)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading attendance summary subjects started")
-                Status.SUCCESS -> {
-                    subjects = it.data!!
-
-                    Timber.i("Loading attendance summary subjects result: Success")
-                    view?.run {
-                        view?.updateSubjects(ArrayList(it.data.map { subject -> subject.name }))
-                        showSubjects(true)
-                    }
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading attendance summary subjects result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Loading attendance summary subjects started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    subjectRepository.getSubjects(student, semester)
                 }
             }
-        }.launch("subjects")
+            .doOnSuccess { subjects = it }
+            .map { ArrayList(it.map { subject -> subject.name }) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Loading attendance summary subjects result: Success")
+                view?.run {
+                    view?.updateSubjects(it)
+                    showSubjects(true)
+                }
+            }, {
+                Timber.i("Loading attendance summary subjects result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
+        )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt
index 535587399..85061997c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt
@@ -9,7 +9,7 @@ import io.github.wulkanowy.databinding.HeaderExamBinding
 import io.github.wulkanowy.databinding.ItemExamBinding
 import io.github.wulkanowy.utils.toFormattedString
 import io.github.wulkanowy.utils.weekDayName
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
 class ExamAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
index 000da00f8..eeab30c15 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
@@ -6,7 +6,6 @@ import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.databinding.FragmentExamBinding
@@ -17,7 +16,6 @@ import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.dpToPx
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam), ExamView,
     MainView.MainChildView, MainView.TitledView {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
index f63316a8d..1140cb020 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.exam
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.repositories.exam.ExamRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -8,30 +7,27 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
-import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-import java.time.LocalDate
-import java.time.LocalDate.now
-import java.time.LocalDate.ofEpochDay
 import javax.inject.Inject
 
 class ExamPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val examRepository: ExamRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<ExamView>(errorHandler, studentRepository) {
+) : BasePresenter<ExamView>(errorHandler, studentRepository, schedulers) {
 
     private var baseDate: LocalDate = now().nextOrSameSchoolDay
 
@@ -93,54 +89,59 @@ class ExamPresenter @Inject constructor(
     }
 
     private fun setBaseDateOnHolidays() {
-        flow {
-            val student = studentRepository.getCurrentStudent()
-            emit(semesterRepository.getCurrentSemester(student))
-        }.catch {
-            Timber.i("Loading semester result: An exception occurred")
-        }.onEach {
-            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-            currentDate = baseDate
-            reloadNavigation()
-        }.launch("holidays")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading exam data started")
         currentDate = date
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            examRepository.getExams(student, semester, currentDate.monday, currentDate.sunday, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading exam data started")
-                Status.SUCCESS -> {
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        examRepository.getExams(student, semester, currentDate.monday, currentDate.sunday, forceRefresh)
+                    }
+                }
+                .map { createExamItems(it) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading exam result: Success")
                     view?.apply {
-                        updateData(createExamItems(it.data!!))
-                        showEmpty(it.data.isEmpty())
+                        updateData(it)
+                        showEmpty(it.isEmpty())
                         showErrorView(false)
-                        showContent(it.data.isNotEmpty())
+                        showContent(it.isNotEmpty())
                     }
                     analytics.logEvent(
                         "load_data",
                         "type" to "exam",
-                        "items" to it.data!!.size
+                        "items" to it.size,
+                        "force_refresh" to forceRefresh
                     )
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Loading exam result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageMode.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageMode.kt
deleted file mode 100644
index 1960c3df7..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageMode.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade
-
-enum class GradeAverageMode(val value: String) {
-    ALL_YEAR("all_year"),
-    ONE_SEMESTER("only_one_semester"),
-    BOTH_SEMESTERS("both_semesters");
-
-    companion object {
-        fun getByValue(value: String) = values().firstOrNull { it.value == value } ?: ONE_SEMESTER
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
index 5d0a310f2..954b57566 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
@@ -1,136 +1,78 @@
 package io.github.wulkanowy.ui.modules.grade
 
-import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.ui.modules.grade.GradeAverageMode.ALL_YEAR
-import io.github.wulkanowy.ui.modules.grade.GradeAverageMode.BOTH_SEMESTERS
-import io.github.wulkanowy.ui.modules.grade.GradeAverageMode.ONE_SEMESTER
 import io.github.wulkanowy.utils.calcAverage
 import io.github.wulkanowy.utils.changeModifier
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.flatMapConcat
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
+import io.reactivex.Single
 import javax.inject.Inject
 
-@OptIn(FlowPreview::class)
 class GradeAverageProvider @Inject constructor(
     private val semesterRepository: SemesterRepository,
     private val gradeRepository: GradeRepository,
     private val preferencesRepository: PreferencesRepository
 ) {
 
-    private val plusModifier get() = preferencesRepository.gradePlusModifier
+    private val plusModifier = preferencesRepository.gradePlusModifier
 
-    private val minusModifier get() = preferencesRepository.gradeMinusModifier
+    private val minusModifier = preferencesRepository.gradeMinusModifier
 
-    fun getGradesDetailsWithAverage(student: Student, semesterId: Int, forceRefresh: Boolean) = flowWithResourceIn {
-        val semesters = semesterRepository.getSemesters(student)
-
-        when (preferencesRepository.gradeAverageMode) {
-            ONE_SEMESTER -> getSemesterDetailsWithAverage(student, semesters.single { it.semesterId == semesterId }, forceRefresh)
-            BOTH_SEMESTERS -> calculateBothSemestersAverage(student, semesters, semesterId, forceRefresh)
-            ALL_YEAR -> calculateAllYearAverage(student, semesters, semesterId, forceRefresh)
-        }
-    }.distinctUntilChanged()
-
-    private fun calculateBothSemestersAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Flow<Resource<List<GradeDetailsWithAverage>>> {
-        val selectedSemester = semesters.single { it.semesterId == semesterId }
-        val firstSemester = semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
-
-        return getSemesterDetailsWithAverage(student, selectedSemester, forceRefresh).flatMapConcat { selectedDetails ->
-            val isAnyAverage = selectedDetails.data.orEmpty().any { it.average != .0 }
-
-            if (selectedSemester != firstSemester) {
-                getSemesterDetailsWithAverage(student, firstSemester, forceRefresh).map { secondDetails ->
-                    secondDetails.copy(data = selectedDetails.data?.map { selected ->
-                        val second = secondDetails.data.orEmpty().singleOrNull { it.subject == selected.subject }
-                        selected.copy(average = if (!isAnyAverage || preferencesRepository.gradeAverageForceCalc) {
-                            val selectedGrades = selected.grades.updateModifiers(student).calcAverage()
-                            (selectedGrades + (second?.grades?.updateModifiers(student)?.calcAverage() ?: selectedGrades)) / 2
-                        } else (selected.average + (second?.average ?: selected.average)) / 2)
-                    })
-                }.filter { it.status != Status.LOADING }.filter { it.data != null }
-            } else flowOf(selectedDetails)
+    fun getGradesDetailsWithAverage(student: Student, semesterId: Int, forceRefresh: Boolean = false): Single<List<GradeDetailsWithAverage>> {
+        return semesterRepository.getSemesters(student).flatMap { semesters ->
+            when (preferencesRepository.gradeAverageMode) {
+                "only_one_semester" -> getSemesterDetailsWithAverage(student, semesters.single { it.semesterId == semesterId }, forceRefresh)
+                "all_year" -> calculateWholeYearAverage(student, semesters, semesterId, forceRefresh)
+                else -> throw IllegalArgumentException("Incorrect grade average mode: ${preferencesRepository.gradeAverageMode} ")
+            }
         }
     }
 
-    private fun calculateAllYearAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Flow<Resource<List<GradeDetailsWithAverage>>> {
+    private fun calculateWholeYearAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<List<GradeDetailsWithAverage>> {
         val selectedSemester = semesters.single { it.semesterId == semesterId }
         val firstSemester = semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
 
-        return getSemesterDetailsWithAverage(student, selectedSemester, forceRefresh).flatMapConcat { selectedDetails ->
-            val isAnyAverage = selectedDetails.data.orEmpty().any { it.average != .0 }
+        return getSemesterDetailsWithAverage(student, selectedSemester, forceRefresh).flatMap { selectedDetails ->
+            val isAnyAverage = selectedDetails.any { it.average != .0 }
 
             if (selectedSemester != firstSemester) {
                 getSemesterDetailsWithAverage(student, firstSemester, forceRefresh).map { secondDetails ->
-                    secondDetails.copy(data = selectedDetails.data?.map { selected ->
-                        val second = secondDetails.data.orEmpty().singleOrNull { it.subject == selected.subject }
-                        selected.copy(average = if (!isAnyAverage || preferencesRepository.gradeAverageForceCalc) {
-                            (selected.grades.updateModifiers(student) + second?.grades?.updateModifiers(student).orEmpty()).calcAverage()
-                        } else selected.average)
-                    })
-                }.filter { it.status != Status.LOADING }.filter { it.data != null }
-            } else flowOf(selectedDetails)
+                    selectedDetails.map { selected ->
+                        val second = secondDetails.singleOrNull { it.subject == selected.subject }
+                        selected.copy(
+                            average = if (!isAnyAverage || preferencesRepository.gradeAverageForceCalc) {
+                                (selected.grades + second?.grades.orEmpty()).calcAverage()
+                            } else (selected.average + (second?.average ?: selected.average)) / 2
+                        )
+                    }
+                }
+            } else Single.just(selectedDetails)
         }
     }
 
-    private fun getSemesterDetailsWithAverage(student: Student, semester: Semester, forceRefresh: Boolean): Flow<Resource<List<GradeDetailsWithAverage>>> {
-        return gradeRepository.getGrades(student, semester, forceRefresh = forceRefresh).map { res ->
-            val (details, summaries) = res.data ?: null to null
-            val isAnyAverage = summaries.orEmpty().any { it.average != .0 }
-            val allGrades = details.orEmpty().groupBy { it.subject }
+    private fun getSemesterDetailsWithAverage(student: Student, semester: Semester, forceRefresh: Boolean): Single<List<GradeDetailsWithAverage>> {
+        return gradeRepository.getGrades(student, semester, forceRefresh).map { (details, summaries) ->
+            val isAnyAverage = summaries.any { it.average != .0 }
+            val allGrades = details.groupBy { it.subject }
 
-            Resource(res.status, summaries?.emulateEmptySummaries(student, semester, allGrades.toList(), isAnyAverage)?.map { summary ->
+            summaries.map { summary ->
                 val grades = allGrades[summary.subject].orEmpty()
                 GradeDetailsWithAverage(
                     subject = summary.subject,
                     average = if (!isAnyAverage || preferencesRepository.gradeAverageForceCalc) {
-                        grades.updateModifiers(student).calcAverage()
+                        grades.map {
+                            if (student.loginMode == Sdk.Mode.SCRAPPER.name) it.changeModifier(plusModifier, minusModifier)
+                            else it
+                        }.calcAverage()
                     } else summary.average,
                     points = summary.pointsSum,
                     summary = summary,
                     grades = grades
                 )
-            }, res.error)
+            }
         }
     }
-
-    private fun List<GradeSummary>.emulateEmptySummaries(student: Student, semester: Semester, grades: List<Pair<String, List<Grade>>>, calcAverage: Boolean): List<GradeSummary> {
-        if (isNotEmpty() && size > grades.size) return this
-
-        return grades.mapIndexed { i, (subject, details) ->
-            singleOrNull { it.subject == subject }?.let { return@mapIndexed it }
-            GradeSummary(
-                studentId = student.studentId,
-                semesterId = semester.semesterId,
-                position = i,
-                subject = subject,
-                predictedGrade = "",
-                finalGrade = "",
-                proposedPoints = "",
-                finalPoints = "",
-                pointsSum = "",
-                average = if (calcAverage) details.updateModifiers(student).calcAverage() else .0
-            )
-        }
-    }
-
-    private fun List<Grade>.updateModifiers(student: Student): List<Grade> {
-        return if (student.loginMode == Sdk.Mode.SCRAPPER.name) {
-            map { it.changeModifier(plusModifier, minusModifier) }
-        } else this
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
index 0678e13ef..59b83c4b0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
@@ -8,7 +8,6 @@ import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import androidx.appcompat.app.AlertDialog
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.FragmentGradeBinding
 import io.github.wulkanowy.ui.base.BaseFragment
@@ -21,14 +20,13 @@ import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade), GradeView,
-    MainView.MainChildView, MainView.TitledView {
+class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade), GradeView, MainView.MainChildView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: GradePresenter
 
-    private val pagerAdapter by lazy { BaseFragmentPagerAdapter(childFragmentManager) }
+    @Inject
+    lateinit var pagerAdapter: BaseFragmentPagerAdapter
 
     private var semesterSwitchMenu: MenuItem? = null
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
new file mode 100644
index 000000000..342f356cb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
@@ -0,0 +1,35 @@
+package io.github.wulkanowy.ui.modules.grade
+
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import io.github.wulkanowy.di.scopes.PerChildFragment
+import io.github.wulkanowy.di.scopes.PerFragment
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
+import io.github.wulkanowy.ui.modules.grade.details.GradeDetailsFragment
+import io.github.wulkanowy.ui.modules.grade.statistics.GradeStatisticsFragment
+import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
+
+@Suppress("unused")
+@Module
+abstract class GradeModule {
+
+    companion object {
+
+        @PerFragment
+        @Provides
+        fun provideGradeAdapter(fragment: GradeFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
+    }
+
+    @PerChildFragment
+    @ContributesAndroidInjector
+    abstract fun bindGradeDetailsFragment(): GradeDetailsFragment
+
+    @PerChildFragment
+    @ContributesAndroidInjector
+    abstract fun binGradeSummaryFragment(): GradeSummaryFragment
+
+    @PerChildFragment
+    @ContributesAndroidInjector
+    abstract fun binGradeStatisticsFragment(): GradeStatisticsFragment
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
index d4c9f210a..ec66e2bd9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
@@ -1,25 +1,24 @@
 package io.github.wulkanowy.ui.modules.grade
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.getCurrentOrLast
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class GradePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<GradeView>(errorHandler, studentRepository) {
+) : BasePresenter<GradeView>(errorHandler, studentRepository, schedulers) {
 
     var selectedIndex = 0
         private set
@@ -99,33 +98,29 @@ class GradePresenter @Inject constructor(
     }
 
     private fun loadData() {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            delay(200)
-            semesterRepository.getSemesters(student, refreshOnNoCurrent = true)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading grade data started")
-                Status.SUCCESS -> {
-                    val current = it.data!!.getCurrentOrLast()
-                    selectedIndex = if (selectedIndex == 0) current.semesterName else selectedIndex
-                    schoolYear = current.schoolYear
-                    semesters = it.data.filter { semester -> semester.diaryId == current.diaryId }
-                    view?.setCurrentSemesterName(current.semesterName, schoolYear)
+        Timber.i("Loading grade data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getSemesters(it, refreshOnNoCurrent = true) }
+            .delay(200, MILLISECONDS)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                val current = it.getCurrentOrLast()
+                selectedIndex = if (selectedIndex == 0) current.semesterName else selectedIndex
+                schoolYear = current.schoolYear
+                semesters = it.filter { semester -> semester.diaryId == current.diaryId }
+                view?.setCurrentSemesterName(current.semesterName, schoolYear)
 
-                    view?.run {
-                        Timber.i("Loading grade result: Attempt load index $currentPageIndex")
-                        loadChild(currentPageIndex)
-                        showErrorView(false)
-                        showSemesterSwitch(true)
-                    }
+                view?.run {
+                    Timber.i("Loading grade result: Attempt load index $currentPageIndex")
+                    loadChild(currentPageIndex)
+                    showErrorView(false)
+                    showSemesterSwitch(true)
                 }
-                Status.ERROR -> {
-                    Timber.i("Loading grade result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.launch()
+            }) {
+                Timber.i("Loading grade result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
index c129d9485..d5e05f3b9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
@@ -7,7 +7,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.NO_POSITION
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.databinding.HeaderGradeDetailsBinding
@@ -24,7 +23,7 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
 
     private var items = mutableListOf<GradeDetailsItem>()
 
-    private var expandedPosition = NO_POSITION
+    private var expandedPosition = RecyclerView.NO_POSITION
 
     private var isExpandable = false
 
@@ -36,7 +35,7 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
         headers = data.filter { it.viewType == ViewType.HEADER }.toMutableList()
         items = if (isExpanded) headers else data.toMutableList()
         isExpandable = isExpanded
-        expandedPosition = NO_POSITION
+        expandedPosition = RecyclerView.NO_POSITION
     }
 
     fun updateDetailsItem(position: Int, grade: Grade) {
@@ -49,40 +48,37 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
     }
 
     fun getHeaderItem(subject: String): GradeDetailsItem {
+        if (headers.any { it.value !is GradeDetailsHeader }) {
+            Timber.e("Headers contains no-header items! $headers")
+        }
+
         val candidates = headers.filter { (it.value as GradeDetailsHeader).subject == subject }
 
         if (candidates.size > 1) {
-            Timber.e("Header with subject $subject found ${candidates.size} times! Expanded: $expandedPosition. Items: $candidates")
+            Timber.e("Header with subject $subject found ${candidates.size} times! Items: $candidates, expanded: $expandedPosition")
         }
 
         return candidates.first()
     }
 
     fun updateHeaderItem(item: GradeDetailsItem) {
-        val headerPosition = headers.indexOf(item)
-        val itemPosition = items.indexOf(item)
-
-        if (headerPosition == NO_POSITION || itemPosition == NO_POSITION) {
-            Timber.e("Invalid update header positions! Header: $headerPosition, item: $itemPosition")
-        }
-
-        headers[headerPosition] = item
-        items[itemPosition] = item
-        notifyItemChanged(itemPosition)
+        headers[headers.indexOf(item)] = item
+        items[items.indexOf(item)] = item
+        notifyItemChanged(items.indexOf(item))
     }
 
     fun collapseAll() {
         if (expandedPosition != -1) {
             refreshList(headers)
-            expandedPosition = NO_POSITION
+            expandedPosition = RecyclerView.NO_POSITION
         }
     }
 
     @Synchronized
-    private fun refreshList(newItems: MutableList<GradeDetailsItem>) {
+    private fun refreshList(newItems: List<GradeDetailsItem>) {
         val diffCallback = GradeDetailsDiffUtil(items, newItems)
         val diffResult = DiffUtil.calculateDiff(diffCallback)
-        items = newItems
+        items = newItems.toMutableList()
         diffResult.dispatchUpdatesTo(this)
     }
 
@@ -103,24 +99,23 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         when (holder) {
             is HeaderViewHolder -> bindHeaderViewHolder(
-                holder = holder,
+                binding = holder.binding,
                 header = items[position].value as GradeDetailsHeader,
-                position = position
+                headerPosition = headers.indexOf(items[position]),
+                adapterPosition = position
             )
             is ItemViewHolder -> bindItemViewHolder(
-                holder = holder,
-                grade = items[position].value as Grade
+                binding = holder.binding,
+                grade = items[position].value as Grade,
+                position = holder.adapterPosition
             )
         }
     }
 
-    private fun bindHeaderViewHolder(holder: HeaderViewHolder, header: GradeDetailsHeader, position: Int) {
-        val headerPosition = headers.indexOf(items[position])
-        val adapterPosition = holder.adapterPosition
-
-        with(holder.binding) {
+    private fun bindHeaderViewHolder(binding: HeaderGradeDetailsBinding, header: GradeDetailsHeader, headerPosition: Int, adapterPosition: Int) {
+        with(binding) {
             gradeHeaderDivider.visibility = if (adapterPosition == 0) View.GONE else View.VISIBLE
-            with(gradeHeaderSubject) {
+            gradeHeaderSubject.apply {
                 text = header.subject
                 maxLines = if (headerPosition == expandedPosition) 2 else 1
             }
@@ -135,7 +130,7 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
             gradeHeaderContainer.setOnClickListener {
                 expandedPosition = if (expandedPosition == adapterPosition) -1 else adapterPosition
 
-                if (expandedPosition != NO_POSITION) {
+                if (expandedPosition != RecyclerView.NO_POSITION) {
                     refreshList(headers.toMutableList().apply {
                         addAll(headerPosition + 1, header.grades)
                     })
@@ -153,8 +148,8 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
     }
 
     @SuppressLint("SetTextI18n")
-    private fun bindItemViewHolder(holder: ItemViewHolder, grade: Grade) {
-        with(holder.binding) {
+    private fun bindItemViewHolder(binding: ItemGradeDetailsBinding, grade: Grade, position: Int) {
+        with(binding) {
             gradeItemValue.run {
                 text = grade.entry
                 setBackgroundResource(grade.getBackgroundColor(colorTheme))
@@ -168,9 +163,7 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
             gradeItemWeight.text = "${root.context.getString(R.string.grade_weight)}: ${grade.weight}"
             gradeItemNote.visibility = if (!grade.isRead) View.VISIBLE else View.GONE
 
-            root.setOnClickListener {
-                holder.adapterPosition.let { if (it != NO_POSITION) onClickListener(grade, it) }
-            }
+            root.setOnClickListener { onClickListener(grade, position) }
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
index ef9a932e1..ac50b9f53 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
@@ -9,7 +9,6 @@ import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.databinding.FragmentGradeDetailsBinding
@@ -19,7 +18,6 @@ import io.github.wulkanowy.ui.modules.grade.GradeView
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class GradeDetailsFragment :
     BaseFragment<FragmentGradeDetailsBinding>(R.layout.fragment_grade_details), GradeDetailsView,
     GradeView.GradeChildView {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
index a36517938..37f2c935a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -11,15 +10,12 @@ import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.grade.GradeAverageProvider
 import io.github.wulkanowy.ui.modules.grade.GradeDetailsWithAverage
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class GradeDetailsPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val gradeRepository: GradeRepository,
@@ -27,7 +23,7 @@ class GradeDetailsPresenter @Inject constructor(
     private val preferencesRepository: PreferencesRepository,
     private val averageProvider: GradeAverageProvider,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<GradeDetailsView>(errorHandler, studentRepository) {
+) : BasePresenter<GradeDetailsView>(errorHandler, studentRepository, schedulers) {
 
     private var newGradesAmount: Int = 0
 
@@ -43,9 +39,7 @@ class GradeDetailsPresenter @Inject constructor(
 
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         currentSemesterId = semesterId
-
         loadData(semesterId, forceRefresh)
-        if (!forceRefresh) view?.showErrorView(false)
     }
 
     fun onGradeItemSelected(grade: Grade, position: Int) {
@@ -67,24 +61,24 @@ class GradeDetailsPresenter @Inject constructor(
     }
 
     fun onMarkAsReadSelected(): Boolean {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            val semesters = semesterRepository.getSemesters(student)
-            val semester = semesters.first { item -> item.semesterId == currentSemesterId }
-            val unreadGrades = gradeRepository.getUnreadGrades(semester).first()
-
-            Timber.i("Mark as read ${unreadGrades.size} grades")
-            gradeRepository.updateGrades(unreadGrades.map { it.apply { isRead = true } })
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Select mark grades as read")
-                Status.SUCCESS -> Timber.i("Mark as read result: Success")
-                Status.ERROR -> {
-                    Timber.i("Mark as read result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
+        Timber.i("Select mark grades as read")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getSemesters(it) }
+            .flatMap { gradeRepository.getUnreadGrades(it.first { item -> item.semesterId == currentSemesterId }) }
+            .map { it.map { grade -> grade.apply { isRead = true } } }
+            .flatMapCompletable {
+                Timber.i("Mark as read ${it.size} grades")
+                gradeRepository.updateGrades(it)
             }
-        }.launch("mark")
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Mark as read result: Success")
+                loadData(currentSemesterId, false)
+            }, {
+                Timber.i("Mark as read result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
         return true
     }
 
@@ -123,7 +117,7 @@ class GradeDetailsPresenter @Inject constructor(
             showEmpty(false)
             clearView()
         }
-        cancelJobs("load")
+        disposable.clear()
     }
 
     fun updateMarkAsDoneButton() {
@@ -131,46 +125,43 @@ class GradeDetailsPresenter @Inject constructor(
     }
 
     private fun loadData(semesterId: Int, forceRefresh: Boolean) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            averageProvider.getGradesDetailsWithAverage(student, semesterId, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading grade details data started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading grade details result: Success")
-                    newGradesAmount = it.data!!.sumBy { item -> item.grades.sumBy { grade -> if (!grade.isRead) 1 else 0 } }
-                    updateMarkAsDoneButton()
-                    val items = createGradeItems(it.data)
-                    view?.run {
-                        showEmpty(items.isEmpty())
-                        showErrorView(false)
-                        showContent(items.isNotEmpty())
-                        updateData(
-                            data = items,
-                            isGradeExpandable = preferencesRepository.isGradeExpandable,
-                            gradeColorTheme = preferencesRepository.gradeColorTheme
-                        )
-                    }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "grade_details",
-                        "items" to it.data.size
+        Timber.i("Loading grade details data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { averageProvider.getGradesDetailsWithAverage(it, semesterId, forceRefresh) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    showRefresh(false)
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded(semesterId)
+                }
+            }
+            .subscribe({ grades ->
+                Timber.i("Loading grade details result: Success")
+                newGradesAmount = grades.sumBy { it.grades.sumBy { grade -> if (!grade.isRead) 1 else 0 } }
+                updateMarkAsDoneButton()
+                view?.run {
+                    showEmpty(grades.isEmpty())
+                    showErrorView(false)
+                    showContent(grades.isNotEmpty())
+                    updateData(
+                        data = createGradeItems(grades),
+                        isGradeExpandable = preferencesRepository.isGradeExpandable,
+                        gradeColorTheme = preferencesRepository.gradeColorTheme
                     )
                 }
-                Status.ERROR -> {
-                    Timber.i("Loading grade details result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded(semesterId)
-            }
-        }.launch()
+                analytics.logEvent(
+                    "load_data",
+                    "type" to "grade_details",
+                    "items" to grades.size,
+                    "force_refresh" to forceRefresh
+                )
+            }) {
+                Timber.i("Loading grade details result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -204,15 +195,15 @@ class GradeDetailsPresenter @Inject constructor(
     }
 
     private fun updateGrade(grade: Grade) {
-        flowWithResource { gradeRepository.updateGrade(grade) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Attempt to update grade ${grade.id}")
-                Status.SUCCESS -> Timber.i("Update grade result: Success")
-                Status.ERROR -> {
-                    Timber.i("Update grade result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.launch("update")
+        Timber.i("Attempt to update grade ${grade.id}")
+        disposable.add(gradeRepository.updateGrade(grade)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Update grade result: Success")
+            }) { error ->
+                Timber.i("Update grade result: An exception occurred")
+                errorHandler.dispatch(error)
+            })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
index 75050249a..3a8f40073 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
@@ -5,7 +5,6 @@ import android.view.View
 import android.widget.ArrayAdapter
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.pojos.GradeStatisticsItem
 import io.github.wulkanowy.databinding.FragmentGradeStatisticsBinding
@@ -16,7 +15,6 @@ import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemSelectedListener
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class GradeStatisticsFragment :
     BaseFragment<FragmentGradeStatisticsBinding>(R.layout.fragment_grade_statistics),
     GradeStatisticsView, GradeView.GradeChildView {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
index 73cee9e96..590e9ce12 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.grade.statistics
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.data.repositories.gradestatistics.GradeStatisticsRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -10,13 +9,12 @@ import io.github.wulkanowy.data.repositories.subject.SubjectRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class GradeStatisticsPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val gradeStatisticsRepository: GradeStatisticsRepository,
@@ -24,7 +22,7 @@ class GradeStatisticsPresenter @Inject constructor(
     private val semesterRepository: SemesterRepository,
     private val preferencesRepository: PreferencesRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<GradeStatisticsView>(errorHandler, studentRepository) {
+) : BasePresenter<GradeStatisticsView>(errorHandler, studentRepository, schedulers) {
 
     private var subjects = emptyList<Subject>()
 
@@ -47,7 +45,6 @@ class GradeStatisticsPresenter @Inject constructor(
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         currentSemesterId = semesterId
         loadSubjects()
-        if (!forceRefresh) view?.showErrorView(false)
         loadDataByType(semesterId, currentSubjectName, currentType, forceRefresh)
     }
 
@@ -67,7 +64,7 @@ class GradeStatisticsPresenter @Inject constructor(
             showEmpty(false)
             clearView()
         }
-        cancelJobs("load")
+        disposable.clear()
     }
 
     fun onSwipeRefresh() {
@@ -105,7 +102,7 @@ class GradeStatisticsPresenter @Inject constructor(
     fun onTypeChange() {
         val type = view?.currentType ?: ViewType.POINTS
         Timber.i("Select grade stats semester: $type")
-        cancelJobs("load")
+        disposable.clear()
         view?.run {
             showContent(false)
             showProgress(true)
@@ -118,77 +115,75 @@ class GradeStatisticsPresenter @Inject constructor(
     }
 
     private fun loadSubjects() {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            subjectRepository.getSubjects(student, semester)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading grade stats subjects started")
-                Status.SUCCESS -> {
-                    subjects = it.data!!
-
-                    Timber.i("Loading grade stats subjects result: Success")
-                    view?.run {
-                        view?.updateSubjects(ArrayList(it.data.map { subject -> subject.name }))
-                        showSubjects(!preferencesRepository.showAllSubjectsOnStatisticsList)
-                    }
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading grade stats subjects result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Loading grade stats subjects started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    subjectRepository.getSubjects(student, semester)
                 }
             }
-        }.launch("subjects")
+            .doOnSuccess { subjects = it }
+            .map { ArrayList(it.map { subject -> subject.name }) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Loading grade stats subjects result: Success")
+                view?.updateSubjects(it)
+            }, {
+                Timber.i("Loading grade stats subjects result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
+        )
     }
 
     private fun loadDataByType(semesterId: Int, subjectName: String, type: ViewType, forceRefresh: Boolean = false) {
         currentSubjectName = if (preferencesRepository.showAllSubjectsOnStatisticsList) "Wszystkie" else subjectName
         currentType = type
 
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semesters = semesterRepository.getSemesters(student)
-            val semester = semesters.first { item -> item.semesterId == semesterId }
+        Timber.i("Loading grade stats data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getSemesters(student).flatMap { semesters ->
+                    val semester = semesters.first { item -> item.semesterId == semesterId }
 
-            with(gradeStatisticsRepository) {
-                when (type) {
-                    ViewType.SEMESTER -> getGradesStatistics(student, semester, currentSubjectName, true, forceRefresh)
-                    ViewType.PARTIAL -> getGradesStatistics(student, semester, currentSubjectName, false, forceRefresh)
-                    ViewType.POINTS -> getGradesPointsStatistics(student, semester, currentSubjectName, forceRefresh)
-                }
-            }
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading grade stats data started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading grade stats result: Success")
-                    view?.run {
-                        showEmpty(it.data!!.isEmpty() || it.data.first().partial.isEmpty())
-                        showContent(it.data.isNotEmpty() && it.data.first().partial.isNotEmpty())
-                        showErrorView(false)
-                        updateData(it.data, preferencesRepository.gradeColorTheme, preferencesRepository.showAllSubjectsOnStatisticsList)
-                        showSubjects(!preferencesRepository.showAllSubjectsOnStatisticsList)
+                    with(gradeStatisticsRepository) {
+                        when (type) {
+                            ViewType.SEMESTER -> getGradesStatistics(student, semester, currentSubjectName, true, forceRefresh)
+                            ViewType.PARTIAL -> getGradesStatistics(student, semester, currentSubjectName, false, forceRefresh)
+                            ViewType.POINTS -> getGradesPointsStatistics(student, semester, currentSubjectName, forceRefresh)
+                        }
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "grade_statistics",
-                        "items" to it.data!!.size
-                    )
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading grade stats result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
                 }
             }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded(semesterId)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    showRefresh(false)
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded(semesterId)
+                }
             }
-        }.launch("load")
+            .subscribe({
+                Timber.i("Loading grade stats result: Success")
+                view?.run {
+                    showEmpty(it.isEmpty())
+                    showContent(it.isNotEmpty())
+                    showErrorView(false)
+                    updateData(it, preferencesRepository.gradeColorTheme, preferencesRepository.showAllSubjectsOnStatisticsList)
+                    showSubjects(!preferencesRepository.showAllSubjectsOnStatisticsList)
+                }
+                analytics.logEvent(
+                    "load_data",
+                    "type" to "grade_statistics",
+                    "items" to it.size,
+                    "force_refresh" to forceRefresh
+                )
+            }) {
+                Timber.i("Loading grade stats result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt
index ccebe94f0..30c4ccc23 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt
@@ -21,7 +21,7 @@ class GradeSummaryAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerV
 
     var items = emptyList<GradeSummary>()
 
-    override fun getItemCount() = items.size + if (items.isNotEmpty()) 1 else 0
+    override fun getItemCount() = items.size + 1
 
     override fun getItemViewType(position: Int) = when (position) {
         0 -> ViewType.HEADER.id
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
index 4d12dcd50..d169f7c62 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
@@ -6,7 +6,6 @@ import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.databinding.FragmentGradeSummaryBinding
@@ -15,7 +14,6 @@ import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class GradeSummaryFragment :
     BaseFragment<FragmentGradeSummaryBinding>(R.layout.fragment_grade_summary), GradeSummaryView,
     GradeView.GradeChildView {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
index caa3cb84d..9b88689db 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -8,18 +7,17 @@ import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.grade.GradeAverageProvider
 import io.github.wulkanowy.ui.modules.grade.GradeDetailsWithAverage
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class GradeSummaryPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val averageProvider: GradeAverageProvider,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<GradeSummaryView>(errorHandler, studentRepository) {
+) : BasePresenter<GradeSummaryView>(errorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -31,46 +29,36 @@ class GradeSummaryPresenter @Inject constructor(
 
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         Timber.i("Loading grade summary data started")
-
-        loadData(semesterId, forceRefresh)
-        if (!forceRefresh) view?.showErrorView(false)
-    }
-
-    private fun loadData(semesterId: Int, forceRefresh: Boolean) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            averageProvider.getGradesDetailsWithAverage(student, semesterId, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading grade summary started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading grade summary result: Success")
-                    val items = createGradeSummaryItems(it.data!!)
-                    view?.run {
-                        showEmpty(items.isEmpty())
-                        showContent(items.isNotEmpty())
-                        showErrorView(false)
-                        updateData(items)
-                    }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "grade_summary",
-                        "items" to it.data.size
-                    )
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { averageProvider.getGradesDetailsWithAverage(it, semesterId, forceRefresh) }
+            .map { createGradeSummaryItems(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    showRefresh(false)
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded(semesterId)
                 }
-                Status.ERROR -> {
-                    Timber.i("Loading grade summary result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+            }.subscribe({
+                Timber.i("Loading grade summary result: Success")
+                view?.run {
+                    showEmpty(it.isEmpty())
+                    showContent(it.isNotEmpty())
+                    showErrorView(false)
+                    updateData(it)
                 }
-            }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded(semesterId)
-            }
-        }.launch()
+                analytics.logEvent(
+                    "load_data",
+                    "type" to "grade_summary",
+                    "items" to it.size,
+                    "force_refresh" to forceRefresh
+                )
+            }) {
+                Timber.i("Loading grade summary result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -116,22 +104,12 @@ class GradeSummaryPresenter @Inject constructor(
             showEmpty(false)
             clearView()
         }
-        cancelJobs("load")
+        disposable.clear()
     }
 
     private fun createGradeSummaryItems(items: List<GradeDetailsWithAverage>): List<GradeSummary> {
         return items
-            .filter { !checkEmpty(it) }
             .sortedBy { it.subject }
             .map { it.summary.copy(average = it.average) }
     }
-
-    private fun checkEmpty(gradeSummary: GradeDetailsWithAverage): Boolean {
-        return gradeSummary.run {
-            summary.finalGrade.isBlank()
-                && summary.predictedGrade.isBlank()
-                && average == .0
-                && points.isBlank()
-        }
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt
index 8ae06aeb5..a87ad18e8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt
@@ -10,7 +10,7 @@ import io.github.wulkanowy.databinding.HeaderHomeworkBinding
 import io.github.wulkanowy.databinding.ItemHomeworkBinding
 import io.github.wulkanowy.utils.toFormattedString
 import io.github.wulkanowy.utils.weekDayName
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
 class HomeworkAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
index e1d7ac52f..f30529575 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
@@ -5,7 +5,6 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.databinding.FragmentHomeworkBinding
@@ -17,7 +16,6 @@ import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.dpToPx
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class HomeworkFragment : BaseFragment<FragmentHomeworkBinding>(R.layout.fragment_homework),
     HomeworkView, MainView.TitledView {
 
@@ -72,6 +70,10 @@ class HomeworkFragment : BaseFragment<FragmentHomeworkBinding>(R.layout.fragment
         }
     }
 
+    fun onReloadList() {
+        presenter.reloadData()
+    }
+
     override fun clearData() {
         with(homeworkAdapter) {
             items = emptyList()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
index 8af0d83f6..41735a23f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.homework
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -8,29 +7,26 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
-import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-import java.time.LocalDate
-import java.time.LocalDate.ofEpochDay
 import javax.inject.Inject
 
 class HomeworkPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val homeworkRepository: HomeworkRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<HomeworkView>(errorHandler, studentRepository) {
+) : BasePresenter<HomeworkView>(errorHandler, studentRepository, schedulers) {
 
     private var baseDate: LocalDate = LocalDate.now().nextOrSameSchoolDay
 
@@ -82,54 +78,64 @@ class HomeworkPresenter @Inject constructor(
     }
 
     private fun setBaseDateOnHolidays() {
-        flow {
-            val student = studentRepository.getCurrentStudent()
-            emit(semesterRepository.getCurrentSemester(student))
-        }.catch {
-            Timber.i("Loading semester result: An exception occurred")
-        }.onEach {
-            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-            currentDate = baseDate
-            reloadNavigation()
-        }.launch("holidays")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
+    fun reloadData() {
+        loadData(currentDate, false)
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading homework data started")
         currentDate = date
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            homeworkRepository.getHomework(student, semester, date, date, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading homework data started")
-                Status.SUCCESS -> {
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        homeworkRepository.getHomework(student, semester, currentDate, currentDate, forceRefresh)
+                    }
+                }
+                .map { createHomeworkItem(it) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading homework result: Success")
                     view?.apply {
-                        updateData(createHomeworkItem(it.data!!))
-                        showEmpty(it.data.isEmpty())
+                        updateData(it)
+                        showEmpty(it.isEmpty())
                         showErrorView(false)
-                        showContent(it.data.isNotEmpty())
+                        showContent(it.isNotEmpty())
                     }
                     analytics.logEvent(
                         "load_data",
                         "type" to "homework",
-                        "items" to it.data!!.size
+                        "items" to it.size,
+                        "force_refresh" to forceRefresh
                     )
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Loading homework result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
index 78abfffd0..7b3b9821a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
@@ -8,15 +8,14 @@ import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.databinding.DialogHomeworkBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
+import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
 import io.github.wulkanowy.utils.openInternetBrowser
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), HomeworkDetailsView {
 
     @Inject
@@ -74,6 +73,7 @@ class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), Homew
     }
 
     override fun updateMarkAsDoneLabel(isDone: Boolean) {
+        (parentFragment as? HomeworkFragment)?.onReloadList()
         binding.homeworkDialogRead.text = view?.context?.getString(if (isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt
index a53d38e86..04a97b8cd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt
@@ -1,23 +1,22 @@
 package io.github.wulkanowy.ui.modules.homework.details
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class HomeworkDetailsPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val homeworkRepository: HomeworkRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<HomeworkDetailsView>(errorHandler, studentRepository) {
+) : BasePresenter<HomeworkDetailsView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: HomeworkDetailsView) {
         super.onAttachView(view)
@@ -26,19 +25,20 @@ class HomeworkDetailsPresenter @Inject constructor(
     }
 
     fun toggleDone(homework: Homework) {
-        flowWithResource { homeworkRepository.toggleDone(homework) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Homework details update start")
-                Status.SUCCESS -> {
-                    Timber.i("Homework details update: Success")
-                    view?.updateMarkAsDoneLabel(homework.isDone)
-                    analytics.logEvent("homework_mark_as_done")
-                }
-                Status.ERROR -> {
-                    Timber.i("Homework details update result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Homework details update start")
+        disposable.add(homeworkRepository.toggleDone(homework)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Homework details update: Success")
+                view?.run {
+                    updateMarkAsDoneLabel(homework.isDone)
                 }
+                analytics.logEvent("homework_mark_as_done")
+            }) {
+                Timber.i("Homework details update result: An exception occurred")
+                errorHandler.dispatch(it)
             }
-        }.launch("toggle")
+        )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
index 749989e3a..ffb36fe6e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
@@ -4,8 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.ActivityLoginBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
@@ -17,13 +16,13 @@ import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), LoginView {
 
     @Inject
     override lateinit var presenter: LoginPresenter
 
-    private val loginAdapter = BaseFragmentPagerAdapter(supportFragmentManager)
+    @Inject
+    lateinit var loginAdapter: BaseFragmentPagerAdapter
 
     companion object {
 
@@ -86,16 +85,16 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
         (loginAdapter.getFragmentInstance(1) as? LoginSymbolFragment)?.onParentInitSymbolFragment(loginData)
     }
 
-    override fun notifyInitStudentSelectFragment(studentsWithSemesters: List<StudentWithSemesters>) {
-        (loginAdapter.getFragmentInstance(2) as? LoginStudentSelectFragment)?.onParentInitStudentSelectFragment(studentsWithSemesters)
+    override fun notifyInitStudentSelectFragment(students: List<Student>) {
+        (loginAdapter.getFragmentInstance(2) as? LoginStudentSelectFragment)?.onParentInitStudentSelectFragment(students)
     }
 
-    fun onFormFragmentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>) {
-        presenter.onFormViewAccountLogged(studentsWithSemesters, loginData)
+    fun onFormFragmentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
+        presenter.onFormViewAccountLogged(students, loginData)
     }
 
-    fun onSymbolFragmentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
-        presenter.onSymbolViewAccountLogged(studentsWithSemesters)
+    fun onSymbolFragmentAccountLogged(students: List<Student>) {
+        presenter.onSymbolViewAccountLogged(students)
     }
 
     fun onAdvancedLoginClick() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
index f30825cff..5ed181bf1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
@@ -4,11 +4,11 @@ import android.content.res.Resources
 import android.database.sqlite.SQLiteConstraintException
 import com.chuckerteam.chucker.api.ChuckerCollector
 import io.github.wulkanowy.R
+import io.github.wulkanowy.sdk.exception.BadCredentialsException
 import io.github.wulkanowy.sdk.mobile.exception.InvalidPinException
 import io.github.wulkanowy.sdk.mobile.exception.InvalidSymbolException
 import io.github.wulkanowy.sdk.mobile.exception.InvalidTokenException
 import io.github.wulkanowy.sdk.mobile.exception.TokenDeadException
-import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException
 import io.github.wulkanowy.ui.base.ErrorHandler
 import javax.inject.Inject
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
new file mode 100644
index 000000000..26a243dcd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
@@ -0,0 +1,45 @@
+package io.github.wulkanowy.ui.modules.login
+
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import io.github.wulkanowy.di.scopes.PerActivity
+import io.github.wulkanowy.di.scopes.PerFragment
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
+import io.github.wulkanowy.ui.modules.login.advanced.LoginAdvancedFragment
+import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
+import io.github.wulkanowy.ui.modules.login.recover.LoginRecoverFragment
+import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
+import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
+
+@Suppress("unused")
+@Module
+internal abstract class LoginModule {
+
+    companion object {
+
+        @PerActivity
+        @Provides
+        fun provideLoginAdapter(activity: LoginActivity) = BaseFragmentPagerAdapter(activity.supportFragmentManager)
+    }
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginFormFragment(): LoginFormFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginAdvancedFragment(): LoginAdvancedFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginSymbolFragment(): LoginSymbolFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginSelectStudentFragment(): LoginStudentSelectFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginRecoverFragment(): LoginRecoverFragment
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
index 7e731772f..16342de4f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
@@ -1,16 +1,18 @@
 package io.github.wulkanowy.ui.modules.login
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class LoginPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<LoginView>(errorHandler, studentRepository) {
+) : BasePresenter<LoginView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: LoginView) {
         super.onAttachView(view)
@@ -21,24 +23,24 @@ class LoginPresenter @Inject constructor(
         Timber.i("Login view was initialized")
     }
 
-    fun onFormViewAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>) {
+    fun onFormViewAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
         view?.apply {
-            if (studentsWithSemesters.isEmpty()) {
+            if (students.isEmpty()) {
                 Timber.i("Switch to symbol form")
                 notifyInitSymbolFragment(loginData)
                 switchView(1)
             } else {
                 Timber.i("Switch to student select")
-                notifyInitStudentSelectFragment(studentsWithSemesters)
+                notifyInitStudentSelectFragment(students)
                 switchView(2)
             }
         }
     }
 
-    fun onSymbolViewAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
+    fun onSymbolViewAccountLogged(students: List<Student>) {
         view?.apply {
             Timber.i("Switch to student select")
-            notifyInitStudentSelectFragment(studentsWithSemesters)
+            notifyInitStudentSelectFragment(students)
             switchView(2)
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
index 2a5cf316a..9c98a1d8d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.login
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginView : BaseView {
@@ -15,5 +15,5 @@ interface LoginView : BaseView {
 
     fun notifyInitSymbolFragment(loginData: Triple<String, String, String>)
 
-    fun notifyInitStudentSelectFragment(studentsWithSemesters: List<StudentWithSemesters>)
+    fun notifyInitStudentSelectFragment(students: List<Student>)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
index 9231914c8..3b6a985be 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
@@ -6,9 +6,8 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.ArrayAdapter
 import androidx.core.widget.doOnTextChanged
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.FragmentLoginAdvancedBinding
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.ui.base.BaseFragment
@@ -19,7 +18,6 @@ import io.github.wulkanowy.utils.setOnEditorDoneSignIn
 import io.github.wulkanowy.utils.showSoftInput
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LoginAdvancedFragment :
     BaseFragment<FragmentLoginAdvancedBinding>(R.layout.fragment_login_advanced),
     LoginAdvancedView {
@@ -295,8 +293,8 @@ class LoginAdvancedFragment :
         binding.loginFormContainer.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
-        (activity as? LoginActivity)?.onFormFragmentAccountLogged(studentsWithSemesters, Triple(
+    override fun notifyParentAccountLogged(students: List<Student>) {
+        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, Triple(
             binding.loginFormUsername.text.toString(),
             binding.loginFormPass.text.toString(),
             resources.getStringArray(R.array.hosts_values)[1]
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
index dfe82ad8b..3a0d4a0d8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
@@ -1,24 +1,23 @@
 package io.github.wulkanowy.ui.modules.login.advanced
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.ifNullOrBlank
-import kotlinx.coroutines.flow.onEach
+import io.reactivex.Single
 import timber.log.Timber
 import javax.inject.Inject
 
 class LoginAdvancedPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LoginAdvancedView>(loginErrorHandler, studentRepository) {
+) : BasePresenter<LoginAdvancedView>(loginErrorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: LoginAdvancedView) {
         super.onAttachView(view)
@@ -126,42 +125,35 @@ class LoginAdvancedPresenter @Inject constructor(
     fun onSignInClick() {
         if (!validateCredentials()) return
 
-        flowWithResource { getStudentsAppropriatesToLoginType() }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    Timber.i("Login started")
+        disposable.add(getStudentsAppropriatesToLoginType()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.apply {
                     hideSoftKeyboard()
                     showProgress(true)
                     showContent(false)
                 }
-                Status.SUCCESS -> {
-                    Timber.i("Login result: Success")
-                    analytics.logEvent("registration_form",
-                        "success" to true,
-                        "students" to it.data!!.size,
-                        "error" to "No error"
-                    )
-                    view?.notifyParentAccountLogged(it.data)
-                }
-                Status.ERROR -> {
-                    Timber.i("Login result: An exception occurred")
-                    analytics.logEvent(
-                        "registration_form",
-                        "success" to false, "students" to -1,
-                        "error" to it.error!!.message.ifNullOrBlank { "No message" }
-                    )
-                    loginErrorHandler.dispatch(it.error)
+                Timber.i("Login started")
+            }
+            .doFinally {
+                view?.apply {
+                    showProgress(false)
+                    showContent(true)
                 }
             }
-        }.afterLoading {
-            view?.apply {
-                showProgress(false)
-                showContent(true)
-            }
-        }.launch("login")
+            .subscribe({
+                Timber.i("Login result: Success")
+                analytics.logEvent("registration_form", "success" to true, "students" to it.size, "error" to "No error")
+                view?.notifyParentAccountLogged(it)
+            }, {
+                Timber.i("Login result: An exception occurred")
+                analytics.logEvent("registration_form", "success" to false, "students" to -1, "error" to it.message.ifNullOrBlank { "No message" })
+                loginErrorHandler.dispatch(it)
+            }))
     }
 
-    private suspend fun getStudentsAppropriatesToLoginType(): List<StudentWithSemesters> {
+    private fun getStudentsAppropriatesToLoginType(): Single<List<Student>> {
         val email = view?.formUsernameValue.orEmpty()
         val password = view?.formPassValue.orEmpty()
         val endpoint = view?.formHostValue.orEmpty()
@@ -170,7 +162,7 @@ class LoginAdvancedPresenter @Inject constructor(
         val symbol = view?.formSymbolValue.orEmpty()
         val token = view?.formTokenValue.orEmpty()
 
-        return when (Sdk.Mode.valueOf(view?.formLoginType.orEmpty())) {
+        return when (Sdk.Mode.valueOf(view?.formLoginType ?: "")) {
             Sdk.Mode.API -> studentRepository.getStudentsApi(pin, symbol, token)
             Sdk.Mode.SCRAPPER -> studentRepository.getStudentsScrapper(email, password, endpoint, symbol)
             Sdk.Mode.HYBRID -> studentRepository.getStudentsHybrid(email, password, endpoint, symbol)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
index 029a6b4d4..36c9a93f8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.login.advanced
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginAdvancedView : BaseView {
@@ -69,7 +69,7 @@ interface LoginAdvancedView : BaseView {
 
     fun showContent(show: Boolean)
 
-    fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>)
+    fun notifyParentAccountLogged(students: List<Student>)
 
     fun setErrorPinRequired()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index 41345686a..a2a083c00 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -6,9 +6,8 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import androidx.core.widget.doOnTextChanged
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.FragmentLoginFormBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
@@ -20,7 +19,6 @@ import io.github.wulkanowy.utils.setOnEditorDoneSignIn
 import io.github.wulkanowy.utils.showSoftInput
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragment_login_form),
     LoginFormView {
 
@@ -171,8 +169,8 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         binding.loginFormVersion.text = "v${appInfo.versionName}"
     }
 
-    override fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>) {
-        (activity as? LoginActivity)?.onFormFragmentAccountLogged(studentsWithSemesters, loginData)
+    override fun notifyParentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
+        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, loginData)
     }
 
     override fun openPrivacyPolicyPage() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index b921140c7..997e1e85f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -1,22 +1,20 @@
 package io.github.wulkanowy.ui.modules.login.form
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.ifNullOrBlank
-import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class LoginFormPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LoginFormView>(loginErrorHandler, studentRepository) {
+) : BasePresenter<LoginFormView>(loginErrorHandler, studentRepository, schedulers) {
 
     private var lastError: Throwable? = null
 
@@ -76,44 +74,34 @@ class LoginFormPresenter @Inject constructor(
 
         if (!validateCredentials(email, password, host)) return
 
-        flowWithResource { studentRepository.getStudentsScrapper(email, password, host, symbol) }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    Timber.i("Login started")
+        disposable.add(studentRepository.getStudentsScrapper(email, password, host, symbol)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.apply {
                     hideSoftKeyboard()
                     showProgress(true)
                     showContent(false)
                 }
-                Status.SUCCESS -> {
-                    Timber.i("Login result: Success")
-                    analytics.logEvent(
-                        "registration_form",
-                        "success" to true,
-                        "students" to it.data!!.size,
-                        "scrapperBaseUrl" to host,
-                        "error" to "No error"
-                    )
-                    view?.notifyParentAccountLogged(it.data, Triple(email, password, host))
-                }
-                Status.ERROR -> {
-                    Timber.i("Login result: An exception occurred")
-                    analytics.logEvent(
-                        "registration_form",
-                        "success" to false,
-                        "students" to -1,
-                        "scrapperBaseUrl" to host,
-                        "error" to it.error!!.message.ifNullOrBlank { "No message" })
-                    loginErrorHandler.dispatch(it.error)
-                    lastError = it.error
-                    view?.showContact(true)
+                Timber.i("Login started")
+            }
+            .doFinally {
+                view?.apply {
+                    showProgress(false)
+                    showContent(true)
                 }
             }
-        }.afterLoading {
-            view?.apply {
-                showProgress(false)
-                showContent(true)
-            }
-        }.launch("login")
+            .subscribe({
+                Timber.i("Login result: Success")
+                analytics.logEvent("registration_form", "success" to true, "students" to it.size, "scrapperBaseUrl" to host, "error" to "No error")
+                view?.notifyParentAccountLogged(it, Triple(email, password, host))
+            }, {
+                Timber.i("Login result: An exception occurred")
+                analytics.logEvent("registration_form", "success" to false, "students" to -1, "scrapperBaseUrl" to host, "error" to it.message.ifNullOrBlank { "No message" })
+                loginErrorHandler.dispatch(it)
+                lastError = it
+                view?.showContact(true)
+            }))
     }
 
     fun onFaqClick() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
index 77e665389..6506fa88f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.login.form
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginFormView : BaseView {
@@ -49,7 +49,7 @@ interface LoginFormView : BaseView {
 
     fun showVersion()
 
-    fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>)
+    fun notifyParentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>)
 
     fun openPrivacyPolicyPage()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
index f0c9652fb..e27c845a6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
@@ -10,7 +10,6 @@ import android.webkit.JavascriptInterface
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.core.widget.doOnTextChanged
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.FragmentLoginRecoverBinding
 import io.github.wulkanowy.ui.base.BaseFragment
@@ -20,7 +19,6 @@ import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.showSoftInput
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LoginRecoverFragment :
     BaseFragment<FragmentLoginRecoverBinding>(R.layout.fragment_login_recover), LoginRecoverView {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
index e58377058..9a21fb910 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
@@ -1,23 +1,21 @@
 package io.github.wulkanowy.ui.modules.login.recover
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.recover.RecoverRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.ifNullOrBlank
-import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class LoginRecoverPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val loginErrorHandler: RecoverErrorHandler,
     private val analytics: FirebaseAnalyticsHelper,
     private val recoverRepository: RecoverRepository
-) : BasePresenter<LoginRecoverView>(loginErrorHandler, studentRepository) {
+) : BasePresenter<LoginRecoverView>(loginErrorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -57,27 +55,24 @@ class LoginRecoverPresenter @Inject constructor(
 
         if (!validateInput(username, host)) return
 
-        flowWithResource { recoverRepository.getReCaptchaSiteKey(host, symbol.ifBlank { "Default" }) }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
+        disposable.add(recoverRepository.getReCaptchaSiteKey(host, symbol.ifBlank { "Default" })
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.run {
                     hideSoftKeyboard()
                     showRecoverForm(false)
                     showProgress(true)
                     showErrorView(false)
                     showCaptcha(false)
                 }
-                Status.SUCCESS -> view?.run {
-                    loadReCaptcha(url = it.data!!.first, siteKey = it.data.second)
-                    showProgress(false)
-                    showErrorView(false)
-                    showCaptcha(true)
-                }
-                Status.ERROR -> {
-                    Timber.i("Obtain captcha site key result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
             }
-        }.launch("captcha")
+            .subscribe({ (resetUrl, siteKey) ->
+                view?.loadReCaptcha(siteKey, resetUrl)
+            }) {
+                Timber.i("Obtain captcha site key result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun validateInput(username: String, host: String): Boolean {
@@ -101,28 +96,35 @@ class LoginRecoverPresenter @Inject constructor(
         val host = view?.recoverHostValue.orEmpty()
         val symbol = view?.formHostSymbol.ifNullOrBlank { "Default" }
 
-        flowWithResource { recoverRepository.sendRecoverRequest(host, symbol, username, reCaptchaResponse) }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    showProgress(true)
-                    showRecoverForm(false)
-                    showCaptcha(false)
+        with(disposable) {
+            clear()
+            add(recoverRepository.sendRecoverRequest(host, symbol, username, reCaptchaResponse)
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.run {
+                        showProgress(true)
+                        showRecoverForm(false)
+                        showCaptcha(false)
+                    }
                 }
-                Status.SUCCESS -> view?.run {
-                    showSuccessView(true)
-                    setSuccessTitle(it.data!!.substringBefore(". "))
-                    setSuccessMessage(it.data.substringAfter(". "))
+                .doFinally {
+                    view?.showProgress(false)
+                }
+                .subscribe({
+                    view?.run {
+                        showSuccessView(true)
+                        setSuccessTitle(it.substringBefore(". "))
+                        setSuccessMessage(it.substringAfter(". "))
+                    }
+
                     analytics.logEvent("account_recover", "register" to host, "symbol" to symbol, "success" to true)
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Send recover request result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+                    errorHandler.dispatch(it)
                     analytics.logEvent("account_recover", "register" to host, "symbol" to symbol, "success" to false)
-                }
-            }
-        }.afterLoading {
-            view?.showProgress(false)
-        }.launch("verified")
+                })
+        }
     }
 
     fun onDetailsClick() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt
index c046c2ff5..7383a5ecb 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt
@@ -5,22 +5,16 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.ItemLoginStudentSelectBinding
 import javax.inject.Inject
 
 class LoginStudentSelectAdapter @Inject constructor() :
     RecyclerView.Adapter<LoginStudentSelectAdapter.ItemViewHolder>() {
 
-    private val checkedList = mutableMapOf<Int, Boolean>()
+    var items = emptyList<Pair<Student, Boolean>>()
 
-    var items = emptyList<Pair<StudentWithSemesters, Boolean>>()
-        set(value) {
-            field = value
-            checkedList.clear()
-        }
-
-    var onClickListener: (StudentWithSemesters, alreadySaved: Boolean) -> Unit = { _, _ -> }
+    var onClickListener: (Student, alreadySaved: Boolean) -> Unit = { _, _ -> }
 
     override fun getItemCount() = items.size
 
@@ -30,31 +24,22 @@ class LoginStudentSelectAdapter @Inject constructor() :
 
     @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val (studentAndSemesters, alreadySaved) = items[position]
-        val student = studentAndSemesters.student
-        val semesters = studentAndSemesters.semesters
-        val diary = semesters.maxByOrNull { it.semesterId }
+        val (student, alreadySaved) = items[position]
 
         with(holder.binding) {
-            loginItemName.text = "${student.studentName} ${diary?.diaryName.orEmpty()}"
+            loginItemName.text = "${student.studentName} ${student.className}"
             loginItemSchool.text = student.schoolName
             loginItemName.isEnabled = !alreadySaved
             loginItemSchool.isEnabled = !alreadySaved
+            loginItemCheck.isEnabled = !alreadySaved
             loginItemSignedIn.visibility = if (alreadySaved) View.VISIBLE else View.GONE
 
-            with(loginItemCheck) {
-                isEnabled = !alreadySaved
-                keyListener = null
-                isChecked = checkedList[position] ?: false
-            }
-
             root.setOnClickListener {
-                onClickListener(studentAndSemesters, alreadySaved)
+                onClickListener(student, alreadySaved)
 
                 with(loginItemCheck) {
                     if (isEnabled) {
                         isChecked = !isChecked
-                        checkedList[position] = isChecked
                     }
                 }
             }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
index e71fc0f6f..b0df51991 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
@@ -5,9 +5,8 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.FragmentLoginStudentSelectBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
@@ -17,7 +16,6 @@ import io.github.wulkanowy.utils.openInternetBrowser
 import java.io.Serializable
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LoginStudentSelectFragment :
     BaseFragment<FragmentLoginStudentSelectBinding>(R.layout.fragment_login_student_select),
     LoginStudentSelectView {
@@ -58,7 +56,7 @@ class LoginStudentSelectFragment :
         }
     }
 
-    override fun updateData(data: List<Pair<StudentWithSemesters, Boolean>>) {
+    override fun updateData(data: List<Pair<Student, Boolean>>) {
         with(loginAdapter) {
             items = data
             notifyDataSetChanged()
@@ -81,8 +79,8 @@ class LoginStudentSelectFragment :
         binding.loginStudentSelectSignIn.isEnabled = enable
     }
 
-    fun onParentInitStudentSelectFragment(studentsWithSemesters: List<StudentWithSemesters>) {
-        presenter.onParentInitStudentSelectView(studentsWithSemesters)
+    fun onParentInitStudentSelectFragment(students: List<Student>) {
+        presenter.onParentInitStudentSelectView(students)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
index 1384f25a0..b2d0aed91 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
@@ -1,34 +1,32 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.ifNullOrBlank
-import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import java.io.Serializable
 import javax.inject.Inject
 
 class LoginStudentSelectPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LoginStudentSelectView>(loginErrorHandler, studentRepository) {
+) : BasePresenter<LoginStudentSelectView>(loginErrorHandler, studentRepository, schedulers) {
 
     private var lastError: Throwable? = null
 
-    var students = emptyList<StudentWithSemesters>()
+    var students = emptyList<Student>()
 
-    private val selectedStudents = mutableListOf<StudentWithSemesters>()
+    private var selectedStudents = mutableListOf<Student>()
 
     fun onAttachView(view: LoginStudentSelectView, students: Serializable?) {
         super.onAttachView(view)
-        with(view) {
+        view.run {
             initView()
             showContact(false)
             enableSignIn(false)
@@ -39,7 +37,7 @@ class LoginStudentSelectPresenter @Inject constructor(
         }
 
         if (students is List<*> && students.isNotEmpty()) {
-            loadData(students.filterIsInstance<StudentWithSemesters>())
+            loadData(students.filterIsInstance<Student>())
         }
     }
 
@@ -47,17 +45,17 @@ class LoginStudentSelectPresenter @Inject constructor(
         registerStudents(selectedStudents)
     }
 
-    fun onParentInitStudentSelectView(studentsWithSemesters: List<StudentWithSemesters>) {
-        loadData(studentsWithSemesters)
-        if (studentsWithSemesters.size == 1) registerStudents(studentsWithSemesters)
+    fun onParentInitStudentSelectView(students: List<Student>) {
+        loadData(students)
+        if (students.size == 1) registerStudents(students)
     }
 
-    fun onItemSelected(studentWithSemester: StudentWithSemesters, alreadySaved: Boolean) {
+    fun onItemSelected(student: Student, alreadySaved: Boolean) {
         if (alreadySaved) return
 
         selectedStudents
-            .removeAll { it == studentWithSemester }
-            .let { if (!it) selectedStudents.add(studentWithSemester) }
+            .removeAll { it == student }
+            .let { if (!it) selectedStudents.add(student) }
 
         view?.enableSignIn(selectedStudents.isNotEmpty())
     }
@@ -70,60 +68,54 @@ class LoginStudentSelectPresenter @Inject constructor(
             && a.classId == b.classId
     }
 
-    private fun loadData(studentsWithSemesters: List<StudentWithSemesters>) {
-        resetSelectedState()
-        this.students = studentsWithSemesters
-
-        flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Login student select students load started")
-                Status.SUCCESS -> view?.updateData(studentsWithSemesters.map { studentWithSemesters ->
-                    studentWithSemesters to it.data!!.any { item -> compareStudents(studentWithSemesters.student, item.student) }
-                })
-                Status.ERROR -> {
-                    errorHandler.dispatch(it.error!!)
-                    lastError = it.error
-                    view?.updateData(studentsWithSemesters.map { student -> student to false })
+    private fun loadData(students: List<Student>) {
+        this.students = students
+        disposable.add(studentRepository.getSavedStudents()
+            .map { savedStudents ->
+                students.map { student ->
+                    student to savedStudents.any { compareStudents(student, it) }
                 }
             }
-        }.launch()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                view?.updateData(it)
+            }, {
+                errorHandler.dispatch(it)
+                lastError = it
+                view?.updateData(students.map { student -> student to false })
+            })
+        )
     }
 
-    private fun resetSelectedState() {
-        selectedStudents.clear()
-        view?.enableSignIn(false)
-    }
-
-    private fun registerStudents(studentsWithSemesters: List<StudentWithSemesters>) {
-        flowWithResource {
-            val savedStudents = studentRepository.saveStudents(studentsWithSemesters)
-            val firstRegistered = studentsWithSemesters.first().apply { student.id = savedStudents.first() }
-            studentRepository.switchStudent(firstRegistered)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    Timber.i("Registration started")
+    private fun registerStudents(students: List<Student>) {
+        disposable.add(studentRepository.saveStudents(students)
+            .map { students.first().apply { id = it.first() } }
+            .flatMapCompletable { studentRepository.switchStudent(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.apply {
                     showProgress(true)
                     showContent(false)
                 }
-                Status.SUCCESS -> {
-                    Timber.i("Registration result: Success")
-                    view?.openMainView()
-                    logRegisterEvent(studentsWithSemesters)
-                }
-                Status.ERROR -> {
-                    Timber.i("Registration result: An exception occurred ")
-                    view?.apply {
-                        showProgress(false)
-                        showContent(true)
-                        showContact(true)
-                    }
-                    lastError = it.error
-                    loginErrorHandler.dispatch(it.error!!)
-                    logRegisterEvent(studentsWithSemesters, it.error)
-                }
+                Timber.i("Registration started")
             }
-        }.launch("register")
+            .subscribe({
+                students.forEach { analytics.logEvent("registration_student_select", "success" to true, "scrapperBaseUrl" to it.scrapperBaseUrl, "symbol" to it.symbol, "error" to "No error") }
+                Timber.i("Registration result: Success")
+                view?.openMainView()
+            }, { error ->
+                students.forEach { analytics.logEvent("registration_student_select", "success" to false, "scrapperBaseUrl" to it.scrapperBaseUrl, "symbol" to it.symbol, "error" to error.message.ifNullOrBlank { "No message" }) }
+                Timber.i("Registration result: An exception occurred ")
+                loginErrorHandler.dispatch(error)
+                lastError = error
+                view?.apply {
+                    showProgress(false)
+                    showContent(true)
+                    showContact(true)
+                }
+            }))
     }
 
     fun onDiscordClick() {
@@ -133,15 +125,4 @@ class LoginStudentSelectPresenter @Inject constructor(
     fun onEmailClick() {
         view?.openEmail(lastError?.message.ifNullOrBlank { "empty" })
     }
-
-    private fun logRegisterEvent(studentsWithSemesters: List<StudentWithSemesters>, error: Throwable? = null) {
-        studentsWithSemesters.forEach { student ->
-            analytics.logEvent(
-                "registration_student_select",
-                "success" to (error != null),
-                "scrapperBaseUrl" to student.student.scrapperBaseUrl,
-                "symbol" to student.student.symbol,
-                "error" to (error?.message?.ifBlank { "No message" } ?: "No error"))
-        }
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
index f2acd76c5..89431dfc6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
@@ -1,13 +1,13 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginStudentSelectView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Pair<StudentWithSemesters, Boolean>>)
+    fun updateData(data: List<Pair<Student, Boolean>>)
 
     fun openMainView()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
index e2c37db61..befbffd50 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
@@ -8,9 +8,8 @@ import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
 import android.view.inputmethod.EditorInfo.IME_NULL
 import android.widget.ArrayAdapter
 import androidx.core.widget.doOnTextChanged
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.FragmentLoginSymbolBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
@@ -21,7 +20,6 @@ import io.github.wulkanowy.utils.openInternetBrowser
 import io.github.wulkanowy.utils.showSoftInput
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LoginSymbolFragment :
     BaseFragment<FragmentLoginSymbolBinding>(R.layout.fragment_login_symbol), LoginSymbolView {
 
@@ -108,8 +106,8 @@ class LoginSymbolFragment :
         binding.loginSymbolContainer.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
-        (activity as? LoginActivity)?.onSymbolFragmentAccountLogged(studentsWithSemesters)
+    override fun notifyParentAccountLogged(students: List<Student>) {
+        (activity as? LoginActivity)?.onSymbolFragmentAccountLogged(students)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
index a2cda4fc1..1f9e66b70 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
@@ -1,23 +1,22 @@
 package io.github.wulkanowy.ui.modules.login.symbol
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.ifNullOrBlank
-import kotlinx.coroutines.flow.onEach
+import io.reactivex.Single
 import timber.log.Timber
 import java.io.Serializable
 import javax.inject.Inject
 
 class LoginSymbolPresenter @Inject constructor(
     studentRepository: StudentRepository,
+    schedulers: SchedulersProvider,
     private val loginErrorHandler: LoginErrorHandler,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LoginSymbolView>(loginErrorHandler, studentRepository) {
+) : BasePresenter<LoginSymbolView>(loginErrorHandler, studentRepository, schedulers) {
 
     private var lastError: Throwable? = null
 
@@ -47,55 +46,44 @@ class LoginSymbolPresenter @Inject constructor(
             return
         }
 
-        flowWithResource { studentRepository.getStudentsScrapper(loginData!!.first, loginData!!.second, loginData!!.third, symbol) }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
+        disposable.add(
+            Single.fromCallable { loginData }
+                .flatMap { studentRepository.getStudentsScrapper(it.first, it.second, it.third, symbol) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.apply {
+                        hideSoftKeyboard()
+                        showProgress(true)
+                        showContent(false)
+                    }
                     Timber.i("Login with symbol started")
-                    hideSoftKeyboard()
-                    showProgress(true)
-                    showContent(false)
                 }
-                Status.SUCCESS -> {
-                    view?.run {
-                        if (it.data!!.isEmpty()) {
+                .doFinally {
+                    view?.apply {
+                        showProgress(false)
+                        showContent(true)
+                    }
+                }
+                .subscribe({
+                    analytics.logEvent("registration_symbol", "success" to true, "students" to it.size, "scrapperBaseUrl" to loginData?.third, "symbol" to symbol, "error" to "No error")
+                    view?.apply {
+                        if (it.isEmpty()) {
                             Timber.i("Login with symbol result: Empty student list")
                             setErrorSymbolIncorrect()
                             view?.showContact(true)
                         } else {
                             Timber.i("Login with symbol result: Success")
-                            notifyParentAccountLogged(it.data)
+                            notifyParentAccountLogged(it)
                         }
                     }
-                    analytics.logEvent(
-                        "registration_symbol",
-                        "success" to true,
-                        "students" to it.data!!.size,
-                        "scrapperBaseUrl" to loginData?.third,
-                        "symbol" to symbol,
-                        "error" to "No error"
-                    )
-                }
-                Status.ERROR -> {
+                }, {
                     Timber.i("Login with symbol result: An exception occurred")
-                    analytics.logEvent(
-                        "registration_symbol",
-                        "success" to false,
-                        "students" to -1,
-                        "scrapperBaseUrl" to loginData?.third,
-                        "symbol" to symbol,
-                        "error" to it.error!!.message.ifNullOrBlank { "No message" }
-                    )
-                    loginErrorHandler.dispatch(it.error)
-                    lastError = it.error
+                    analytics.logEvent("registration_symbol", "success" to false, "students" to -1, "scrapperBaseUrl" to loginData?.third, "symbol" to symbol, "error" to it.message.ifNullOrBlank { "No message" })
+                    loginErrorHandler.dispatch(it)
+                    lastError = it
                     view?.showContact(true)
-                }
-            }
-        }.afterLoading {
-            view?.apply {
-                showProgress(false)
-                showContent(true)
-            }
-        }.launch("login")
+                }))
     }
 
     fun onParentInitSymbolView(loginData: Triple<String, String, String>) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
index 830c77d17..6938bf138 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.login.symbol
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginSymbolView : BaseView {
@@ -25,7 +25,7 @@ interface LoginSymbolView : BaseView {
 
     fun showContent(show: Boolean)
 
-    fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>)
+    fun notifyParentAccountLogged(students: List<Student>)
 
     fun showContact(show: Boolean)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
index 0f1d836d0..0775ce189 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.databinding.FragmentLuckyNumberBinding
@@ -12,7 +11,6 @@ import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LuckyNumberFragment :
     BaseFragment<FragmentLuckyNumberBinding>(R.layout.fragment_lucky_number), LuckyNumberView,
     MainView.TitledView {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
index 90aea441e..e932fedc0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
@@ -1,23 +1,21 @@
 package io.github.wulkanowy.ui.modules.luckynumber
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class LuckyNumberPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val luckyNumberRepository: LuckyNumberRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LuckyNumberView>(errorHandler, studentRepository) {
+) : BasePresenter<LuckyNumberView>(errorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -34,47 +32,47 @@ class LuckyNumberPresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            luckyNumberRepository.getLuckyNumber(student, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading lucky number started")
-                Status.SUCCESS -> {
-                    if (it.data != null) {
-                        Timber.i("Loading lucky number result: Success")
-                        view?.apply {
-                            updateData(it.data)
-                            showContent(true)
-                            showEmpty(false)
-                            showErrorView(false)
-                        }
-                        analytics.logEvent(
-                            "load_item",
-                            "type" to "lucky_number",
-                            "number" to it.data.luckyNumber
-                        )
-                    } else {
-                        Timber.i("Loading lucky number result: No lucky number found")
-                        view?.run {
-                            showContent(false)
-                            showEmpty(true)
-                            showErrorView(false)
-                        }
+        Timber.i("Loading lucky number started")
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMapMaybe { luckyNumberRepository.getLuckyNumber(it, forceRefresh) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
                     }
                 }
-                Status.ERROR -> {
+                .subscribe({
+                    Timber.i("Loading lucky number result: Success")
+                    view?.apply {
+                        updateData(it)
+                        showContent(true)
+                        showEmpty(false)
+                        showErrorView(false)
+                    }
+                    analytics.logEvent(
+                        "load_item",
+                        "type" to "lucky_number",
+                        "number" to it.luckyNumber,
+                        "force_refresh" to forceRefresh
+                    )
+                }, {
                     Timber.i("Loading lucky number result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+                    errorHandler.dispatch(it)
+                }, {
+                    Timber.i("Loading lucky number result: No lucky number found")
+                    view?.run {
+                        showContent(false)
+                        showEmpty(true)
+                        showErrorView(false)
+                    }
+                })
+            )
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
index 692615d98..961ac6338 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
@@ -9,7 +9,6 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.ActivityWidgetConfigureBinding
@@ -19,7 +18,6 @@ import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LuckyNumberWidgetConfigureActivity :
     BaseActivity<LuckyNumberWidgetConfigurePresenter, ActivityWidgetConfigureBinding>(),
     LuckyNumberWidgetConfigureView {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
index 574120b36..468f9b575 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
@@ -8,16 +7,15 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider.Companion.getStudentWidgetKey
 import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider.Companion.getThemeWidgetKey
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class LuckyNumberWidgetConfigurePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val sharedPref: SharedPrefProvider
-) : BasePresenter<LuckyNumberWidgetConfigureView>(errorHandler, studentRepository) {
+) : BasePresenter<LuckyNumberWidgetConfigureView>(errorHandler, studentRepository, schedulers) {
 
     private var appWidgetId: Int? = null
 
@@ -47,25 +45,23 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
     }
 
     private fun loadData() {
-        flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Lucky number widget configure students data load")
-                Status.SUCCESS -> {
-                    val widgetId = appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) }
-                    when {
-                        it.data!!.isEmpty() -> view?.openLoginView()
-                        it.data.size == 1 -> {
-                            selectedStudent = it.data.single().student
-                            view?.showThemeDialog()
-                        }
-                        else -> view?.updateData(it.data.map { entity ->
-                            entity.student to (entity.student.id == widgetId)
-                        })
-                    }
-                }
-                Status.ERROR -> errorHandler.dispatch(it.error!!)
+        disposable.add(studentRepository.getSavedStudents(false)
+            .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
+            .map { (students, currentStudentId) ->
+                students.map { student -> student to (student.id == currentStudentId) }
             }
-        }.launch()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                when {
+                    it.isEmpty() -> view?.openLoginView()
+                    it.size == 1 -> {
+                        selectedStudent = it.single().first
+                        view?.showThemeDialog()
+                    }
+                    else -> view?.updateData(it)
+                }
+            }, { errorHandler.dispatch(it) }))
     }
 
     private fun registerStudent(student: Student?) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
index b7f4b740e..55a048b32 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
@@ -7,25 +7,26 @@ import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT
 import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH
 import android.appwidget.AppWidgetProvider
 import android.content.Context
+import android.content.Intent
 import android.content.res.Configuration
 import android.os.Bundle
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.RemoteViews
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.android.AndroidInjection
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.toFirstResult
-import kotlinx.coroutines.runBlocking
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Maybe
 import timber.log.Timber
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LuckyNumberWidgetProvider : AppWidgetProvider() {
 
     @Inject
@@ -34,6 +35,12 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
     @Inject
     lateinit var luckyNumberRepository: LuckyNumberRepository
 
+    @Inject
+    lateinit var schedulers: SchedulersProvider
+
+    @Inject
+    lateinit var appWidgetManager: AppWidgetManager
+
     @Inject
     lateinit var sharedPref: SharedPrefProvider
 
@@ -48,6 +55,11 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
         fun getWidthWidgetKey(appWidgetId: Int) = "lucky_number_widget_width_$appWidgetId"
     }
 
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+        super.onReceive(context, intent)
+    }
+
     override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray?) {
         super.onUpdate(context, appWidgetManager, appWidgetIds)
         appWidgetIds?.forEach { appWidgetId ->
@@ -125,23 +137,27 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
         return n - 1
     }
 
-    private fun getLuckyNumber(studentId: Long, appWidgetId: Int) = runBlocking {
-        try {
-            val students = studentRepository.getSavedStudents()
-            val student = students.singleOrNull { it.student.id == studentId }?.student
-            val currentStudent = when {
-                student != null -> student
-                studentId != 0L && studentRepository.isCurrentStudentSet() -> {
-                    studentRepository.getCurrentStudent(false).also {
-                        sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id)
+    private fun getLuckyNumber(studentId: Long, appWidgetId: Int): LuckyNumber? {
+        return try {
+            studentRepository.isStudentSaved()
+                .filter { true }
+                .flatMap { studentRepository.getSavedStudents().toMaybe() }
+                .flatMap { students ->
+                    val student = students.singleOrNull { student -> student.id == studentId }
+                    when {
+                        student != null -> Maybe.just(student)
+                        studentId != 0L -> {
+                            studentRepository.isCurrentStudentSet()
+                                .filter { true }
+                                .flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
+                                .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
+                        }
+                        else -> Maybe.empty()
                     }
                 }
-                else -> null
-            }
-
-            currentStudent?.let {
-                luckyNumberRepository.getLuckyNumber(it, false).toFirstResult().data
-            }
+                .flatMap { luckyNumberRepository.getLuckyNumber(it) }
+                .subscribeOn(schedulers.backgroundThread)
+                .blockingGet()
         } catch (e: Exception) {
             if (e.cause !is NoCurrentStudentException) {
                 Timber.e(e, "An error has occurred in lucky number provider")
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index 035608893..f5b7c47c8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -17,7 +17,7 @@ import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem
 import com.google.android.material.elevation.ElevationOverlayProvider
 import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavController.Companion.HIDE
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.Lazy
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.ActivityMainBinding
 import io.github.wulkanowy.ui.base.BaseActivity
@@ -39,18 +39,19 @@ import io.github.wulkanowy.utils.setOnViewChangeListener
 import timber.log.Timber
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainView {
 
     @Inject
     override lateinit var presenter: MainPresenter
 
+    @Inject
+    lateinit var navController: FragNavController
+
     @Inject
     lateinit var analytics: FirebaseAnalyticsHelper
 
-    private val overlayProvider by lazy { ElevationOverlayProvider(this) }
-
-    private val navController = FragNavController(supportFragmentManager, R.id.mainFragmentContainer)
+    @Inject
+    lateinit var overlayProvider: Lazy<ElevationOverlayProvider>
 
     companion object {
         const val EXTRA_START_MENU = "extraStartMenu"
@@ -105,7 +106,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     override fun initView() {
         with(binding.mainToolbar) {
             if (SDK_INT >= LOLLIPOP) stateListAnimator = null
-            setBackgroundColor(overlayProvider.compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(4f)))
+            setBackgroundColor(overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(4f)))
         }
 
         with(binding.mainBottomNav) {
@@ -118,7 +119,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
             ))
             accentColor = getThemeAttrColor(R.attr.colorPrimary)
             inactiveColor = getThemeAttrColor(R.attr.colorOnSurface, 153)
-            defaultBackgroundColor = overlayProvider.compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(8f))
+            defaultBackgroundColor = overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(8f))
             titleState = ALWAYS_SHOW
             currentItem = startMenuIndex
             isBehaviorTranslationEnabled = false
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
new file mode 100644
index 000000000..03f6ac382
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
@@ -0,0 +1,139 @@
+package io.github.wulkanowy.ui.modules.main
+
+import com.google.android.material.elevation.ElevationOverlayProvider
+import com.ncapdevi.fragnav.FragNavController
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import io.github.wulkanowy.R
+import io.github.wulkanowy.di.scopes.PerFragment
+import io.github.wulkanowy.ui.modules.about.AboutFragment
+import io.github.wulkanowy.ui.modules.about.contributor.ContributorFragment
+import io.github.wulkanowy.ui.modules.about.license.LicenseFragment
+import io.github.wulkanowy.ui.modules.about.license.LicenseModule
+import io.github.wulkanowy.ui.modules.about.logviewer.LogViewerFragment
+import io.github.wulkanowy.ui.modules.account.AccountDialog
+import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
+import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
+import io.github.wulkanowy.ui.modules.exam.ExamFragment
+import io.github.wulkanowy.ui.modules.grade.GradeFragment
+import io.github.wulkanowy.ui.modules.grade.GradeModule
+import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
+import io.github.wulkanowy.ui.modules.homework.details.HomeworkDetailsDialog
+import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
+import io.github.wulkanowy.ui.modules.message.MessageFragment
+import io.github.wulkanowy.ui.modules.message.MessageModule
+import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
+import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceFragment
+import io.github.wulkanowy.ui.modules.mobiledevice.token.MobileDeviceTokenDialog
+import io.github.wulkanowy.ui.modules.more.MoreFragment
+import io.github.wulkanowy.ui.modules.note.NoteFragment
+import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
+import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersModule
+import io.github.wulkanowy.ui.modules.settings.SettingsFragment
+import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
+import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
+
+@Suppress("unused")
+@Module
+abstract class MainModule {
+
+    companion object {
+
+        @Provides
+        fun provideFragNavController(activity: MainActivity) =
+            FragNavController(activity.supportFragmentManager, R.id.mainFragmentContainer)
+
+        //In activities must be injected as Lazy
+        @Provides
+        fun provideElevationOverlayProvider(activity: MainActivity) = ElevationOverlayProvider(activity)
+    }
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindAttendanceFragment(): AttendanceFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindAttendanceSummaryFragment(): AttendanceSummaryFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindExamFragment(): ExamFragment
+
+    @PerFragment
+    @ContributesAndroidInjector(modules = [GradeModule::class])
+    abstract fun bindGradeFragment(): GradeFragment
+
+    @PerFragment
+    @ContributesAndroidInjector(modules = [MessageModule::class])
+    abstract fun bindMessagesFragment(): MessageFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindMessagePreviewFragment(): MessagePreviewFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindMoreFragment(): MoreFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindTimetableFragment(): TimetableFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindAboutFragment(): AboutFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindSettingsFragment(): SettingsFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindNoteFragment(): NoteFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindHomeworkFragment(): HomeworkFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindHomeworkDetailsDialog(): HomeworkDetailsDialog
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLuckyNumberFragment(): LuckyNumberFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindCompletedLessonsFragment(): CompletedLessonsFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindAccountDialog(): AccountDialog
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindMobileDevices(): MobileDeviceFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindMobileDeviceDialog(): MobileDeviceTokenDialog
+
+    @PerFragment
+    @ContributesAndroidInjector(modules = [LicenseModule::class])
+    abstract fun bindLicenseFragment(): LicenseFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLogViewerFragment(): LogViewerFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindContributorFragment(): ContributorFragment
+
+    @PerFragment
+    @ContributesAndroidInjector(modules = [SchoolAndTeachersModule::class])
+    abstract fun bindSchoolAndTeachersFragment(): SchoolAndTeachersFragment
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
index 8d5c9d67f..233d44917 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
@@ -9,16 +9,18 @@ import io.github.wulkanowy.ui.modules.main.MainView.Section.GRADE
 import io.github.wulkanowy.ui.modules.main.MainView.Section.MESSAGE
 import io.github.wulkanowy.ui.modules.main.MainView.Section.SCHOOL
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class MainPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val prefRepository: PreferencesRepository,
     private val syncManager: SyncManager,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<MainView>(errorHandler, studentRepository) {
+) : BasePresenter<MainView>(errorHandler, studentRepository, schedulers) {
 
     fun onAttachView(view: MainView, initMenu: MainView.Section?) {
         super.onAttachView(view)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
index 16e0184a0..4a9d217b0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
@@ -4,8 +4,8 @@ import android.os.Bundle
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
 import io.github.wulkanowy.data.repositories.message.MessageFolder.SENT
 import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
@@ -19,14 +19,14 @@ import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_message),
     MessageView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: MessagePresenter
 
-    private val pagerAdapter by lazy { BaseFragmentPagerAdapter(childFragmentManager) }
+    @Inject
+    lateinit var pagerAdapter: BaseFragmentPagerAdapter
 
     companion object {
         fun newInstance() = MessageFragment()
@@ -77,6 +77,10 @@ class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_m
         binding.messageProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
+    fun onDeleteMessage(message: Message) {
+        presenter.onDeleteMessage(message)
+    }
+
     fun onChildFragmentLoaded() {
         presenter.onChildViewLoaded()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
new file mode 100644
index 000000000..bf7950209
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
@@ -0,0 +1,25 @@
+package io.github.wulkanowy.ui.modules.message
+
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import io.github.wulkanowy.di.scopes.PerChildFragment
+import io.github.wulkanowy.di.scopes.PerFragment
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
+import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
+
+@Suppress("unused")
+@Module
+abstract class MessageModule {
+
+    companion object {
+
+        @PerFragment
+        @Provides
+        fun provideMessageAdapter(fragment: MessageFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
+    }
+
+    @PerChildFragment
+    @ContributesAndroidInjector
+    abstract fun bindMessageTabFragment(): MessageTabFragment
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
index 0fb454b31..0f5598b23 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
@@ -1,26 +1,29 @@
 package io.github.wulkanowy.ui.modules.message
 
+import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Completable
 import timber.log.Timber
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class MessagePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<MessageView>(errorHandler, studentRepository) {
+) : BasePresenter<MessageView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: MessageView) {
         super.onAttachView(view)
-        launch {
-            delay(150)
-            view.initView()
-            Timber.i("Message view was initialized")
-            loadData()
-        }
+        disposable.add(Completable.timer(150, MILLISECONDS, schedulers.mainThread)
+            .subscribe {
+                view.initView()
+                Timber.i("Message view was initialized")
+                loadData()
+            })
     }
 
     fun onPageSelected(index: Int) {
@@ -43,6 +46,15 @@ class MessagePresenter @Inject constructor(
         }
     }
 
+    fun onDeleteMessage(message: Message) {
+        view?.notifyChildMessageDeleted(
+            when (message.removed) {
+                true -> 2
+                else -> message.folderId - 1
+            }
+        )
+    }
+
     fun onSendMessageButtonClicked() {
         view?.openSendMessage()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt
index 206a74602..436dee53f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt
@@ -9,6 +9,7 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import io.github.wulkanowy.data.repositories.message.MessageFolder
 import io.github.wulkanowy.databinding.ItemMessageAttachmentBinding
 import io.github.wulkanowy.databinding.ItemMessageDividerBinding
 import io.github.wulkanowy.databinding.ItemMessagePreviewBinding
@@ -62,11 +63,11 @@ class MessagePreviewAdapter @Inject constructor() :
     @SuppressLint("SetTextI18n")
     private fun bindMessage(holder: MessageViewHolder, message: Message) {
         with(holder.binding) {
-            messagePreviewSubject.text = message.subject.ifBlank { root.context.getString(R.string.message_no_subject) }
+            messagePreviewSubject.text = if (message.subject.isNotBlank()) message.subject else root.context.getString(R.string.message_no_subject)
             messagePreviewDate.text = root.context.getString(R.string.message_date, message.date.toFormattedString("yyyy-MM-dd HH:mm:ss"))
             messagePreviewContent.text = message.content
-            messagePreviewFromSender.text = message.sender
-            messagePreviewToRecipient.text = message.recipient
+            messagePreviewAuthor.text = if (message.folderId == MessageFolder.SENT.id) "${root.context.getString(R.string.message_to)} ${message.recipient}"
+            else "${root.context.getString(R.string.message_from)} ${message.sender}"
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
index 740f4927c..99eede15a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
@@ -1,22 +1,13 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
-import android.os.Build
 import android.os.Bundle
-import android.print.PrintAttributes
-import android.print.PrintManager
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.webkit.WebResourceRequest
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import androidx.annotation.RequiresApi
-import androidx.core.content.getSystemService
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
@@ -24,12 +15,10 @@ import io.github.wulkanowy.databinding.FragmentMessagePreviewBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
-import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.shareText
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class MessagePreviewFragment :
     BaseFragment<FragmentMessagePreviewBinding>(R.layout.fragment_message_preview),
     MessagePreviewView, MainView.TitledView {
@@ -40,31 +29,18 @@ class MessagePreviewFragment :
     @Inject
     lateinit var previewAdapter: MessagePreviewAdapter
 
-    @Inject
-    lateinit var appInfo: AppInfo
-
     private var menuReplyButton: MenuItem? = null
 
     private var menuForwardButton: MenuItem? = null
 
     private var menuDeleteButton: MenuItem? = null
 
-    private var menuShareButton: MenuItem? = null
-
-    private var menuPrintButton: MenuItem? = null
-
     override val titleStringId: Int
         get() = R.string.message_title
 
     override val deleteMessageSuccessString: String
         get() = getString(R.string.message_delete_success)
 
-    override val messageNoSubjectString: String
-        get() = getString(R.string.message_no_subject)
-
-    override val printHTML: String
-        get() = requireContext().assets.open("message-print-page.html").bufferedReader().use { it.readText() }
-
     companion object {
         const val MESSAGE_ID_KEY = "message_id"
 
@@ -101,8 +77,6 @@ class MessagePreviewFragment :
         menuReplyButton = menu.findItem(R.id.messagePreviewMenuReply)
         menuForwardButton = menu.findItem(R.id.messagePreviewMenuForward)
         menuDeleteButton = menu.findItem(R.id.messagePreviewMenuDelete)
-        menuShareButton = menu.findItem(R.id.messagePreviewMenuShare)
-        menuPrintButton = menu.findItem(R.id.messagePreviewMenuPrint)
         presenter.onCreateOptionsMenu()
     }
 
@@ -111,8 +85,6 @@ class MessagePreviewFragment :
             R.id.messagePreviewMenuReply -> presenter.onReply()
             R.id.messagePreviewMenuForward -> presenter.onForward()
             R.id.messagePreviewMenuDelete -> presenter.onMessageDelete()
-            R.id.messagePreviewMenuShare -> presenter.onShare()
-            R.id.messagePreviewMenuPrint -> presenter.onPrint()
             else -> false
         }
     }
@@ -136,8 +108,6 @@ class MessagePreviewFragment :
         menuReplyButton?.isVisible = show
         menuForwardButton?.isVisible = show
         menuDeleteButton?.isVisible = show
-        menuShareButton?.isVisible = show
-        menuPrintButton?.isVisible = show && appInfo.systemVersion >= Build.VERSION_CODES.LOLLIPOP
     }
 
     override fun setDeletedOptionsLabels() {
@@ -168,42 +138,14 @@ class MessagePreviewFragment :
         context?.let { it.startActivity(SendMessageActivity.getStartIntent(it, message)) }
     }
 
-    override fun shareText(text: String, subject: String) {
-        context?.shareText(text, subject)
-    }
-
-    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
-    override fun printDocument(html: String, jobName: String) {
-        val webView = WebView(activity)
-        webView.webViewClient = object : WebViewClient() {
-
-            override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest) = false
-
-            override fun onPageFinished(view: WebView, url: String) {
-                createWebPrintJob(view, jobName)
-            }
-        }
-
-        webView.loadDataWithBaseURL("file:///android_asset/", html, "text/HTML", "UTF-8", null)
-    }
-
-    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
-    private fun createWebPrintJob(webView: WebView, jobName: String) {
-        activity?.getSystemService<PrintManager>()?.let { printManager ->
-            val printAdapter = webView.createPrintDocumentAdapter(jobName)
-
-            printManager.print(
-                jobName,
-                printAdapter,
-                PrintAttributes.Builder().build()
-            )
-        }
-    }
-
     override fun popView() {
         (activity as MainActivity).popView()
     }
 
+    override fun notifyParentMessageDeleted(message: Message) {
+        parentFragmentManager.fragments.forEach { if (it is MessageFragment) it.onDeleteMessage(message) }
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         outState.putSerializable(MESSAGE_ID_KEY, presenter.message)
         super.onSaveInstanceState(outState)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
index 7a633a2df..24678c70e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
@@ -1,37 +1,25 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
-import android.annotation.SuppressLint
-import android.os.Build
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
-import io.github.wulkanowy.data.repositories.message.MessageFolder
 import io.github.wulkanowy.data.repositories.message.MessageRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import io.github.wulkanowy.utils.flowWithResourceIn
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class MessagePreviewPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val messageRepository: MessageRepository,
-    private val analytics: FirebaseAnalyticsHelper,
-    private var appInfo: AppInfo
-) : BasePresenter<MessagePreviewView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<MessagePreviewView>(errorHandler, studentRepository, schedulers) {
 
     var message: Message? = null
 
-    var attachments: List<MessageAttachment>? = null
-
     private lateinit var lastError: Throwable
 
     private var retryCallback: () -> Unit = {}
@@ -57,36 +45,32 @@ class MessagePreviewPresenter @Inject constructor(
     }
 
     private fun loadData(message: Message) {
-        flowWithResourceIn {
-            val student = studentRepository.getStudentById(message.studentId)
-            messageRepository.getMessage(student, message, true)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading message ${message.messageId} preview started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading message ${message.messageId} preview result: Success ")
-                    checkNotNull(it.data, { "Can't find message in local db! Probably no longer exist in this folder" })
-                    this@MessagePreviewPresenter.message = it.data.message
-                    this@MessagePreviewPresenter.attachments = it.data.attachments
+        Timber.i("Loading message ${message.messageId} preview started")
+        disposable.apply {
+            clear()
+            add(studentRepository.getStudentById(message.studentId)
+                .flatMap { messageRepository.getMessage(it, message, true) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally { view?.showProgress(false) }
+                .subscribe({ message ->
+                    Timber.i("Loading message ${message.message.messageId} preview result: Success ")
+                    this@MessagePreviewPresenter.message = message.message
                     view?.apply {
-                        setMessageWithAttachment(it.data)
+                        setMessageWithAttachment(message)
                         initOptions()
                     }
                     analytics.logEvent(
                         "load_item",
                         "type" to "message_preview",
-                        "length" to it.data.message.content.length
+                        "length" to message.message.content.length
                     )
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Loading message ${message.messageId} preview result: An exception occurred ")
                     retryCallback = { onMessageLoadRetry(message) }
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.showProgress(false)
-        }.launch()
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     fun onReply(): Boolean {
@@ -103,99 +87,41 @@ class MessagePreviewPresenter @Inject constructor(
         } else false
     }
 
-    fun onShare(): Boolean {
-        message?.let {
-            var text = "Temat: ${it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }}\n" + when (it.sender.isNotEmpty()) {
-                true -> "Od: ${it.sender}\n"
-                false -> "Do: ${it.recipient}\n"
-            } + "Data: ${it.date.toFormattedString("yyyy-MM-dd HH:mm:ss")}\n\n${it.content}"
-
-            attachments?.let { attachments ->
-                if (attachments.isNotEmpty()) {
-                    text += "\n\nZałączniki:"
-
-                    attachments.forEach { attachment ->
-                        text += "\n${attachment.filename}: ${attachment.url}"
+    private fun deleteMessage() {
+        message?.let { message ->
+            disposable.add(studentRepository.getCurrentStudent()
+                .flatMap { messageRepository.deleteMessage(it, message) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.run {
+                        showContent(false)
+                        showProgress(true)
+                        showOptions(false)
+                        showErrorView(false)
                     }
                 }
-            }
-
-            view?.shareText(text, "FW: ${it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }}")
-            return true
-        }
-        return false
-    }
-
-    @SuppressLint("NewApi")
-    fun onPrint(): Boolean {
-        if (appInfo.systemVersion < Build.VERSION_CODES.LOLLIPOP) return false
-        message?.let {
-            val dateString = it.date.toFormattedString("yyyy-MM-dd HH:mm:ss")
-            val infoContent = "<div><h4>Data wysłania</h4>$dateString</div>" + when {
-                it.sender.isNotEmpty() -> "<div><h4>Od</h4>${it.sender}</div>"
-                else -> "<div><h4>Do</h4>${it.recipient}</div>"
-            }
-
-            val messageContent = "<p>${it.content}</p>"
-                .replace(Regex("[\\n\\r]{2,}"), "</p><p>")
-                .replace(Regex("[\\n\\r]"), "<br>")
-
-            val jobName = "Wiadomość " + when {
-                it.sender.isNotEmpty() -> "od ${it.sender}"
-                else -> "do ${it.recipient}"
-            } + " $dateString: ${it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }} | Wulkanowy"
-
-            view?.apply {
-                val html = printHTML
-                    .replace("%SUBJECT%", it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() })
-                    .replace("%CONTENT%", messageContent)
-                    .replace("%INFO%", infoContent)
-                printDocument(html, jobName)
-            }
-            return true
-        }
-        return false
-    }
-
-    private fun deleteMessage() {
-        message ?: return
-
-        view?.run {
-            showContent(false)
-            showProgress(true)
-            showOptions(false)
-            showErrorView(false)
-        }
-
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            messageRepository.deleteMessage(student, message!!)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Message ${message?.id} delete started")
-                Status.SUCCESS -> {
-                    Timber.d("Message ${message?.id} delete success")
+                .doFinally {
+                    view?.showProgress(false)
+                }
+                .subscribe({
                     view?.run {
+                        notifyParentMessageDeleted(message)
                         showMessage(deleteMessageSuccessString)
                         popView()
                     }
-                }
-                Status.ERROR -> {
-                    Timber.d("Message ${message?.id} delete failed")
+                }, { error ->
                     retryCallback = { onMessageDelete() }
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.showProgress(false)
-        }.launch("delete")
+                    errorHandler.dispatch(error)
+                })
+            )
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
         view?.run {
             lastError = error
             setErrorDetails(message)
-            showContent(false)
             showErrorView(true)
             setErrorRetryCallback { retryCallback() }
         }
@@ -210,7 +136,7 @@ class MessagePreviewPresenter @Inject constructor(
         view?.apply {
             showOptions(message != null)
             message?.let {
-                when (it.folderId == MessageFolder.TRASHED.id) {
+                when (it.removed) {
                     true -> setDeletedOptionsLabels()
                     false -> setNotDeletedOptionsLabels()
                 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
index fa6d735ed..3d620459c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
@@ -1,7 +1,5 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
-import android.os.Build
-import androidx.annotation.RequiresApi
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.ui.base.BaseView
@@ -10,10 +8,6 @@ interface MessagePreviewView : BaseView {
 
     val deleteMessageSuccessString: String
 
-    val messageNoSubjectString: String
-
-    val printHTML: String
-
     fun initView()
 
     fun setMessageWithAttachment(item: MessageWithAttachment)
@@ -22,6 +16,8 @@ interface MessagePreviewView : BaseView {
 
     fun showContent(show: Boolean)
 
+    fun notifyParentMessageDeleted(message: Message)
+
     fun showErrorView(show: Boolean)
 
     fun setErrorDetails(message: String)
@@ -38,10 +34,5 @@ interface MessagePreviewView : BaseView {
 
     fun openMessageForward(message: Message?)
 
-    fun shareText(text: String, subject: String)
-
-    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
-    fun printDocument(html: String, jobName: String)
-
     fun popView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
index 2267279c2..7b7503433 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
@@ -11,7 +11,6 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.ReportingUnit
@@ -22,7 +21,6 @@ import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.showSoftInput
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessageBinding>(), SendMessageView {
 
     @Inject
@@ -64,7 +62,7 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     override val messageSuccess: String
         get() = getString(R.string.message_send_successful)
 
-    public override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(ActivitySendMessageBinding.inflate(layoutInflater).apply { binding = this }.root)
         setSupportActionBar(binding.sendMessageToolbar)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
index f877c8096..aec79f9db 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.ui.modules.message.send
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.repositories.message.MessageRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.recipient.RecipientRepository
@@ -12,14 +12,14 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.onEach
+import io.reactivex.Completable
 import timber.log.Timber
 import javax.inject.Inject
 
 class SendMessagePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
@@ -28,14 +28,14 @@ class SendMessagePresenter @Inject constructor(
     private val recipientRepository: RecipientRepository,
     private val preferencesRepository: PreferencesRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<SendMessageView>(errorHandler, studentRepository) {
+) : BasePresenter<SendMessageView>(errorHandler, studentRepository, schedulers) {
 
     fun onAttachView(view: SendMessageView, message: Message?, reply: Boolean?) {
         super.onAttachView(view)
         view.initView()
         Timber.i("Send message view was initialized")
         loadData(message, reply)
-        with(view) {
+        view.apply {
             message?.let {
                 setSubject(when (reply) {
                     true -> "RE: "
@@ -93,89 +93,90 @@ class SendMessagePresenter @Inject constructor(
     }
 
     private fun loadData(message: Message?, reply: Boolean?) {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            val unit = reportingUnitRepository.getReportingUnit(student, semester.unitId)
+        var reportingUnit: ReportingUnit? = null
+        var recipientChips: List<RecipientChipItem> = emptyList()
+        var selectedRecipientChips: List<RecipientChipItem> = emptyList()
 
-            Timber.i("Loading recipients started")
-            val recipients = when {
-                unit != null -> recipientRepository.getRecipients(student, 2, unit)
-                else -> listOf()
-            }.let { createChips(it) }
-            Timber.i("Loading recipients result: Success, fetched %d recipients", recipients.size)
-
-            Timber.i("Loading message recipients started")
-            val messageRecipients = when {
-                message != null && reply == true -> recipientRepository.getMessageRecipients(student, message)
-                else -> emptyList()
-            }.let { createChips(it) }
-            Timber.i("Loaded message recipients to reply result: Success, fetched %d recipients", messageRecipients.size)
-
-            Triple(unit, recipients, messageRecipients)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    Timber.i("Loading recipients started")
+        Timber.i("Loading recipients started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it).map { semester -> it to semester } }
+            .flatMapCompletable { (student, semester) ->
+                reportingUnitRepository.getReportingUnit(student, semester.unitId)
+                    .doOnSuccess { reportingUnit = it }
+                    .flatMap { recipientRepository.getRecipients(student, 2, it).toMaybe() }
+                    .doOnSuccess {
+                        Timber.i("Loading recipients result: Success, fetched %d recipients", it.size)
+                        recipientChips = createChips(it)
+                    }
+                    .flatMapCompletable {
+                        if (message == null || reply != true) Completable.complete()
+                        else recipientRepository.getMessageRecipients(student, message)
+                            .doOnSuccess {
+                                Timber.i("Loaded message recipients to reply result: Success, fetched %d recipients", it.size)
+                                selectedRecipientChips = createChips(it)
+                            }
+                            .ignoreElement()
+                    }
+            }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.run {
                     showProgress(true)
                     showContent(false)
                 }
-                Status.SUCCESS -> it.data!!.let { (reportingUnit, recipientChips, selectedRecipientChips) ->
-                    view?.run {
-                        if (reportingUnit != null) {
-                            setReportingUnit(reportingUnit)
-                            setRecipients(recipientChips)
-                            if (selectedRecipientChips.isNotEmpty()) setSelectedRecipients(selectedRecipientChips)
-                            showContent(true)
-                        } else {
-                            Timber.i("Loading recipients result: Can't find the reporting unit")
-                            view?.showEmpty(true)
-                        }
+            }
+            .doFinally { view?.run { showProgress(false) } }
+            .subscribe({
+                view?.run {
+                    if (reportingUnit !== null) {
+                        reportingUnit?.let { setReportingUnit(it) }
+                        setRecipients(recipientChips)
+                        if (selectedRecipientChips.isNotEmpty()) setSelectedRecipients(selectedRecipientChips)
+                        showContent(true)
+                    } else {
+                        Timber.i("Loading recipients result: Can't find the reporting unit")
+                        view?.showEmpty(true)
                     }
                 }
-                Status.ERROR -> {
-                    Timber.i("Loading recipients result: An exception occurred")
-                    view?.showContent(true)
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run { showProgress(false) }
-        }.launch()
+            }, {
+                Timber.i("Loading recipients result: An exception occurred")
+                view?.showContent(true)
+                errorHandler.dispatch(it)
+            }))
     }
 
     private fun sendMessage(subject: String, content: String, recipients: List<Recipient>) {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            messageRepository.sendMessage(student, subject, content, recipients)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    Timber.i("Sending message started")
+        Timber.i("Sending message started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { messageRepository.sendMessage(it, subject, content, recipients) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.run {
                     showSoftInput(false)
                     showContent(false)
                     showProgress(true)
                     showActionBar(false)
                 }
-                Status.SUCCESS -> {
-                    Timber.i("Sending message result: Success")
-                    view?.run {
-                        showMessage(messageSuccess)
-                        popView()
-                    }
-                    analytics.logEvent("send_message", "recipients" to recipients.size)
-                }
-                Status.ERROR -> {
-                    Timber.i("Sending message result: An exception occurred")
-                    view?.run {
-                        showContent(true)
-                        showProgress(false)
-                        showActionBar(true)
-                    }
-                    errorHandler.dispatch(it.error!!)
-                }
             }
-        }.launch("send")
+            .subscribe({
+                Timber.i("Sending message result: Success")
+                analytics.logEvent("send_message", "recipients" to recipients.size)
+                view?.run {
+                    showMessage(messageSuccess)
+                    popView()
+                }
+            }, {
+                Timber.i("Sending message result: An exception occurred")
+                view?.run {
+                    showContent(true)
+                    showProgress(false)
+                    showActionBar(true)
+                }
+                errorHandler.dispatch(it)
+            })
+        )
     }
 
     private fun createChips(recipients: List<Recipient>): List<RecipientChipItem> {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
index e9b34da33..6064f10ae 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
@@ -4,9 +4,9 @@ import android.graphics.Typeface
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.NO_POSITION
+import androidx.recyclerview.widget.SortedList
+import androidx.recyclerview.widget.SortedListAdapterCallback
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.message.MessageFolder
@@ -19,18 +19,39 @@ class MessageTabAdapter @Inject constructor() :
 
     var onClickListener: (Message, position: Int) -> Unit = { _, _ -> }
 
-    var onChangesDetectedListener = {}
+    private val items = SortedList(Message::class.java, object :
+        SortedListAdapterCallback<Message>(this) {
 
-    private var items = mutableListOf<Message>()
+        override fun compare(item1: Message, item2: Message): Int {
+            return item2.date.compareTo(item1.date)
+        }
 
-    fun setDataItems(data: List<Message>) {
-        if (items.size != data.size) onChangesDetectedListener()
-        val diffResult = DiffUtil.calculateDiff(MessageTabDiffUtil(items, data))
-        items = data.toMutableList()
-        diffResult.dispatchUpdatesTo(this)
+        override fun areContentsTheSame(oldItem: Message?, newItem: Message?): Boolean {
+            return oldItem == newItem
+        }
+
+        override fun areItemsTheSame(item1: Message, item2: Message): Boolean {
+            return item1 == item2
+        }
+    })
+
+    fun replaceAll(models: List<Message>) {
+        items.beginBatchedUpdates()
+        for (i in items.size() - 1 downTo 0) {
+            val model = items.get(i)
+            if (model !in models) {
+                items.remove(model)
+            }
+        }
+        items.addAll(models)
+        items.endBatchedUpdates()
     }
 
-    override fun getItemCount() = items.size
+    fun updateItem(position: Int, item: Message) {
+        items.updateItemAt(position, item)
+    }
+
+    override fun getItemCount() = items.size()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
         ItemMessageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@@ -56,26 +77,9 @@ class MessageTabAdapter @Inject constructor() :
             }
             messageItemAttachmentIcon.visibility = if (item.hasAttachments) View.VISIBLE else View.GONE
 
-            root.setOnClickListener {
-                holder.adapterPosition.let { if (it != NO_POSITION) onClickListener(item, it) }
-            }
+            root.setOnClickListener { onClickListener(item, holder.adapterPosition) }
         }
     }
 
     class ItemViewHolder(val binding: ItemMessageBinding) : RecyclerView.ViewHolder(binding.root)
-
-    private class MessageTabDiffUtil(private val old: List<Message>, private val new: List<Message>) :
-        DiffUtil.Callback() {
-        override fun getOldListSize(): Int = old.size
-
-        override fun getNewListSize(): Int = new.size
-
-        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-            return old[oldItemPosition].id == new[newItemPosition].id
-        }
-
-        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-            return old[oldItemPosition] == new[newItemPosition]
-        }
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
index 44ad4bf18..909bb6873 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
@@ -9,7 +9,6 @@ import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import androidx.appcompat.widget.SearchView
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.message.MessageFolder
@@ -19,10 +18,8 @@ import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
 import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import kotlinx.coroutines.FlowPreview
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.fragment_message_tab),
     MessageTabView {
 
@@ -52,7 +49,6 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
         setHasOptionsMenu(true)
     }
 
-    @FlowPreview
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentMessageTabBinding.bind(view)
@@ -63,10 +59,7 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
     }
 
     override fun initView() {
-        with(tabAdapter) {
-            onClickListener = presenter::onMessageItemSelected
-            onChangesDetectedListener = ::resetListPosition
-        }
+        tabAdapter.onClickListener = presenter::onMessageItemSelected
 
         with(binding.messageTabRecycler) {
             layoutManager = LinearLayoutManager(context)
@@ -97,7 +90,11 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
     }
 
     override fun updateData(data: List<Message>) {
-        tabAdapter.setDataItems(data)
+        tabAdapter.replaceAll(data)
+    }
+
+    override fun updateItem(item: Message, position: Int) {
+        tabAdapter.updateItem(position, item)
     }
 
     override fun showProgress(show: Boolean) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
index 79062dcfc..221762d16 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
-import io.github.wulkanowy.data.Status
+import android.annotation.SuppressLint
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.message.MessageFolder
 import io.github.wulkanowy.data.repositories.message.MessageRepository
@@ -9,31 +9,19 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.consumeAsFlow
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
-import me.xdrop.fuzzywuzzy.FuzzySearch
 import timber.log.Timber
-import java.util.Locale
 import javax.inject.Inject
-import kotlin.math.pow
 
 class MessageTabPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val messageRepository: MessageRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<MessageTabView>(errorHandler, studentRepository) {
+) : BasePresenter<MessageTabView>(errorHandler, studentRepository, schedulers) {
 
     lateinit var folder: MessageFolder
 
@@ -43,13 +31,9 @@ class MessageTabPresenter @Inject constructor(
 
     private var messages = emptyList<Message>()
 
-    private val searchChannel = Channel<String>()
-
-    @FlowPreview
     fun onAttachView(view: MessageTabView, folder: MessageFolder) {
         super.onAttachView(view)
         view.initView()
-        initializeSearchStream()
         errorHandler.showErrorMessage = ::showErrorViewOnError
         this.folder = folder
     }
@@ -72,7 +56,7 @@ class MessageTabPresenter @Inject constructor(
     }
 
     fun onDeleteMessage() {
-        loadData(true)
+        loadData(false)
     }
 
     fun onParentViewLoadData(forceRefresh: Boolean) {
@@ -81,41 +65,49 @@ class MessageTabPresenter @Inject constructor(
 
     fun onMessageItemSelected(message: Message, position: Int) {
         Timber.i("Select message ${message.id} item (position: $position)")
-        view?.openMessage(message)
+        view?.run {
+            openMessage(message)
+            if (message.unread) {
+                message.unread = false
+                updateItem(message, position)
+            }
+        }
     }
 
     private fun loadData(forceRefresh: Boolean) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            messageRepository.getMessages(student, semester, folder, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading $folder message data started")
-                Status.SUCCESS -> {
+        Timber.i("Loading $folder message data started")
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student)
+                        .flatMap { messageRepository.getMessages(student, it, folder, forceRefresh) }
+                }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        showRefresh(false)
+                        showProgress(false)
+                        enableSwipe(true)
+                        notifyParentDataLoaded()
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading $folder message result: Success")
-                    messages = it.data!!
-                    updateData(getFilteredData(lastSearchQuery))
+                    messages = it
+                    onSearchQueryTextChange(lastSearchQuery)
                     analytics.logEvent(
                         "load_data",
                         "type" to "messages",
-                        "items" to it.data.size,
+                        "items" to it.size,
                         "folder" to folder.name
                     )
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Loading $folder message result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded()
-            }
-        }.launch()
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -129,40 +121,25 @@ class MessageTabPresenter @Inject constructor(
         }
     }
 
+    @SuppressLint("DefaultLocale")
     fun onSearchQueryTextChange(query: String) {
-        launch {
-            searchChannel.send(query)
-        }
-    }
+        lastSearchQuery = query
 
-    @FlowPreview
-    private fun initializeSearchStream() {
-        launch {
-            searchChannel.consumeAsFlow()
-                .debounce(250)
-                .map { query ->
-                    lastSearchQuery = query
-                    getFilteredData(query)
-                }
-                .catch { Timber.e(it) }
-                .collect {
-                    Timber.d("Applying filter. Full list: ${messages.size}, filtered: ${it.size}")
-                    updateData(it)
-                    view?.resetListPosition()
-                }
+        val lowerCaseQuery = query.toLowerCase()
+        val filteredList = mutableListOf<Message>()
+        messages.forEach {
+            if (lowerCaseQuery in it.subject.toLowerCase() ||
+                lowerCaseQuery in it.sender.toLowerCase() ||
+                lowerCaseQuery in it.recipient.toLowerCase() ||
+                lowerCaseQuery in it.date.toFormattedString()
+            ) {
+                filteredList.add(it)
+            }
         }
-    }
 
-    private fun getFilteredData(query: String): List<Message> {
-        return if (query.trim().isEmpty()) {
-            messages.sortedByDescending { it.date }
-        } else {
-            messages
-                .map { it to calculateMatchRatio(it, query) }
-                .sortedByDescending { it.second }
-                .filter { it.second > 5000 }
-                .map { it.first }
-        }
+        Timber.d("Applying filter. Full list: ${messages.size}, filtered: ${filteredList.size}")
+
+        updateData(filteredList)
     }
 
     private fun updateData(data: List<Message>) {
@@ -171,44 +148,7 @@ class MessageTabPresenter @Inject constructor(
             showContent(data.isNotEmpty())
             showErrorView(false)
             updateData(data)
+            resetListPosition()
         }
     }
-
-    private fun calculateMatchRatio(message: Message, query: String): Int {
-        val subjectRatio = FuzzySearch.tokenSortPartialRatio(
-            query.toLowerCase(Locale.getDefault()),
-            message.subject
-        )
-
-        val senderOrRecipientRatio = FuzzySearch.tokenSortPartialRatio(
-            query.toLowerCase(Locale.getDefault()),
-            if (message.sender.isNotEmpty()) message.sender.toLowerCase(Locale.getDefault())
-            else message.recipient.toLowerCase(Locale.getDefault())
-        )
-
-        val dateRatio = listOf(
-            FuzzySearch.ratio(
-                query.toLowerCase(Locale.getDefault()),
-                message.date.toFormattedString("dd.MM").toLowerCase(Locale.getDefault())
-            ),
-            FuzzySearch.ratio(
-                query.toLowerCase(Locale.getDefault()),
-                message.date.toFormattedString("dd.MM.yyyy").toLowerCase(Locale.getDefault())
-            ),
-            FuzzySearch.ratio(
-                query.toLowerCase(Locale.getDefault()),
-                message.date.toFormattedString("d MMMM").toLowerCase(Locale.getDefault())
-            ),
-            FuzzySearch.ratio(
-                query.toLowerCase(Locale.getDefault()),
-                message.date.toFormattedString("d MMMM yyyy").toLowerCase(Locale.getDefault())
-            )
-        ).maxOrNull() ?: 0
-
-
-        return (subjectRatio.toDouble().pow(2)
-            + senderOrRecipientRatio.toDouble().pow(2)
-            + dateRatio.toDouble().pow(2) * 2
-            ).toInt()
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
index fe9b60077..f521191cf 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
@@ -13,6 +13,8 @@ interface MessageTabView : BaseView {
 
     fun updateData(data: List<Message>)
 
+    fun updateItem(item: Message, position: Int)
+
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
index 8065e9b60..6a3e5a441 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
@@ -7,7 +7,6 @@ import android.view.View.VISIBLE
 import androidx.core.view.postDelayed
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.snackbar.Snackbar
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.databinding.FragmentMobileDeviceBinding
@@ -18,7 +17,6 @@ import io.github.wulkanowy.ui.modules.mobiledevice.token.MobileDeviceTokenDialog
 import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class MobileDeviceFragment :
     BaseFragment<FragmentMobileDeviceBinding>(R.layout.fragment_mobile_device), MobileDeviceView,
     MainView.TitledView {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
index 6314c2c31..459ca17e8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.mobiledevice
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.repositories.mobiledevice.MobileDeviceRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -8,21 +7,18 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class MobileDevicePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val mobileDeviceRepository: MobileDeviceRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<MobileDeviceView>(errorHandler, studentRepository) {
+) : BasePresenter<MobileDeviceView>(errorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -51,39 +47,39 @@ class MobileDevicePresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            mobileDeviceRepository.getDevices(student, semester, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading mobile devices data started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading mobile devices result: Success")
-                    view?.run {
-                        updateData(it.data!!)
-                        showContent(it.data.isNotEmpty())
-                        showEmpty(it.data.isEmpty())
-                        showErrorView(false)
-                    }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "devices",
-                        "items" to it.data!!.size
-                    )
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading mobile devices result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Loading mobile devices data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    mobileDeviceRepository.getDevices(student, semester, forceRefresh)
                 }
             }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    hideRefresh()
+                    showProgress(false)
+                    enableSwipe(true)
+                }
+            }.subscribe({
+                Timber.i("Loading mobile devices result: Success")
+                view?.run {
+                    updateData(it)
+                    showContent(it.isNotEmpty())
+                    showEmpty(it.isEmpty())
+                    showErrorView(false)
+                }
+                analytics.logEvent(
+                    "load_data",
+                    "type" to "devices",
+                    "items" to it.size,
+                    "force_refresh" to forceRefresh
+                )
+            }) {
+                Timber.i("Loading mobile devices result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -117,25 +113,33 @@ class MobileDevicePresenter @Inject constructor(
     }
 
     fun onUnregisterConfirmed(device: MobileDevice) {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            mobileDeviceRepository.unregisterDevice(student, semester, device)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Unregister device started")
-                Status.SUCCESS -> {
-                    Timber.i("Unregister device result: Success")
-                    view?.run {
-                        showProgress(false)
-                        enableSwipe(true)
-                    }
-                }
-                Status.ERROR -> {
-                    Timber.i("Unregister device result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Unregister device started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    mobileDeviceRepository.unregisterDevice(student, semester, device)
+                        .flatMap { mobileDeviceRepository.getDevices(student, semester, it) }
                 }
             }
-        }.launchIn(this)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    showProgress(false)
+                    enableSwipe(true)
+                }
+            }
+            .subscribe({
+                Timber.i("Unregister device result: Success")
+                view?.run {
+                    updateData(it)
+                    showContent(it.isNotEmpty())
+                    showEmpty(it.isEmpty())
+                }
+            }) {
+                Timber.i("Unregister device result: An exception occurred")
+                errorHandler.dispatch(it)
+            }
+        )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
index 48150d8de..9ac6049e9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
@@ -12,14 +12,12 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.content.getSystemService
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
 import io.github.wulkanowy.databinding.DialogMobileDeviceBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(), MobileDeviceTokenVIew {
 
     @Inject
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt
index f6d0de992..6a2a6b98b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt
@@ -1,25 +1,23 @@
 package io.github.wulkanowy.ui.modules.mobiledevice.token
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.mobiledevice.MobileDeviceRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class MobileDeviceTokenPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val mobileDeviceRepository: MobileDeviceRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<MobileDeviceTokenVIew>(errorHandler, studentRepository) {
+) : BasePresenter<MobileDeviceTokenVIew>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: MobileDeviceTokenVIew) {
         super.onAttachView(view)
@@ -29,29 +27,28 @@ class MobileDeviceTokenPresenter @Inject constructor(
     }
 
     private fun loadData() {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            mobileDeviceRepository.getToken(student, semester)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Mobile device registration data started")
-                Status.SUCCESS -> {
-                    Timber.i("Mobile device registration result: Success")
-                    view?.run {
-                        updateData(it.data!!)
-                        showContent()
-                    }
-                    analytics.logEvent("device_register", "symbol" to it.data!!.token.substring(0, 3))
-                }
-                Status.ERROR -> {
-                    Timber.i("Mobile device registration result: An exception occurred")
-                    view?.closeDialog()
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Mobile device registration data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    mobileDeviceRepository.getToken(student, semester)
                 }
             }
-        }.afterLoading {
-            view?.hideLoading()
-        }.launch()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally { view?.hideLoading() }
+            .subscribe({
+                Timber.i("Mobile device registration result: Success")
+                view?.run {
+                    updateData(it)
+                    showContent()
+                }
+                analytics.logEvent("device_register", "symbol" to it.token.substring(0, 3))
+            }) {
+                Timber.i("Mobile device registration result: An exception occurred")
+                view?.closeDialog()
+                errorHandler.dispatch(it)
+            }
+        )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
index 1bdcc26fa..a79087de2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
@@ -4,7 +4,6 @@ import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.FragmentMoreBinding
 import io.github.wulkanowy.ui.base.BaseFragment
@@ -21,7 +20,6 @@ import io.github.wulkanowy.ui.modules.settings.SettingsFragment
 import io.github.wulkanowy.utils.getCompatDrawable
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more), MoreView,
     MainView.TitledView, MainView.MainChildView {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
index 6d80f4181..593645c19 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
@@ -3,13 +3,15 @@ package io.github.wulkanowy.ui.modules.more
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class MorePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<MoreView>(errorHandler, studentRepository) {
+) : BasePresenter<MoreView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: MoreView) {
         super.onAttachView(view)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt
index 48482cb75..2ffcad949 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt
@@ -6,11 +6,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
+import io.github.wulkanowy.sdk.scrapper.notes.Note.CategoryType
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.databinding.ItemNoteBinding
-import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.toFormattedString
 import javax.inject.Inject
@@ -43,9 +43,9 @@ class NoteAdapter @Inject constructor() : RecyclerView.Adapter<NoteAdapter.ItemV
             with(noteItemPoints) {
                 text = "${if (item.points > 0) "+" else ""}${item.points}"
                 visibility = if (item.isPointsShow) View.VISIBLE else View.GONE
-                setTextColor(when (NoteCategory.getByValue(item.categoryType)) {
-                    NoteCategory.POSITIVE -> ContextCompat.getColor(context, R.color.note_positive)
-                    NoteCategory.NEGATIVE -> ContextCompat.getColor(context, R.color.note_negative)
+                setTextColor(when (CategoryType.getByValue(item.categoryType)) {
+                    CategoryType.POSITIVE -> ContextCompat.getColor(context, R.color.note_positive)
+                    CategoryType.NEGATIVE -> ContextCompat.getColor(context, R.color.note_negative)
                     else -> context.getThemeAttrColor(android.R.attr.textColorPrimary)
                 })
             }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
index e016fe0b9..6d1b181ac 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
@@ -10,10 +10,10 @@ import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.databinding.DialogNoteBinding
-import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory
 import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.sdk.scrapper.notes.Note.CategoryType
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 
 class NoteDialog : DialogFragment() {
 
@@ -57,9 +57,9 @@ class NoteDialog : DialogFragment() {
         if (note.isPointsShow) {
             with(binding.noteDialogPoints) {
                 text = "${if (note.points > 0) "+" else ""}${note.points}"
-                setTextColor(when (NoteCategory.getByValue(note.categoryType)) {
-                    NoteCategory.POSITIVE -> ContextCompat.getColor(requireContext(), R.color.note_positive)
-                    NoteCategory.NEGATIVE -> ContextCompat.getColor(requireContext(), R.color.note_negative)
+                setTextColor(when (CategoryType.getByValue(note.categoryType)) {
+                    CategoryType.POSITIVE -> ContextCompat.getColor(requireContext(), R.color.note_positive)
+                    CategoryType.NEGATIVE -> ContextCompat.getColor(requireContext(), R.color.note_negative)
                     else -> requireContext().getThemeAttrColor(android.R.attr.textColorPrimary)
                 })
             }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
index 079285a80..473381659 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
@@ -5,7 +5,6 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.databinding.FragmentNoteBinding
@@ -15,7 +14,6 @@ import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class NoteFragment : BaseFragment<FragmentNoteBinding>(R.layout.fragment_note), NoteView,
     MainView.TitledView {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
index db3b495a8..7d301c66b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.note
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.repositories.note.NoteRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -8,21 +7,18 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class NotePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val noteRepository: NoteRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<NoteView>(errorHandler, studentRepository) {
+) : BasePresenter<NoteView>(errorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -52,39 +48,38 @@ class NotePresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            noteRepository.getNotes(student, semester, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading note data started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading note result: Success")
-                    view?.apply {
-                        updateData(it.data!!.sortedByDescending { item -> item.date })
-                        showEmpty(it.data.isEmpty())
-                        showErrorView(false)
-                        showContent(it.data.isNotEmpty())
-                    }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "note",
-                        "items" to it.data!!.size
-                    )
+        Timber.i("Loading note data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it).map { semester -> semester to it } }
+            .flatMap { noteRepository.getNotes(it.second, it.first, forceRefresh) }
+            .map { items -> items.sortedByDescending { it.date } }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    hideRefresh()
+                    showProgress(false)
+                    enableSwipe(true)
                 }
-                Status.ERROR -> {
-                    Timber.i("Loading note result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+            }.subscribe({
+                Timber.i("Loading note result: Success")
+                view?.apply {
+                    updateData(it)
+                    showEmpty(it.isEmpty())
+                    showErrorView(false)
+                    showContent(it.isNotEmpty())
                 }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+                analytics.logEvent(
+                    "load_data",
+                    "type" to "note",
+                    "items" to it.size,
+                    "force_refresh" to forceRefresh
+                )
+            }, {
+                Timber.i("Loading note result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
+        )
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -111,15 +106,14 @@ class NotePresenter @Inject constructor(
     }
 
     private fun updateNote(note: Note) {
-        flowWithResource { noteRepository.updateNote(note) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Attempt to update note ${note.id}")
-                Status.SUCCESS -> Timber.i("Update note result: Success")
-                Status.ERROR -> {
-                    Timber.i("Update note result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.launchIn(this)
+        Timber.i("Attempt to update note ${note.id}")
+        disposable.add(noteRepository.updateNote(note)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({ Timber.i("Update note result: Success") })
+            { error ->
+                Timber.i("Update note result: An exception occurred")
+                errorHandler.dispatch(error)
+            })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt
index c1c569611..0245aa076 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.FragmentSchoolandteachersBinding
 import io.github.wulkanowy.ui.base.BaseFragment
@@ -16,7 +15,6 @@ import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class SchoolAndTeachersFragment :
     BaseFragment<FragmentSchoolandteachersBinding>(R.layout.fragment_schoolandteachers),
     SchoolAndTeachersView, MainView.TitledView {
@@ -24,7 +22,8 @@ class SchoolAndTeachersFragment :
     @Inject
     lateinit var presenter: SchoolAndTeachersPresenter
 
-    private val pagerAdapter by lazy { BaseFragmentPagerAdapter(childFragmentManager) }
+    @Inject
+    lateinit var pagerAdapter: BaseFragmentPagerAdapter
 
     companion object {
         fun newInstance() = SchoolAndTeachersFragment()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt
new file mode 100644
index 000000000..2087b0b42
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.ui.modules.schoolandteachers
+
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import io.github.wulkanowy.di.scopes.PerChildFragment
+import io.github.wulkanowy.di.scopes.PerFragment
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
+import io.github.wulkanowy.ui.modules.schoolandteachers.school.SchoolFragment
+import io.github.wulkanowy.ui.modules.schoolandteachers.teacher.TeacherFragment
+
+@Suppress("unused")
+@Module
+abstract class SchoolAndTeachersModule {
+
+    companion object {
+
+        @PerFragment
+        @Provides
+        fun provideSchoolAndTeachersAdapter(fragment: SchoolAndTeachersFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
+    }
+
+    @PerChildFragment
+    @ContributesAndroidInjector
+    abstract fun provideSchoolFragment(): SchoolFragment
+
+    @PerChildFragment
+    @ContributesAndroidInjector
+    abstract fun provideTeacherFragment(): TeacherFragment
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt
index 305f4e7d5..1856803c6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt
@@ -3,24 +3,26 @@ package io.github.wulkanowy.ui.modules.schoolandteachers
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Completable
 import timber.log.Timber
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class SchoolAndTeachersPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<SchoolAndTeachersView>(errorHandler, studentRepository) {
+) : BasePresenter<SchoolAndTeachersView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: SchoolAndTeachersView) {
         super.onAttachView(view)
-        launch {
-            delay(150)
-            view.initView()
-            Timber.i("Message view was initialized")
-            loadData()
-        }
+        disposable.add(Completable.timer(150, TimeUnit.MILLISECONDS, schedulers.mainThread)
+            .subscribe {
+                view.initView()
+                Timber.i("Message view was initialized")
+                loadData()
+            })
     }
 
     fun onPageSelected(index: Int) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt
index d3f110073..722999f86 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.databinding.FragmentSchoolBinding
@@ -16,7 +15,6 @@ import io.github.wulkanowy.utils.openDialer
 import io.github.wulkanowy.utils.openNavigation
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class SchoolFragment : BaseFragment<FragmentSchoolBinding>(R.layout.fragment_school), SchoolView,
     MainView.TitledView, SchoolAndTeachersChildView {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt
index 4cda5d33c..7beff922d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt
@@ -1,25 +1,23 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.school
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.school.SchoolRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class SchoolPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val schoolRepository: SchoolRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<SchoolView>(errorHandler, studentRepository) {
+) : BasePresenter<SchoolView>(errorHandler, studentRepository, schedulers) {
 
     private var address: String? = null
 
@@ -64,46 +62,48 @@ class SchoolPresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            schoolRepository.getSchoolInfo(student, semester, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading school info started")
-                Status.SUCCESS -> if (it.data != null) {
-                    Timber.i("Loading teachers result: Success")
-                    view?.run {
-                        address = it.data.address.ifBlank { null }
-                        contact = it.data.contact.ifBlank { null }
-                        updateData(it.data)
-                        showContent(true)
-                        showEmpty(false)
-                        showErrorView(false)
-                    }
-                    analytics.logEvent(
-                        "load_item",
-                        "type" to "school"
-                    )
-                } else view?.run {
-                    Timber.i("Loading school result: No school info found")
+        Timber.i("Loading school info started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMapMaybe { student ->
+                semesterRepository.getCurrentSemester(student).flatMapMaybe {
+                    schoolRepository.getSchoolInfo(student, it, forceRefresh)
+                }
+            }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    hideRefresh()
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded()
+                }
+            }.subscribe({
+                Timber.i("Loading teachers result: Success")
+                view?.run {
+                    address = it.address.ifBlank { null }
+                    contact = it.contact.ifBlank { null }
+                    updateData(it)
+                    showContent(true)
+                    showEmpty(false)
+                    showErrorView(false)
+                }
+                analytics.logEvent(
+                    "load_item",
+                    "type" to "school",
+                    "force_refresh" to forceRefresh
+                )
+            }, {
+                Timber.i("Loading school result: An exception occurred")
+                errorHandler.dispatch(it)
+            }, {
+                Timber.i("Loading school result: No school info found")
+                view?.run {
                     showContent(!isViewEmpty)
                     showEmpty(isViewEmpty)
                     showErrorView(false)
                 }
-                Status.ERROR -> {
-                    Timber.i("Loading school result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded()
-            }
-        }.launch()
+            }))
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
index 5914945b9..aa50339c1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
@@ -5,7 +5,6 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.databinding.FragmentTeacherBinding
@@ -16,7 +15,6 @@ import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragmen
 import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class TeacherFragment : BaseFragment<FragmentTeacherBinding>(R.layout.fragment_teacher),
     TeacherView, MainView.TitledView, SchoolAndTeachersChildView {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
index ff02116b9..0d8eec6d4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
@@ -1,25 +1,23 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.teacher.TeacherRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class TeacherPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val teacherRepository: TeacherRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<TeacherView>(errorHandler, studentRepository) {
+) : BasePresenter<TeacherView>(errorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -40,7 +38,7 @@ class TeacherPresenter @Inject constructor(
             showErrorView(false)
             showProgress(true)
         }
-        loadData()
+        loadData(true)
     }
 
     fun onDetailsClick() {
@@ -52,40 +50,41 @@ class TeacherPresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            teacherRepository.getTeachers(student, semester, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading teachers data started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading teachers result: Success")
-                    view?.run {
-                        updateData(it.data!!.filter { item -> item.name.isNotBlank() })
-                        showContent(it.data.isNotEmpty())
-                        showEmpty(it.data.isEmpty())
-                        showErrorView(false)
-                    }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "teachers",
-                        "items" to it.data!!.size
-                    )
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading teachers result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Loading teachers data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    teacherRepository.getTeachers(student, semester, forceRefresh)
                 }
             }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded()
-            }
-        }.launch()
+            .map { it.filter { teacher -> teacher.name.isNotBlank() } }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    hideRefresh()
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded()
+                }
+            }.subscribe({
+                Timber.i("Loading teachers result: Success")
+                view?.run {
+                    updateData(it)
+                    showContent(it.isNotEmpty())
+                    showEmpty(it.isEmpty())
+                    showErrorView(false)
+                }
+                analytics.logEvent(
+                    "load_data",
+                    "type" to "teachers",
+                    "items" to it.size,
+                    "force_refresh" to forceRefresh
+                )
+            }) {
+                Timber.i("Loading teachers result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
index 6f4a695d6..248417fd1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
@@ -9,7 +9,7 @@ import androidx.preference.PreferenceFragmentCompat
 import com.thelittlefireman.appkillermanager.AppKillerManager
 import com.thelittlefireman.appkillermanager.exceptions.NoActionFoundException
 import com.yariksoffice.lingver.Lingver
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.android.support.AndroidSupportInjection
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.ErrorDialog
@@ -18,7 +18,6 @@ import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.openInternetBrowser
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class SettingsFragment : PreferenceFragmentCompat(),
     SharedPreferences.OnSharedPreferenceChangeListener,
     MainView.TitledView, SettingsView {
@@ -43,6 +42,7 @@ class SettingsFragment : PreferenceFragmentCompat(),
     override val syncFailedString get() = getString(R.string.pref_services_message_sync_failed)
 
     override fun onAttach(context: Context) {
+        AndroidSupportInjection.inject(this)
         super.onAttach(context)
     }
 
@@ -120,6 +120,15 @@ class SettingsFragment : PreferenceFragmentCompat(),
         ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
     }
 
+    override fun showForceSyncDialog() {
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.pref_services_dialog_force_sync_title)
+            .setMessage(R.string.pref_services_dialog_force_sync_summary)
+            .setPositiveButton(android.R.string.ok) { _, _ -> presenter.onForceSyncDialogSubmit() }
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .show()
+    }
+
     override fun showFixSyncDialog() {
         AlertDialog.Builder(requireContext())
             .setTitle(R.string.pref_notify_fix_sync_issues)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
index 3d1e063e2..bccb6f0bb 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
@@ -10,14 +10,14 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.isHolidays
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate.now
 import timber.log.Timber
-import java.time.LocalDate.now
 import javax.inject.Inject
 
 class SettingsPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val preferencesRepository: PreferencesRepository,
@@ -26,7 +26,7 @@ class SettingsPresenter @Inject constructor(
     private val syncManager: SyncManager,
     private val chuckerCollector: ChuckerCollector,
     private val appInfo: AppInfo
-) : BasePresenter<SettingsView>(errorHandler, studentRepository) {
+) : BasePresenter<SettingsView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: SettingsView) {
         super.onAttachView(view)
@@ -55,32 +55,40 @@ class SettingsPresenter @Inject constructor(
     }
 
     fun onSyncNowClicked() {
-        view?.run {
-            syncManager.startOneTimeSyncWorker().onEach { workInfo ->
-                when (workInfo.state) {
-                    WorkInfo.State.ENQUEUED -> {
-                        setSyncInProgress(true)
-                        Timber.i("Setting sync now started")
-                        analytics.logEvent("sync_now", "status" to "started")
-                    }
-                    WorkInfo.State.SUCCEEDED -> {
-                        showMessage(syncSuccessString)
-                        analytics.logEvent("sync_now", "status" to "success")
-                    }
-                    WorkInfo.State.FAILED -> {
-                        showError(syncFailedString, Throwable(workInfo.outputData.getString("error")))
-                        analytics.logEvent("sync_now", "status" to "failed")
-                    }
-                    else -> Timber.d("Sync now state: ${workInfo.state}")
-                }
-                if (workInfo.state.isFinished) setSyncInProgress(false)
-            }.catch {
-                Timber.e(it, "Sync now failed")
-            }.launch("sync")
-        }
+        view?.showForceSyncDialog()
     }
 
     fun onFixSyncIssuesClicked() {
         view?.showFixSyncDialog()
     }
+
+    fun onForceSyncDialogSubmit() {
+        view?.run {
+            val successString = syncSuccessString
+            val failedString = syncFailedString
+            disposable.add(syncManager.startOneTimeSyncWorker()
+                .doOnSubscribe {
+                    setSyncInProgress(true)
+                    Timber.i("Setting sync now started")
+                    analytics.logEvent("sync_now", "status" to "started")
+                }
+                .doFinally { setSyncInProgress(false) }
+                .subscribe({ workInfo ->
+                    when (workInfo.state) {
+                        WorkInfo.State.SUCCEEDED -> {
+                            showMessage(successString)
+                            analytics.logEvent("sync_now", "status" to "success")
+                        }
+                        WorkInfo.State.FAILED -> {
+                            showError(failedString, Throwable(workInfo.outputData.getString("error")))
+                            analytics.logEvent("sync_now", "status" to "failed")
+                        }
+                        else -> Timber.d("Sync now state: ${workInfo.state}")
+                    }
+                }, {
+                    Timber.e(it, "Sync now failed")
+                })
+            )
+        }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
index b647c0b76..3786ba4b2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
@@ -18,5 +18,6 @@ interface SettingsView : BaseView {
 
     fun setSyncInProgress(inProgress: Boolean)
 
+    fun showForceSyncDialog()
     fun showFixSyncDialog()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
index 7fc20d238..23a437506 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
@@ -4,13 +4,11 @@ import android.os.Bundle
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.viewbinding.ViewBinding
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class SplashActivity : BaseActivity<SplashPresenter, ViewBinding>(), SplashView {
 
     @Inject
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
index d16ca4a80..44b53c5f9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
@@ -1,30 +1,27 @@
 package io.github.wulkanowy.ui.modules.splash
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class SplashPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<SplashView>(errorHandler, studentRepository) {
+) : BasePresenter<SplashView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: SplashView) {
         super.onAttachView(view)
-        flowWithResource { studentRepository.isCurrentStudentSet() }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Is current user set check started")
-                Status.SUCCESS -> with(view) {
-                    if (it.data!!) openMainView()
+        disposable.add(studentRepository.isCurrentStudentSet()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                view.apply {
+                    if (it) openMainView()
                     else openLoginView()
                 }
-                Status.ERROR -> errorHandler.dispatch(it.error!!)
-            }
-        }.launch()
+            }, { errorHandler.dispatch(it) }))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
index 58be38cec..85ded2025 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
@@ -6,7 +6,6 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.TextView
-import androidx.core.view.ViewCompat
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
@@ -18,8 +17,8 @@ import io.github.wulkanowy.utils.isShowTimeUntil
 import io.github.wulkanowy.utils.left
 import io.github.wulkanowy.utils.toFormattedString
 import io.github.wulkanowy.utils.until
+import org.threeten.bp.LocalDateTime
 import timber.log.Timber
-import java.time.LocalDateTime
 import java.util.Timer
 import javax.inject.Inject
 import kotlin.concurrent.timer
@@ -45,8 +44,8 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
 
     private val timers = mutableMapOf<Int, Timer>()
 
-    fun resetTimers() {
-        Timber.d("Timetable timers (${timers.size}) reset")
+    private fun resetTimers() {
+        Timber.d("Timetable timers reset")
         with(timers) {
             forEach { (_, timer) -> timer.cancel() }
             clear()
@@ -70,6 +69,11 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
         }
     }
 
+    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
+        super.onDetachedFromRecyclerView(recyclerView)
+        resetTimers()
+    }
+
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         val lesson = items[position]
 
@@ -108,12 +112,8 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
             bindNormalDescription(binding, lesson)
             bindNormalColors(binding, lesson)
 
-            if (lesson.isStudentPlan && showTimers) {
-                timers[position] = timer(period = 1000) {
-                    if (ViewCompat.isAttachedToWindow(root)) {
-                        root.post { updateTimeLeft(binding, lesson, position) }
-                    }
-                }
+            if (lesson.isStudentPlan && showTimers) timers[position] = timer(period = 1000) {
+                root.post { updateTimeLeft(binding, lesson, position) }
             } else {
                 // reset item on set changed
                 timetableItemTimeUntil.visibility = GONE
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
index f7d5b1ed9..8efecf07c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
@@ -15,7 +15,7 @@ import io.github.wulkanowy.databinding.DialogTimetableBinding
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
-import java.time.LocalDateTime
+import org.threeten.bp.LocalDateTime
 
 class TimetableDialog : DialogFragment() {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
index 74a9aa6ea..2f01511ad 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
@@ -9,7 +9,6 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.databinding.FragmentTimetableBinding
@@ -20,10 +19,9 @@ import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragme
 import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.SchooldaysRangeLimiter
 import io.github.wulkanowy.utils.dpToPx
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragment_timetable),
     TimetableView, MainView.MainChildView, MainView.TitledView {
 
@@ -185,7 +183,6 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
     }
 
     override fun onDestroyView() {
-        timetableAdapter.resetTimers()
         presenter.onDetachView()
         super.onDestroyView()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index 8581b73c6..e1ce005e3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -1,7 +1,6 @@
 package io.github.wulkanowy.ui.modules.timetable
 
 import android.annotation.SuppressLint
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -10,33 +9,29 @@ import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-import java.lang.NullPointerException
-import java.time.LocalDate
-import java.time.LocalDate.now
-import java.time.LocalDate.of
-import java.time.LocalDate.ofEpochDay
 import javax.inject.Inject
 
 class TimetablePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val timetableRepository: TimetableRepository,
     private val semesterRepository: SemesterRepository,
     private val prefRepository: PreferencesRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<TimetableView>(errorHandler, studentRepository) {
+) : BasePresenter<TimetableView>(errorHandler, studentRepository, schedulers) {
 
     private var baseDate: LocalDate = now().nextOrSameSchoolDay
 
@@ -116,60 +111,60 @@ class TimetablePresenter @Inject constructor(
     }
 
     private fun setBaseDateOnHolidays() {
-        flow {
-            val student = studentRepository.getCurrentStudent()
-            emit(semesterRepository.getCurrentSemester(student))
-        }.catch {
-            Timber.i("Loading semester result: An exception occurred")
-        }.onEach {
-            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-            currentDate = baseDate
-            reloadNavigation()
-        }.launch("holidays")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading timetable data started")
         currentDate = date
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            timetableRepository.getTimetable(student, semester, date, date, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading timetable data started")
-                Status.SUCCESS -> {
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        timetableRepository.getTimetable(student, semester, currentDate, currentDate, forceRefresh)
+                    }
+                }
+                .map { items -> items.filter { if (prefRepository.showWholeClassPlan == "no") it.isStudentPlan else true } }
+                .map { items -> items.sortedWith(compareBy({ it.number }, { !it.isStudentPlan })) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading timetable result: Success")
                     view?.apply {
-                        updateData(
-                            showWholeClassPlanType = prefRepository.showWholeClassPlan,
-                            showTimetableTimers = prefRepository.showTimetableTimers,
-                            data = it.data!!
-                                .filter { item -> if (prefRepository.showWholeClassPlan == "no") item.isStudentPlan else true }
-                                .sortedWith(compareBy({ item -> item.number }, { item -> !item.isStudentPlan }))
-                        )
-                        showEmpty(it.data.isEmpty())
+                        updateData(it, prefRepository.showWholeClassPlan, prefRepository.showTimetableTimers)
+                        showEmpty(it.isEmpty())
                         showErrorView(false)
-                        showContent(it.data.isNotEmpty())
+                        showContent(it.isNotEmpty())
                     }
                     analytics.logEvent(
                         "load_data",
                         "type" to "timetable",
-                        "items" to it.data!!.size
+                        "items" to it.size,
+                        "force_refresh" to forceRefresh
                     )
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Loading timetable result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
index fe34f1ee9..1efa320fc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.timetable
 
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.ui.base.BaseView
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 interface TimetableView : BaseView {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
index 767c2f313..c1389cedd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.content.res.Resources
 import com.chuckerteam.chucker.api.ChuckerCollector
-import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
 import io.github.wulkanowy.ui.base.ErrorHandler
 import javax.inject.Inject
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
index 5b77fc1f3..2efd30a34 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
@@ -7,7 +7,6 @@ import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.databinding.FragmentTimetableCompletedBinding
@@ -18,10 +17,9 @@ import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.SchooldaysRangeLimiter
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getCompatDrawable
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class CompletedLessonsFragment :
     BaseFragment<FragmentTimetableCompletedBinding>(R.layout.fragment_timetable_completed),
     CompletedLessonsView, MainView.TitledView {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
index f1c2cedc6..7243061d6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
@@ -1,37 +1,33 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.annotation.SuppressLint
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-import java.time.LocalDate
-import java.time.LocalDate.now
-import java.time.LocalDate.ofEpochDay
 import javax.inject.Inject
 
 class CompletedLessonsPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val completedLessonsErrorHandler: CompletedLessonsErrorHandler,
     private val semesterRepository: SemesterRepository,
     private val completedLessonsRepository: CompletedLessonsRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<CompletedLessonsView>(completedLessonsErrorHandler, studentRepository) {
+) : BasePresenter<CompletedLessonsView>(completedLessonsErrorHandler, studentRepository, schedulers) {
 
     private var baseDate: LocalDate = now().nextOrSameSchoolDay
 
@@ -47,7 +43,6 @@ class CompletedLessonsPresenter @Inject constructor(
         completedLessonsErrorHandler.showErrorMessage = ::showErrorViewOnError
         completedLessonsErrorHandler.onFeatureDisabled = {
             this.view?.showFeatureDisabled()
-            this.view?.showEmpty(true)
             Timber.i("Completed lessons feature disabled by school")
         }
         loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
@@ -97,54 +92,59 @@ class CompletedLessonsPresenter @Inject constructor(
     }
 
     private fun setBaseDateOnHolidays() {
-        flow {
-            val student = studentRepository.getCurrentStudent()
-            emit(semesterRepository.getCurrentSemester(student))
-        }.catch {
-            Timber.i("Loading semester result: An exception occurred")
-        }.onEach {
-            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-            currentDate = baseDate
-            reloadNavigation()
-        }.launch("holidays")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading completed lessons data started")
         currentDate = date
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            completedLessonsRepository.getCompletedLessons(student, semester, date, date, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading completed lessons data started")
-                Status.SUCCESS -> {
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        completedLessonsRepository.getCompletedLessons(student, semester, currentDate, currentDate, forceRefresh)
+                    }
+                }
+                .map { items -> items.sortedBy { it.number } }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading completed lessons lessons result: Success")
                     view?.apply {
-                        updateData(it.data!!.sortedBy { item -> item.number })
-                        showEmpty(it.data.isEmpty())
+                        updateData(it)
+                        showEmpty(it.isEmpty())
                         showErrorView(false)
-                        showContent(it.data.isNotEmpty())
+                        showContent(it.isNotEmpty())
                     }
                     analytics.logEvent(
                         "load_data",
                         "type" to "completed_lessons",
-                        "items" to it.data!!.size
+                        "items" to it.size,
+                        "force_refresh" to forceRefresh
                     )
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Loading completed lessons result: An exception occurred")
-                    completedLessonsErrorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+                    completedLessonsErrorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
index 7e92cc63c..170e19694 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.timetable.completed
 
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.ui.base.BaseView
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 interface CompletedLessonsView : BaseView {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
index 23d1f27ab..3dc7a3a8c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
@@ -10,7 +10,6 @@ import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.ActivityWidgetConfigureBinding
@@ -21,7 +20,6 @@ import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Co
 import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class TimetableWidgetConfigureActivity :
     BaseActivity<TimetableWidgetConfigurePresenter, ActivityWidgetConfigureBinding>(),
     TimetableWidgetConfigureView {
@@ -37,7 +35,7 @@ class TimetableWidgetConfigureActivity :
 
     private var dialog: AlertDialog? = null
 
-    override public fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
         setContentView(ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
index 2274ecb90..57dde824c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
@@ -8,16 +7,15 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getThemeWidgetKey
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class TimetableWidgetConfigurePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val sharedPref: SharedPrefProvider
-) : BasePresenter<TimetableWidgetConfigureView>(errorHandler, studentRepository) {
+) : BasePresenter<TimetableWidgetConfigureView>(errorHandler, studentRepository, schedulers) {
 
     private var appWidgetId: Int? = null
 
@@ -52,25 +50,23 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
     }
 
     private fun loadData() {
-        flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Timetable widget configure students data load")
-                Status.SUCCESS -> {
-                    val widgetId = appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) }
-                    when {
-                        it.data!!.isEmpty() -> view?.openLoginView()
-                        it.data.size == 1 && !isFromProvider -> {
-                            selectedStudent = it.data.single().student
-                            view?.showThemeDialog()
-                        }
-                        else -> view?.updateData(it.data.map { entity ->
-                            entity.student to (entity.student.id == widgetId)
-                        })
-                    }
-                }
-                Status.ERROR -> errorHandler.dispatch(it.error!!)
+        disposable.add(studentRepository.getSavedStudents(false)
+            .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
+            .map { (students, currentStudentId) ->
+                students.map { student -> student to (student.id == currentStudentId) }
             }
-        }.launch()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                when {
+                    it.isEmpty() -> view?.openLoginView()
+                    it.size == 1 && !isFromProvider -> {
+                        selectedStudent = it.single().first
+                        view?.showThemeDialog()
+                    }
+                    else -> view?.updateData(it)
+                }
+            }, { errorHandler.dispatch(it) }))
     }
 
     private fun registerStudent(student: Student?) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
index c7b4d4a84..dd223ad8b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
@@ -21,12 +21,12 @@ import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getCurrentThemeWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getDateWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.getCompatColor
-import io.github.wulkanowy.utils.toFirstResult
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import timber.log.Timber
-import java.time.LocalDate
 
 class TimetableWidgetFactory(
     private val timetableRepository: TimetableRepository,
@@ -34,6 +34,7 @@ class TimetableWidgetFactory(
     private val semesterRepository: SemesterRepository,
     private val prefRepository: PreferencesRepository,
     private val sharedPref: SharedPrefProvider,
+    private val schedulers: SchedulersProvider,
     private val context: Context,
     private val intent: Intent?
 ) : RemoteViewsService.RemoteViewsFactory {
@@ -68,7 +69,7 @@ class TimetableWidgetFactory(
             val studentId = sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0)
 
             updateTheme(appWidgetId)
-            lessons = getLessons(date, studentId)
+            updateLessons(date, studentId)
         }
     }
 
@@ -97,23 +98,30 @@ class TimetableWidgetFactory(
         }
     }
 
-    private fun getLessons(date: LocalDate, studentId: Long) = try {
-        runBlocking {
-            if (!studentRepository.isStudentSaved()) return@runBlocking emptyList<Timetable>()
+    private fun updateLessons(date: LocalDate, studentId: Long) {
+        lessons = try {
+            studentRepository.isStudentSaved()
+                .filter { true }
+                .flatMap { studentRepository.getSavedStudents().toMaybe() }
+                .flatMap {
+                    val student = it.singleOrNull { student -> student.id == studentId }
 
-            val students = studentRepository.getSavedStudents()
-            val student = students.singleOrNull { it.student.id == studentId }?.student
-                ?: return@runBlocking emptyList<Timetable>()
-
-            val semester = semesterRepository.getCurrentSemester(student)
-            timetableRepository.getTimetable(student, semester, date, date, false)
-                .toFirstResult().data.orEmpty()
-                .sortedWith(compareBy({ it.number }, { !it.isStudentPlan }))
-                .filter { if (prefRepository.showWholeClassPlan == "no") it.isStudentPlan else true }
+                    if (student != null) Maybe.just(student)
+                    else Maybe.empty()
+                }
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).toMaybe().flatMap { semester ->
+                        timetableRepository.getTimetable(student, semester, date, date).toMaybe()
+                    }
+                }
+                .map { items -> items.sortedWith(compareBy({ it.number }, { !it.isStudentPlan })) }
+                .map { lessons -> lessons.filter { if (prefRepository.showWholeClassPlan == "no") it.isStudentPlan else true } }
+                .subscribeOn(schedulers.backgroundThread)
+                .blockingGet(emptyList())
+        } catch (e: Exception) {
+            Timber.e(e, "An error has occurred in timetable widget factory")
+            emptyList()
         }
-    } catch (e: Exception) {
-        Timber.e(e, "An error has occurred in timetable widget factory")
-        emptyList<Timetable>()
     }
 
     @SuppressLint("DefaultLocale")
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
index 60ad9d5cc..79888f83d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
@@ -8,36 +8,35 @@ import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_DELETED
 import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.content.res.Configuration
 import android.widget.RemoteViews
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.android.AndroidInjection
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.services.HiltBroadcastReceiver
 import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
 import timber.log.Timber
-import java.time.LocalDate
-import java.time.LocalDate.now
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class TimetableWidgetProvider : HiltBroadcastReceiver() {
+class TimetableWidgetProvider : BroadcastReceiver() {
 
     @Inject
     lateinit var appWidgetManager: AppWidgetManager
@@ -48,6 +47,9 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
     @Inject
     lateinit var sharedPref: SharedPrefProvider
 
+    @Inject
+    lateinit var schedulers: SchedulersProvider
+
     @Inject
     lateinit var analytics: FirebaseAnalyticsHelper
 
@@ -75,16 +77,14 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
     }
 
     override fun onReceive(context: Context, intent: Intent) {
-        super.onReceive(context, intent)
-        GlobalScope.launch {
-            when (intent.action) {
-                ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
-                ACTION_APPWIDGET_DELETED -> onDelete(intent)
-            }
+        AndroidInjection.inject(this, context)
+        when (intent.action) {
+            ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
+            ACTION_APPWIDGET_DELETED -> onDelete(intent)
         }
     }
 
-    private suspend fun onUpdate(context: Context, intent: Intent) {
+    private fun onUpdate(context: Context, intent: Intent) {
         if (intent.getStringExtra(EXTRA_BUTTON_TYPE) === null) {
             intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS)?.forEach { appWidgetId ->
                 val student = getStudent(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)
@@ -168,9 +168,8 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
         }
 
         with(appWidgetManager) {
-            updateAppWidget(appWidgetId, remoteView)
             notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetableWidgetList)
-            Timber.d("TimetableWidgetProvider updated")
+            updateAppWidget(appWidgetId, remoteView)
         }
     }
 
@@ -183,22 +182,31 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
             }, FLAG_UPDATE_CURRENT)
     }
 
-    private suspend fun getStudent(studentId: Long, appWidgetId: Int) = try {
-        val students = studentRepository.getSavedStudents(false)
-        val student = students.singleOrNull { it -> it.student.id == studentId }?.student
-        when {
-            student != null -> student
-            studentId != 0L && studentRepository.isCurrentStudentSet() -> {
-                studentRepository.getCurrentStudent(false).also {
-                    sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id)
+    private fun getStudent(studentId: Long, appWidgetId: Int): Student? {
+        return try {
+            studentRepository.isStudentSaved()
+                .filter { true }
+                .flatMap { studentRepository.getSavedStudents(false).toMaybe() }
+                .flatMap { students ->
+                    val student = students.singleOrNull { student -> student.id == studentId }
+                    when {
+                        student != null -> Maybe.just(student)
+                        studentId != 0L -> {
+                            studentRepository.isCurrentStudentSet()
+                                .filter { true }
+                                .flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
+                                .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
+                        }
+                        else -> Maybe.empty()
+                    }
                 }
+                .subscribeOn(schedulers.backgroundThread)
+                .blockingGet()
+        } catch (e: Exception) {
+            if (e.cause !is NoCurrentStudentException) {
+                Timber.e(e, "An error has occurred in timetable widget provider")
             }
-            else -> null
+            null
         }
-    } catch (e: Exception) {
-        if (e.cause !is NoCurrentStudentException) {
-            Timber.e(e, "An error has occurred in timetable widget provider")
-        }
-        null
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt b/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
index 1098a9a06..6912baa36 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
@@ -7,11 +7,10 @@ import android.os.Build.VERSION.SDK_INT
 import io.github.wulkanowy.BuildConfig.DEBUG
 import io.github.wulkanowy.BuildConfig.VERSION_CODE
 import io.github.wulkanowy.BuildConfig.VERSION_NAME
-import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-open class AppInfo @Inject constructor() {
+open class AppInfo {
 
     open val isDebug get() = DEBUG
 
diff --git a/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
index f10b00a07..c2b1efaa8 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
@@ -1,9 +1,6 @@
 package io.github.wulkanowy.utils
 
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import io.github.wulkanowy.sdk.scrapper.attendance.AttendanceCategory
 
 /**
  * [UONET+ - Zasady tworzenia podsumowań liczb uczniów obecnych i nieobecnych w tabeli frekwencji]
@@ -26,15 +23,4 @@ private fun calculatePercentage(presence: Double, absence: Double): Double {
     return if ((presence + absence) == 0.0) 0.0 else (presence / (presence + absence)) * 100
 }
 
-inline val Attendance.description
-    get() = when (AttendanceCategory.getCategoryByName(name)) {
-        AttendanceCategory.PRESENCE -> R.string.attendance_present
-        AttendanceCategory.ABSENCE_UNEXCUSED -> R.string.attendance_absence_unexcused
-        AttendanceCategory.ABSENCE_EXCUSED -> R.string.attendance_absence_excused
-        AttendanceCategory.UNEXCUSED_LATENESS -> R.string.attendance_unexcused_lateness
-        AttendanceCategory.EXCUSED_LATENESS -> R.string.attendance_excused_lateness
-        AttendanceCategory.ABSENCE_FOR_SCHOOL_REASONS -> R.string.attendance_absence_school
-        AttendanceCategory.EXEMPTION -> R.string.attendance_exemption
-        AttendanceCategory.DELETED -> R.string.attendance_deleted
-        else -> R.string.attendance_unknown
-    }
+
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
index cf715e657..2b40cb476 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -71,17 +71,4 @@ fun Context.openDialer(phone: String) {
     startActivity(intent)
 }
 
-fun Context.shareText(text: String, subject: String?) {
-    val sendIntent: Intent = Intent().apply {
-        action = Intent.ACTION_SEND
-        putExtra(Intent.EXTRA_TEXT, text)
-        if (subject != null) {
-            putExtra(Intent.EXTRA_SUBJECT, subject)
-        }
-        type = "text/plain"
-    }
-    val shareIntent = Intent.createChooser(sendIntent, null)
-    startActivity(shareIntent)
-}
-
 fun Context.dpToPx(dp: Float) = dp * resources.displayMetrics.densityDpi / DENSITY_DEFAULT
diff --git a/app/src/main/java/io/github/wulkanowy/utils/DispatchersProvider.kt b/app/src/main/java/io/github/wulkanowy/utils/DispatchersProvider.kt
deleted file mode 100644
index ecc8e05eb..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/DispatchersProvider.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.github.wulkanowy.utils
-
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-
-open class DispatchersProvider {
-
-    open val backgroundThread: CoroutineDispatcher
-        get() = Dispatchers.IO
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FlowUtils.kt b/app/src/main/java/io/github/wulkanowy/utils/FlowUtils.kt
deleted file mode 100644
index 724458c04..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/FlowUtils.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-package io.github.wulkanowy.utils
-
-import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.Status
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.takeWhile
-
-inline fun <ResultType, RequestType> networkBoundResource(
-    showSavedOnLoading: Boolean = true,
-    crossinline query: () -> Flow<ResultType>,
-    crossinline fetch: suspend (ResultType) -> RequestType,
-    crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
-    crossinline onFetchFailed: (Throwable) -> Unit = { Unit },
-    crossinline shouldFetch: (ResultType) -> Boolean = { true },
-    crossinline filterResult: (ResultType) -> ResultType = { it }
-) = flow {
-    emit(Resource.loading())
-
-    val data = query().first()
-    emitAll(if (shouldFetch(data)) {
-        if (showSavedOnLoading) emit(Resource.loading(filterResult(data)))
-
-        try {
-            saveFetchResult(data, fetch(data))
-            query().map { Resource.success(filterResult(it)) }
-        } catch (throwable: Throwable) {
-            onFetchFailed(throwable)
-            query().map { Resource.error(throwable, filterResult(it)) }
-        }
-    } else {
-        query().map { Resource.success(filterResult(it)) }
-    })
-}
-
-@JvmName("networkBoundResourceWithMap")
-inline fun <ResultType, RequestType, T> networkBoundResource(
-    showSavedOnLoading: Boolean = true,
-    crossinline query: () -> Flow<ResultType>,
-    crossinline fetch: suspend (ResultType) -> RequestType,
-    crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
-    crossinline onFetchFailed: (Throwable) -> Unit = { Unit },
-    crossinline shouldFetch: (ResultType) -> Boolean = { true },
-    crossinline mapResult: (ResultType) -> T
-) = flow {
-    emit(Resource.loading())
-
-    val data = query().first()
-    emitAll(if (shouldFetch(data)) {
-        if (showSavedOnLoading) emit(Resource.loading(mapResult(data)))
-
-        try {
-            saveFetchResult(data, fetch(data))
-            query().map { Resource.success(mapResult(it)) }
-        } catch (throwable: Throwable) {
-            onFetchFailed(throwable)
-            query().map { Resource.error(throwable, mapResult(it)) }
-        }
-    } else {
-        query().map { Resource.success(mapResult(it)) }
-    })
-}
-
-fun <T> flowWithResource(block: suspend () -> T) = flow {
-    emit(Resource.loading())
-    emit(try {
-        Resource.success(block())
-    } catch (e: Throwable) {
-        Resource.error(e)
-    })
-}
-
-fun <T> flowWithResourceIn(block: suspend () -> Flow<Resource<T>>) = flow {
-    emit(Resource.loading())
-
-    block()
-        .catch { emit(Resource.error(it)) }
-        .collect {
-            if (it.status != Status.LOADING) { // LOADING is already emitted
-                emit(it)
-            }
-        }
-}
-
-fun <T> Flow<Resource<T>>.afterLoading(callback: () -> Unit) = onEach {
-    if (it.status != Status.LOADING) callback()
-}
-
-suspend fun <T> Flow<Resource<T>>.toFirstResult() = filter { it.status != Status.LOADING }.first()
-
-suspend fun <T> Flow<Resource<T>>.waitForResult() = takeWhile { it.status == Status.LOADING }.collect()
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt b/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
index b96faeb21..2c49ee97c 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
@@ -52,4 +52,4 @@ class LifecycleAwareVariableActivity<T : Any> : ReadWriteProperty<AppCompatActiv
 @Suppress("unused")
 fun <T : Any> Fragment.lifecycleAwareVariable() = LifecycleAwareVariable<T>()
 
-fun <T : Any> lifecycleAwareVariable() = LifecycleAwareVariableActivity<T>()
+fun <T : Any> AppCompatActivity.lifecycleAwareVariable() = LifecycleAwareVariableActivity<T>()
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt
index de9f656a2..a2d0384e3 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt
@@ -2,11 +2,11 @@ package io.github.wulkanowy.utils
 
 import android.content.res.Resources
 import io.github.wulkanowy.R
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
 import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
-import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
-import io.github.wulkanowy.sdk.scrapper.exception.ServiceUnavailableException
-import io.github.wulkanowy.sdk.scrapper.login.NotLoggedInException
-import io.github.wulkanowy.sdk.scrapper.login.PasswordChangeRequiredException
+import io.github.wulkanowy.sdk.exception.NotLoggedInException
+import io.github.wulkanowy.sdk.exception.PasswordChangeRequiredException
+import io.github.wulkanowy.sdk.exception.ServiceUnavailableException
 import java.io.InterruptedIOException
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SchedulersProvider.kt b/app/src/main/java/io/github/wulkanowy/utils/SchedulersProvider.kt
new file mode 100644
index 000000000..e426d4d5d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/SchedulersProvider.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.utils
+
+import io.reactivex.Scheduler
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+
+open class SchedulersProvider {
+
+    open val mainThread: Scheduler
+        get() = AndroidSchedulers.mainThread()
+
+    open val backgroundThread: Scheduler
+        get() = Schedulers.io()
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt b/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
index e7c51745c..46a707abb 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.utils
 import android.os.Parcel
 import android.os.Parcelable
 import com.wdullaer.materialdatetimepicker.date.DateRangeLimiter
-import java.time.DayOfWeek
-import java.time.LocalDate
+import org.threeten.bp.DayOfWeek
+import org.threeten.bp.LocalDate
 import java.util.Calendar
 
 @Suppress("UNUSED_PARAMETER")
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
index 63a30db8c..e4d4163b4 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
@@ -23,8 +23,6 @@ fun Sdk.init(student: Student): Sdk {
     certKey = student.certificateKey
     privateKey = student.privateKey
 
-    emptyCookieJarInterceptor = true
-
     Timber.d("Sdk in ${student.loginMode} mode reinitialized")
 
     return this
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
index 6e11a8b2c..b3c479c38 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
@@ -1,7 +1,7 @@
 package io.github.wulkanowy.utils
 
 import io.github.wulkanowy.data.db.entities.Semester
-import java.time.LocalDate.now
+import org.threeten.bp.LocalDate.now
 
 inline val Semester.isCurrent: Boolean
     get() = now() in start..end
@@ -13,7 +13,7 @@ fun List<Semester>.getCurrentOrLast(): Semester {
     singleOrNull { it.isCurrent }?.let { return it }
 
     // when there is more than one current semester - find one with higher id
-    singleOrNull { semester -> semester.semesterId == maxByOrNull { it.semesterId }?.semesterId }?.let { return it }
+    singleOrNull { semester -> semester.semesterId == maxBy { it.semesterId }?.semesterId }?.let { return it }
 
     throw IllegalArgumentException("Duplicated last semester! Semesters: ${joinToString(separator = "\n")}")
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
index 9bd30e878..802b2ee0f 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
@@ -1,22 +1,21 @@
 package io.github.wulkanowy.utils
 
-import android.annotation.SuppressLint
-import java.time.DayOfWeek.FRIDAY
-import java.time.DayOfWeek.MONDAY
-import java.time.DayOfWeek.SATURDAY
-import java.time.DayOfWeek.SUNDAY
-import java.time.Instant.ofEpochMilli
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalDateTime.ofInstant
-import java.time.Month
-import java.time.ZoneId
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter.ofPattern
-import java.time.format.TextStyle.FULL
-import java.time.temporal.TemporalAdjusters.firstInMonth
-import java.time.temporal.TemporalAdjusters.next
-import java.time.temporal.TemporalAdjusters.previous
+import org.threeten.bp.DayOfWeek.FRIDAY
+import org.threeten.bp.DayOfWeek.MONDAY
+import org.threeten.bp.DayOfWeek.SATURDAY
+import org.threeten.bp.DayOfWeek.SUNDAY
+import org.threeten.bp.Instant.ofEpochMilli
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.ofInstant
+import org.threeten.bp.Month
+import org.threeten.bp.ZoneId
+import org.threeten.bp.ZoneOffset
+import org.threeten.bp.format.DateTimeFormatter.ofPattern
+import org.threeten.bp.format.TextStyle.FULL_STANDALONE
+import org.threeten.bp.temporal.TemporalAdjusters.firstInMonth
+import org.threeten.bp.temporal.TemporalAdjusters.next
+import org.threeten.bp.temporal.TemporalAdjusters.previous
 import java.util.Locale
 
 private const val DATE_PATTERN = "dd.MM.yyyy"
@@ -25,15 +24,17 @@ fun String.toLocalDate(format: String = DATE_PATTERN): LocalDate = LocalDate.par
 
 fun LocalDateTime.toTimestamp() = atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC).toInstant().toEpochMilli()
 
-fun Long.toLocalDateTime(): LocalDateTime = ofInstant(ofEpochMilli(this), ZoneId.systemDefault())
+fun Long.toLocalDateTime() = ofInstant(ofEpochMilli(this), ZoneId.systemDefault())
 
 fun LocalDate.toFormattedString(format: String = DATE_PATTERN): String = format(ofPattern(format))
 
 fun LocalDateTime.toFormattedString(format: String = DATE_PATTERN): String = format(ofPattern(format))
 
-@SuppressLint("DefaultLocale")
+/**
+ * https://github.com/ThreeTen/threetenbp/issues/55
+ */
 fun Month.getFormattedName(): String {
-    return getDisplayName(FULL, Locale.getDefault())
+    return getDisplayName(FULL_STANDALONE, Locale.getDefault())
         .let {
             when (it) {
                 "stycznia" -> "Styczeń"
@@ -50,7 +51,7 @@ fun Month.getFormattedName(): String {
                 "grudnia" -> "Grudzień"
                 else -> it
             }
-        }.capitalize()
+        }
 }
 
 inline val LocalDate.nextSchoolDay: LocalDate
@@ -77,12 +78,6 @@ inline val LocalDate.nextOrSameSchoolDay: LocalDate
         }
     }
 
-inline val LocalDate.startExamsDay: LocalDate
-    get() = nextOrSameSchoolDay.monday
-
-inline val LocalDate.endExamsDay: LocalDate
-    get() = nextOrSameSchoolDay.monday.plusWeeks(4).minusDays(1)
-
 inline val LocalDate.previousOrSameSchoolDay: LocalDate
     get() {
         return when (dayOfWeek) {
diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt
index f3591306e..ccb2afeb0 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt
@@ -1,10 +1,10 @@
 package io.github.wulkanowy.utils
 
 import io.github.wulkanowy.data.db.entities.Timetable
-import java.time.Duration
-import java.time.Duration.between
-import java.time.LocalDateTime
-import java.time.LocalDateTime.now
+import org.threeten.bp.Duration
+import org.threeten.bp.Duration.between
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.now
 
 fun Timetable.isShowTimeUntil(previousLessonEnd: LocalDateTime?) = when {
     !isStudentPlan -> false
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 62a71f437..d61f1b97b 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,5 +1,8 @@
-Wersja 0.20.5
-- naprawiliśmy logowanie do koszalińskiego dziennika
-- naprawiliśmy resetowanie hasła na gdańskim dzienniku
+Wersja 0.18.1
+- naprawiliśmy sortowanie w ocenach
+- naprawilismy wiele problemów ze stabilnością
+- nazwy opcji w ustawieniach nie są już ucięte
+- w zadaniach domowych wyświetlają się teraz pozycje na weekend
+- wyłączyliśmy logowanie przez token (bo nie działa i nie wiadomo kiedy będzie działać)
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases
diff --git a/app/src/main/res/drawable/ic_menu_message_print.xml b/app/src/main/res/drawable/ic_menu_message_print.xml
deleted file mode 100644
index 204b0f6e3..000000000
--- a/app/src/main/res/drawable/ic_menu_message_print.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19,8h-1L18,3L6,3v5L5,8c-1.66,0 -3,1.34 -3,3v6h4v4h12v-4h4v-6c0,-1.66 -1.34,-3 -3,-3zM8,5h8v3L8,8L8,5zM16,17v2L8,19v-4h8v2zM18,15v-2L6,13v2L4,15v-4c0,-0.55 0.45,-1 1,-1h14c0.55,0 1,0.45 1,1v4h-2z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18,11.5m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_message_share.xml b/app/src/main/res/drawable/ic_menu_message_share.xml
deleted file mode 100644
index 67a8ee494..000000000
--- a/app/src/main/res/drawable/ic_menu_message_share.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_send_message.xml b/app/src/main/res/layout/activity_send_message.xml
index e0ec52bb6..f59dcabdf 100644
--- a/app/src/main/res/layout/activity_send_message.xml
+++ b/app/src/main/res/layout/activity_send_message.xml
@@ -148,7 +148,7 @@
                     android:hint="@string/message_content"
                     android:imeOptions="flagNoExtractUi"
                     android:importantForAutofill="no"
-                    android:inputType="textMultiLine|textCapSentences"
+                    android:inputType="textMultiLine"
                     android:minHeight="58dp"
                     android:paddingStart="16dp"
                     android:paddingLeft="16dp"
diff --git a/app/src/main/res/layout/dialog_account.xml b/app/src/main/res/layout/dialog_account.xml
index d56de3a2e..6e975c80d 100644
--- a/app/src/main/res/layout/dialog_account.xml
+++ b/app/src/main/res/layout/dialog_account.xml
@@ -5,60 +5,45 @@
     android:layout_width="300dp"
     android:layout_height="wrap_content">
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/accountDialogTitle"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:paddingStart="24dp"
+        android:paddingLeft="24dp"
+        android:paddingEnd="24dp"
+        android:paddingRight="24dp"
+        android:text="@string/account_title"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        app:firstBaselineToTopHeight="40dp" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/accountDialogRecycler"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_below="@id/accountDialogTitle"
+        android:overScrollMode="never"
+        tools:itemCount="3"
+        tools:listitem="@layout/item_account" />
 
-        <TextView
-            android:id="@+id/accountDialogTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="24dp"
-            android:paddingLeft="24dp"
-            android:paddingEnd="24dp"
-            android:paddingRight="24dp"
-            android:text="@string/account_title"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            app:firstBaselineToTopHeight="40dp" />
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/accountDialogAdd"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/accountDialogRecycler"
+        android:layout_margin="8dp"
+        android:text="@string/account_add_new"
+        android:textColor="?android:textColorPrimary" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/accountDialogRecycler"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginTop="8dp"
-            android:layout_weight="1"
-            android:overScrollMode="never"
-            tools:itemCount="3"
-            tools:listitem="@layout/item_account" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/accountDialogAdd"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                android:text="@string/account_add_new"
-                android:textColor="?android:textColorPrimary" />
-
-            <Space
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/accountDialogRemove"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                android:text="@string/account_logout" />
-        </LinearLayout>
-    </LinearLayout>
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/accountDialogRemove"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/accountDialogRecycler"
+        android:layout_alignParentEnd="true"
+        android:layout_margin="8dp"
+        android:text="@string/account_logout" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_license.xml b/app/src/main/res/layout/fragment_license.xml
index f4105355c..80ecd6b10 100644
--- a/app/src/main/res/layout/fragment_license.xml
+++ b/app/src/main/res/layout/fragment_license.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -15,6 +14,5 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/licenseRecycler"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:listitem="@layout/item_license" />
+        android:layout_height="match_parent" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_login_student_select.xml b/app/src/main/res/layout/fragment_login_student_select.xml
index f9c6c1572..64e06cbd5 100644
--- a/app/src/main/res/layout/fragment_login_student_select.xml
+++ b/app/src/main/res/layout/fragment_login_student_select.xml
@@ -24,10 +24,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            android:visibility="gone"
             tools:visibility="visible">
 
             <View
@@ -42,9 +42,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="32dp"
                 android:layout_marginLeft="32dp"
-                android:layout_marginTop="16dp"
                 android:layout_marginEnd="32dp"
                 android:layout_marginRight="32dp"
+                android:layout_marginTop="16dp"
                 android:layout_marginBottom="16dp"
                 android:gravity="center_horizontal"
                 android:text="@string/login_contact_header"
@@ -55,29 +55,28 @@
                 android:id="@+id/loginStudentSelectContactButtons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="horizontal"
                 android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:orientation="horizontal">
-
+                android:layout_marginRight="16dp">
                 <com.google.android.material.button.MaterialButton
-                    android:id="@+id/loginStudentSelectContactEmail"
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    android:id="@+id/loginStudentSelectContactEmail"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
                     android:layout_weight="1"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginEnd="8dp"
                     android:text="@string/login_contact_email"
                     app:icon="@drawable/ic_more_messages" />
 
                 <com.google.android.material.button.MaterialButton
-                    android:id="@+id/loginStudentSelectContactDiscord"
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    android:id="@+id/loginStudentSelectContactDiscord"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
                     android:layout_weight="1"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:text="@string/login_contact_discord"
                     app:icon="@drawable/ic_about_discord" />
             </LinearLayout>
@@ -96,9 +95,9 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
             android:layout_marginLeft="32dp"
-            android:layout_marginTop="32dp"
             android:layout_marginEnd="32dp"
             android:layout_marginRight="32dp"
+            android:layout_marginTop="32dp"
             android:layout_marginBottom="32dp"
             android:gravity="center_horizontal"
             android:text="@string/login_select_student"
@@ -130,8 +129,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginEnd="24dp"
+            android:layout_marginRight="24dp"
             android:layout_marginBottom="32dp"
-            android:enabled="false"
             android:text="@string/login_sign_in"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/header_account.xml b/app/src/main/res/layout/header_account.xml
deleted file mode 100644
index 6219c26db..000000000
--- a/app/src/main/res/layout/header_account.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingHorizontal="24dp"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
-    tools:context=".ui.modules.account.AccountAdapter">
-
-    <TextView
-        android:id="@+id/accountHeaderEmail"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="14sp"
-        tools:text="jan@fakelog.cf" />
-
-    <TextView
-        android:id="@+id/accountHeaderType"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="12sp"
-        tools:text="Konto ucznia" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 9568b345a..614e4d2df 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -3,17 +3,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="56dp"
     android:background="?selectableItemBackground"
     android:orientation="horizontal"
-    android:paddingVertical="8dp"
-    android:paddingHorizontal="16dp"
+    android:paddingStart="24dp"
+    android:paddingLeft="24dp"
+    android:paddingEnd="24dp"
+    android:paddingRight="24dp"
     tools:context=".ui.modules.account.AccountAdapter">
 
     <ImageView
         android:id="@+id/accountItemImage"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_all_account"
@@ -24,7 +27,7 @@
         android:id="@+id/accountItemName"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="20dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="16sp"
@@ -37,7 +40,7 @@
         android:id="@+id/accountItemSchool"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="20dp"
         android:layout_marginTop="3dp"
         android:ellipsize="end"
         android:maxLines="1"
@@ -47,21 +50,4 @@
         app:layout_constraintStart_toEndOf="@id/accountItemImage"
         app:layout_constraintTop_toBottomOf="@id/accountItemName"
         tools:text="@tools:sample/lorem/random" />
-
-    <TextView
-        android:id="@+id/accountItemLoginMode"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="3dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="12sp"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/accountItemImage"
-        app:layout_constraintTop_toBottomOf="@id/accountItemSchool"
-        tools:text="Tryb API mobilne"
-        tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_message_preview.xml b/app/src/main/res/layout/item_message_preview.xml
index 83a4406bb..6c130909d 100644
--- a/app/src/main/res/layout/item_message_preview.xml
+++ b/app/src/main/res/layout/item_message_preview.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/messagePreviewContentContainer"
     android:layout_width="match_parent"
@@ -10,84 +9,37 @@
 
     <TextView
         android:id="@+id/messagePreviewSubject"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
         android:lineSpacingMultiplier="1.2"
         android:textSize="22sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/lorem" />
 
     <TextView
-        android:id="@+id/messagePreviewFromLabel"
+        android:id="@+id/messagePreviewAuthor"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
-        android:text="@string/message_from"
-        android:textColor="?android:textColorSecondary"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/messagePreviewSubject" />
-
-    <TextView
-        android:id="@+id/messagePreviewFromSender"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:ellipsize="end"
-        android:maxLines="1"
+        android:layout_marginBottom="4dp"
         android:textColor="?android:textColorSecondary"
         android:textSize="15sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/messagePreviewFromLabel"
-        app:layout_constraintTop_toTopOf="@id/messagePreviewFromLabel"
-        tools:text="@tools:sample/full_names[0]" />
-
-    <TextView
-        android:id="@+id/messagePreviewToLabel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:text="@string/message_to"
-        android:textColor="?android:textColorSecondary"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/messagePreviewFromLabel" />
-
-    <TextView
-        android:id="@+id/messagePreviewToRecipient"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="15sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/messagePreviewToLabel"
-        app:layout_constraintTop_toTopOf="@id/messagePreviewToLabel"
-        tools:text="@tools:sample/full_names[1]" />
+        tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/messagePreviewDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginBottom="15dp"
         android:textColor="?android:textColorSecondary"
         android:textSize="15sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/messagePreviewToLabel"
         tools:text="@tools:sample/date/ddmmyy" />
 
     <TextView
         android:id="@+id/messagePreviewContent"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
         android:autoLink="web"
         android:lineSpacingMultiplier="1.2"
         android:textIsSelectable="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/messagePreviewDate"
         tools:text="@tools:sample/lorem/random" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/app/src/main/res/menu/action_menu_message_preview.xml b/app/src/main/res/menu/action_menu_message_preview.xml
index 4c1332e10..dfc12e234 100644
--- a/app/src/main/res/menu/action_menu_message_preview.xml
+++ b/app/src/main/res/menu/action_menu_message_preview.xml
@@ -22,18 +22,4 @@
         android:title="@string/message_delete"
         app:iconTint="@color/material_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/messagePreviewMenuShare"
-        android:icon="@drawable/ic_menu_message_share"
-        android:orderInCategory="1"
-        android:title="@string/message_share"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/messagePreviewMenuPrint"
-        android:icon="@drawable/ic_menu_message_print"
-        android:orderInCategory="1"
-        android:title="@string/message_print"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
-        app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/values-de/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml
index 11935b49b..28ad08bc2 100644
--- a/app/src/main/res/values-de/preferences_values.xml
+++ b/app/src/main/res/values-de/preferences_values.xml
@@ -36,8 +36,7 @@
     </string-array>
     <string-array name="grade_average_mode_entries">
         <item>Durchschnittsnote für das 2. Semester</item>
-        <item>Durchschnitt der Noten aus beiden Semestern</item>
-        <item>Durchschnitt der Noten aus dem ganzen Jahr</item>
+        <item>Durchschnitt der Bewertungen für das ganze Jahr</item>
     </string-array>
     <string-array name="timetable_show_whole_class_entries">
         <item>Nicht zeigen</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 42169ca53..4b1669371 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -103,26 +103,10 @@
         <item quantity="one">Neue Note</item>
         <item quantity="other">Neue Noten</item>
     </plurals>
-    <plurals name="grade_new_items_predicted">
-        <item quantity="one">Neue vorhergesagte Note</item>
-        <item quantity="other">Neue vorhergesagte Noten</item>
-    </plurals>
-    <plurals name="grade_new_items_final">
-        <item quantity="one">Neue Abschlussnote</item>
-        <item quantity="other">Neue Abschlussnoten</item>
-    </plurals>
     <plurals name="grade_notify_new_items">
         <item quantity="one">Du hast %1$d Note bekommen</item>
         <item quantity="other">Du hast %1$d Noten bekommen</item>
     </plurals>
-    <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">Sie haben %1$d vorhergesagte Note bekommen</item>
-        <item quantity="other">Sie haben %1$d vorhergesagte Noten bekommen</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_final">
-        <item quantity="one">Sie haben %1$d Abschlussnote bekommen</item>
-        <item quantity="other">Sie haben %1$d Abschlussnoten bekommen</item>
-    </plurals>
     <!--Timetable-->
     <string name="timetable_lesson">Lektion</string>
     <string name="timetable_room">Klassenzimmer</string>
@@ -188,8 +172,6 @@
     <string name="message_move_to_bin">In den Korb wandern</string>
     <string name="message_delete_forever">Dauerhaft löschen</string>
     <string name="message_delete_success">Nachricht erfolgreich gelöscht</string>
-    <string name="message_share">Teilen</string>
-    <string name="message_print">Drucken</string>
     <string name="message_subject">Thema</string>
     <string name="message_content">Inhalt</string>
     <string name="message_send_successful">Nachricht erfolgreich gesendet</string>
@@ -232,7 +214,7 @@
     <string name="lucky_number_header">Die heutige Glücksnummer ist </string>
     <string name="lucky_number_empty">Keine Information über die Glücksnummer.</string>
     <string name="lucky_number_notify_new_item_title">Glücksnummer für heute</string>
-    <string name="lucky_number_notify_new_item">Die heutige Glücksnummer ist: %d</string>
+    <string name="lucky_number_notify_new_item">Die heutige Glücksnummer ist: </string>
     <!--Mobile devices-->
     <string name="mobile_devices_title">Mobile Geräte</string>
     <string name="mobile_devices_no_items">Keine Geräte</string>
@@ -263,10 +245,6 @@
     <string name="account_logout">Abmelden</string>
     <string name="account_confirm">Wollen Sie sich von einem aktiven Studenten abmelden?</string>
     <string name="account_logout_student">Abmeldung von Student</string>
-    <string name="account_type_student">Studentenkonto</string>
-    <string name="account_type_parent">Elternkonto</string>
-    <string name="account_login_mobile_api">Mobiler API Modus</string>
-    <string name="account_login_hybrid">Hybrid Modus</string>
     <!--About-->
     <string name="about_version">Version der App</string>
     <string name="about_contributor">Mitarbeiter</string>
@@ -292,8 +270,8 @@
     <string name="logviewer_share">Logs teilen</string>
     <string name="logviewer_refresh">Aktualisieren</string>
     <!--Error dialog-->
-    <string name="dialog_error_check_update">Auf Updates prüfen</string>
-    <string name="dialog_error_check_update_message">Bevor Sie einen Fehler melden, prüfen Sie zuerst, ob ein Update mit der Fehlerbehebung verfügbar ist</string>
+    <string name="dialog_error_check_update">Check for updates</string>
+    <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</string>
     <!--Generic-->
     <string name="all_content">Inhalt</string>
     <string name="all_retry">Wiederhol</string>
@@ -311,7 +289,7 @@
     <string name="all_prev">Zurück</string>
     <string name="all_next">Nächste</string>
     <string name="all_search">Suchen</string>
-    <string name="all_search_hint">Suchen…</string>
+    <string name="all_search_hint">Suchen...</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Keine Lektionen</string>
     <string name="widget_timetable_theme_title">Thema wählen</string>
diff --git a/app/src/main/res/values-pl/preferences_values.xml b/app/src/main/res/values-pl/preferences_values.xml
index 1d81fb586..475f7327f 100644
--- a/app/src/main/res/values-pl/preferences_values.xml
+++ b/app/src/main/res/values-pl/preferences_values.xml
@@ -35,9 +35,8 @@
         <item>Kolory ocen w dzienniku</item>
     </string-array>
     <string-array name="grade_average_mode_entries">
-        <item>Średnia ocen z drugiego semestru</item>
-        <item>Średnia średnich z obu semestrów</item>
-        <item>Średnia wszystkich ocen z całego roku</item>
+        <item>Średnia ocen z 2 semestru</item>
+        <item>Średnia ocen z całego roku</item>
     </string-array>
     <string-array name="timetable_show_whole_class_entries">
         <item>Nie pokazuj</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ebc145423..7f25d8a67 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -107,36 +107,12 @@
         <item quantity="many">Nowe oceny</item>
         <item quantity="other">Nowe oceny</item>
     </plurals>
-    <plurals name="grade_new_items_predicted">
-        <item quantity="one">Nowa ocena przewidywana</item>
-        <item quantity="few">Nowe oceny przewidywane</item>
-        <item quantity="many">Nowe oceny przewidywane</item>
-        <item quantity="other">Nowe oceny przewidywane</item>
-    </plurals>
-    <plurals name="grade_new_items_final">
-        <item quantity="one">Nowa ocena końcowa</item>
-        <item quantity="few">Nowe oceny końcowe</item>
-        <item quantity="many">Nowe oceny końcowe</item>
-        <item quantity="other">Nowe oceny końcowe</item>
-    </plurals>
     <plurals name="grade_notify_new_items">
         <item quantity="one">Masz %1$d nową ocenę</item>
         <item quantity="few">Masz %1$d nowe oceny</item>
         <item quantity="many">Masz %1$d nowych ocen</item>
         <item quantity="other">Masz %1$d nowych ocen</item>
     </plurals>
-    <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">Masz %1$d nową przewidywaną ocenę</item>
-        <item quantity="few">Masz %1$d nowe przewidywane oceny</item>
-        <item quantity="many">Masz %1$d nowych przewidywanych ocen</item>
-        <item quantity="other">Masz %1$d nowych przewidywanych ocen</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_final">
-        <item quantity="one">Masz %1$d nową końcową ocenę</item>
-        <item quantity="few">Masz %1$d nowe końcowe oceny</item>
-        <item quantity="many">Masz %1$d nowych końcowych ocen</item>
-        <item quantity="other">Masz %1$d nowych końcowych ocen</item>
-    </plurals>
     <!--Timetable-->
     <string name="timetable_lesson">Lekcja</string>
     <string name="timetable_room">Sala</string>
@@ -168,8 +144,6 @@
     <string name="attendance_excused_lateness">Spóźnienie usprawiedliwione</string>
     <string name="attendance_unexcused_lateness">Spóźnienie nieusprawiedliwione</string>
     <string name="attendance_present">Obecność</string>
-    <string name="attendance_deleted">Usunięty</string>
-    <string name="attendance_unknown">Nieznany</string>
     <string name="attendance_number">Numer lekcji</string>
     <string name="attendance_no_items">Brak wpisów</string>
     <plurals name="attendance_number_absences">
@@ -206,8 +180,6 @@
     <string name="message_move_to_bin">Przenieś do kosza</string>
     <string name="message_delete_forever">Usuń trwale</string>
     <string name="message_delete_success">Wiadomość usunięta pomyślnie</string>
-    <string name="message_share">Udostępnij</string>
-    <string name="message_print">Drukuj</string>
     <string name="message_subject">Temat</string>
     <string name="message_content">Treść</string>
     <string name="message_send_successful">Wiadomość wysłana pomyślnie</string>
@@ -293,10 +265,6 @@
     <string name="account_logout">Wyloguj</string>
     <string name="account_confirm">Czy chcesz wylogować aktualnego ucznia?</string>
     <string name="account_logout_student">Wylogowanie ucznia</string>
-    <string name="account_type_student">Konto ucznia</string>
-    <string name="account_type_parent">Konto rodzica</string>
-    <string name="account_login_mobile_api">Tryb API mobilne</string>
-    <string name="account_login_hybrid">Tryb hybrydowy</string>
     <!--About-->
     <string name="about_version">Wersja aplikacji</string>
     <string name="about_contributor">Twórcy</string>
@@ -341,7 +309,7 @@
     <string name="all_prev">Poprzedni</string>
     <string name="all_next">Następny</string>
     <string name="all_search">Szukaj</string>
-    <string name="all_search_hint">Szukaj…</string>
+    <string name="all_search_hint">Szukaj...</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Brak lekcji</string>
     <string name="widget_timetable_theme_title">Wybierz motyw</string>
@@ -379,7 +347,7 @@
     <string name="pref_services_sync_in_progress">Synchronizacja w trakcie</string>
     <string name="pref_services_dialog_force_sync_title">Synchronizacja</string>
     <string name="pref_services_dialog_force_sync_summary">        Ręczna synchronizacja nie odświeża widoków w aplikacji.
-        \nAby zobaczyć zsynchronizowane informacje, uruchom ponownie aplikację po zsynchronizowaniu.
+        \nAby zobaczyć zsynchronizowane informacje uruchom ponownie aplikację po zsynchronizowaniu.
     </string>
     <string name="pref_other_header">Inne</string>
     <string name="pref_other_grade_modifier_plus">Wartość plusa</string>
diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml
index a41abf350..6c1522682 100644
--- a/app/src/main/res/values-ru/preferences_values.xml
+++ b/app/src/main/res/values-ru/preferences_values.xml
@@ -36,8 +36,7 @@
     </string-array>
     <string-array name="grade_average_mode_entries">
         <item>Средняя оценка со 2 семестра</item>
-        <item>Average of grades from both semesters</item>
-        <item>Average of grades from the whole year</item>
+        <item>Средняя оценка с целого года</item>
     </string-array>
     <string-array name="timetable_show_whole_class_entries">
         <item>Не показывать</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 15c583173..c0c751960 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -107,36 +107,12 @@
         <item quantity="many">Новые оценки</item>
         <item quantity="other">Новые оценки</item>
     </plurals>
-    <plurals name="grade_new_items_predicted">
-        <item quantity="one">New predicted grade</item>
-        <item quantity="few">New predicted grades</item>
-        <item quantity="many">New predicted grades</item>
-        <item quantity="other">New predicted grades</item>
-    </plurals>
-    <plurals name="grade_new_items_final">
-        <item quantity="one">New final grade</item>
-        <item quantity="few">New final grades</item>
-        <item quantity="many">New final grades</item>
-        <item quantity="other">New final grades</item>
-    </plurals>
     <plurals name="grade_notify_new_items">
         <item quantity="one">Вы получили %1$d оценку</item>
         <item quantity="few">Вы получили %1$d оценки</item>
         <item quantity="many">Вы получили %1$d оценок</item>
         <item quantity="other">Вы получили %1$d оценок</item>
     </plurals>
-    <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">You received %1$d predicted grade</item>
-        <item quantity="few">You received %1$d predicted grades</item>
-        <item quantity="many">You received %1$d predicted grades</item>
-        <item quantity="other">You received %1$d predicted grades</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_final">
-        <item quantity="one">You received %1$d final grade</item>
-        <item quantity="few">You received %1$d final grades</item>
-        <item quantity="many">You received %1$d final grades</item>
-        <item quantity="other">You received %1$d final grades</item>
-    </plurals>
     <!--Timetable-->
     <string name="timetable_lesson">Урок</string>
     <string name="timetable_room">Аудитория</string>
@@ -204,8 +180,6 @@
     <string name="message_move_to_bin">Перенести в корзину</string>
     <string name="message_delete_forever">Удалить навсегда</string>
     <string name="message_delete_success">Сообщение успешно удалено</string>
-    <string name="message_share">Share</string>
-    <string name="message_print">Print</string>
     <string name="message_subject">Тема</string>
     <string name="message_content">Текст</string>
     <string name="message_send_successful">Сообщение успешно отправлено</string>
@@ -291,10 +265,6 @@
     <string name="account_logout">Выйти</string>
     <string name="account_confirm">Вы точно хотите выйти из данного аккаунта?</string>
     <string name="account_logout_student">Выйти</string>
-    <string name="account_type_student">Student account</string>
-    <string name="account_type_parent">Parent account</string>
-    <string name="account_login_mobile_api">Mobile API mode</string>
-    <string name="account_login_hybrid">Hybrid mode</string>
     <!--About-->
     <string name="about_version">Версия приложения</string>
     <string name="about_contributor">Разработчики</string>
@@ -320,8 +290,8 @@
     <string name="logviewer_share">Поделиться логами</string>
     <string name="logviewer_refresh">Обновить</string>
     <!--Error dialog-->
-    <string name="dialog_error_check_update">Проверить наличие обновлений</string>
-    <string name="dialog_error_check_update_message">Прежде чем сообщать об ошибке, проверьте наличие обновлений</string>
+    <string name="dialog_error_check_update">Check for updates</string>
+    <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</string>
     <!--Generic-->
     <string name="all_content">Содержание</string>
     <string name="all_retry">Повторить</string>
@@ -339,7 +309,7 @@
     <string name="all_prev">Предыдущий</string>
     <string name="all_next">Следующий</string>
     <string name="all_search">Поиск</string>
-    <string name="all_search_hint">Поиск…</string>
+    <string name="all_search_hint">Поиск...</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Нет уроков</string>
     <string name="widget_timetable_theme_title">Выбрать тему</string>
diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml
index 9942621a5..3c70c9d09 100644
--- a/app/src/main/res/values-uk/preferences_values.xml
+++ b/app/src/main/res/values-uk/preferences_values.xml
@@ -36,8 +36,7 @@
     </string-array>
     <string-array name="grade_average_mode_entries">
         <item>Середня оцінка з 2 семестру</item>
-        <item>Average of grades from both semesters</item>
-        <item>Average of grades from the whole year</item>
+        <item>Середня оцінка за весь рік</item>
     </string-array>
     <string-array name="timetable_show_whole_class_entries">
         <item>Не показувати</item>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 423c4e12f..a63e5682a 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -107,36 +107,12 @@
         <item quantity="many">Нові оцінки</item>
         <item quantity="other">Нові оцінки</item>
     </plurals>
-    <plurals name="grade_new_items_predicted">
-        <item quantity="one">New predicted grade</item>
-        <item quantity="few">New predicted grades</item>
-        <item quantity="many">New predicted grades</item>
-        <item quantity="other">New predicted grades</item>
-    </plurals>
-    <plurals name="grade_new_items_final">
-        <item quantity="one">New final grade</item>
-        <item quantity="few">New final grades</item>
-        <item quantity="many">New final grades</item>
-        <item quantity="other">New final grades</item>
-    </plurals>
     <plurals name="grade_notify_new_items">
         <item quantity="one">Ви отримали %1$d оцінку</item>
         <item quantity="few">Ви отримали %1$d оцінки</item>
         <item quantity="many">Ви отримали %1$d оцінок</item>
         <item quantity="other">Ви отримали %1$d оцінок</item>
     </plurals>
-    <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">You received %1$d predicted grade</item>
-        <item quantity="few">You received %1$d predicted grades</item>
-        <item quantity="many">You received %1$d predicted grades</item>
-        <item quantity="other">You received %1$d predicted grades</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_final">
-        <item quantity="one">You received %1$d final grade</item>
-        <item quantity="few">You received %1$d final grades</item>
-        <item quantity="many">You received %1$d final grades</item>
-        <item quantity="other">You received %1$d final grades</item>
-    </plurals>
     <!--Timetable-->
     <string name="timetable_lesson">Урок</string>
     <string name="timetable_room">Аудиторія</string>
@@ -144,14 +120,14 @@
     <string name="timetable_time">Години</string>
     <string name="timetable_changes">Зміни</string>
     <string name="timetable_no_items">Брак уроків у цей день</string>
-    <string name="timetable_minutes">%s хвилин</string>
-    <string name="timetable_seconds">%s сек</string>
-    <string name="timetable_time_left">%1$s лишилося</string>
-    <string name="timetable_time_until">через %1$s</string>
-    <string name="timetable_finished">Завершено</string>
-    <string name="timetable_now">Зараз: %s</string>
-    <string name="timetable_next">Наступний: %s</string>
-    <string name="timetable_later">Пізніше: %s</string>
+    <string name="timetable_minutes">%s min</string>
+    <string name="timetable_seconds">%s sec</string>
+    <string name="timetable_time_left">%1$s left</string>
+    <string name="timetable_time_until">in %1$s</string>
+    <string name="timetable_finished">Finished</string>
+    <string name="timetable_now">Now: %s</string>
+    <string name="timetable_next">Next: %s</string>
+    <string name="timetable_later">Later: %s</string>
     <!--Completed lessons-->
     <string name="completed_lessons_title">Уроки, що відбулися</string>
     <string name="completed_lessons_button">Показати уроки, що відбулися</string>
@@ -204,8 +180,6 @@
     <string name="message_move_to_bin">Перемістити у кошик</string>
     <string name="message_delete_forever">Видалити назавжди</string>
     <string name="message_delete_success">Повідомлення було успішно видалено</string>
-    <string name="message_share">Share</string>
-    <string name="message_print">Print</string>
     <string name="message_subject">Тема</string>
     <string name="message_content">Зміст</string>
     <string name="message_send_successful">Повідомлення було успішно відправлено</string>
@@ -291,10 +265,6 @@
     <string name="account_logout">Вийти</string>
     <string name="account_confirm">Ви впевнені, що хочете вийти з цього аккаунту?</string>
     <string name="account_logout_student">Вийти з аккаунту учня</string>
-    <string name="account_type_student">Student account</string>
-    <string name="account_type_parent">Parent account</string>
-    <string name="account_login_mobile_api">Mobile API mode</string>
-    <string name="account_login_hybrid">Hybrid mode</string>
     <!--About-->
     <string name="about_version">Версія додатка</string>
     <string name="about_contributor">Розробники</string>
@@ -320,8 +290,8 @@
     <string name="logviewer_share">Поділитися логами</string>
     <string name="logviewer_refresh">Оновити</string>
     <!--Error dialog-->
-    <string name="dialog_error_check_update">Провірити наявність оновлень</string>
-    <string name="dialog_error_check_update_message">Перед тим, як повідомлювати о помілці, перевірте наявність оновлень</string>
+    <string name="dialog_error_check_update">Check for updates</string>
+    <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</string>
     <!--Generic-->
     <string name="all_content">Зміст</string>
     <string name="all_retry">Повторити</string>
@@ -338,8 +308,8 @@
     <string name="all_subject">Предмет</string>
     <string name="all_prev">Попередній</string>
     <string name="all_next">Наступний</string>
-    <string name="all_search">Пошук</string>
-    <string name="all_search_hint">Пошук…</string>
+    <string name="all_search">Search</string>
+    <string name="all_search_hint">Search...</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Брак уроків</string>
     <string name="widget_timetable_theme_title">Увібрати тему</string>
@@ -354,17 +324,17 @@
     <string name="pref_view_present">Показувати присутність у відвідуваності</string>
     <string name="pref_view_app_theme">Тема додатку</string>
     <string name="pref_view_expand_grade">Більше оцінок</string>
-    <string name="pref_view_timetable_show_timers">Позначити поточний урок у розкладі</string>
-    <string name="pref_view_grade_statistics_list">Показувати діаграми в оцінках класу</string>
+    <string name="pref_view_timetable_show_timers">Mark current lesson in timetable</string>
+    <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
     <string name="pref_view_timetable_show_whole_class">Показати уроки всього класу</string>
     <string name="pref_view_grade_color_scheme">Схема кольорів оцінок</string>
     <string name="pref_view_app_language">Мова додатку</string>
     <string name="pref_notify_header">Повідомлення</string>
     <string name="pref_notify_switch">Показувати повідомлення</string>
-    <string name="pref_notify_upcoming_lessons_switch">Показувати повідомлення о наступних уроках</string>
-    <string name="pref_notify_fix_sync_issues">Виправити помилки з синхронізацією і повідомленнями</string>
-    <string name="pref_notify_fix_sync_issues_message">На вашому пристрої можуть бути помилки з синхронізацією і повідомленнями\n\nЩоб виправити іх, вам необхідно додати Wulkanowy в авто-старт и вимкнути оптимізацію/экономію батареї в налаштуваннях пристрою.</string>
-    <string name="pref_notify_fix_sync_issues_settings_button">Перейти до налаштувань</string>
+    <string name="pref_notify_upcoming_lessons_switch">Show upcoming lesson notifications</string>
+    <string name="pref_notify_fix_sync_issues">Fix synchronization &amp; notifications issues</string>
+    <string name="pref_notify_fix_sync_issues_message">Your device may have data synchronization issues and with notifications.\n\nTo fix them, you need to add Wulkanowy to the autostart and turn off battery optimization/saving in the phone settings.</string>
+    <string name="pref_notify_fix_sync_issues_settings_button">Go to settings</string>
     <string name="pref_notify_debug_switch">Показувати дебаг-повідомлення</string>
     <string name="pref_services_header">Синхронізація</string>
     <string name="pref_services_switch">Автоматична синхронізація</string>
@@ -390,7 +360,7 @@
     <string name="channel_new_message">Нові повідомлення</string>
     <string name="channel_new_notes">Нові нотатки</string>
     <string name="channel_push">Показувати push-повідомлення</string>
-    <string name="channel_upcoming_lessons">Наступні уроки</string>
+    <string name="channel_upcoming_lessons">Upcoming lessons</string>
     <string name="channel_debug">Дебаг</string>
     <!--Colors-->
     <string name="all_black">Чорний</string>
diff --git a/app/src/main/res/values/api_hosts.xml b/app/src/main/res/values/api_hosts.xml
index 29434602e..f661b88c5 100644
--- a/app/src/main/res/values/api_hosts.xml
+++ b/app/src/main/res/values/api_hosts.xml
@@ -7,11 +7,9 @@
         <item>Lubelski Portal Oświatowy</item>
         <item>EduNet Miasta Tarnowa</item>
         <item>ResMan Rzeszów</item>
-        <item>Platforma Edukacyjna Koszalina</item>
         <item>Rawa Mazowiecka - Platforma vEdukacja</item>
         <item>Zduńska Wola - e-Urząd</item>
         <item>Sieradz - Portal oświatowy</item>
-        <item>Skarżysko-Kamienna - e-Skarżysko</item>
         <item>Łask - Platforma vEdukacja</item>
         <item>Powiat łaski - Platforma edukacyjna</item>
         <item>Powiat Krasnostawski - Platforma oświatowa</item>
@@ -28,8 +26,6 @@
         <item>https://edu.lublin.eu</item>
         <item>https://umt.tarnow.pl</item>
         <item>https://resman.pl</item>
-        <item>https://eduportal.koszalin.pl</item>
-        <item>https://vulcan.net.pl/</item>
         <item>https://vulcan.net.pl/</item>
         <item>https://vulcan.net.pl/</item>
         <item>https://vulcan.net.pl/</item>
@@ -49,11 +45,9 @@
         <item>lublin</item>
         <item>tarnow</item>
         <item>rzeszow</item>
-        <item>koszalin</item>
         <item>rawamazowiecka</item>
         <item>zdunskawola</item>
         <item>sieradz</item>
-        <item>skarzyskokamienna</item>
         <item>lask</item>
         <item>powiatlaski</item>
         <item>powiatkrasnostawski</item>
diff --git a/app/src/main/res/values/preferences_values.xml b/app/src/main/res/values/preferences_values.xml
index 5824658c4..76427a487 100644
--- a/app/src/main/res/values/preferences_values.xml
+++ b/app/src/main/res/values/preferences_values.xml
@@ -88,12 +88,10 @@
 
     <string-array name="grade_average_mode_entries">
         <item>Average of grades only from the 2nd semester</item>
-        <item>Average of grades from both semesters</item>
         <item>Average of grades from the whole year</item>
     </string-array>
     <string-array name="grade_average_mode_values" translatable="false">
         <item>only_one_semester</item>
-        <item>both_semesters</item>
         <item>all_year</item>
     </string-array>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 963c70478..7793cd9c2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -113,26 +113,10 @@
         <item quantity="one">New grade</item>
         <item quantity="other">New grades</item>
     </plurals>
-    <plurals name="grade_new_items_predicted">
-        <item quantity="one">New predicted grade</item>
-        <item quantity="other">New predicted grades</item>
-    </plurals>
-    <plurals name="grade_new_items_final">
-        <item quantity="one">New final grade</item>
-        <item quantity="other">New final grades</item>
-    </plurals>
     <plurals name="grade_notify_new_items">
         <item quantity="one">You received %1$d grade</item>
         <item quantity="other">You received %1$d grades</item>
     </plurals>
-    <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">You received %1$d predicted grade</item>
-        <item quantity="other">You received %1$d predicted grades</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_final">
-        <item quantity="one">You received %1$d final grade</item>
-        <item quantity="other">You received %1$d final grades</item>
-    </plurals>
 
 
     <!--Timetable-->
@@ -170,8 +154,6 @@
     <string name="attendance_excused_lateness">Excused lateness</string>
     <string name="attendance_unexcused_lateness">Unexcused lateness</string>
     <string name="attendance_present">Present</string>
-    <string name="attendance_deleted">Deleted</string>
-    <string name="attendance_unknown">Unknown</string>
     <string name="attendance_number">Number of lesson</string>
     <string name="attendance_no_items">No entries</string>
     <plurals name="attendance_number_absences">
@@ -212,8 +194,6 @@
     <string name="message_move_to_bin">Move to trash</string>
     <string name="message_delete_forever">Delete permanently</string>
     <string name="message_delete_success">Message deleted successfully</string>
-    <string name="message_share">Share</string>
-    <string name="message_print">Print</string>
     <string name="message_subject">Subject</string>
     <string name="message_content">Content</string>
     <string name="message_send_successful">Message sent successfully</string>
@@ -302,10 +282,6 @@
     <string name="account_logout">Logout</string>
     <string name="account_confirm">Do you want to log out of an active student?</string>
     <string name="account_logout_student">Student logout</string>
-    <string name="account_type_student">Student account</string>
-    <string name="account_type_parent">Parent account</string>
-    <string name="account_login_mobile_api">Mobile API mode</string>
-    <string name="account_login_hybrid">Hybrid mode</string>
 
 
     <!--About-->
@@ -363,7 +339,7 @@
     <string name="all_prev">Prev</string>
     <string name="all_next">Next</string>
     <string name="all_search">Search</string>
-    <string name="all_search_hint">Search…</string>
+    <string name="all_search_hint">Search...</string>
 
 
     <!--Timetable Widget-->
diff --git a/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt b/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
index d7850b072..e87177c1d 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@@ -4,8 +4,8 @@ import android.util.Log
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import fr.bipi.tressence.base.FormatterPriorityTree
 import fr.bipi.tressence.common.StackTraceRecorder
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
 import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
-import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
 import java.io.InterruptedIOException
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
diff --git a/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
index f7e4a0fc0..b0b2fda4d 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
@@ -4,14 +4,11 @@ import android.app.Activity
 import android.content.Context
 import android.os.Bundle
 import com.google.firebase.analytics.FirebaseAnalytics
-import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class FirebaseAnalyticsHelper @Inject constructor(
-    @ApplicationContext private val context: Context
-) {
+class FirebaseAnalyticsHelper @Inject constructor(private val context: Context) {
 
     private val analytics by lazy { FirebaseAnalytics.getInstance(context) }
 
diff --git a/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt b/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt
deleted file mode 100644
index 10724868a..000000000
--- a/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.github.wulkanowy
-
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.TestCoroutineDispatcher
-import kotlinx.coroutines.test.resetMain
-import kotlinx.coroutines.test.setMain
-import org.junit.rules.TestWatcher
-import org.junit.runner.Description
-
-@OptIn(ExperimentalCoroutinesApi::class)
-class MainCoroutineRule(
-    private val testDispatcher: TestCoroutineDispatcher = TestCoroutineDispatcher()
-) : TestWatcher() {
-
-    override fun starting(description: Description?) {
-        super.starting(description)
-        Dispatchers.setMain(testDispatcher)
-    }
-
-    override fun finished(description: Description?) {
-        super.finished(description)
-        Dispatchers.resetMain()
-        testDispatcher.cleanupTestCoroutines()
-    }
-}
diff --git a/app/src/test/java/io/github/wulkanowy/TestDispatchersProvider.kt b/app/src/test/java/io/github/wulkanowy/TestDispatchersProvider.kt
deleted file mode 100644
index e60b1d7a2..000000000
--- a/app/src/test/java/io/github/wulkanowy/TestDispatchersProvider.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.github.wulkanowy
-
-import io.github.wulkanowy.utils.DispatchersProvider
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-
-class TestDispatchersProvider : DispatchersProvider() {
-
-    override val backgroundThread: CoroutineDispatcher
-        get() = Dispatchers.Unconfined
-}
diff --git a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
index d15dc9530..5d003f273 100644
--- a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
+++ b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
@@ -1,13 +1,12 @@
 package io.github.wulkanowy
 
-import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.sdk.Sdk
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalDateTime.now
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.now
 
 fun createSemesterEntity(diaryId: Int, semesterId: Int, start: LocalDate, end: LocalDate, semesterName: Int = 1): Semester {
     return Semester(
@@ -45,8 +44,7 @@ fun getStudentEntity(mode: Sdk.Mode = Sdk.Mode.API): Student {
         studentId = 0,
         studentName = "",
         symbol = "",
-        userLoginId = 0,
-        userName = "",
+        userLoginId = 0
     )
 }
 
@@ -74,26 +72,3 @@ fun getTimetableEntity(
     teacher = "",
     teacherOld = ""
 )
-
-fun getMessageEntity(
-    messageId: Int,
-    content: String,
-    unread: Boolean
-) = Message(
-    studentId = 1,
-    realId = 1,
-    messageId = messageId,
-    sender = "",
-    senderId = 1,
-    recipient = "",
-    subject = "",
-    date = now(),
-    folderId = 1,
-    unread = unread,
-    removed = false,
-    hasAttachments = false
-).apply {
-    this.content = content
-    unreadBy = 1
-    readBy = 1
-}
diff --git a/app/src/test/java/io/github/wulkanowy/TestSchedulersProvider.kt b/app/src/test/java/io/github/wulkanowy/TestSchedulersProvider.kt
new file mode 100644
index 000000000..8c52d7b37
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/TestSchedulersProvider.kt
@@ -0,0 +1,15 @@
+package io.github.wulkanowy
+
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Scheduler
+import io.reactivex.schedulers.Schedulers
+
+class TestSchedulersProvider : SchedulersProvider() {
+
+    override val backgroundThread: Scheduler
+        get() = Schedulers.trampoline()
+
+    override val mainThread: Scheduler
+        get() = Schedulers.trampoline()
+}
+
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt
new file mode 100644
index 000000000..954c191ce
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.data.repositories
+
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingStrategy
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error.ErrorHandler
+import io.reactivex.Observable
+import io.reactivex.Single
+
+class UnitTestInternetObservingStrategy(var isInternetConnection: Boolean = true) : InternetObservingStrategy {
+
+    override fun checkInternetConnectivity(host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Single<Boolean> {
+        return Single.just(isInternetConnection)
+    }
+
+    override fun observeInternetConnectivity(initialIntervalInMs: Int, intervalInMs: Int, host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Observable<Boolean> {
+        return Observable.just(isInternetConnection)
+    }
+
+    override fun getDefaultPingHost() = "localhost"
+}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
index 2400c6c46..a5b79cfdd 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
@@ -6,16 +6,15 @@ import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Attendance
 import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate
-import java.time.LocalDate.of
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.of
 
 class AttendanceRemoteTest {
 
@@ -35,16 +34,16 @@ class AttendanceRemoteTest {
     @Test
     fun getAttendanceTest() {
         every { mockSdk.init(student) } returns mockSdk
-        coEvery {
+        every {
             mockSdk.getAttendance(
                 of(2018, 9, 10),
                 of(2018, 9, 15),
                 1
             )
-        } returns listOf(
+        } returns Single.just(listOf(
             getAttendance(of(2018, 9, 10)),
             getAttendance(of(2018, 9, 17))
-        )
+        ))
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
@@ -52,12 +51,10 @@ class AttendanceRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val attendance = runBlocking {
-            AttendanceRemote(mockSdk).getAttendance(student, semesterMock,
-                of(2018, 9, 10),
-                of(2018, 9, 15)
-            )
-        }
+        val attendance = AttendanceRemote(mockSdk).getAttendance(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
+        ).blockingGet()
         assertEquals(2, attendance.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
index 7be3f84fd..10307feee 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
@@ -6,16 +6,15 @@ import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.CompletedLesson
 import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate
-import java.time.LocalDate.of
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.of
 
 class CompletedLessonsRemoteTest {
 
@@ -35,15 +34,15 @@ class CompletedLessonsRemoteTest {
     @Test
     fun getCompletedLessonsTest() {
         every { mockSdk.init(student) } returns mockSdk
-        coEvery {
+        every {
             mockSdk.getCompletedLessons(
                 of(2018, 9, 10),
                 of(2018, 9, 15)
             )
-        } returns listOf(
+        } returns Single.just(listOf(
             getCompletedLesson(of(2018, 9, 10)),
             getCompletedLesson(of(2018, 9, 17))
-        )
+        ))
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
@@ -51,12 +50,10 @@ class CompletedLessonsRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val completed = runBlocking {
-            CompletedLessonsRemote(mockSdk).getCompletedLessons(student, semesterMock,
-                of(2018, 9, 10),
-                of(2018, 9, 15)
-            )
-        }
+        val completed = CompletedLessonsRemote(mockSdk).getCompletedLessons(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
+        ).blockingGet()
         Assert.assertEquals(2, completed.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
index 23bf0297e..aecef4728 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
@@ -6,16 +6,15 @@ import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Exam
 import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate
-import java.time.LocalDate.of
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.of
 
 class ExamRemoteTest {
 
@@ -37,28 +36,26 @@ class ExamRemoteTest {
         every { mockSdk.init(student) } returns mockSdk
         every { mockSdk.switchDiary(1, 2019) } returns mockSdk
 
-        coEvery {
+        every {
             mockSdk.getExams(
                 of(2018, 9, 10),
                 of(2018, 9, 15),
                 1
             )
-        } returns listOf(
+        } returns Single.just(listOf(
             getExam(of(2018, 9, 10)),
             getExam(of(2018, 9, 17))
-        )
+        ))
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
         every { semesterMock.schoolYear } returns 2019
         every { semesterMock.semesterId } returns 1
 
-        val exams = runBlocking {
-            ExamRemote(mockSdk).getExams(student, semesterMock,
-                of(2018, 9, 10),
-                of(2018, 9, 15)
-            )
-        }
+        val exams = ExamRemote(mockSdk).getExams(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
+        ).blockingGet()
         assertEquals(2, exams.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
index cd2a3070b..77c87025d 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
@@ -7,11 +7,10 @@ import io.github.wulkanowy.sdk.pojo.GradePointsStatistics
 import io.github.wulkanowy.sdk.pojo.GradeStatistics
 import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -34,10 +33,10 @@ class GradeStatisticsRemoteTest {
 
     @Test
     fun getGradeStatisticsTest() {
-        coEvery { mockSdk.getGradesPartialStatistics(1) } returns listOf(
+        every { mockSdk.getGradesPartialStatistics(1) } returns Single.just(listOf(
             getGradeStatistics("Fizyka"),
             getGradeStatistics("Matematyka")
-        )
+        ))
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
@@ -45,16 +44,16 @@ class GradeStatisticsRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val stats = runBlocking { GradeStatisticsRemote(mockSdk).getGradeStatistics(student, semesterMock, false) }
+        val stats = GradeStatisticsRemote(mockSdk).getGradeStatistics(student, semesterMock, false).blockingGet()
         assertEquals(2, stats.size)
     }
 
     @Test
     fun getGradePointsStatisticsTest() {
-        coEvery { mockSdk.getGradesPointsStatistics(1) } returns listOf(
+        every { mockSdk.getGradesPointsStatistics(1) } returns Single.just(listOf(
             getGradePointsStatistics("Fizyka"),
             getGradePointsStatistics("Matematyka")
-        )
+        ))
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
@@ -62,7 +61,7 @@ class GradeStatisticsRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val stats = runBlocking { GradeStatisticsRemote(mockSdk).getGradePointsStatistics(student, semesterMock) }
+        val stats = GradeStatisticsRemote(mockSdk).getGradePointsStatistics(student, semesterMock).blockingGet()
         assertEquals(2, stats.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
index 1a8157f66..cbdf34fa8 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
@@ -4,14 +4,13 @@ import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.SpyK
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Maybe
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 class LuckyNumberRemoteTest {
 
@@ -28,17 +27,16 @@ class LuckyNumberRemoteTest {
     @Test
     fun getLuckyNumberTest() {
         every { mockSdk.init(student) } returns mockSdk
-        coEvery { mockSdk.getLuckyNumber("test") } returns 14
+        every { mockSdk.getLuckyNumber("test") } returns Maybe.just(14)
 
         every { mockSdk.diaryId } returns 1
 
-        val luckyNumber = runBlocking {
-            LuckyNumberRemote(mockSdk)
-                .getLuckyNumber(student)
-        }
+        val luckyNumber = LuckyNumberRemote(mockSdk)
+            .getLuckyNumber(student)
+            .blockingGet()
 
-        assertEquals(14, luckyNumber?.luckyNumber)
-        assertEquals(LocalDate.now(), luckyNumber?.date)
-        assertEquals(student.studentId, luckyNumber?.studentId)
+        assertEquals(14, luckyNumber.luckyNumber)
+        assertEquals(LocalDate.now(), luckyNumber.date)
+        assertEquals(student.studentId, luckyNumber.studentId)
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
index d07a0f393..b7963d430 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
@@ -1,106 +1,114 @@
 package io.github.wulkanowy.data.repositories.message
 
-import io.github.wulkanowy.data.Status
+import androidx.room.EmptyResultSetException
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.getMessageEntity
-import io.mockk.MockKAnnotations
-import io.mockk.Runs
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.just
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.toList
-import kotlinx.coroutines.runBlocking
+import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
+import io.reactivex.Single
+import io.reactivex.observers.TestObserver
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDateTime.now
 import java.net.UnknownHostException
 
 class MessageRepositoryTest {
 
-    @MockK
+    @Mock
     lateinit var local: MessageLocal
 
-    @MockK
+    @Mock
     lateinit var remote: MessageRemote
 
-    @MockK
+    @Mock
     lateinit var student: Student
 
+    private val testObservingStrategy = UnitTestInternetObservingStrategy()
+
     private lateinit var repo: MessageRepository
 
     @Before
     fun setUp() {
-        MockKAnnotations.init(this)
+        MockitoAnnotations.initMocks(this)
 
-        every { student.userName } returns "Jan"
-        repo = MessageRepository(local, remote)
+        repo = MessageRepository(InternetObservingSettings.builder()
+            .strategy(testObservingStrategy)
+            .build(), local, remote)
     }
 
     @Test
     fun `throw error when message is not in the db`() {
-        val testMessage = getMessageEntity(1, "", false)
-        coEvery { local.getMessageWithAttachment(student, testMessage) } throws NullPointerException("No message in database")
+        val testMessage = Message(1, 1, 1, "", 1, "", "", "", now(), 1, false, 1, 1, false, false)
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.error(EmptyResultSetException("No message in database")))
 
-        val message = runCatching { runBlocking { repo.getMessage(student, testMessage).toList()[1] } }
-        assertEquals(NullPointerException::class.java, message.exceptionOrNull()?.javaClass)
+        val message = repo.getMessage(student, testMessage)
+        val messageObserver = TestObserver<MessageWithAttachment>()
+        message.subscribe(messageObserver)
+        messageObserver.assertError(EmptyResultSetException::class.java)
     }
 
     @Test
     fun `get message when content already in db`() {
-        val testMessage = getMessageEntity(123, "Test", false)
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "Test", now(), 1, false, 1, 1, false, false)
         val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
 
-        coEvery { local.getMessageWithAttachment(student, testMessage) } returns flowOf(messageWithAttachment)
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
 
-        val message = runBlocking { repo.getMessage(student, testMessage).toList() }
+        val message = repo.getMessage(student, testMessage).blockingGet()
 
-        assertEquals(Status.SUCCESS, message[1].status)
-        assertEquals("Test", message[1].data!!.message.content)
+        assertEquals("Test", message.message.content)
     }
 
     @Test
     fun `get message when content in db is empty`() {
-        val testMessage = getMessageEntity(123, "", true)
-        val testMessageWithContent = testMessage.copy().apply { content = "Test" }
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, true, 1, 1, false, false)
+        val testMessageWithContent = testMessage.copy(content = "Test")
 
         val mWa = MessageWithAttachment(testMessage, emptyList())
         val mWaWithContent = MessageWithAttachment(testMessageWithContent, emptyList())
 
-        coEvery { local.getMessageWithAttachment(student, testMessage) } returnsMany listOf(flowOf(mWa), flowOf(mWaWithContent))
-        coEvery { remote.getMessagesContentDetails(student, any(), any()) } returns ("Test" to emptyList())
-        coEvery { local.updateMessages(any()) } just Runs
-        coEvery { local.saveMessageAttachments(any()) } just Runs
+        `when`(local.getMessageWithAttachment(student, testMessage))
+            .thenReturn(Single.just(mWa))
+            .thenReturn(Single.just(mWaWithContent))
+        `when`(remote.getMessagesContentDetails(student, testMessageWithContent)).thenReturn(Single.just("Test" to emptyList()))
 
-        val message = runBlocking { repo.getMessage(student, testMessage).toList() }
+        val message = repo.getMessage(student, testMessage).blockingGet()
 
-        assertEquals(Status.SUCCESS, message[2].status)
-        assertEquals("Test", message[2].data!!.message.content)
-        coVerify { local.updateMessages(listOf(testMessageWithContent)) }
+        assertEquals("Test", message.message.content)
+        verify(local).updateMessages(listOf(testMessageWithContent))
     }
 
     @Test
     fun `get message when content in db is empty and there is no internet connection`() {
-        val testMessage = getMessageEntity(123, "", false)
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, false, 1, 1, false, false)
         val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
 
-        coEvery { local.getMessageWithAttachment(student, testMessage) } throws UnknownHostException()
+        testObservingStrategy.isInternetConnection = false
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
 
-        val message = runCatching { runBlocking { repo.getMessage(student, testMessage).toList()[1] } }
-        assertEquals(UnknownHostException::class.java, message.exceptionOrNull()?.javaClass)
+        val message = repo.getMessage(student, testMessage)
+        val messageObserver = TestObserver<MessageWithAttachment>()
+        message.subscribe(messageObserver)
+        messageObserver.assertError(UnknownHostException::class.java)
     }
 
     @Test
     fun `get message when content in db is empty, unread and there is no internet connection`() {
-        val testMessage = getMessageEntity(123, "", true)
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, true, 1, 1, false, false)
         val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
 
-        coEvery { local.getMessageWithAttachment(student, testMessage) } throws UnknownHostException()
+        testObservingStrategy.isInternetConnection = false
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
 
-        val message = runCatching { runBlocking { repo.getMessage(student, testMessage).toList()[1] } }
-        assertEquals(UnknownHostException::class.java, message.exceptionOrNull()?.javaClass)
+        val message = repo.getMessage(student, testMessage)
+        val messageObserver = TestObserver<MessageWithAttachment>()
+        message.subscribe(messageObserver)
+        messageObserver.assertError(UnknownHostException::class.java)
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
index 286cf5e91..c586572f6 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
@@ -1,40 +1,43 @@
 package io.github.wulkanowy.data.repositories.mobiledevice
 
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
 import io.github.wulkanowy.getStudentEntity
-import io.mockk.MockKAnnotations
-import io.mockk.Runs
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.impl.annotations.MockK
-import io.mockk.just
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.toList
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Maybe
+import io.reactivex.Single
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDateTime.of
+import org.mockito.Mock
+import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDateTime.of
 
 class MobileDeviceRepositoryTest {
 
-    @MockK
+    @Mock
     private lateinit var semester: Semester
 
-    @MockK
+    @Mock
     private lateinit var mobileDeviceRemote: MobileDeviceRemote
 
-    @MockK
+    @Mock
     private lateinit var mobileDeviceLocal: MobileDeviceLocal
 
     private val student = getStudentEntity()
 
     private lateinit var mobileDeviceRepository: MobileDeviceRepository
 
+    private val settings = InternetObservingSettings.builder()
+        .strategy(UnitTestInternetObservingStrategy())
+        .build()
+
     @Before
     fun initTest() {
-        MockKAnnotations.init(this)
-        mobileDeviceRepository = MobileDeviceRepository(mobileDeviceLocal, mobileDeviceRemote)
+        MockitoAnnotations.initMocks(this)
+        mobileDeviceRepository = MobileDeviceRepository(settings, mobileDeviceLocal, mobileDeviceRemote)
     }
 
     @Test
@@ -44,15 +47,13 @@ class MobileDeviceRepositoryTest {
             getDeviceEntity(2)
         )
 
-        coEvery { mobileDeviceLocal.getDevices(semester) } returns flowOf(emptyList())
-        coEvery { mobileDeviceLocal.deleteDevices(emptyList()) } just Runs
-        coEvery { mobileDeviceLocal.saveDevices(devices) } just Runs
-        coEvery { mobileDeviceRemote.getDevices(student, semester) } returns devices
+        doReturn(Maybe.empty<MobileDevice>()).`when`(mobileDeviceLocal).getDevices(semester)
+        doReturn(Single.just(devices)).`when`(mobileDeviceRemote).getDevices(student, semester)
 
-        runBlocking { mobileDeviceRepository.getDevices(student, semester, true).toList() }
+        mobileDeviceRepository.getDevices(student, semester).blockingGet()
 
-        coVerify { mobileDeviceLocal.deleteDevices(emptyList()) }
-        coVerify { mobileDeviceLocal.saveDevices(devices) }
+        verify(mobileDeviceLocal).deleteDevices(emptyList())
+        verify(mobileDeviceLocal).saveDevices(devices)
     }
 
     private fun getDeviceEntity(day: Int): MobileDevice {
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
index 5a2388ff7..c00a771cc 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
@@ -1,40 +1,44 @@
 package io.github.wulkanowy.data.repositories.semester
 
-import io.github.wulkanowy.TestDispatchersProvider
-import io.github.wulkanowy.createSemesterEntity
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.mockk.MockKAnnotations
-import io.mockk.Runs
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.just
-import kotlinx.coroutines.runBlocking
+import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
+import io.github.wulkanowy.createSemesterEntity
+import io.reactivex.Maybe
+import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate.now
+import org.mockito.Mock
+import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDate.now
 
 class SemesterRepositoryTest {
 
-    @MockK
+    @Mock
     private lateinit var semesterRemote: SemesterRemote
 
-    @MockK
+    @Mock
     private lateinit var semesterLocal: SemesterLocal
 
-    @MockK
+    @Mock
     private lateinit var student: Student
 
     private lateinit var semesterRepository: SemesterRepository
 
+    private val settings = InternetObservingSettings.builder()
+        .strategy(UnitTestInternetObservingStrategy())
+        .build()
+
     @Before
     fun initTest() {
-        MockKAnnotations.init(this)
-        semesterRepository = SemesterRepository(semesterRemote, semesterLocal, TestDispatchersProvider())
-        every { student.loginMode } returns "SCRAPPER"
+        MockitoAnnotations.initMocks(this)
+        semesterRepository = SemesterRepository(semesterRemote, semesterLocal, settings)
+        doReturn("SCRAPPER").`when`(student).loginMode
     }
 
     @Test
@@ -44,43 +48,33 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 2, now().minusMonths(3), now())
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returns emptyList()
-        coEvery { semesterRemote.getSemesters(student) } returns semesters
-        coEvery { semesterLocal.deleteSemesters(any()) } just Runs
-        coEvery { semesterLocal.saveSemesters(any()) } just Runs
+        doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
 
-        runBlocking { semesterRepository.getSemesters(student) }
+        semesterRepository.getSemesters(student).blockingGet()
 
-        coVerify { semesterLocal.saveSemesters(semesters) }
-        coVerify { semesterLocal.deleteSemesters(emptyList()) }
+        verify(semesterLocal).deleteSemesters(emptyList())
+        verify(semesterLocal).saveSemesters(semesters)
     }
 
     @Test
     fun getSemesters_invalidDiary_api() {
-        every { student.loginMode } returns "API"
+        doReturn("API").`when`(student).loginMode
         val badSemesters = listOf(
             createSemesterEntity(0, 1, now().minusMonths(6), now().minusMonths(3)),
             createSemesterEntity(0, 2, now().minusMonths(3), now())
         )
 
-        val goodSemesters = listOf(
-            createSemesterEntity(122, 1, now().minusMonths(6), now().minusMonths(3)),
-            createSemesterEntity(123, 2, now().minusMonths(3), now())
-        )
+        doReturn(Maybe.just(badSemesters)).`when`(semesterLocal).getSemesters(student)
 
-        coEvery { semesterLocal.getSemesters(student) } returns badSemesters
-        coEvery { semesterRemote.getSemesters(student) } returns goodSemesters
-        coEvery { semesterLocal.deleteSemesters(any()) } just Runs
-        coEvery { semesterLocal.saveSemesters(any()) } just Runs
-
-        val items = runBlocking { semesterRepository.getSemesters(student) }
+        val items = semesterRepository.getSemesters(student).blockingGet()
         assertEquals(2, items.size)
         assertEquals(0, items[0].diaryId)
     }
 
     @Test
     fun getSemesters_invalidDiary_scrapper() {
-        every { student.loginMode } returns "SCRAPPER"
+        doReturn("SCRAPPER").`when`(student).loginMode
         val badSemesters = listOf(
             createSemesterEntity(0, 1, now().minusMonths(6), now().minusMonths(3)),
             createSemesterEntity(0, 2, now().minusMonths(3), now())
@@ -91,12 +85,10 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 2, now().minusMonths(3), now())
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returnsMany listOf(badSemesters, badSemesters, goodSemesters)
-        coEvery { semesterRemote.getSemesters(student) } returns goodSemesters
-        coEvery { semesterLocal.deleteSemesters(any()) } just Runs
-        coEvery { semesterLocal.saveSemesters(any()) } just Runs
+        doReturn(Maybe.just(badSemesters), Maybe.just(badSemesters), Maybe.just(goodSemesters)).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(goodSemesters)).`when`(semesterRemote).getSemesters(student)
 
-        val items = runBlocking { semesterRepository.getSemesters(student) }
+        val items = semesterRepository.getSemesters(student).blockingGet()
         assertEquals(2, items.size)
         assertNotEquals(0, items[0].diaryId)
     }
@@ -108,9 +100,9 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1))
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returns semesters
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
 
-        val items = runBlocking { semesterRepository.getSemesters(student) }
+        val items = semesterRepository.getSemesters(student).blockingGet()
         assertEquals(2, items.size)
     }
 
@@ -121,9 +113,9 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 2, now().minusMonths(3), now())
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returns semesters
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
 
-        val items = runBlocking { semesterRepository.getSemesters(student) }
+        val items = semesterRepository.getSemesters(student).blockingGet()
         assertEquals(2, items.size)
     }
 
@@ -134,9 +126,9 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 2, now(), now())
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returns semesters
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
 
-        val items = runBlocking { semesterRepository.getSemesters(student) }
+        val items = semesterRepository.getSemesters(student).blockingGet()
         assertEquals(2, items.size)
     }
 
@@ -147,38 +139,26 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 2, now().minusMonths(3), now())
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returns emptyList()
-        coEvery { semesterRemote.getSemesters(student) } returns semesters
-        coEvery { semesterLocal.deleteSemesters(any()) } just Runs
-        coEvery { semesterLocal.saveSemesters(any()) } just Runs
+        doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
 
-        runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
+        semesterRepository.getSemesters(student, refreshOnNoCurrent = true).blockingGet()
 
-        coVerify { semesterLocal.deleteSemesters(emptyList()) }
-        coVerify { semesterLocal.saveSemesters(semesters) }
+        verify(semesterLocal).deleteSemesters(emptyList())
+        verify(semesterLocal).saveSemesters(semesters)
     }
 
     @Test
     fun getSemesters_noCurrent_refreshOnNoCurrent() {
-        val semestersWithNoCurrent = listOf(
+        val semesters = listOf(
             createSemesterEntity(1, 1, now().minusMonths(12), now().minusMonths(6)),
             createSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1))
         )
 
-        val newSemesters = listOf(
-            createSemesterEntity(1, 1, now().minusMonths(12), now().minusMonths(6)),
-            createSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1)),
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
 
-            createSemesterEntity(2, 1, now().minusMonths(1), now().plusMonths(5)),
-            createSemesterEntity(2, 2, now().plusMonths(5), now().plusMonths(11)),
-        )
-
-        coEvery { semesterLocal.getSemesters(student) } returns semestersWithNoCurrent
-        coEvery { semesterRemote.getSemesters(student) } returns newSemesters
-        coEvery { semesterLocal.deleteSemesters(any()) } just Runs
-        coEvery { semesterLocal.saveSemesters(any()) } just Runs
-
-        val items = runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
+        val items = semesterRepository.getSemesters(student, refreshOnNoCurrent = true).blockingGet()
         assertEquals(2, items.size)
     }
 
@@ -189,9 +169,9 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 2, now(), now())
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returns semesters
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
 
-        val items = runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
+        val items = semesterRepository.getSemesters(student, refreshOnNoCurrent = true).blockingGet()
         assertEquals(2, items.size)
     }
 
@@ -202,15 +182,15 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 1, now(), now())
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returns semesters
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
 
-        runBlocking { semesterRepository.getCurrentSemester(student) }
+        semesterRepository.getCurrentSemester(student).blockingGet()
     }
 
     @Test(expected = RuntimeException::class)
     fun getCurrentSemester_emptyList() {
-        coEvery { semesterLocal.getSemesters(student) } returns emptyList()
+        doReturn(Maybe.just(emptyList<Semester>())).`when`(semesterLocal).getSemesters(student)
 
-        runBlocking { semesterRepository.getCurrentSemester(student) }
+        semesterRepository.getCurrentSemester(student).blockingGet()
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
index 47a10772e..b6b195c91 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
@@ -2,31 +2,32 @@ package io.github.wulkanowy.data.repositories.student
 
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Student
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.anyString
+import org.mockito.Mockito.doReturn
+import org.mockito.MockitoAnnotations
 
 class StudentRemoteTest {
 
-    @MockK
+    @Mock
     private lateinit var mockSdk: Sdk
 
     @Before
     fun initApi() {
-        MockKAnnotations.init(this)
+        MockitoAnnotations.initMocks(this)
     }
 
     @Test
     fun testRemoteAll() {
-        coEvery { mockSdk.getStudentsFromScrapper(any(), any(), any(), any()) } returns listOf(getStudent("test"))
+        doReturn(Single.just(listOf(getStudent("test")))).`when`(mockSdk).getStudentsFromScrapper(anyString(), anyString(), anyString(), anyString())
 
-        val students = runBlocking { StudentRemote(mockSdk).getStudentsScrapper("", "", "http://fakelog.cf", "") }
+        val students = StudentRemote(mockSdk).getStudentsScrapper("", "", "http://fakelog.cf", "").blockingGet()
         assertEquals(1, students.size)
-        assertEquals("test Kowalski", students.first().student.studentName)
+        assertEquals("test", students.first().studentName)
     }
 
     private fun getStudent(name: String): Student {
@@ -35,10 +36,7 @@ class StudentRemoteTest {
             symbol = "",
             studentId = 0,
             userLoginId = 0,
-            userLogin = "",
-            userName = "",
             studentName = name,
-            studentSurname = "Kowalski",
             schoolSymbol = "",
             schoolShortName = "",
             schoolName = "",
@@ -50,8 +48,7 @@ class StudentRemoteTest {
             mobileBaseUrl = "",
             loginType = Sdk.ScrapperLoginType.STANDARD,
             scrapperBaseUrl = "",
-            isParent = false,
-            semesters = emptyList()
+            isParent = false
         )
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
index c948ba31b..d2b4a6670 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
@@ -5,17 +5,16 @@ import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Timetable
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate
-import java.time.LocalDate.of
-import java.time.LocalDateTime.now
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDateTime.now
 
 class TimetableRemoteTest {
 
@@ -34,15 +33,15 @@ class TimetableRemoteTest {
 
     @Test
     fun getTimetableTest() {
-        coEvery {
+        every {
             mockSdk.getTimetable(
                 of(2018, 9, 10),
                 of(2018, 9, 15)
             )
-        } returns listOf(
+        } returns Single.just(listOf(
             getTimetable(of(2018, 9, 10)),
             getTimetable(of(2018, 9, 17))
-        )
+        ))
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
@@ -50,12 +49,10 @@ class TimetableRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val timetable = runBlocking {
-            TimetableRemote(mockSdk).getTimetable(student, semesterMock,
-                of(2018, 9, 10),
-                of(2018, 9, 15)
-            )
-        }
+        val timetable = TimetableRemote(mockSdk).getTimetable(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
+        ).blockingGet()
         assertEquals(2, timetable.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
index 390098f0d..fcc30593f 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
@@ -1,45 +1,38 @@
 package io.github.wulkanowy.ui.modules.grade
 
-import io.github.wulkanowy.createSemesterEntity
-import io.github.wulkanowy.data.Resource
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.createSemesterEntity
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.flowWithResource
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.toList
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate.now
-import java.time.LocalDate.of
-import java.time.LocalDateTime
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDateTime
 
 class GradeAverageProviderTest {
 
-    private suspend fun <T> Flow<Resource<T>>.getResult() = toList()[1].data!!
-
-    @MockK
+    @Mock
     lateinit var preferencesRepository: PreferencesRepository
 
-    @MockK
+    @Mock
     lateinit var semesterRepository: SemesterRepository
 
-    @MockK
+    @Mock
     lateinit var gradeRepository: GradeRepository
 
     private lateinit var gradeAverageProvider: GradeAverageProvider
 
-    private val student = Student("", "", "", "SCRAPPER", "", "", false, "", "", "", 101, 0, "", "", "", "", "", "", 1, true, LocalDateTime.now())
+    private val student = Student("", "", "", "SCRAPPER", "", "", false, "", "", "", 101, 0, "", "", "", "", "", 1, true, LocalDateTime.now())
 
     private val semesters = mutableListOf(
         createSemesterEntity(10, 21, of(2019, 1, 31), of(2019, 6, 23)),
@@ -89,412 +82,161 @@ class GradeAverageProviderTest {
 
     @Before
     fun setUp() {
-        MockKAnnotations.init(this)
+        MockitoAnnotations.initMocks(this)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
-        every { preferencesRepository.gradeMinusModifier } returns .33
-        every { preferencesRepository.gradePlusModifier } returns .33
+        `when`(preferencesRepository.gradeMinusModifier).thenReturn(.33)
+        `when`(preferencesRepository.gradePlusModifier).thenReturn(.33)
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
+        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
 
         gradeAverageProvider = GradeAverageProvider(semesterRepository, gradeRepository, preferencesRepository)
     }
 
     @Test
-    fun `force calc average on no grades`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+    fun onlyOneSemesterTest() {
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to secondSummaries))
 
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { emptyList<Grade>() to emptyList<GradeSummary>() }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { emptyList<Grade>() to emptyList<GradeSummary>() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(0, items.size)
+        assertEquals(2, items.size)
+        assertEquals(2.5, items.single { it.subject == "Matematyka" }.average, .0)
+        assertEquals(3.0, items.single { it.subject == "Fizyka" }.average, .0)
     }
 
     @Test
-    fun `force calc current semester average with default modifiers in scraper mode`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGradeWithModifier to secondSummariesWithModifier }
+    fun onlyOneSemester_gradesWithModifiers_default() {
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
-        assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0) // from details and after set custom plus/minus
+        assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0)
     }
 
     @Test
-    fun `force calc current semester average with custom modifiers in scraper mode`() {
-        val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
-
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeMinusModifier } returns .33
-        every { preferencesRepository.gradePlusModifier } returns .33
-
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGradeWithModifier to secondSummariesWithModifier }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0) // from details and after set custom plus/minus
-    }
-
-    @Test
-    fun `force calc current semester average with custom modifiers in api mode`() {
+    fun onlyOneSemester_gradesWithModifiers_api() {
         val student = student.copy(loginMode = Sdk.Mode.API.name)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeMinusModifier } returns .33  // useless in this mode
-        every { preferencesRepository.gradePlusModifier } returns .33
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
+        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
 
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGradeWithModifier to secondSummariesWithModifier }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0) // (from details): 3.375
+        assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0)
     }
 
     @Test
-    fun `force calc current semester average with custom modifiers in hybrid mode`() {
+    fun onlyOneSemester_gradesWithModifiers_scrapper() {
+        val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
+
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
+        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
+
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
+
+        assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0)
+    }
+
+    @Test
+    fun onlyOneSemester_gradesWithModifiers_hybrid() {
         val student = student.copy(loginMode = Sdk.Mode.HYBRID.name)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeMinusModifier } returns .33 // useless in this mode
-        every { preferencesRepository.gradePlusModifier } returns .33
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
+        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
 
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGradeWithModifier to secondSummariesWithModifier }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0) // (from details): 3.375
+        assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0)
     }
 
     @Test
-    fun `calc current semester average`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries }
+    fun allYearFirstSemesterTest() {
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[1].semesterId).blockingGet()
 
         assertEquals(2, items.size)
-        assertEquals(2.9, items.single { it.subject == "Matematyka" }.average, .0) // from summary: 2,9
-        assertEquals(3.4, items.single { it.subject == "Fizyka" }.average, .0) // from details: 3,4
+        assertEquals(3.5, items.single { it.subject == "Matematyka" }.average, .0)
+        assertEquals(3.5, items.single { it.subject == "Fizyka" }.average, .0)
     }
 
     @Test
-    fun `force calc current semester average`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries }
+    fun allYearSecondSemesterTest() {
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to secondSummaries))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(2, items.size)
-        assertEquals(2.5, items.single { it.subject == "Matematyka" }.average, .0) // from details: 2,5
-        assertEquals(3.0, items.single { it.subject == "Fizyka" }.average, .0) // from details: 3,0
+        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0)
+        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun incorrectAverageModeTest() {
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("test_mode")
+
+        gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).blockingGet()
     }
 
     @Test
-    fun `force calc full year average when current is first`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries }
+    fun allYearSemester_averageFromSummary() {
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to listOf(
+            getSummary(22, "Matematyka", 3.0),
+            getSummary(22, "Fizyka", 3.5)
+        )))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to listOf(
+            getSummary(22, "Matematyka", 3.5),
+            getSummary(22, "Fizyka", 4.0)
+        )))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[1].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(2, items.size)
-        assertEquals(3.5, items.single { it.subject == "Matematyka" }.average, .0) // (from summary): 3,5
-        assertEquals(3.5, items.single { it.subject == "Fizyka" }.average, .0) // (from summary): 3,5
+        assertEquals(3.25, items.single { it.subject == "Matematyka" }.average, .0)
+        assertEquals(3.75, items.single { it.subject == "Fizyka" }.average, .0)
     }
 
     @Test
-    fun `calc both semesters average`() {
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
-            firstGrades to listOf(
-                getSummary(22, "Matematyka", 3.0),
-                getSummary(22, "Fizyka", 3.5)
-            )
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
-            secondGrades to listOf(
-                getSummary(22, "Matematyka", 3.5),
-                getSummary(22, "Fizyka", 4.0)
-            )
-        }
+    fun onlyOneSemester_averageFromSummary_forceCalc() {
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to listOf(
+            getSummary(22, "Matematyka", 1.1),
+            getSummary(22, "Fizyka", 7.26)
+        )))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(2, items.size)
-        assertEquals(3.25, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries ↑): 3,0 + 3,5 → 3,25
-        assertEquals(3.75, items.single { it.subject == "Fizyka" }.average, .0) // (from summaries ↑): 3,5 + 4,0 → 3,75
+        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0)
+        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0)
     }
 
-    @Test
-    fun `force calc full year average`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
-            secondGrades to listOf(
-                getSummary(22, "Matematyka", 1.1),
-                getSummary(22, "Fizyka", 7.26)
-            )
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(2, items.size)
-        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
-    }
-
-    @Test
-    fun `calc both semesters average when no summaries`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to emptyList<GradeSummary>() }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to emptyList<GradeSummary>() }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(2, items.size)
-        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5 + 3,0 → 3,25
-    }
-
-    @Test
-    fun `force calc full year average when no summaries`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to emptyList<GradeSummary>() }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to emptyList<GradeSummary>() }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(2, items.size)
-        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
-    }
-
-    @Test
-    fun `calc both semesters average when missing summaries in both semesters`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
-            firstGrades to listOf(
-                getSummary(22, "Matematyka", 4.0)
-            )
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
-            secondGrades to listOf(
-                getSummary(23, "Matematyka", 3.0)
-            )
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(2, items.size)
-        assertEquals(3.5, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries ↑): 4,0 + 3,0 → 3,5
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
-    }
-
-    @Test
-    fun `calc both semesters average when missing summary in second semester`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries.dropLast(1) }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(2, items.size)
-        assertEquals(3.4, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries): 3,9 + 2,9 → 3,4
-        assertEquals(3.05, items.single { it.subject == "Fizyka" }.average, .0) // 3,1 (from summary) + 3,0 (from details) → 3,05
-    }
-
-    @Test
-    fun `calc both semesters average when missing summary in first semester`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries.dropLast(1) }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(2, items.size)
-        assertEquals(3.4, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries): 3,9 + 2,9 → 3,4
-        assertEquals(3.45, items.single { it.subject == "Fizyka" }.average, .0) // 3,5 (from details) + 3,4 (from summary) → 3,45
-    }
-
-    @Test
-    fun `force calc full year average when missing summary in first semester`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries.dropLast(1) }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(2, items.size)
-        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
-    }
-
-    @Test
-    fun `force calc both semesters average with different average from all grades and from two semesters`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
-            listOf(
-                getGrade(22, "Fizyka", 5.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 5.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 22, subject = "Fizyka", average = .0))
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
-            listOf(
-                getGrade(23, "Fizyka", 5.0, weight = 1.0),
-                getGrade(23, "Fizyka", 5.0, weight = 2.0),
-                getGrade(23, "Fizyka", 4.0, modifier = 0.3, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(5.2296, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272 + 4,732 → 5.229636363636364
-    }
-
-    @Test
-    fun `force calc full year average with different average from all grades and from two semesters`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
-            listOf(
-                getGrade(22, "Fizyka", 5.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 5.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 22, subject = "Fizyka", average = .0))
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
-            listOf(
-                getGrade(23, "Fizyka", 5.0, weight = 1.0),
-                getGrade(23, "Fizyka", 5.0, weight = 2.0),
-                getGrade(23, "Fizyka", 4.0, modifier = 0.3, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(5.5429, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272 + 4,732 → .average()
-    }
-
-    @Test
-    fun `force calc both semesters average with different average from all grades and from two semesters with custom modifiers`() {
-        val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
-
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeMinusModifier } returns .33
-        every { preferencesRepository.gradePlusModifier } returns .5
-
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
-            listOf(
-                getGrade(22, "Fizyka", 5.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 5.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 22, subject = "Fizyka", average = .0))
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
-            listOf(
-                getGrade(23, "Fizyka", 5.0, weight = 1.0),
-                getGrade(23, "Fizyka", 5.0, weight = 2.0),
-                getGrade(23, "Fizyka", 4.0, modifier = 0.33, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(5.2636, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272 + 4,8 → 5.26363636
-    }
-
-    @Test
-    fun `force calc full year average with different average from all grades and from two semesters with custom modifiers`() {
-        val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
-
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeMinusModifier } returns .33
-        every { preferencesRepository.gradePlusModifier } returns .5
-
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
-            listOf(
-                getGrade(22, "Fizyka", 5.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 5.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 22, subject = "Fizyka", average = .0))
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
-            listOf(
-                getGrade(23, "Fizyka", 5.0, weight = 1.0),
-                getGrade(23, "Fizyka", 5.0, weight = 2.0),
-                getGrade(23, "Fizyka", 4.0, modifier = 0.33, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(5.5555, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272  + 4,8 → .average()
-    }
-
-    private fun getGrade(semesterId: Int, subject: String, value: Double, modifier: Double = 0.0, weight: Double = 1.0): Grade {
+    private fun getGrade(semesterId: Int, subject: String, value: Double, modifier: Double = 0.0): Grade {
         return Grade(
             studentId = 101,
             semesterId = semesterId,
             subject = subject,
             value = value,
             modifier = modifier,
-            weightValue = weight,
+            weightValue = 1.0,
             teacher = "",
             date = now(),
             weight = "",
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
index 4f32cf7eb..4ef5904fb 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
@@ -1,55 +1,56 @@
 package io.github.wulkanowy.ui.modules.login
 
+import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.mockk.MockKAnnotations
-import io.mockk.clearMocks
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
 import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.clearInvocations
+import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
 
 class LoginPresenterTest {
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var loginView: LoginView
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var errorHandler: LoginErrorHandler
 
-    @MockK
+    @Mock
     lateinit var studentRepository: StudentRepository
 
     private lateinit var presenter: LoginPresenter
 
     @Before
     fun initPresenter() {
-        MockKAnnotations.init(this)
-        clearMocks(loginView)
+        MockitoAnnotations.initMocks(this)
+        clearInvocations(loginView)
 
-        presenter = LoginPresenter(errorHandler, studentRepository)
+        presenter = LoginPresenter(TestSchedulersProvider(), errorHandler, studentRepository)
         presenter.onAttachView(loginView)
     }
 
     @Test
     fun initViewTest() {
-        verify { loginView.initView() }
-        verify { loginView.showActionBar(false) }
+        verify(loginView).initView()
+        verify(loginView).showActionBar(false)
     }
 
     @Test
     fun onBackPressedTest() {
-        clearMocks(loginView)
-        every { loginView.currentViewIndex } returns 1
+        clearInvocations(loginView)
+        doReturn(1).`when`(loginView).currentViewIndex
         presenter.onBackPressed { }
-        verify { loginView.switchView(0) }
+        verify(loginView).switchView(0)
     }
 
     @Test
     fun onBackPressedDefaultTest() {
         var i = 0
-        every { loginView.currentViewIndex } returns 0
+        doReturn(0).`when`(loginView).currentViewIndex
         presenter.onBackPressed { i++ }
         assertNotEquals(0, i)
     }
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
index daacbac20..9d226dac9 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
@@ -1,169 +1,157 @@
 package io.github.wulkanowy.ui.modules.login.form
 
-import io.github.wulkanowy.MainCoroutineRule
+import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.mockk.MockKAnnotations
-import io.mockk.Runs
-import io.mockk.coEvery
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.just
-import io.mockk.verify
+import io.reactivex.Single
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
-import java.time.LocalDateTime.now
-import java.io.IOException
+import org.mockito.ArgumentMatchers.anyString
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.clearInvocations
+import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.never
+import org.mockito.Mockito.times
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDateTime.now
 
 class LoginFormPresenterTest {
 
-    @get:Rule
-    val coroutineRule = MainCoroutineRule()
-
-    @MockK(relaxed = true)
+    @Mock
     lateinit var loginFormView: LoginFormView
 
-    @MockK
+    @Mock
     lateinit var repository: StudentRepository
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var errorHandler: LoginErrorHandler
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var analytics: FirebaseAnalyticsHelper
 
     private lateinit var presenter: LoginFormPresenter
 
     @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
-
-        every { loginFormView.initView() } just Runs
-        every { loginFormView.showContact(any()) } just Runs
-        every { loginFormView.showVersion() } just Runs
-        every { loginFormView.showProgress(any()) } just Runs
-        every { loginFormView.showContent(any()) } just Runs
-        every { loginFormView.formHostSymbol } returns "Default"
-        every { loginFormView.setErrorPassInvalid(any()) } just Runs
-        every { loginFormView.setErrorPassRequired(any()) } just Runs
-        every { loginFormView.setErrorUsernameRequired() } just Runs
-
-        presenter = LoginFormPresenter(repository, errorHandler, analytics)
+    fun initPresenter() {
+        MockitoAnnotations.initMocks(this)
+        clearInvocations(repository, loginFormView)
+        presenter = LoginFormPresenter(TestSchedulersProvider(), repository, errorHandler, analytics)
         presenter.onAttachView(loginFormView)
     }
 
     @Test
     fun initViewTest() {
-        verify { loginFormView.initView() }
+        verify(loginFormView).initView()
     }
 
     @Test
     fun emptyNicknameLoginTest() {
-        every { loginFormView.formUsernameValue } returns ""
-        every { loginFormView.formPassValue } returns "test123"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
+        `when`(loginFormView.formUsernameValue).thenReturn("")
+        `when`(loginFormView.formPassValue).thenReturn("test123")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         presenter.onSignInClick()
 
-        verify { loginFormView.setErrorUsernameRequired() }
-        verify(exactly = 0) { loginFormView.setErrorPassRequired(true) }
-        verify(exactly = 0) { loginFormView.setErrorPassInvalid(false) }
+        verify(loginFormView).setErrorUsernameRequired()
+        verify(loginFormView, never()).setErrorPassRequired(false)
+        verify(loginFormView, never()).setErrorPassInvalid(false)
     }
 
     @Test
     fun emptyPassLoginTest() {
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns ""
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         presenter.onSignInClick()
 
-        verify(exactly = 0) { loginFormView.setErrorUsernameRequired() }
-        verify { loginFormView.setErrorPassRequired(true) }
-        verify(exactly = 0) { loginFormView.setErrorPassInvalid(false) }
+        verify(loginFormView, never()).setErrorUsernameRequired()
+        verify(loginFormView).setErrorPassRequired(true)
+        verify(loginFormView, never()).setErrorPassInvalid(false)
     }
 
     @Test
     fun invalidPassLoginTest() {
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns "123"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         presenter.onSignInClick()
 
-        verify(exactly = 0) { loginFormView.setErrorUsernameRequired() }
-        verify(exactly = 0) { loginFormView.setErrorPassRequired(true) }
-        verify { loginFormView.setErrorPassInvalid(true) }
+        verify(loginFormView, never()).setErrorUsernameRequired()
+        verify(loginFormView, never()).setErrorPassRequired(true)
+        verify(loginFormView).setErrorPassInvalid(true)
     }
 
     @Test
     fun loginTest() {
-        val studentTest = Student(email = "test@", password = "123", scrapperBaseUrl = "https://fakelog.cf/", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, classId = 1, isCurrent = false, symbol = "", registrationDate = now(), className = "", mobileBaseUrl = "", privateKey = "", certificateKey = "", loginMode = "", userLoginId = 0, schoolShortName = "", isParent = false, userName = "")
-        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } returns listOf(StudentWithSemesters(studentTest, emptyList()))
+        val studentTest = Student(email = "test@", password = "123", scrapperBaseUrl = "https://fakelog.cf/", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, classId = 1, isCurrent = false, symbol = "", registrationDate = now(), className = "", mobileBaseUrl = "", privateKey = "", certificateKey = "", loginMode = "", userLoginId = 0, schoolShortName = "", isParent = false)
+        doReturn(Single.just(listOf(studentTest))).`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
 
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns "123456"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
-        every { loginFormView.formHostSymbol } returns "Default"
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
 
-        verify { loginFormView.hideSoftKeyboard() }
-        verify { loginFormView.showProgress(true) }
-        verify { loginFormView.showProgress(false) }
-        verify { loginFormView.showContent(false) }
-        verify { loginFormView.showContent(true) }
+        verify(loginFormView).hideSoftKeyboard()
+        verify(loginFormView).showProgress(true)
+        verify(loginFormView).showProgress(false)
+        verify(loginFormView).showContent(false)
+        verify(loginFormView).showContent(true)
     }
 
     @Test
     fun loginEmptyTest() {
-        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } returns listOf()
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns "123456"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
-        every { loginFormView.formHostSymbol } returns "Default"
+        doReturn(Single.just(emptyList<Student>()))
+            .`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
 
-        verify { loginFormView.showContent(false) }
-        verify { loginFormView.showProgress(true) }
-        verify { loginFormView.showProgress(false) }
-        verify { loginFormView.showContent(false) }
-        verify { loginFormView.showContent(true) }
+        verify(loginFormView).hideSoftKeyboard()
+        verify(loginFormView).showProgress(true)
+        verify(loginFormView).showProgress(false)
+        verify(loginFormView).showContent(false)
+        verify(loginFormView).showContent(true)
     }
 
     @Test
     fun loginEmptyTwiceTest() {
-        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } returns listOf()
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns "123456"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
-        every { loginFormView.formHostSymbol } returns "Default"
+        doReturn(Single.just(emptyList<Student>()))
+            .`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
         presenter.onSignInClick()
 
-        verify(exactly = 2) { loginFormView.hideSoftKeyboard() }
-        verify(exactly = 2) { loginFormView.showProgress(true) }
-        verify(exactly = 2) { loginFormView.showProgress(false) }
-        verify(exactly = 2) { loginFormView.showContent(false) }
-        verify(exactly = 2) { loginFormView.showContent(true) }
+        verify(loginFormView, times(2)).hideSoftKeyboard()
+        verify(loginFormView, times(2)).showProgress(true)
+        verify(loginFormView, times(2)).showProgress(false)
+        verify(loginFormView, times(2)).showContent(false)
+        verify(loginFormView, times(2)).showContent(true)
     }
 
     @Test
     fun loginErrorTest() {
-        val testException = IOException("test")
-        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } throws testException
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns "123456"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
-        every { loginFormView.formHostSymbol } returns "Default"
-        every { loginFormView.showProgress(any()) } just Runs
-        every { loginFormView.showProgress(any()) } just Runs
+        val testException = RuntimeException("test")
+        doReturn(Single.error<List<Student>>(testException)).`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
 
-        verify { loginFormView.hideSoftKeyboard() }
-        verify { loginFormView.showProgress(false) }
-        verify { loginFormView.showContent(false) }
-        verify { loginFormView.showContent(true) }
-        verify { errorHandler.dispatch(match { it.message == testException.message }) }
+        verify(loginFormView).hideSoftKeyboard()
+        verify(loginFormView).showProgress(true)
+        verify(loginFormView).showProgress(false)
+        verify(loginFormView).showContent(false)
+        verify(loginFormView).showContent(true)
+        verify(errorHandler).dispatch(testException)
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
index b3a24a2ac..121391dee 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
@@ -1,88 +1,73 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
-import io.github.wulkanowy.MainCoroutineRule
+import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.mockk.MockKAnnotations
-import io.mockk.Runs
-import io.mockk.clearMocks
-import io.mockk.coEvery
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.just
-import io.mockk.verify
+import io.reactivex.Completable
+import io.reactivex.Single
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
-import java.time.LocalDateTime.now
+import org.mockito.Mock
+import org.mockito.Mockito.clearInvocations
+import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDateTime.now
 
 class LoginStudentSelectPresenterTest {
 
-    @get:Rule
-    val coroutineRule = MainCoroutineRule()
-
-    @MockK(relaxed = true)
+    @Mock
     lateinit var errorHandler: LoginErrorHandler
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var loginStudentSelectView: LoginStudentSelectView
 
-    @MockK
+    @Mock
     lateinit var studentRepository: StudentRepository
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var analytics: FirebaseAnalyticsHelper
 
     private lateinit var presenter: LoginStudentSelectPresenter
 
-    private val testStudent by lazy { Student(email = "test", password = "test123", scrapperBaseUrl = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", classId = 1, studentName = "", registrationDate = now(), className = "", loginMode = "", certificateKey = "", privateKey = "", mobileBaseUrl = "", schoolShortName = "", userLoginId = 1, isParent = false, userName = "") }
+    private val testStudent by lazy { Student(email = "test", password = "test123", scrapperBaseUrl = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", classId = 1, studentName = "", registrationDate = now(), className = "", loginMode = "", certificateKey = "", privateKey = "", mobileBaseUrl = "", schoolShortName = "", userLoginId = 1, isParent = false) }
 
     private val testException by lazy { RuntimeException("Problem") }
 
     @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
-
-        clearMocks(studentRepository, loginStudentSelectView)
-        every { loginStudentSelectView.initView() } just Runs
-        every { loginStudentSelectView.showContact(any()) } just Runs
-        every { loginStudentSelectView.enableSignIn(any()) } just Runs
-        every { loginStudentSelectView.showProgress(any()) } just Runs
-        every { loginStudentSelectView.showContent(any()) } just Runs
-
-        presenter = LoginStudentSelectPresenter(studentRepository, errorHandler, analytics)
+    fun initPresenter() {
+        MockitoAnnotations.initMocks(this)
+        clearInvocations(studentRepository, loginStudentSelectView)
+        presenter = LoginStudentSelectPresenter(TestSchedulersProvider(), studentRepository, errorHandler, analytics)
         presenter.onAttachView(loginStudentSelectView, null)
     }
 
     @Test
     fun initViewTest() {
-        verify { loginStudentSelectView.initView() }
+        verify(loginStudentSelectView).initView()
     }
 
     @Test
     fun onSelectedStudentTest() {
-        coEvery { studentRepository.saveStudents(listOf(StudentWithSemesters(testStudent, emptyList()))) } returns listOf(1L)
-        coEvery { studentRepository.switchStudent(StudentWithSemesters(testStudent, emptyList())) } just Runs
-        every { loginStudentSelectView.openMainView() } just Runs
-        presenter.onItemSelected(StudentWithSemesters(testStudent, emptyList()), false)
+        doReturn(Single.just(listOf(1L))).`when`(studentRepository).saveStudents(listOf(testStudent))
+        doReturn(Completable.complete()).`when`(studentRepository).switchStudent(testStudent)
+        presenter.onItemSelected(testStudent, false)
         presenter.onSignIn()
-
-        verify { loginStudentSelectView.showContent(false) }
-        verify { loginStudentSelectView.showProgress(true) }
-        verify { loginStudentSelectView.openMainView() }
+        verify(loginStudentSelectView).showContent(false)
+        verify(loginStudentSelectView).showProgress(true)
+        verify(loginStudentSelectView).openMainView()
     }
 
     @Test
     fun onSelectedStudentErrorTest() {
-        coEvery { studentRepository.saveStudents(listOf(StudentWithSemesters(testStudent, emptyList()))) } throws testException
-        coEvery { studentRepository.logoutStudent(testStudent) } just Runs
-        presenter.onItemSelected(StudentWithSemesters(testStudent, emptyList()), false)
+        doReturn(Single.error<Student>(testException)).`when`(studentRepository).saveStudents(listOf(testStudent))
+        doReturn(Completable.complete()).`when`(studentRepository).logoutStudent(testStudent)
+        presenter.onItemSelected(testStudent, false)
         presenter.onSignIn()
-        verify { loginStudentSelectView.showContent(false) }
-        verify { loginStudentSelectView.showProgress(true) }
-        verify { errorHandler.dispatch(match { testException.message == it.message }) }
+        verify(loginStudentSelectView).showContent(false)
+        verify(loginStudentSelectView).showProgress(true)
+        verify(errorHandler).dispatch(testException)
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
index fc2832b2e..936098970 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
@@ -1,67 +1,58 @@
 package io.github.wulkanowy.ui.modules.main
 
+import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.mockk.MockKAnnotations
-import io.mockk.Runs
-import io.mockk.clearMocks
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.just
-import io.mockk.verify
 import org.junit.Before
 import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.clearInvocations
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
 
 class MainPresenterTest {
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var errorHandler: ErrorHandler
 
-    @MockK
+    @Mock
     lateinit var studentRepository: StudentRepository
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var prefRepository: PreferencesRepository
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var syncManager: SyncManager
 
-    @MockK
+    @Mock
     lateinit var mainView: MainView
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var analytics: FirebaseAnalyticsHelper
 
     private lateinit var presenter: MainPresenter
 
     @Before
     fun initPresenter() {
-        MockKAnnotations.init(this)
-        clearMocks(mainView)
+        MockitoAnnotations.initMocks(this)
+        clearInvocations(mainView)
 
-        every { mainView.startMenuIndex = any() } just Runs
-        every { mainView.startMenuMoreIndex = any() } just Runs
-        every { mainView.startMenuIndex } returns 1
-        every { mainView.startMenuMoreIndex } returns 1
-        every { mainView.initView() } just Runs
-        presenter = MainPresenter(errorHandler, studentRepository, prefRepository, syncManager, analytics)
+        presenter = MainPresenter(TestSchedulersProvider(), errorHandler, studentRepository, prefRepository, syncManager, analytics)
         presenter.onAttachView(mainView, null)
     }
 
     @Test
     fun initMenuTest() {
-        verify { mainView.initView() }
+        verify(mainView).initView()
     }
 
     @Test
     fun onTabSelectedTest() {
-        every { mainView.notifyMenuViewChanged() } just Runs
-
-        every { mainView.switchMenuView(1) } just Runs
         presenter.onTabSelected(1, false)
-        verify { mainView.switchMenuView(1) }
+        verify(mainView).switchMenuView(1)
     }
 }
+
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
index a81f1abd9..34d0ce5cb 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
@@ -1,49 +1,46 @@
 package io.github.wulkanowy.ui.modules.splash
 
-import io.github.wulkanowy.MainCoroutineRule
+import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
+import io.reactivex.Single
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
 
 class SplashPresenterTest {
 
-    @get:Rule
-    val coroutineRule = MainCoroutineRule()
-
-    @MockK(relaxed = true)
+    @Mock
     lateinit var splashView: SplashView
 
-    @MockK
+    @Mock
     lateinit var studentRepository: StudentRepository
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var errorHandler: ErrorHandler
 
     private lateinit var presenter: SplashPresenter
 
     @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
-        presenter = SplashPresenter(errorHandler, studentRepository)
+    fun initPresenter() {
+        MockitoAnnotations.initMocks(this)
+        presenter = SplashPresenter(TestSchedulersProvider(), errorHandler, studentRepository)
     }
 
     @Test
     fun testOpenLoginView() {
-        coEvery { studentRepository.isCurrentStudentSet() } returns false
+        doReturn(Single.just(false)).`when`(studentRepository).isCurrentStudentSet()
         presenter.onAttachView(splashView)
-        verify { splashView.openLoginView() }
+        verify(splashView).openLoginView()
     }
 
     @Test
     fun testMainMainView() {
-        coEvery { studentRepository.isCurrentStudentSet() } returns true
+        doReturn(Single.just(true)).`when`(studentRepository).isCurrentStudentSet()
         presenter.onAttachView(splashView)
-        verify { splashView.openMainView() }
+        verify(splashView).openMainView()
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
index e1693d523..ece7acf20 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
@@ -3,21 +3,21 @@ package io.github.wulkanowy.utils
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.mockk.MockKAnnotations
-import io.mockk.impl.annotations.MockK
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate
+import org.mockito.Mock
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDate
 
 class GradeExtensionTest {
 
-    @MockK
+    @Mock
     lateinit var date: LocalDate
 
     @Before
     fun before() {
-        MockKAnnotations.init(this)
+        MockitoAnnotations.initMocks(this)
     }
 
     @Test
diff --git a/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
index d604dfef4..72d08c411 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
@@ -4,9 +4,9 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import java.time.LocalDate.of
-import java.time.LocalDateTime
-import java.time.Month.JANUARY
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.Month.JANUARY
 import java.util.Locale
 
 class TimeExtensionTest {
@@ -171,42 +171,4 @@ class TimeExtensionTest {
         assertEquals(of(2019, 5, 1), of(2019, 5, 1).getLastSchoolDayIfHoliday(2018))
         assertEquals(of(2018, 5, 1), of(2019, 5, 1).getLastSchoolDayIfHoliday(2017))
     }
-
-    @Test
-    fun getExamsCutOffDates() {
-        with(of(2020, 9, 13)) {
-            assertEquals(of(2020, 9, 14), startExamsDay)
-            assertEquals(of(2020, 10, 11), endExamsDay)
-        }
-
-        with(of(2020, 9, 14)) {
-            assertEquals(of(2020, 9, 14), startExamsDay)
-            assertEquals(of(2020, 10, 11), endExamsDay)
-        }
-
-        with(of(2020, 9, 15)) {
-            assertEquals(of(2020, 9, 14), startExamsDay)
-            assertEquals(of(2020, 10, 11), endExamsDay)
-        }
-
-        with(of(2020, 9, 16)) {
-            assertEquals(of(2020, 9, 14), startExamsDay)
-            assertEquals(of(2020, 10, 11), endExamsDay)
-        }
-
-        with(of(2020, 9, 17)) {
-            assertEquals(of(2020, 9, 14), startExamsDay)
-            assertEquals(of(2020, 10, 11), endExamsDay)
-        }
-
-        with(of(2020, 9, 18)) {
-            assertEquals(of(2020, 9, 14), startExamsDay)
-            assertEquals(of(2020, 10, 11), endExamsDay)
-        }
-
-        with(of(2020, 9, 19)) {
-            assertEquals(of(2020, 9, 21), startExamsDay)
-            assertEquals(of(2020, 10, 18), endExamsDay)
-        }
-    }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt
index eac84759d..33a798502 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt
@@ -6,7 +6,7 @@ import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import java.time.LocalDateTime.now
+import org.threeten.bp.LocalDateTime.now
 
 class TimetableExtensionTest {
 
diff --git a/build.gradle b/build.gradle
index 4205cce56..696e778f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,6 @@
 buildscript {
-    ext {
-        kotlin_version = '1.4.10'
-        about_libraries = '8.3.0'
-        hilt_version = "2.29.1-alpha"
-    }
+    ext.kotlin_version = '1.3.72'
+    ext.about_libraries = '8.1.3'
     repositories {
         mavenCentral()
         google()
@@ -12,14 +9,13 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:4.0.1'
-        classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
         classpath "com.github.triplet.gradle:play-publisher:2.7.5"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
-        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
+        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${about_libraries}"
     }
 }