515 changed files with 3640 additions and 22848 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -7,11 +7,11 @@ references:

  container_config: &container_config
    docker:
-      - image: circleci/android@sha256:5cdc8626cc6f13efe5ed982cdcdb432b0472f8740fed8743a6461e025ad6cdfc
+      - image: circleci/android:api-28-alpha
    working_directory: *workspace_root
    environment:
      environment:
-        _JAVA_OPTS: -Xmx3072m
+        JVM_OPTS: -Xmx3200m

  attach_workspace: &attach_workspace
    attach_workspace:
@ -35,7 +35,7 @@ jobs:
          command: ./gradlew dependencies --no-daemon --stacktrace --console=plain -PdisablePreDex || true
      - run:
          name: Initial build
-          command: ./gradlew build -x test -x lint -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease -x packageRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew build -x test -x lint -x fabricGenerateResourcesRelease -x packageRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
      - run:
          name: Run FOSSA
          command: fossa --no-ansi || true
@ -56,7 +56,7 @@ jobs:
          <<: *general_cache_key
      - run:
          name: Run lint
-          command: ./gradlew lint -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew lint -x fabricGenerateResourcesRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
      - store_artifacts:
          path: ./app/build/reports/
          destination: lint_reports/app/
@ -75,7 +75,7 @@ jobs:
          <<: *general_cache_key
      - run:
          name: Run app tests
-          command: ./gradlew :app:test :app:jacocoTestReport -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew :app:test :app:jacocoTestReport -x fabricGenerateResourcesRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
      - run:
          name: Upload unit code coverage to codecov
          command: bash <(curl -s https://codecov.io/bash) -F app
@ -93,12 +93,9 @@ jobs:
    <<: *container_config
    steps:
      - *attach_workspace
-      - run:
-          name: Accept licenses
-          command: yes | sdkmanager --licenses && yes | sdkmanager --update
      - run:
          name: Setup emulator
-          command: sdkmanager "system-images;android-22;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-22;default;armeabi-v7a"
+          command: sdkmanager "system-images;android-19;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-19;default;armeabi-v7a"
      - run:
          name: Launch emulator
          command: export LD_LIBRARY_PATH=${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib && emulator64-arm -avd test -noaudio -no-boot-anim -no-window -accel on
@ -116,7 +113,7 @@ jobs:
            adb shell input keyevent 82
      - run:
          name: Run instrumented tests
-          command: ./gradlew clean createFdroidDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew clean createDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
      - run:
          name: Collect logs from emulator
          command: adb logcat -d > ./app/build/reports/logcat_emulator.txt
@ -162,7 +159,7 @@ jobs:
            openssl aes-256-cbc -d -in ./app/upload-key-encrypted.jks -k $ENCRYPT_KEY >> ./app/upload-key.jks
      - run:
          name: Publish release
-          command: ./gradlew publishPlayRelease --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
+          command: ./gradlew publish --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex

 workflows:
  version: 2
--- a/.gitignore
+++ b/.gitignore
@ -1,90 +1,39 @@
-# Created by https://www.gitignore.io
+/captures
+.externalNativeBuild
+
+## https://gist.github.com/iainconnor/8605514

 # Built application files
-*.apk
-*.ap_
-*.aab
+/build
+/*/build/

-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-
-# Gradle files
-.gradle/
-build/
+# Crashlytics configuations
+com_crashlytics_export_strings.xml

 # Local configuration file (sdk path, etc)
 local.properties

-# Proguard folder generated by Eclipse
-proguard/
+# Gradle generated files
+.gradle/

-# Log Files
-*.log
+# Signing files
+.signing/

-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# IntelliJ configurations
-*.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-.idea/caches
-.idea/modules.xml
-.idea/navEditor.xml
-.idea/caches/
+# User-specific configurations
+.idea/copyright/profiles_settings.xml
 .idea/libraries/
-.idea/shelf/
+.idea/inspectionProfiles/
 .idea/.name
 .idea/compiler.xml
-.idea/copyright/profiles_settings.xml
 .idea/encodings.xml
 .idea/misc.xml
+.idea/modules.xml
 .idea/scopes/scope_settings.xml
+.idea/tasks.xml
 .idea/vcs.xml
-.idea/jsLibraryMappings.xml
-.idea/datasources.xml
-.idea/dataSources.ids
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
-.idea/runConfigurations.xml
-
-# Keystore files
-*.jks
-*.keystore
-*.p12
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
-
-# Version control
-vcs.xml
-
-# lint
-lint/intermediates/
-lint/generated/
-lint/outputs/
-lint/tmp/
-lint/reports/
-
-### Android Patch ###
-gen-external-apklibs
-output.json
+.idea/workspace.xml
+.idea/caches/
+*.iml

 # OS-specific files
 .DS_Store
@ -94,21 +43,8 @@ output.json
 .Trashes
 ehthumbs.db
 Thumbs.db
-
-# Legacy Eclipse project files
-.classpath
-.project
-.cproject
-.settings/
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.war
-*.ear
-
-### AndroidStudio Patch ###
-
-!/gradle/wrapper/gradle-wrapper.jar
-.idea/jarRepositories.xml
+.idea/caches/
+app/key.p12
+app/upload-key.jks
+*.log
+.idea/assetWizardSettings.xml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -12,7 +12,7 @@ build:
  script:
    - ./gradlew --no-daemon --stacktrace dependencies || true
    - ./gradlew --no-daemon --stacktrace assembleDebug
-    - mv app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk .
+    - mv app/build/outputs/apk/debug/app-debug.apk .
  artifacts:
    name: "${CI_PROJECT_NAME}_${CI_BUILD_REF_NAME}-${CI_BUILD_ID}"
    paths:
@ -26,7 +26,7 @@ tests:
     - .gradle
    policy: pull
  script:
-    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease test
+    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesRelease test
  artifacts:
    paths:
    - app/build/reports/tests
@ -39,7 +39,7 @@ lint:
     - .gradle
    policy: pull
  script:
-    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease lint
+    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesRelease lint
  artifacts:
    paths:
    - app/build/reports
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@ -2,7 +2,7 @@
  <code_scheme name="Project" version="173">
    <option name="LINE_SEPARATOR" value="&#10;" />
    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+      <option name="USE_CUSTOM_SETTINGS" value="true" />
    </AndroidXmlCodeStyleSettings>
    <JetCodeStyleSettings>
      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
@ -21,10 +21,38 @@
      <option name="CONTINUATION_INDENT_IN_ELVIS" value="false" />
      <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
    </JetCodeStyleSettings>
-    <MarkdownNavigatorCodeStyleSettings>
-      <option name="RIGHT_MARGIN" value="72" />
-    </MarkdownNavigatorCodeStyleSettings>
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+    <XML>
+      <option name="XML_KEEP_LINE_BREAKS" value="false" />
+      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
+      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+    </XML>
    <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
      <indentOptions>
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
      </indentOptions>
@ -35,7 +63,6 @@
              <match>
                <AND>
                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
@ -46,7 +73,6 @@
              <match>
                <AND>
                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
@ -58,7 +84,6 @@
              <match>
                <AND>
                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
@ -69,7 +94,6 @@
              <match>
                <AND>
                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
@ -80,7 +104,6 @@
              <match>
                <AND>
                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
@ -91,7 +114,6 @@
              <match>
                <AND>
                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
@ -102,7 +124,6 @@
              <match>
                <AND>
                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
@ -114,7 +135,6 @@
              <match>
                <AND>
                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
@ -126,7 +146,6 @@
              <match>
                <AND>
                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>.*</XML_NAMESPACE>
                </AND>
              </match>
@ -144,6 +163,7 @@
      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
      <indentOptions>
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
      </indentOptions>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
--- a/.travis.yml
+++ b/.travis.yml
@ -3,18 +3,18 @@ jdk: oraclejdk8

 env:
 global:
-    - ANDROID_API_LEVEL=29
-    - ANDROID_BUILD_TOOLS_VERSION=29.0.2
+    - ANDROID_API_LEVEL=28
+    - ANDROID_BUILD_TOOLS_VERSION=28.0.3

 cache:
  directories:
    - $HOME/.gradle/caches/
    - $HOME/.gradle/wrapper/

-branches:
-  only:
-    - develop
-    - 0.12.0
+#branches:
+#  only:
+#  - master
+#  - 0.7.x

 android:
 licenses:
@ -34,12 +34,12 @@ android:
    - extra-android-m2repository
    - addon-google_apis-google-$ANDROID_API_LEVEL
    # Android emulator
-    - android-22
-    - sys-img-armeabi-v7a-android-22
+    - android-19
+    - sys-img-armeabi-v7a-android-19

 before_script:
    # Launch emulator before the execution
-    - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
+    - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
    - emulator -avd test -no-audio -no-window &
    - android-wait-for-emulator
    - adb shell input keyevent 82 &
@ -48,20 +48,20 @@ before_script:
 script:
  - ./gradlew dependencies --stacktrace --daemon
  - fossa --no-ansi || true
-  #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
-  - ./gradlew testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
-  - ./gradlew createFdroidDebugCoverageReport --stacktrace --daemon
+  - ./gradlew lint -x fabricGenerateResourcesRelease --stacktrace --daemon
+  - ./gradlew test -x fabricGenerateResourcesRelease --stacktrace --daemon
+  - ./gradlew createDebugCoverageReport --stacktrace --daemon
  - ./gradlew jacocoTestReport --stacktrace --daemon
  - if [ -z ${SONAR_HOST+x} ]; then echo "sonar scan skipped"; else
      git fetch --unshallow;
-      ./gradlew sonarqube -x test -x lint -x fabricGenerateResourcesPlayRelease -x fabricGenerateResourcesFdroidRelease -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_KEY -Dsonar.branch.name=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} --stacktrace --daemon;
+      ./gradlew sonarqube -x test -x lint -x fabricGenerateResourcesRelease -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_KEY -Dsonar.branch.name=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} --stacktrace --daemon;
    fi
  - |
    if [ $TRAVIS_TAG ]; then
      gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg;
      gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg;
      gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg;
-      ./gradlew publishPlayRelease -PenableCrashlytics --stacktrace;
+      ./gradlew publish -PenableCrashlytics --stacktrace;
    fi

 after_success:
--- a/2
+++ b/2
@ -186,7 +186,7 @@
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

-   Copyright 2019 Wulkanowy
+   Copyright 2017 wulkanowy

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/README.en.md
+++ b/README.en.md
@ -1,61 +0,0 @@
-[Polska wersja README](README.md)
-
-# Wulkanowy
-[![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
-[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
-[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
-
-Unofficial android VULCAN UONET+ register client for student and parent
-
-## Features
-
-* logging in using the email and password
-* functions from the register website:
-    * grades
-    * grade statistics
-    * attendance
-    * percentage of attendance
-    * exams
-    * timetable
-    * completed lessons
-    * messages
-    * homework
-    * notes
-    * lucky number
-* calculation of the average
-* notifications, e.g. about a new grade
-* dark and black (AMOLED) theme
-* offline mode
-* no ads
-
-## Download
-
-You can download the current beta from the Google Play or Fdroid store
-
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
-      alt="Get it on Google Play"
-      height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-    alt="Get it on Fdroid"
-    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
-    
-You can also download a [development version](https://wulkanowy.github.io/#download) that includes new features prepared for the next release
-
-## Built With
-
-
-* [Wulkanowy API](https://github.com/wulkanowy/api)
-* [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) 
-
-## Contributing
-
-Please contribute to the project either by creating a PR or submitting an issue on GitHub.
-
-## License
-
-This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details
--- a/README.md
+++ b/README.md
@ -1,62 +1,22 @@
-[English version of README](README.en.md)
-
 # Wulkanowy
+
+[![CircleCI](https://img.shields.io/circleci/project/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://circleci.com/gh/wulkanowy/wulkanowy)
 [![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
+[![Bitrise](https://img.shields.io/bitrise/daeff1893f3c8128/master.svg?token=Hjm1ACamk86JDeVVJHOeqQ&style=flat-square)](https://www.bitrise.io/app/daeff1893f3c8128)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
+[![BCH compliance](https://bettercodehub.com/edge/badge/wulkanowy/wulkanowy?branch=master)](https://bettercodehub.com/)
+[![Sonarcloud](https://sonarcloud.io/api/project_badges/measure?project=io.github.wulkanowy%3Aapp&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=io.github.wulkanowy%3Aapp)
+[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy.svg?type=shield)](https://app.fossa.com/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy?ref=badge_shield)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)

-Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
+[Pobierz wersję beta z Google Play](https://play.google.com/store/apps/details?id=io.github.wulkanowy&amp;utm_source=vcs)

-## Funkcje
+[Pobierz wersję DEV](https://bitrise-redirector.herokuapp.com/v0.1/apps/f841f20d8f8b1dc8/builds/master/artifacts/0)
+[(Więcej wersji DEV)](https://wulkanowy.github.io/dev.html)

-* logowanie za pomocą e-maila i hasła
-* funkcje ze strony internetowej dziennika:
-    * oceny
-    * statystyki ocen
-    * frekwencja
-    * procent frekwencji
-    * sprawdziany
-    * plan lekcji
-    * lekcje zrealizowane
-    * wiadomości
-    * zadania domowe
-    * uwagi
-    * szczęśliwy numerek
-* obliczanie średniej
-* powiadomienia np. o nowej ocenie
-* ciemny i czarny (AMOLED) motyw
-* tryb offilne
-* brak reklam
-
-## Pobierz
-
-Aktualną wersję beta możesz pobrać ze sklepu Google Play lub Fdroid
-
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
-      alt="Pobierz z Google Play"
-      height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-    alt="Pobierz z Fdroid"
-    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
+Androidowy klient dziennika VULCAN UONET+.


-Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#download), która zawiera nowe funkcje przygotowywane do następnego wydania
+## License

-
-## Zbudowana za pomocą
-
-* [Wulkanowy API](https://github.com/wulkanowy/api)
-* [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) 
-
-## Współpraca
-
-Wnieś swój wkład w projekt, tworząc PR lub wysyłając issue na GitHub.
-
-## Licencja
-
-Ten projekt jest licencjonowany w ramach Apache License 2.0 - szczegóły w pliku [LICENSE](LICENSE)
+[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy.svg?type=large)](https://app.fossa.com/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy?ref=badge_large)
--- a/app/.gitignore
+++ b/app/.gitignore
@ -0,0 +1 @@
+/build
--- a/app/build.gradle
+++ b/app/build.gradle
@ -6,38 +6,25 @@ apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
-apply from: 'hooks.gradle'

 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.2'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'

    defaultConfig {
        applicationId "io.github.wulkanowy"
        testApplicationId "io.github.tests.wulkanowy"
-        minSdkVersion 16
-        targetSdkVersion 29
-        versionCode 47
-        versionName "0.12.0"
+        minSdkVersion 15
+        targetSdkVersion 28
+        versionCode 28
+        versionName "0.7.2"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
        manifestPlaceholders = [
-                fabric_api_key     : System.getenv("FABRIC_API_KEY") ?: "null",
+                fabric_api_key: System.getenv("FABRIC_API_KEY") ?: "null",
                crashlytics_enabled: project.hasProperty("enableCrashlytics")
        ]
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [
-                        "room.schemaLocation": "$projectDir/schemas".toString(),
-                        "room.incremental"   : "true"
-                ]
-            }
-        }
-    }
-
-    sourceSets {
-        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
    }

    signingConfigs {
@ -63,19 +50,7 @@ android {
            versionNameSuffix "-dev"
            testCoverageEnabled = true
            ext.enableCrashlytics = project.hasProperty("enableCrashlytics")
-        }
-    }
-
-    flavorDimensions "platform"
-
-    productFlavors {
-        play {
-            dimension "platform"
-        }
-
-        fdroid {
-            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "false"
-            dimension "platform"
+            multiDexKeepProguard file('proguard-multidex-rules.pro')
        }
    }

@ -87,15 +62,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    packagingOptions {
-        exclude 'META-INF/library_release.kotlin_module'
-        exclude 'META-INF/library-core_release.kotlin_module'
-    }
 }

 androidExtensions {
@ -105,97 +71,73 @@ androidExtensions {
 play {
    serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
    serviceAccountCredentials = file('key.p12')
-    defaultToAppBundles = false
+    defaultToAppBundles = true
    track = 'alpha'
 }

-ext {
-    work_manager = "2.3.0-alpha03"
-    room = "2.2.1"
-    dagger = "2.25.2"
-    chucker = "2.0.4"
-    mockk = "1.9.2"
-}
-
-configurations.all {
-    resolutionStrategy.force "androidx.constraintlayout:constraintlayout:1.1.3"
-    resolutionStrategy.force "com.google.android.material:material:1.1.0-alpha07"
-}
-
 dependencies {
-    implementation "io.github.wulkanowy:api:0.12.0"
-
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "androidx.core:core-ktx:1.2.0-beta01"
-    implementation "androidx.activity:activity-ktx:1.1.0-rc01"
-    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "androidx.appcompat:appcompat-resources:1.1.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.0-rc01"
-    implementation "androidx.annotation:annotation:1.1.0"
-    implementation "androidx.multidex:multidex:2.0.1"
+    implementation('io.github.wulkanowy:api:0.7.2') { exclude module: "threetenbp" }

-    implementation "androidx.preference:preference-ktx:1.1.0"
-    implementation "androidx.recyclerview:recyclerview:1.1.0-rc01"
-    implementation "androidx.viewpager:viewpager:1.0.0"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03"
-    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0-rc01"
-    implementation "com.google.android.material:material:1.1.0-alpha07"
-    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.legacy:legacy-support-v4:1.0.0"
+    implementation "androidx.appcompat:appcompat:1.0.2"
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation "com.google.android.material:material:1.0.0"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.multidex:multidex:2.0.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.work:work-runtime:2.0.0"
+    implementation "androidx.work:work-rxjava2:2.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 "androidx.room:room-runtime:2.1.0-alpha06"
+    implementation "androidx.room:room-rxjava2:2.1.0-alpha06"
+    kapt "androidx.room:room-compiler:2.1.0-alpha06"

-    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.0"
-    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.0"
+    implementation 'com.takisoft.preferencex:preferencex:1.0.0'
+
+    implementation 'com.squareup.inject:assisted-inject-annotations-dagger2:0.3.3'
+    kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.3.3'
+
+    implementation "com.google.dagger:dagger-android-support:2.21"
+    kapt "com.google.dagger:dagger-compiler:2.21"
+    kapt "com.google.dagger:dagger-android-processor:2.21"

    implementation "eu.davidea:flexible-adapter:5.1.0"
    implementation "eu.davidea:flexible-adapter-ui:1.0.0"
    implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
-    implementation "com.ncapdevi:frag-nav:3.3.0"
+    implementation 'com.ncapdevi:frag-nav:3.2.0'

-    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.13"
+    implementation 'com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f'
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'

-    implementation "com.google.code.gson:gson:2.8.6"
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
+    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.2'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation "io.reactivex.rxjava2:rxjava:2.2.7"
+
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.0"
    implementation "com.jakewharton.timber:timber:4.7.1"
    implementation "at.favre.lib:slf4j-timber:1.0.1"
-    implementation "com.squareup.okhttp3:logging-interceptor:3.12.6"
-    implementation "com.mikepenz:aboutlibraries:7.0.4"
+    implementation "com.mikepenz:aboutlibraries:6.2.3"

-    playImplementation "com.google.firebase:firebase-core:17.2.1"
-    playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
+    implementation 'com.google.firebase:firebase-core:16.0.8'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'

-    releaseImplementation "fr.o80.chucker:library-no-op:$chucker"
+    releaseImplementation 'fr.o80.chucker:library-no-op:2.0.4'

-    debugImplementation "fr.o80.chucker:library:$chucker"
+    debugImplementation 'fr.o80.chucker:library:2.0.4'
    debugImplementation "com.amitshekhar.android:debug-db:1.0.6"

    testImplementation "junit:junit:4.12"
-    testImplementation "io.mockk:mockk:$mockk"
-    testImplementation "org.threeten:threetenbp:1.4.0"
-    testImplementation "org.mockito:mockito-inline:3.1.0"
+    testImplementation "io.mockk:mockk:1.9.2"
+    testImplementation "org.mockito:mockito-inline:2.25.1"
+    testImplementation 'org.threeten:threetenbp:1.3.8'

-    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 'androidx.test:core:1.1.0'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
+    androidTestImplementation "io.mockk:mockk-android:1.9.2"
+    androidTestImplementation 'org.mockito:mockito-android:2.25.1'
    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    androidTestImplementation "org.mockito:mockito-android:3.1.0"
 }

 apply plugin: 'com.google.gms.google-services'
--- a/app/hooks.gradle
+++ b/app/hooks.gradle
@ -1,10 +0,0 @@
-apply plugin: "com.star-zero.gradle.githook"
-
-githook {
-    failOnMissingHooksDir = false
-    hooks {
-        "pre-push" {
-            shell = "./app/play-publish-lint.sh"
-        }
-    }
-}
--- a/app/jacoco.gradle
+++ b/app/jacoco.gradle
@ -1,7 +1,7 @@
 apply plugin: "jacoco"

 jacoco {
-    toolVersion "0.8.4"
+    toolVersion "0.8.3"
    reportsDir = file("$buildDir/reports")
 }

@ -31,20 +31,17 @@ task jacocoTestReport(type: JacocoReport) {
                    '**/*_Provide*Factory*.*',
                    '**/*_Factory.*']

-    classDirectories.setFrom(fileTree(
+    classDirectories = fileTree(
            dir: "$buildDir/intermediates/classes/debug",
            excludes: excludes
    ) + fileTree(
-            dir: "$buildDir/tmp/kotlin-classes/playDebug",
+            dir: "$buildDir/tmp/kotlin-classes/debug",
            excludes: excludes
-    ))
+    )

-    sourceDirectories.setFrom(files([
-            "src/main/java",
-            "src/play/java"
-    ]))
-    executionData.setFrom(fileTree(
+    sourceDirectories = files("$project.projectDir/src/main/java")
+    executionData = fileTree(
            dir: project.projectDir,
            includes: ["**/*.exec", "**/*.ec"]
-    ))
+    )
 }
--- a/app/key-encrypted.p12
+++ b/app/key-encrypted.p12
--- a/app/play-publish-lint.sh
+++ b/app/play-publish-lint.sh
@ -1,7 +0,0 @@
-#!/bin/bash -
-
-content=$(cat < "app/src/main/play/release-notes/pl-PL/default.txt") || exit
-if [[ "${#content}" -gt 500 ]]; then
-    echo >&2 "Release notes content has reached the limit of 500 characters"
-    exit 1
-fi
--- a/app/proguard-multidex-rules.pro
+++ b/app/proguard-multidex-rules.pro
@ -0,0 +1,3 @@
+-keep class android.support.test.internal** { *; }
+-keep class org.junit.** { *; }
+-keep public class io.github.wulkanowy** { *; }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@ -11,10 +11,6 @@
 -verbose


-#Keep all wulkanowy files
-keep class io.github.wulkanowy.** {*;}
-
-
 #Config for anallitycs
 -keepattributes *Annotation*
 -keepattributes SourceFile,LineNumberTable
@ -36,10 +32,8 @@
 -dontwarn rx.internal.util.**
 -dontwarn sun.misc.Unsafe

-
 #Config for MPAndroidChart
 -keep class com.github.mikephil.charting.** { *; }

-
-#Config for Material Components
-keep class com.google.android.material.tabs.** { *; }
+#Config for API
+-keep class io.github.wulkanowy.api.** {*;}
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/11.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/11.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/12.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/12.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/13.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/13.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/14.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/14.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/15.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/15.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/16.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/16.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/17.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/17.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/18.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/18.json
--- a/app/sonarqube.gradle
+++ b/app/sonarqube.gradle
@ -29,6 +29,5 @@ sonarqube {
        property "sonar.java.coveragePlugin", "jacoco"
        property "sonar.android.lint.report", "build/reports/lint-results.xml"
        property "sonar.jacoco.reportPaths", fileTree(dir: project.projectDir, includes: ['**/*.exec', '**/*.ec'])
-        property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacocoTestReport/jacocoTestReport.xml"
    }
 }
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
@ -1,31 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.Room
-import androidx.room.testing.MigrationTestHelper
-import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.platform.app.InstrumentationRegistry
-import io.github.wulkanowy.data.db.AppDatabase
-import org.junit.Rule
-
-abstract class AbstractMigrationTest {
-
-    val dbName = "migration-test"
-
-    @get:Rule
-    val helper: MigrationTestHelper = MigrationTestHelper(
-        InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java.canonicalName,
-        FrameworkSQLiteOpenHelperFactory()
-    )
-
-    fun getMigratedRoomDatabase(): AppDatabase {
-        val database = Room.databaseBuilder(ApplicationProvider.getApplicationContext(),
-            AppDatabase::class.java, dbName)
-            .addMigrations(*AppDatabase.getMigrations())
-            .build()
-        // close the database and release any stream resources when the test finishes
-        helper.closeWhenFinished(database)
-        return database
-    }
-}
--- 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
@ -1,133 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import android.content.ContentValues
-import android.database.sqlite.SQLiteDatabase.CONFLICT_FAIL
-import androidx.sqlite.db.SupportSQLiteDatabase
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Test
-import org.junit.runner.RunWith
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class Migration12Test : AbstractMigrationTest() {
-
-    @Test
-    fun twoNotRelatedStudents() {
-        helper.createDatabase(dbName, 11).apply {
-            // user 1
-            createStudent(this, 1, true)
-            createSemester(this, 1, false, 5, 1)
-            createSemester(this, 1, true, 5, 2)
-
-            // user 2
-            createStudent(this, 2, true)
-            createSemester(this, 2, false, 6, 1)
-            createSemester(this, 2, true, 6, 2)
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
-
-        val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
-
-        assertEquals(2, students.size)
-
-        students[0].run {
-            assertEquals(1, studentId)
-            assertEquals(5, classId)
-        }
-
-        students[1].run {
-            assertEquals(2, studentId)
-            assertEquals(6, classId)
-        }
-    }
-
-    @Test
-    fun removeStudentsWithoutClassId() {
-        helper.createDatabase(dbName, 11).apply {
-            // user 1
-            createStudent(this, 1, true)
-            createSemester(this, 1, false, 0, 2)
-            createStudent(this, 2, true)
-            createSemester(this, 2, true, 1, 2)
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
-
-        val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
-
-        assertEquals(1, students.size)
-
-        students[0].run {
-            assertEquals(2, studentId)
-            assertEquals(1, classId)
-        }
-    }
-
-    @Test
-    fun ensureThereIsOnlyOneCurrentStudent() {
-        helper.createDatabase(dbName, 11).apply {
-            // user 1
-            createStudent(this, 1, true)
-            createSemester(this, 1, true, 5, 2)
-            createStudent(this, 2, true)
-            createSemester(this, 2, true, 6, 2)
-            createStudent(this, 3, true)
-            createSemester(this, 3, false, 7, 2)
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
-
-        val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
-
-        assertEquals(3, students.size)
-
-        students[0].run {
-            assertEquals(studentId, 1)
-            assertEquals(false, isCurrent)
-        }
-        students[1].run {
-            assertEquals(studentId, 2)
-            assertEquals(false, isCurrent)
-        }
-        students[2].run {
-            assertEquals(studentId, 3)
-            assertEquals(true, isCurrent)
-        }
-    }
-
-    private fun createStudent(db: SupportSQLiteDatabase, studentId: Int, isCurrent: Boolean) {
-        db.insert("Students", CONFLICT_FAIL, ContentValues().apply {
-            put("endpoint", "https://fakelog.cf")
-            put("loginType", "STANDARD")
-            put("email", "jan@fakelog.cf")
-            put("password", "******")
-            put("symbol", "Default")
-            put("student_id", studentId)
-            put("student_name", "Jan Kowalski")
-            put("school_id", "000123")
-            put("school_name", "")
-            put("is_current", isCurrent)
-            put("registration_date", "0")
-        })
-    }
-
-    private fun createSemester(db: SupportSQLiteDatabase, studentId: Int, isCurrent: Boolean, classId: Int, diaryId: Int) {
-        db.insert("Semesters", CONFLICT_FAIL, ContentValues().apply {
-            put("student_id", studentId)
-            put("diary_id", diaryId)
-            put("diary_name", "IA")
-            put("semester_id", diaryId * 5)
-            put("semester_name", "1")
-            put("is_current", isCurrent)
-            put("class_id", classId)
-            put("unit_id", "99")
-        })
-    }
-}
--- 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
@ -1,197 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import android.content.ContentValues
-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 org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDate.of
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
-
-class Migration13Test : AbstractMigrationTest() {
-
-    @Test
-    fun studentsWithSchoolNameWithClassName() {
-        helper.createDatabase(dbName, 12).apply {
-            createStudent(this, 1, "Klasa A - Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", 1, 1)
-            createStudent(this, 2, "Klasa B - Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", 2, 1)
-            createStudent(this, 2, "Klasa C - Publiczna szkoła Wulkanowego-fejka nr 2 w fakelog.cf", 1, 2)
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
-
-        val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
-
-        assertEquals(3, students.size)
-
-        students[0].run {
-            assertEquals(1, studentId)
-            assertEquals("A", className)
-            assertEquals("Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", schoolName)
-        }
-
-        students[1].run {
-            assertEquals(2, studentId)
-            assertEquals("B", className)
-            assertEquals("Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", schoolName)
-        }
-
-        students[2].run {
-            assertEquals(2, studentId)
-            assertEquals("C", className)
-            assertEquals("Publiczna szkoła Wulkanowego-fejka nr 2 w fakelog.cf", schoolName)
-        }
-    }
-
-    @Test
-    fun studentsWithSchoolNameWithoutClassName() {
-        helper.createDatabase(dbName, 12).apply {
-            createStudent(this, 1, "Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", 1)
-            createStudent(this, 2, "Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", 1)
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
-
-        val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
-
-        assertEquals(2, students.size)
-
-        students[0].run {
-            assertEquals(1, studentId)
-            assertEquals("", className)
-            assertEquals("Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", schoolName)
-        }
-
-        students[1].run {
-            assertEquals(2, studentId)
-            assertEquals("", className)
-            assertEquals("Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", schoolName)
-        }
-    }
-
-    @Test
-    fun markAtLeastAndOnlyOneSemesterAtCurrent() {
-        helper.createDatabase(dbName, 12).apply {
-            createStudent(this, 1, "", 5)
-            createSemester(this, 1, 5, 1, 1, false)
-            createSemester(this, 1, 5, 2, 1, false)
-            createSemester(this, 1, 5, 3, 2, false)
-            createSemester(this, 1, 5, 4, 2, false)
-
-            createStudent(this, 2, "", 5)
-            createSemester(this, 2, 5, 5, 5, true)
-            createSemester(this, 2, 5, 6, 5, true)
-            createSemester(this, 2, 5, 7, 55, true)
-            createSemester(this, 2, 5, 8, 55, true)
-
-            createStudent(this, 3, "", 5)
-            createSemester(this, 3, 5, 11, 99, false)
-            createSemester(this, 3, 5, 12, 99, false)
-            createSemester(this, 3, 5, 13, 100, false)
-            createSemester(this, 3, 5, 14, 100, true)
-            close()
-        }
-
-        val db = helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
-
-        val semesters1 = getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 1 AND class_id = 5")
-        assertTrue { semesters1.single { it.isCurrent }.isCurrent }
-        semesters1[0].run {
-            assertFalse(isCurrent)
-            assertEquals(1, semesterId)
-            assertEquals(1, diaryId)
-        }
-        semesters1[2].run {
-            assertFalse(isCurrent)
-            assertEquals(3, semesterId)
-            assertEquals(2, diaryId)
-        }
-        semesters1[3].run {
-            assertTrue(isCurrent)
-            assertEquals(4, semesterId)
-            assertEquals(2, diaryId)
-        }
-
-        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
-            assertTrue { it.single { it.isCurrent }.isCurrent }
-            assertEquals(1970, it[0].schoolYear)
-            assertEquals(of(1970, 1, 1), it[0].end)
-            assertEquals(of(1970, 1, 1), it[0].start)
-            assertFalse(it[0].isCurrent)
-            assertFalse(it[1].isCurrent)
-            assertFalse(it[2].isCurrent)
-            assertTrue(it[3].isCurrent)
-        }
-
-        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
-            assertTrue { it.single { it.isCurrent }.isCurrent }
-            assertFalse(it[0].isCurrent)
-            assertFalse(it[1].isCurrent)
-            assertFalse(it[2].isCurrent)
-            assertTrue(it[3].isCurrent)
-        }
-    }
-
-    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Semester> {
-        val semesters = mutableListOf<Semester>()
-
-        val cursor = db.query(query)
-        if (cursor.moveToFirst()) {
-            do {
-                semesters.add(Semester(
-                    studentId = cursor.getInt(1),
-                    diaryId = cursor.getInt(2),
-                    diaryName = cursor.getString(3),
-                    semesterId = cursor.getInt(4),
-                    semesterName = cursor.getInt(5),
-                    isCurrent = cursor.getInt(6) == 1,
-                    classId = cursor.getInt(7),
-                    unitId = cursor.getInt(8),
-                    schoolYear = cursor.getInt(9),
-                    start = Converters().timestampToDate(cursor.getLong(10))!!,
-                    end = Converters().timestampToDate(cursor.getLong(11))!!
-                ))
-            } while (cursor.moveToNext())
-        }
-        return semesters.toList()
-    }
-
-    private fun createStudent(db: SupportSQLiteDatabase, studentId: Int, schoolName: String = "", classId: Int = -1, schoolId: Int = 123) {
-        db.insert("Students", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
-            put("endpoint", "https://fakelog.cf")
-            put("loginType", "STANDARD")
-            put("email", "jan@fakelog.cf")
-            put("password", "******")
-            put("symbol", "Default")
-            put("student_id", studentId)
-            put("class_id", classId)
-            put("student_name", "Jan Kowalski")
-            put("school_id", schoolId)
-            put("school_name", schoolName)
-            put("is_current", false)
-            put("registration_date", "0")
-        })
-    }
-
-    private fun createSemester(db: SupportSQLiteDatabase, studentId: Int, classId: Int, semesterId: Int, diaryId: Int, isCurrent: Boolean = false) {
-        db.insert("Semesters", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
-            put("student_id", studentId)
-            put("diary_id", diaryId)
-            put("diary_name", "IA")
-            put("semester_id", semesterId)
-            put("semester_name", "1")
-            put("is_current", isCurrent)
-            put("class_id", classId)
-            put("unit_id", "99")
-        })
-    }
-}
--- 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
@ -11,7 +11,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
 import kotlin.test.assertEquals

@RunWith(AndroidJUnit4::class)
@ -41,7 +40,7 @@ class AttendanceLocalTest {
        ))

        val attendance = attendanceLocal
-            .getAttendance(Semester(1, 2, "", 1, 3, 2019, true, now(), now(), 1, 1),
+            .getAttendance(Semester(1, 2, "", 1, 3, true, 1, 1),
                        LocalDate.of(2018, 9, 10),
                        LocalDate.of(2018, 9, 14)
                )
--- 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
@ -41,7 +41,7 @@ class CompletedLessonsLocalTest {
        ))

        val completed = completedLessonsLocal
-            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            .getCompletedLessons(Semester(1, 2, "", 1, 3, true, 1, 1),
                LocalDate.of(2018, 9, 10),
                LocalDate.of(2018, 9, 14)
            )
--- 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
@ -40,7 +40,7 @@ class ExamLocalTest {
        ))

        val exams = examLocal
-            .getExams(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            .getExams(Semester(1, 2, "", 1, 3, true, 1, 1),
                        LocalDate.of(2018, 9, 10),
                        LocalDate.of(2018, 9, 14)
                )
--- 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
@ -10,7 +10,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
 import kotlin.test.assertEquals

@RunWith(AndroidJUnit4::class)
@ -40,10 +39,8 @@ class GradeLocalTest {
            createGradeLocal(3, 5.0, LocalDate.of(2019, 2, 28), "", 2)
        ))

-        val semester = Semester(1, 2, "", 2019, 2, 1, true, now(), now(), 1, 1)
-
        val grades = gradeLocal
-            .getGrades(semester)
+            .getGrades(Semester(1, 2, "", 2, 3, true, 1, 1))
            .blockingGet()

        assertEquals(2, grades.size)
--- 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
@ -22,7 +22,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate.of
 import org.threeten.bp.LocalDateTime
-import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 import io.github.wulkanowy.api.grades.Grade as GradeApi
@ -110,73 +109,4 @@ class GradeRepositoryTest {
        assertTrue { grades[2].isRead }
        assertTrue { grades[3].isRead }
    }
-
-    @Test
-    fun subtractLocaleDuplicateGrades() {
-        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")
-        ))
-
-        every { mockApi.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")
-        ))
-
-        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet()
-
-        assertEquals(2, grades.size)
-    }
-
-    @Test
-    fun subtractRemoteDuplicateGrades() {
-        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")
-        ))
-
-        every { mockApi.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")
-        ))
-
-        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet()
-
-        assertEquals(3, grades.size)
-    }
-
-    @Test
-    fun emptyLocal() {
-        gradeLocal.saveGrades(listOf())
-
-        every { mockApi.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")
-        ))
-
-        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet()
-
-        assertEquals(3, grades.size)
-    }
-
-    @Test
-    fun emptyRemote() {
-        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")
-        ))
-
-        every { mockApi.getGrades(1) } returns Single.just(listOf())
-
-        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet()
-
-        assertEquals(0, grades.size)
-    }
 }
--- 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
@ -4,14 +4,12 @@ import androidx.room.Room
 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.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
 import kotlin.test.assertEquals

@RunWith(AndroidJUnit4::class)
@ -25,7 +23,7 @@ class GradeStatisticsLocalTest {
    fun createDb() {
        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
            .build()
-        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics, testDb.gradePointsStatistics)
+        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics)
    }

    @After
@ -41,7 +39,7 @@ class GradeStatisticsLocalTest {
        ))

        val stats = gradeStatisticsLocal.getGradesStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
+            Semester(2, 2, "", 1, 2, true, 1, 1), false,
            "Matematyka"
        ).blockingGet()
        assertEquals(1, stats.size)
@ -57,59 +55,14 @@ class GradeStatisticsLocalTest {
        ))

        val stats = gradeStatisticsLocal.getGradesStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
+            Semester(2, 2, "", 1, 2, true, 1, 1), false,
            "Wszystkie"
        ).blockingGet()
        assertEquals(1, stats.size)
        assertEquals(stats[0].subject, "Wszystkie")
    }

-    @Test
-    fun saveAndRead_points() {
-        gradeStatisticsLocal.saveGradesPointsStatistics(listOf(
-            getGradePointsStatistics("Matematyka", 2, 1),
-            getGradePointsStatistics("Chemia", 2, 1),
-            getGradePointsStatistics("Fizyka", 1, 2)
-        ))
-
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
-            "Matematyka"
-        ).blockingGet()
-        with(stats) {
-            assertEquals(subject, "Matematyka")
-            assertEquals(others, 5.0)
-            assertEquals(student, 5.0)
-        }
-    }
-
-    @Test
-    fun saveAndRead_subjectEmpty() {
-        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
-
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
-            "Matematyka"
-        ).blockingGet()
-        assertEquals(null, stats)
-    }
-
-    @Test
-    fun saveAndRead_allEmpty() {
-        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
-
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
-            "Wszystkie"
-        ).blockingGet()
-        assertEquals(null, stats)
-    }
-
    private fun getGradeStatistics(subject: String, studentId: Int, semesterId: Int): GradeStatistics {
        return GradeStatistics(studentId, semesterId, subject, 5, 5, false)
    }
-
-    private fun getGradePointsStatistics(subject: String, studentId: Int, semesterId: Int): GradePointsStatistics {
-        return GradePointsStatistics(studentId, semesterId, subject, 5.0, 5.0)
-    }
 }
--- 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
@ -36,7 +36,7 @@ class LuckyNumberLocalTest {
    fun saveAndReadTest() {
        luckyNumberLocal.saveLuckyNumber(LuckyNumber(1, LocalDate.of(2019, 1, 20), 14))

-        val luckyNumber = luckyNumberLocal.getLuckyNumber(Semester(1, 1, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+        val luckyNumber = luckyNumberLocal.getLuckyNumber(Semester(1, 1, "", 1, 3, true, 1, 1),
            LocalDate.of(2019, 1, 20)
        ).blockingGet()

--- 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
@ -42,7 +42,7 @@ class RecipientLocalTest {
        ))

        val recipients = recipientLocal.getRecipients(
-            Student("fakelog.cf", "AUTO", "", "", "", 1, "", "", "", "", 1, true, LocalDateTime.now()),
+            Student("fakelog.cf", "AUTO", "", "", "", 1, "", "", "", true, LocalDateTime.now()),
            2,
            ReportingUnit(1, 4, "", 0, "", emptyList())
        ).blockingGet()
--- 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
@ -5,7 +5,7 @@ import androidx.room.Room
 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.SharedPrefProvider
+import io.github.wulkanowy.data.db.SharedPrefHelper
 import io.github.wulkanowy.data.db.entities.Student
 import org.junit.After
 import org.junit.Before
@ -21,14 +21,14 @@ class StudentLocalTest {

    private lateinit var testDb: AppDatabase

-    private lateinit var sharedProvider: SharedPrefProvider
+    private lateinit var sharedHelper: SharedPrefHelper

    @Before
    fun createDb() {
        val context = ApplicationProvider.getApplicationContext<Context>()
        testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
            .build()
-        sharedProvider = SharedPrefProvider(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
+        sharedHelper = SharedPrefHelper(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
        studentLocal = StudentLocal(testDb.studentDao, context)
    }

@ -39,7 +39,7 @@ class StudentLocalTest {

    @Test
    fun saveAndReadTest() {
-        studentLocal.saveStudents(listOf(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = "")))
+        studentLocal.saveStudent(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, symbol = "", registrationDate = now()))
            .blockingGet()

        val student = studentLocal.getCurrentStudent(true).blockingGet()
--- 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
@ -7,7 +7,7 @@ import org.threeten.bp.LocalDateTime.now
 import io.github.wulkanowy.api.timetable.Timetable as TimetableRemote
 import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal

-fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableLocal {
+fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", subject: String = ""): TimetableLocal {
    return TimetableLocal(
        studentId = 1,
        diaryId = 2,
@ -20,15 +20,15 @@ fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", s
        group = "",
        room = room,
        roomOld = "",
-        teacher = teacher,
+        teacher = "",
        teacherOld = "",
        info = "",
-        changes = changes,
+        changes = false,
        canceled = false
    )
 }

-fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = "", teacher: String = "", changes: Boolean = false): TimetableRemote {
+fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = ""): TimetableRemote {
    return TimetableRemote(
        number = number,
        start = start.toDate(),
@ -37,9 +37,9 @@ fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subje
        subject = subject,
        group = "",
        room = room,
-        teacher = teacher,
+        teacher = "",
        info = "",
-        changes = changes,
+        changes = false,
        canceled = false
    )
 }
--- 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
@ -41,7 +41,7 @@ class TimetableLocalTest {
        ))

        val exams = timetableDb.getTimetable(
-            Semester(1, 2, "", 1, 1, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            Semester(1, 2, "", 1, 1, true, 1, 1),
            LocalDate.of(2018, 9, 10),
            LocalDate.of(2018, 9, 14)
        ).blockingGet()
--- 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
@ -60,55 +60,26 @@ class TimetableRepositoryTest {
    }

    @Test
-    fun copyRoomToCompletedFromPrevious() {
+    fun copyDetailsToCompletedFromPrevious() {
        timetableLocal.saveTimetable(listOf(
            createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda"),
-            createTimetableLocal(2, of(2019, 3, 5, 8, 50), "321", "Religia"),
-            createTimetableLocal(3, of(2019, 3, 5, 9, 40), "213", "W-F"),
-            createTimetableLocal(4, of(2019, 3, 5, 10, 30), "213", "W-F", "Jan Kowalski")
+            createTimetableLocal(1, of(2019, 3, 5, 8, 50), "321", "Religia"),
+            createTimetableLocal(1, of(2019, 3, 5, 9, 40), "213", "W-F")
        ))

        every { mockApi.getTimetable(any(), any()) } returns Single.just(listOf(
            createTimetableRemote(1, of(2019, 3, 5, 8, 0), "", "Przyroda"),
-            createTimetableRemote(2, of(2019, 3, 5, 8, 50), "", "Religia"),
-            createTimetableRemote(3, of(2019, 3, 5, 9, 40), "", "W-F"),
-            createTimetableRemote(4, of(2019, 3, 5, 10, 30), "", "W-F")
+            createTimetableRemote(1, of(2019, 3, 5, 8, 50), "", "Religia"),
+            createTimetableRemote(1, of(2019, 3, 5, 9, 40), "", "W-F")
        ))

        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
            .blockingGet()

-        assertEquals(4, lessons.size)
+        assertEquals(3, lessons.size)
        assertEquals("123", lessons[0].room)
        assertEquals("321", lessons[1].room)
        assertEquals("213", lessons[2].room)
    }
-
-    @Test
-    fun copyTeacherToCompletedFromPrevious() {
-        timetableLocal.saveTimetable(listOf(
-            createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda", "Jan Garnkiewicz", false),
-            createTimetableLocal(2, of(2019, 3, 5, 8, 50), "321", "Religia", "Paweł Jumper", false),
-            createTimetableLocal(3, of(2019, 3, 5, 9, 40), "213", "W-F", "", true),
-            createTimetableLocal(4, of(2019, 3, 5, 10, 30), "213", "W-F", "", false)
-        ))
-
-        every { mockApi.getTimetable(any(), any()) } returns Single.just(listOf(
-            createTimetableRemote(1, of(2019, 3, 5, 8, 0), "", "Przyroda", "", true), // should override local
-            createTimetableRemote(2, of(2019, 3, 5, 8, 50), "", "Religia", "", false),
-            createTimetableRemote(3, of(2019, 3, 5, 9, 40), "", "W-F", "Jan Garnkiewicz", false),
-            createTimetableRemote(4, of(2019, 3, 5, 10, 30), "", "W-F", "Paweł Jumper", false)
-        ))
-
-        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
-            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
-            .blockingGet()
-
-        assertEquals(4, lessons.size)
-        assertEquals("", lessons[0].teacher)
-        assertEquals("Paweł Jumper", lessons[1].teacher)
-        assertEquals("Jan Garnkiewicz", lessons[2].teacher)
-        assertEquals("Paweł Jumper", lessons[3].teacher)
-    }
 }
--- a/app/src/debug/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/debug/res/drawable/ic_launcher_foreground.xml
@ -0,0 +1,58 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="1926.9231"
+        android:viewportHeight="1926.9231">
+    <group android:translateX="462.46155"
+            android:translateY="462.46155">
+      <path
+          android:pathData="M2000,1440.1V2002H1240.1L238.1,1000v0l-120,-120c0.2,-0.2 -0.7,-1.6 -0.6,-1.8 1.6,-3.1 3.4,-6 5,-9.1 0.4,-0.8 0.6,-1.6 0.6,-2.5 9.2,-15.1 20.2,-28.9 31.4,-42.6 0.1,-0.2 0.3,-0.3 0.4,-0.5 5.1,-6.3 10.3,-12.6 15.3,-18.9 1,-1.2 1.9,-2.4 2.9,-3.7 0.2,-0.2 0.3,-0.4 0.5,-0.6 7.6,-9.7 14.8,-19.7 21.2,-30.2 1,-1.7 2,-3.4 2.9,-5.1 0.1,-0.2 0.2,-0.3 0.3,-0.5 6.2,-11.4 11.3,-23.3 17.7,-34.6 4.5,-8 9.3,-15.9 13.8,-23.9 0.1,-0.2 0.2,-0.3 0.3,-0.5 0.8,-1.5 1.6,-3 2.4,-4.4 0.2,-0.3 0.3,-0.6 0.5,-0.9 2,-3.7 3.8,-7.4 5.6,-11.2 6.2,-13.4 10.2,-27.7 14,-41.9 0,-0.2 0.1,-0.3 0.1,-0.5 0.3,-1 0.5,-2 0.8,-2.9 4,-15.3 7.3,-31.4 13.5,-45.9 1.4,-3.3 3,-6.5 4.6,-9.6 0.1,-0.2 0.2,-0.3 0.3,-0.5 5,-9.7 10.6,-19.1 13.5,-29.7 2.6,-9.2 3.5,-19 3.6,-28.8 0,-0.2 0,-0.3 0,-0.5 0.1,-7.2 -0.1,-14.4 -0.4,-21.3 0.9,-5.6 1.9,-11.3 3,-16.9 0.2,-0.9 0.3,-1.7 0.5,-2.6 1.2,-5.9 2.5,-11.7 4.2,-17.4 0,-0.1 0.1,-0.3 0.1,-0.4 0,-0.2 0.1,-0.3 0.1,-0.5 0.2,-2.1 -0.8,-3.7 -2.4,-4.5l7.7,-7.6c1.2,0.9 2.7,1.3 4.3,0.9 12.8,-3.9 24.9,-9.9 36.3,-16.8 2.8,-1.7 5.6,-3.4 8.3,-5.2 0.2,-0.1 0.3,-0.2 0.5,-0.3 7.7,-4.9 15.2,-10.2 22.1,-16 3.1,-2.7 5.9,-5.6 8.3,-8.9 0.1,-0.2 0.2,-0.3 0.4,-0.5 2.3,-3.4 4.2,-7.2 5.3,-11.4 2.4,-9.2 1.9,-19 1.9,-28.4 0,-0.2 0,-0.4 0,-0.6l5.7,-5.6 -0.3,0.1 4.1,1.3 45.3,45 9.6,9.6 14.3,14.3 100.8,100.8 17.2,17.2 16.3,16.3 30.3,-30.3 -192.9,-191.5c0.5,-0.5 1.1,-1.6 1.4,-2.3 0.3,-0.6 0.5,-1.2 0.4,-1.9 0,-0.8 -0.2,-1.6 -0.6,-2.3 -0.1,-0.3 -0.3,-0.7 -0.4,-1 -0.2,-0.4 -0.5,-0.7 -0.9,-1.1l27.8,-27.8 191.1,-191.1c0.7,0.4 1.5,0.6 2.5,0.7 4.1,0 8.2,0.1 11.9,1.9 0.5,0.3 1.3,0.7 2.1,1.1 1.7,2.3 3.5,4.5 5.7,6.2 2.7,2.1 8.2,3 9.4,0.3z"
+          android:fillColor="#AD2A2A"/>
+      <path
+          android:pathData="m616.3,796.7c0.4,1.2 0.5,2.4 0.5,3.7l-5.8,73.3c-0.4,5.2 -5,9.3 -10.6,9.3h-187.2c-4,0 -7.7,-2.3 -9.5,-5.6l-30.9,-57.4c-0.2,-0.3 -0.3,-0.6 -0.4,-0.9l-29.1,-70.5c-1.1,-2.5 -0.9,-5.4 0.3,-7.8l48.3,-94.5c1.2,-2.3 1.4,-5 0.5,-7.4l-23.6,-65.4c-0.8,-2.3 -0.7,-4.9 0.3,-7.1l39.4,-83.9c4,-8.4 17.1,-7.7 19.9,1.1l12.3,38.2 37.5,100.4c1,2.8 3.4,5 6.4,6l80,27.3c3.1,1.1 5.5,3.4 6.5,6.3z"
+          android:fillColor="#FFFFFF"/>
+      <path
+          android:pathData="m386.7,253.5c0,-22.9 14.5,-42.6 35.3,-51.8 -1.5,-2.5 -2.4,-5.2 -2.4,-8.1 0,-11.1 12.8,-20.1 28.5,-20.1 0.4,0 0.7,0 1.1,0 6.5,-10.8 18.9,-18.1 33.1,-18.1 1,0 2,0 3,0.1 1.3,0.1 2.6,-0.5 3.3,-1.5 10.5,-16 37.1,-27.4 68.2,-27.4 11.5,0 22.4,1.6 32.1,4.3 2.3,-3.8 7.4,-6.4 13.3,-6.4 6.7,0 12.4,3.4 14.1,8.1 8.2,-9.5 22.1,-15.7 37.9,-15.7 25.2,0 45.6,15.9 45.6,35.5 0,2.4 -0.3,4.7 -0.9,7 -0.4,1.6 0.5,3.2 2.2,3.8 16.1,5.9 27,17.1 27,29.9 0,14.6 -14.1,27.1 -34,32 -1.6,0.4 -2.6,1.8 -2.6,3.3 0,0.1 0,0.2 0,0.3 0,11.3 -11.2,20.6 -25.6,21.6 0.1,0.5 0.1,1 0.1,1.6 0,21.7 -41.3,39.2 -92.2,39.2 -11,0 -21.5,-0.8 -31.2,-2.3 0,0.2 0,0.3 0,0.5 0,9 -11.6,16.3 -25.8,16.3 -0.8,0 -1.5,0 -2.2,-0.1 1,2.2 1.5,4.5 1.5,6.9 0,14 -17.7,25.3 -39.6,25.3 -2.4,0 -4.7,-0.1 -7,-0.4 -1.8,-0.2 -3.5,0.9 -3.9,2.6 -1.9,7 -8,12.1 -15.3,12.1 -8.8,0 -15.8,-7.5 -15.8,-16.7 0,-4.3 1.5,-8.2 4,-11.1 0.9,-1 1.2,-2.4 0.6,-3.6 -1.4,-2.6 -2,-5.3 -2,-8.2v0c0,-1.6 -1.3,-2.9 -2.9,-3.3 -27.1,-6 -47.5,-28.6 -47.5,-55.6z"
+          android:fillColor="#FFFFFF"/>
+      <path
+          android:pathData="m870.4,883h-124.4c-3.6,0 -6.9,-1.8 -8.9,-4.6l-83.7,-117.7c-0.5,-0.8 -1,-1.6 -1.3,-2.5l-41.5,-121.2c-0.8,-2.4 -2.7,-4.5 -5.1,-5.7l-101.6,-51.3c-2.8,-1.4 -4.8,-4 -5.4,-6.9l-15,-74.4c-0.2,-1.2 -0.7,-2.4 -1.5,-3.5l-34.5,-50.7c-1.9,-2.8 -2.2,-6.2 -0.8,-9.2l21,-44.9c1.6,-3.4 5.1,-5.7 9.1,-5.9l39,-2.3c2.3,-0.1 4.4,-0.9 6.1,-2.3l28.7,-22.3c5.4,-4.2 13.6,-2.4 16.5,3.5l98.9,201.2c0.4,0.9 0.7,1.8 0.9,2.7l12.2,80.9c0.3,1.9 1.1,3.6 2.4,5l197,215.6c5.8,6.4 0.9,16.5 -8.1,16.5z"
+          android:fillColor="#FFFFFF"/>
+      <path
+          android:pathData="m335.8,838.9c0.8,2.6 0.4,5.4 -1,7.7l-19.3,31.3c-1.9,3.1 -5.4,5.1 -9.2,5.1h-180.6c-8.4,0 -13.5,-8.8 -9,-15.4l116.3,-171.3c0.7,-1 1.1,-2.1 1.4,-3.2l53.3,-227.6c0.6,-2.7 2.4,-5 5,-6.4l72.2,-39.6c2.6,-1.4 4.4,-3.7 5,-6.5l9.7,-42.3c2,-8.8 14.6,-10.7 19.6,-3l3.5,5.6c1.5,2.4 1.9,5.4 0.9,8.1l-65.8,190.2c-0.5,1.5 -0.7,3.1 -0.4,4.7l16.4,91c0.3,1.8 0.1,3.7 -0.7,5.4l-39.1,87.8c-0.9,2.1 -1.1,4.4 -0.4,6.5z"
+          android:fillColor="#FFFFFF"/>
+      <path
+          android:pathData="m424.22,657.05 l1580.54,-0.05c0.54,0 0,292 0,292l-1580.54,-0.03c-10.78,0 -19.46,-8.68 -19.46,-19.46l0,-252.99c0,-10.78 8.68,-19.46 19.46,-19.46z"
+          android:strokeAlpha="0.49803922"
+          android:strokeLineJoin="round"
+          android:strokeWidth="4"
+          android:fillColor="#3f3f3f"
+          android:strokeColor="#00000000"
+          android:fillType="nonZero"
+          android:fillAlpha="1"
+          android:strokeLineCap="square"/>
+      <path
+          android:pathData="m728.71,710.91l0,19.89l-88.7,0l0,59.3l77.04,0L717.05,810l-77.04,0l0,65.39l89.84,0l0,19.9L616.56,895.29L616.56,791.16l-52.35,-52.35 -0.77,-0.18c5.41,6.64 9.65,14.32 12.69,23.09 3.72,10.39 5.62,21.92 5.7,34.6L581.84,809.87c-0.08,12.67 -1.98,24.25 -5.7,34.72 -3.63,10.39 -8.95,19.35 -15.97,26.87 -6.93,7.43 -15.46,13.26 -25.6,17.49 -7.54,3.1 -15.86,5.07 -24.97,5.89 -3.04,0.27 -6.16,0.42 -9.37,0.45L457.53,895.29l0,-6.55l-0.37,6.82 53.8,53.45l415.85,0c0.24,0 0.47,-0.02 0.69,-0.05L1132.91,948.97L953.5,769.55l-58.39,-58.39 -0.28,0.06 -58.03,184.06l-20.4,0l-44.66,-141.34zM783.29,711.07 L826.41,857.52 850.08,777.86zM509.6,711.29c1.52,0.15 3.01,0.33 4.49,0.54 -1.47,-0.21 -2.97,-0.39 -4.49,-0.54zM481.35,730.04l0,146.11l18.88,0c9.97,-0.08 18.59,-1.81 25.85,-5.19 7.27,-3.46 13.26,-8.15 17.99,-14.07 4.82,-5.91 8.36,-12.88 10.64,-20.91 2.37,-8.03 3.59,-16.73 3.68,-26.11l0,-13.81c-0.08,-9.38 -1.31,-18.04 -3.68,-25.98 -2.37,-8.03 -5.91,-14.95 -10.64,-20.78 -4.73,-5.91 -10.73,-10.56 -17.99,-13.94 -7.27,-3.38 -15.88,-5.15 -25.85,-5.32zM560.17,734.86c0.65,0.69 1.26,1.4 1.88,2.11 -0.61,-0.72 -1.23,-1.42 -1.88,-2.11z"
+          android:strokeAlpha="1"
+          android:strokeLineJoin="miter"
+          android:strokeWidth="1.94642854"
+          android:fillColor="#000000"
+          android:strokeColor="#00000000"
+          android:fillAlpha="0.18431373"
+          android:strokeLineCap="butt"/>
+      <path
+          android:pathData="m457.53,895.28l0,-184.51l42.7,0q19.26,0.25 34.34,6.59 15.21,6.21 25.6,17.49 10.52,11.15 15.97,26.86 5.58,15.59 5.7,34.59l0,13.56q-0.13,19.01 -5.7,34.72 -5.45,15.59 -15.97,26.86 -10.39,11.15 -25.6,17.49 -15.08,6.21 -34.34,6.34zM481.35,730.04l0,146.11l18.88,0q14.95,-0.13 25.85,-5.2 10.9,-5.2 17.99,-14.07 7.22,-8.87 10.64,-20.91 3.55,-12.04 3.67,-26.1l0,-13.81q-0.13,-14.07 -3.67,-25.98 -3.55,-12.04 -10.64,-20.78 -7.1,-8.87 -17.99,-13.94 -10.9,-5.07 -25.85,-5.32z"
+          android:fillColor="#ffffff"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+      <path
+          android:pathData="M717.05,810L640.01,810l0,65.39l89.84,0l0,19.9l-113.29,0l0,-184.51l112.15,0l0,20.02L640.01,730.8l0,59.31l77.05,0z"
+          android:fillColor="#ffffff"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+      <path
+          android:pathData="m826.41,857.52 l43.59,-146.74l24.96,0l-58.16,184.51L816.4,895.28l-58.29,-184.51l25.09,0z"
+          android:fillColor="#ffffff"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+    </group>
+</vector>
--- a/app/src/debug/res/drawable/ic_launcher_foreground_dev.xml
+++ b/app/src/debug/res/drawable/ic_launcher_foreground_dev.xml
@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="1926"
-    android:viewportHeight="1926">
-    <path
-        android:fillColor="#ad2a2a"
-        android:pathData="M2465,1904v561h-759L704,1463l-120,-120 -1,-1 5,-9 1,-3c9,-15 20,-29 31,-43l16,-19 3,-4 21,-30 3,-6c7,-11 12,-23 18,-35l14,-24 3,-4v-1a234,234 0,0 0,20 -53v-1l1,-3c4,-15 7,-31 13,-46l5,-9v-1c5,-10 11,-19 14, -30 2,-9 3,-19 3,-28v-1,-21l3,-17v-3l4,-17h1v-1c0,-2 -1,-4 -3,-4l8,-8 4,1c13,-4 25,-10 37,-17l8,-5 22,-16 9,-9v-1l5, -11c3,-9 2,-19 2,-29l6,-6 4,2 45,45 10,9 14,14 101,101 17,17 16,17 31,-31 -193,-191 1,-2 1,-2 -1,-3v-1l-1,-1 27,-27 192,-192 2,1a27,27 0,0 1,14 3l6,6c2,2 8,3 9,1l1310,1310z" />
-    <path
-        android:fillColor="#fff"
-        android:pathData="M1082,1260v4l-6,73c0,5 -5,9 -10,9H879c-4,0 -8,-2 -10,-5l-31,-58 -29,-71v-8l48,-94c2,-3 2,-5 1, -8l-24,-65c-1,-2 0,-5 1,-7l39,-84c4,-8 17,-8 20,1l12,38 38,101c1,2 3,5 6,6l80,27c3,1 6,3 7,6l45,135zM852,717c0,-23 15,-43 35,-52l-2,-8c0,-11 13,-20 29,-20h1a38,38 0,0 1,36 -18l3,-2c11,-16 37,-27 68,-27 12,0 23,2 32,4 3,-3 8,-6 14,-6s12,3 14,8c8,-9 22,-16 38,-16 25,0 45,16 45,36l-1,7 3,4c16,6 27,17 27,30 0,14 -15,27 -34,32 -2,0 -3,1 -3,3 0,11 -11,21 -26,22v1c0,22 -41,40 -92,40 -11,0 -21,-1 -31,-3v1c0,9 -12,16 -26,16h-2l2,7c0,14 -18,25 -40,25h-7l-4, 2c-2,7 -8,12 -15,12 -9,0 -16,-7 -16,-16 0,-5 1,-8 4,-11l1,-4c-2,-3 -2,-5 -2,-8 0,-2 -2,-3 -3,-3 -27,-6 -48,-29 -48,-56z" />
-    <path
-        android:fillColor="#fff"
-        android:pathData="M1336,1346h-125c-3,0 -6,-1 -8,-4l-84,-118 -1,-2 -42,-122 -5,-5 -102,-52 -5,-6 -15,-75 -2,-3 -34,-51c-2,-3 -2,-6 -1,-9l21,-45c2,-4 5,-6 9,-6l39,-2c3,0 5,-1 6,-3l29,-22c5,-4 14,-2 17,4l98,201 1,2 13,81 2,5 197,216c6,6 1,16 -8,16zM801,1302c1,3 1,6 -1,8l-19,31c-2,3 -5,5 -9,5H591c-8,0 -13,-8 -9,-15l116,-171 2,-3 53, -228c1,-3 3,-5 5,-6l72,-40c3,-1 5,-4 5,-7l10,-42c2,-9 15,-11 20,-3l3,6c2,2 2,5 1,8l-66,190v5l16,91v5l-40,88v6l22,72z" />
-    <path
-        android:fillColor="#3f3f3f"
-        android:pathData="M886.7,1119.5h1580.5c0.6,0 0,292 0,292H886.7a19.4,19.4 0,0 1,-19.5 -19.5v-253c0,-10.8 8.7,-19.5 19.5,-19.5z"
-        android:strokeWidth="4"
-        android:strokeAlpha=".5"
-        android:strokeColor="#000"
-        android:strokeLineCap="square"
-        android:strokeLineJoin="round" />
-    <path
-        android:fillAlpha=".2"
-        android:fillColor="#000"
-        android:pathData="M1191.2,1173.4v19.9h-88.7v59.3h77v19.9h-77v65.4h89.8v19.9L1079,1357.8v-104.2l-52.3,-52.3 -0.8, -0.2a75.1,75.1 0,0 1,12.7 23,104 104,0 0,1 5.7,34.7v13.5c0,12.7 -2,24.3 -5.7,34.8a72.8,72.8 0,0 1,-41.6 44.4,85.5 85.5,0 0,1 -34.3,6.3L920,1357.8v-6.6l-0.4,6.8 53.8,53.5h622L1416,1232l-58.4,-58.4h-0.3l-58,184.1h -20.4l-44.7,-141.3zM1245.8,1173.5l43,146.5 23.7,-79.7zM972.1,1173.8zM943.8,1192.5v146.1h18.9a62,62 0,0 0,25.8 -5.2,50.3 50.3,0 0,0 18,-14c4.9,-6 8.4,-13 10.7,-21 2.3,-8 3.6,-16.7 3.7,-26v-13.9c-0.1,-9.4 -1.4,-18 -3.7,-26 -2.4,-8 -6,-15 -10.7,-20.7a49.3,49.3 0,0 0,-18 -14,63.4 63.4,0 0,0 -25.8,-5.3zM1022.6,1197.3l2,2.1 -2,-2z"
-        android:strokeWidth="1.9"
-        android:strokeColor="#000" />
-    <path
-        android:fillColor="#fff"
-        android:pathData="M920,1357.7v-184.5h42.7q19.3,0.3 34.3,6.6 15.2,6.2 25.6,17.5 10.6,11.2 16,26.9 5.6,15.6 5.7, 34.6v13.5q-0.1,19 -5.7,34.7 -5.4,15.6 -16,26.9 -10.4,11.2 -25.6,17.5 -15,6.2 -34.3,6.3zM943.8,1192.5v146.1h18.9q15, -0.1 25.8,-5.2 11,-5.2 18,-14 7.3,-9 10.7,-21 3.5,-12 3.6,-26v-13.9q0,-14 -3.6,-26t-10.7,-20.7q-7,-9 -18,-14 -10.9,-5 -25.8,-5.3zM1179.5,1272.5h-77v65.4h89.8v19.9L1079,1357.8v-184.6h112.2v20h-88.7v59.4h77zM1288.9, 1320l43.6,-146.8h25l-58.2,184.6h-20.4l-58.3,-184.6h25z"
-        android:strokeWidth="1"
-        android:strokeColor="#000" />
-</vector>
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/colorPrimary" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/colorPrimary" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
--- a/app/src/debug/res/values/ic_launcher_background.xml
+++ b/app/src/debug/res/values/ic_launcher_background.xml
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#D32F2F</color>
+</resources>
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@ -1,17 +0,0 @@
-@file:Suppress("UNUSED_PARAMETER")
-
-package io.github.wulkanowy.utils
-
-import android.content.Context
-import timber.log.Timber
-
-fun initCrashlytics(context: Context, appInfo: AppInfo) {
-    // do nothing
-}
-
-class CrashlyticsTree : Timber.Tree() {
-
-    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-        // do nothing
-    }
-}
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
@ -1,13 +0,0 @@
-package io.github.wulkanowy.utils
-
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class FirebaseAnalyticsHelper @Inject constructor() {
-
-    @Suppress("UNUSED_PARAMETER")
-    fun logEvent(name: String, vararg params: Pair<String, Any?>) {
-        // do nothing
-    }
-}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -4,6 +4,8 @@
    package="io.github.wulkanowy"
    android:installLocation="internalOnly">

+    <uses-sdk tools:overrideLibrary="com.readystatesoftware.chuck" />
+
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@ -32,7 +34,6 @@
            android:name=".ui.modules.login.LoginActivity"
            android:configChanges="orientation|screenSize"
            android:label="@string/login_title"
-            android:theme="@style/WulkanowyTheme.NoActionBar"
            android:windowSoftInputMode="adjustResize" />
        <activity
            android:name=".ui.modules.main.MainActivity"
@ -43,33 +44,14 @@
            android:name=".ui.modules.message.send.SendMessageActivity"
            android:configChanges="orientation|screenSize"
            android:label="@string/send_message_title"
-            android:windowSoftInputMode="adjustResize"
            android:theme="@style/WulkanowyTheme.NoActionBar" />
-        <activity
-            android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
-            android:excludeFromRecents="true"
-            android:noHistory="true"
-            android:theme="@style/WulkanowyTheme.WidgetAccountSwitcher">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity"
-            android:excludeFromRecents="true"
-            android:noHistory="true"
-            android:theme="@style/WulkanowyTheme.WidgetAccountSwitcher">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
-            </intent-filter>
-        </activity>

        <service
            android:name=".services.widgets.TimetableWidgetService"
            android:permission="android.permission.BIND_REMOTEVIEWS" />

        <receiver
-            android:name=".ui.modules.timetablewidget.TimetableWidgetProvider"
+            android:name=".ui.widgets.timetable.TimetableWidgetProvider"
            android:exported="true"
            android:label="@string/timetable_title">
            <intent-filter>
@ -79,16 +61,6 @@
                android:name="android.appwidget.provider"
                android:resource="@xml/provider_widget_timetable" />
        </receiver>
-        <receiver
-            android:name=".ui.modules.luckynumberwidget.LuckyNumberWidgetProvider"
-            android:label="@string/lucky_number_title">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/provider_widget_lucky_number" />
-        </receiver>

        <provider
            android:name="androidx.work.impl.WorkManagerInitializer"
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@ -1,40 +1,35 @@
 package io.github.wulkanowy

 import android.content.Context
-import android.util.Log.INFO
-import android.util.Log.VERBOSE
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.multidex.MultiDex
 import androidx.work.Configuration
+import androidx.work.WorkManager
+import com.crashlytics.android.Crashlytics
+import com.crashlytics.android.core.CrashlyticsCore
 import com.jakewharton.threetenabp.AndroidThreeTen
 import dagger.android.AndroidInjector
 import dagger.android.support.DaggerApplication
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.utils.Log
+import io.fabric.sdk.android.Fabric
+import io.github.wulkanowy.BuildConfig.DEBUG
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 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.CrashlyticsTree
 import io.github.wulkanowy.utils.DebugLogTree
-import io.github.wulkanowy.utils.initCrashlytics
-import io.reactivex.exceptions.UndeliverableException
-import io.reactivex.plugins.RxJavaPlugins
 import timber.log.Timber
-import java.io.IOException
 import javax.inject.Inject

-class WulkanowyApp : DaggerApplication(), Configuration.Provider {
+class WulkanowyApp : DaggerApplication() {
+
+    @Inject
+    lateinit var prefRepository: PreferencesRepository

    @Inject
    lateinit var workerFactory: SyncWorkerFactory

-    @Inject
-    lateinit var themeManager: ThemeManager
-
-    @Inject
-    lateinit var appInfo: AppInfo
-
    override fun attachBaseContext(base: Context?) {
        super.attachBaseContext(base)
        MultiDex.install(this)
@ -43,37 +38,25 @@ class WulkanowyApp : DaggerApplication(), Configuration.Provider {
    override fun onCreate() {
        super.onCreate()
        AndroidThreeTen.init(this)
-        RxJavaPlugins.setErrorHandler(::onError)
-        themeManager.applyDefaultTheme()
-
-        initLogging()
-        initCrashlytics(this, appInfo)
+        initializeFabric()
+        if (DEBUG) enableDebugLog()
+        AppCompatDelegate.setDefaultNightMode(prefRepository.currentTheme)
+        WorkManager.initialize(this, Configuration.Builder().setWorkerFactory(workerFactory).build())
    }

-    private fun initLogging() {
-        if (appInfo.isDebug) {
-            Timber.plant(DebugLogTree())
-            FlexibleAdapter.enableLogs(Log.Level.DEBUG)
-        } else {
-            Timber.plant(CrashlyticsTree())
-        }
-        registerActivityLifecycleCallbacks(ActivityLifecycleLogger())
+    private fun enableDebugLog() {
+        Timber.plant(DebugLogTree())
+        FlexibleAdapter.enableLogs(Log.Level.DEBUG)
    }

-    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
+    private fun initializeFabric() {
+        Fabric.with(Fabric.Builder(this).kits(
+            Crashlytics.Builder().core(CrashlyticsCore.Builder().disabled(!BuildConfig.CRASHLYTICS_ENABLED).build()).build()
+        ).debuggable(BuildConfig.DEBUG).build())
+        Timber.plant(CrashlyticsTree())
    }

    override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
-        return DaggerAppComponent.factory().create(this)
+        return DaggerAppComponent.builder().create(this)
    }
-
-    override fun getWorkManagerConfiguration() = Configuration.Builder()
-        .setWorkerFactory(workerFactory)
-        .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
-        .build()
 }
--- a/app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt
@ -14,7 +14,6 @@ class ApiHelper @Inject constructor(private val api: Api) {
            symbol = student.symbol
            schoolSymbol = student.schoolSymbol
            studentId = student.studentId
-            classId = student.classId
            host = URL(student.endpoint).run { host + ":$port".removeSuffix(":-1") }
            ssl = student.endpoint.startsWith("https")
            loginType = Api.LoginType.valueOf(student.loginType)
@ -29,7 +28,6 @@ class ApiHelper @Inject constructor(private val api: Api) {
            this.symbol = symbol
            host = URL(endpoint).run { host + ":$port".removeSuffix(":-1") }
            ssl = endpoint.startsWith("https")
-            useNewStudent = true
        }
    }
 }
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
@ -85,10 +85,6 @@ internal class RepositoryModule {
    @Provides
    fun provideGradeStatisticsDao(database: AppDatabase) = database.gradeStatistics

-    @Singleton
-    @Provides
-    fun provideGradePointsStatisticsDao(database: AppDatabase) = database.gradePointsStatistics
-
    @Singleton
    @Provides
    fun provideMessagesDao(database: AppDatabase) = database.messagesDao
@ -136,16 +132,4 @@ internal class RepositoryModule {
    @Singleton
    @Provides
    fun provideRecipientDao(database: AppDatabase) = database.recipientDao
-
-    @Singleton
-    @Provides
-    fun provideMobileDevicesDao(database: AppDatabase) = database.mobileDeviceDao
-
-    @Singleton
-    @Provides
-    fun provideTeacherDao(database: AppDatabase) = database.teacherDao
-
-    @Singleton
-    @Provides
-    fun provideSchoolInfoDao(database: AppDatabase) = database.schoolDao
 }
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@ -6,58 +6,42 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.RoomDatabase.JournalMode.TRUNCATE
 import androidx.room.TypeConverters
-import androidx.room.migration.Migration
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.db.dao.GradeDao
-import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.dao.HomeworkDao
 import io.github.wulkanowy.data.db.dao.LuckyNumberDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
-import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.dao.NoteDao
 import io.github.wulkanowy.data.db.dao.RecipientDao
 import io.github.wulkanowy.data.db.dao.ReportingUnitDao
-import io.github.wulkanowy.data.db.dao.SchoolDao
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.dao.SubjectDao
-import io.github.wulkanowy.data.db.dao.TeacherDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
-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.data.db.entities.Subject
-import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.db.migrations.Migration10
 import io.github.wulkanowy.data.db.migrations.Migration11
-import io.github.wulkanowy.data.db.migrations.Migration12
-import io.github.wulkanowy.data.db.migrations.Migration13
-import io.github.wulkanowy.data.db.migrations.Migration14
-import io.github.wulkanowy.data.db.migrations.Migration15
-import io.github.wulkanowy.data.db.migrations.Migration16
-import io.github.wulkanowy.data.db.migrations.Migration17
-import io.github.wulkanowy.data.db.migrations.Migration18
 import io.github.wulkanowy.data.db.migrations.Migration2
 import io.github.wulkanowy.data.db.migrations.Migration3
 import io.github.wulkanowy.data.db.migrations.Migration4
@ -80,7 +64,6 @@ import javax.inject.Singleton
        Grade::class,
        GradeSummary::class,
        GradeStatistics::class,
-        GradePointsStatistics::class,
        Message::class,
        Note::class,
        Homework::class,
@ -88,48 +71,34 @@ import javax.inject.Singleton
        LuckyNumber::class,
        CompletedLesson::class,
        ReportingUnit::class,
-        Recipient::class,
-        MobileDevice::class,
-        Teacher::class,
-        School::class
+        Recipient::class
    ],
    version = AppDatabase.VERSION_SCHEMA,
-    exportSchema = true
+    exportSchema = false
 )
@TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {

    companion object {
-        const val VERSION_SCHEMA = 18
-
-        fun getMigrations(): Array<Migration> {
-            return arrayOf(
-                Migration2(),
-                Migration3(),
-                Migration4(),
-                Migration5(),
-                Migration6(),
-                Migration7(),
-                Migration8(),
-                Migration9(),
-                Migration10(),
-                Migration11(),
-                Migration12(),
-                Migration13(),
-                Migration14(),
-                Migration15(),
-                Migration16(),
-                Migration17(),
-                Migration18()
-            )
-        }
+        const val VERSION_SCHEMA = 11

        fun newInstance(context: Context): AppDatabase {
            return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
                .setJournalMode(TRUNCATE)
                .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
                .fallbackToDestructiveMigrationOnDowngrade()
-                .addMigrations(*getMigrations())
+                .addMigrations(
+                    Migration2(),
+                    Migration3(),
+                    Migration4(),
+                    Migration5(),
+                    Migration6(),
+                    Migration7(),
+                    Migration8(),
+                    Migration9(),
+                    Migration10(),
+                    Migration11()
+                )
                .build()
        }
    }
@ -152,8 +121,6 @@ abstract class AppDatabase : RoomDatabase() {

    abstract val gradeStatistics: GradeStatisticsDao

-    abstract val gradePointsStatistics: GradePointsStatisticsDao
-
    abstract val messagesDao: MessagesDao

    abstract val noteDao: NoteDao
@ -169,10 +136,4 @@ abstract class AppDatabase : RoomDatabase() {
    abstract val reportingUnitDao: ReportingUnitDao

    abstract val recipientDao: RecipientDao
-
-    abstract val mobileDeviceDao: MobileDeviceDao
-
-    abstract val teacherDao: TeacherDao
-
-    abstract val schoolDao: SchoolDao
 }
--- a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
@ -0,0 +1,25 @@
+package io.github.wulkanowy.data.db
+
+import android.annotation.SuppressLint
+import android.content.SharedPreferences
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SharedPrefHelper @Inject constructor(private val sharedPref: SharedPreferences) {
+
+    @SuppressLint("ApplySharedPref")
+    fun putLong(key: String, value: Long, sync: Boolean = false) {
+        sharedPref.edit().putLong(key, value).apply {
+            if (sync) commit() else apply()
+        }
+    }
+
+    fun getLong(key: String, defaultValue: Long): Long {
+        return sharedPref.getLong(key, defaultValue)
+    }
+
+    fun delete(key: String) {
+        sharedPref.edit().remove(key).apply()
+    }
+}
--- a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
@ -1,20 +0,0 @@
-package io.github.wulkanowy.data.db
-
-import android.content.SharedPreferences
-import androidx.core.content.edit
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class SharedPrefProvider @Inject constructor(private val sharedPref: SharedPreferences) {
-
-    fun putLong(key: String, value: Long, sync: Boolean = false) {
-        sharedPref.edit(sync) { putLong(key, value) }
-    }
-
-    fun getLong(key: String, defaultValue: Long) = sharedPref.getLong(key, defaultValue)
-
-    fun delete(key: String) {
-        sharedPref.edit().remove(key).apply()
-    }
-}
--- 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
@ -1,26 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.reactivex.Maybe
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface GradePointsStatisticsDao {
-
-    @Insert
-    fun insertAll(gradesStatistics: List<GradePointsStatistics>)
-
-    @Delete
-    fun deleteAll(gradesStatistics: List<GradePointsStatistics>)
-
-    @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName")
-    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String): Maybe<GradePointsStatistics>
-
-    @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId")
-    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradePointsStatistics>>
-}
--- 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
@ -23,8 +23,8 @@ interface MessagesDao {
    @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 id = :id")
-    fun load(id: Long): Maybe<Message>
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND real_id = :id")
+    fun load(studentId: Int, id: Int): Maybe<Message>

    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND removed = 1 ORDER BY date DESC")
    fun loadDeleted(studentId: Int): Maybe<List<Message>>
--- 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
@ -1,21 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.reactivex.Maybe
-
-@Dao
-interface MobileDeviceDao {
-
-    @Insert
-    fun insertAll(devices: List<MobileDevice>)
-
-    @Delete
-    fun deleteAll(devices: List<MobileDevice>)
-
-    @Query("SELECT * FROM MobileDevices WHERE student_id = :studentId ORDER BY date DESC")
-    fun loadAll(studentId: Int): Maybe<List<MobileDevice>>
-}
--- 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
@ -1,23 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.School
-import io.reactivex.Maybe
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface SchoolDao {
-
-    @Insert
-    fun insert(school: School)
-
-    @Delete
-    fun delete(school: School)
-
-    @Query("SELECT * FROM School WHERE student_id = :studentId AND class_id = :classId")
-    fun load(studentId: Int, classId: Int): Maybe<School>
-}
--- 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
@ -18,6 +18,6 @@ interface SemesterDao {
    @Delete
    fun deleteAll(semester: List<Semester>)

-    @Query("SELECT * FROM Semesters WHERE student_id = :studentId AND class_id = :classId")
-    fun loadAll(studentId: Int, classId: Int): Maybe<List<Semester>>
+    @Query("SELECT * FROM Semesters WHERE student_id = :studentId")
+    fun loadAll(studentId: Int): Maybe<List<Semester>>
 }
--- 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
@ -14,7 +14,7 @@ import javax.inject.Singleton
 interface StudentDao {

    @Insert(onConflict = ABORT)
-    fun insertAll(student: List<Student>): List<Long>
+    fun insert(student: Student): Long

    @Delete
    fun delete(student: Student)
@ -25,8 +25,8 @@ interface StudentDao {
    @Query("SELECT * FROM Students")
    fun loadAll(): Maybe<List<Student>>

-    @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
-    fun updateCurrent(id: Long)
+    @Query("UPDATE Students SET is_current = 1 WHERE student_id = :studentId")
+    fun updateCurrent(studentId: Int)

    @Query("UPDATE Students SET is_current = 0")
    fun resetCurrent()
--- 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
@ -1,23 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.reactivex.Maybe
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface TeacherDao {
-
-    @Insert
-    fun insertAll(teachers: List<Teacher>)
-
-    @Delete
-    fun deleteAll(teachers: List<Teacher>)
-
-    @Query("SELECT * FROM Teachers WHERE student_id = :studentId AND class_id = :classId")
-    fun loadAll(studentId: Int, classId: Int): Maybe<List<Teacher>>
-}
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradePointsStatistics.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradePointsStatistics.kt
@ -1,24 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "GradesPointsStatistics")
-data class GradePointsStatistics(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "semester_id")
-    val semesterId: Int,
-
-    val subject: String,
-
-    val others: Double,
-
-    val student: Double
-) {
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}
--- 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
@ -13,26 +13,11 @@ data class GradeSummary(
    @ColumnInfo(name = "student_id")
    val studentId: Int,

-    val position: Int,
-
    val subject: String,

-    @ColumnInfo(name = "predicted_grade")
    val predictedGrade: String,

-    @ColumnInfo(name = "final_grade")
-    val finalGrade: String,
-
-    @ColumnInfo(name = "proposed_points")
-    val proposedPoints: String,
-
-    @ColumnInfo(name = "final_points")
-    val finalPoints: String,
-
-    @ColumnInfo(name = "points_sum")
-    val pointsSum: String,
-
-    val average: Double
+    val finalGrade: String
 ) {
    @PrimaryKey(autoGenerate = true)
    var id: Long = 0
--- 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
@ -1,25 +0,0 @@
-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
-
-@Entity(tableName = "MobileDevices")
-data class MobileDevice(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "device_id")
-    val deviceId: Int,
-
-    val name: String,
-
-    val date: LocalDateTime
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/School.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/School.kt
@ -1,30 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-
-@Entity(tableName = "School")
-data class School(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "class_id")
-    val classId: Int,
-
-    val name: String,
-
-    val address: String,
-
-    val contact: String,
-
-    val headmaster: String,
-
-    val pedagogue: String
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}
--- 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,7 +4,6 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate

@Entity(tableName = "Semesters", indices = [Index(value = ["student_id", "diary_id", "semester_id"], unique = true)])
 data class Semester(
@ -18,9 +17,6 @@ data class Semester(
    @ColumnInfo(name = "diary_name")
    val diaryName: String,

-    @ColumnInfo(name = "school_year")
-    val schoolYear: Int,
-
    @ColumnInfo(name = "semester_id")
    val semesterId: Int,

@ -30,10 +26,6 @@ data class Semester(
    @ColumnInfo(name = "is_current")
    val isCurrent: Boolean,

-    val start: LocalDate,
-
-    val end: LocalDate,
-
    @ColumnInfo(name = "class_id")
    val classId: Int,

--- 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
@ -7,7 +7,7 @@ import androidx.room.PrimaryKey
 import org.threeten.bp.LocalDateTime
 import java.io.Serializable

-@Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id", "class_id"], unique = true)])
+@Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id"], unique = true)])
 data class Student(

    val endpoint: String,
@ -32,12 +32,6 @@ data class Student(
    @ColumnInfo(name = "school_name")
    val schoolName: String,

-    @ColumnInfo(name = "class_name")
-    val className: String,
-
-    @ColumnInfo(name = "class_id")
-    val classId: Int,
-
    @ColumnInfo(name = "is_current")
    val isCurrent: Boolean,

--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Teacher.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Teacher.kt
@ -1,27 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-
-@Entity(tableName = "Teachers")
-data class Teacher(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "class_id")
-    val classId: Int,
-
-    val subject: String,
-
-    val name: String,
-
-    @ColumnInfo(name = "short_name")
-    val shortName: String
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration11.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration11.kt
@ -8,7 +8,7 @@ class Migration11 : Migration(10, 11) {
    override fun migrate(database: SupportSQLiteDatabase) {
        database.execSQL("""
            CREATE TABLE IF NOT EXISTS Grades_temp (
-                id INTEGER PRIMARY KEY NOT NULL,
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                is_read INTEGER NOT NULL,
                is_notified INTEGER NOT NULL,
                semester_id INTEGER NOT NULL,
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration12.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration12.kt
@ -1,69 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration12 : Migration(11, 12) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        createTempStudentsTable(database)
-        replaceStudentTable(database)
-        updateStudentsWithClassId(database, getStudentsIds(database))
-        removeStudentsWithNoClassId(database)
-        ensureThereIsOnlyOneCurrentStudent(database)
-    }
-
-    private fun createTempStudentsTable(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS Students_tmp (
-                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-                endpoint TEXT NOT NULL,
-                loginType TEXT NOT NULL,
-                email TEXT NOT NULL,
-                password TEXT NOT NULL,
-                symbol TEXT NOT NULL,
-                student_id INTEGER NOT NULL,
-                student_name TEXT NOT NULL,
-                school_id TEXT NOT NULL,
-                school_name TEXT NOT NULL,
-                is_current INTEGER NOT NULL,
-                registration_date INTEGER NOT NULL,
-                class_id INTEGER NOT NULL
-            )
-        """)
-        database.execSQL("CREATE UNIQUE INDEX index_Students_email_symbol_student_id_school_id_class_id ON Students_tmp (email, symbol, student_id, school_id, class_id)")
-    }
-
-    private fun replaceStudentTable(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN class_id INTEGER DEFAULT 0 NOT NULL")
-        database.execSQL("INSERT INTO Students_tmp SELECT * FROM Students")
-        database.execSQL("DROP TABLE Students")
-        database.execSQL("ALTER TABLE Students_tmp RENAME TO Students")
-    }
-
-    private fun getStudentsIds(database: SupportSQLiteDatabase): List<Int> {
-        val students = mutableListOf<Int>()
-        val studentsCursor = database.query("SELECT student_id FROM Students")
-        if (studentsCursor.moveToFirst()) {
-            do {
-                students.add(studentsCursor.getInt(0))
-            } while (studentsCursor.moveToNext())
-        }
-        return students
-    }
-
-    private fun updateStudentsWithClassId(database: SupportSQLiteDatabase, students: List<Int>) {
-        students.forEach {
-            database.execSQL("UPDATE Students SET class_id = IFNULL((SELECT class_id FROM Semesters WHERE student_id = $it), 0) WHERE student_id = $it")
-        }
-    }
-
-    private fun removeStudentsWithNoClassId(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM Students WHERE class_id = 0")
-    }
-
-    private fun ensureThereIsOnlyOneCurrentStudent(database: SupportSQLiteDatabase) {
-        database.execSQL("UPDATE Students SET is_current = 0")
-        database.execSQL("UPDATE Students SET is_current = 1 WHERE id = (SELECT MAX(id) FROM Students)")
-    }
-}
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration13.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration13.kt
@ -1,64 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration13 : Migration(12, 13) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        addClassNameToStudents(database, getStudentsIds(database))
-        updateSemestersTable(database)
-        markAtLeastAndOnlyOneSemesterAtCurrent(database, getStudentsAndClassIds(database))
-        clearMessagesTable(database)
-    }
-
-    private fun addClassNameToStudents(database: SupportSQLiteDatabase, students: List<Pair<Int, String>>) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN class_name TEXT DEFAULT \"\" NOT NULL")
-
-        students.forEach { (id, name) ->
-            val schoolName = name.substringAfter(" - ")
-            val className = name.substringBefore(" - ", "").replace("Klasa ", "")
-            database.execSQL("UPDATE Students SET class_name = '$className' WHERE id = '$id'")
-            database.execSQL("UPDATE Students SET school_name = '$schoolName' WHERE id = '$id'")
-        }
-    }
-
-    private fun getStudentsIds(database: SupportSQLiteDatabase): MutableList<Pair<Int, String>> {
-        val students = mutableListOf<Pair<Int, String>>()
-        val studentsCursor = database.query("SELECT id, school_name FROM Students")
-        if (studentsCursor.moveToFirst()) {
-            do {
-                students.add(studentsCursor.getInt(0) to studentsCursor.getString(1))
-            } while (studentsCursor.moveToNext())
-        }
-        return students
-    }
-
-    private fun updateSemestersTable(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN school_year INTEGER DEFAULT 1970 NOT NULL")
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN start INTEGER DEFAULT 0 NOT NULL")
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN `end` INTEGER DEFAULT 0 NOT NULL")
-    }
-
-    private fun getStudentsAndClassIds(database: SupportSQLiteDatabase): List<Pair<Int, Int>> {
-        val students = mutableListOf<Pair<Int, Int>>()
-        val studentsCursor = database.query("SELECT student_id, class_id FROM Students")
-        if (studentsCursor.moveToFirst()) {
-            do {
-                students.add(studentsCursor.getInt(0) to studentsCursor.getInt(1))
-            } while (studentsCursor.moveToNext())
-        }
-        return students
-    }
-
-    private fun markAtLeastAndOnlyOneSemesterAtCurrent(database: SupportSQLiteDatabase, students: List<Pair<Int, Int>>) {
-        students.forEach { (studentId, classId) ->
-            database.execSQL("UPDATE Semesters SET is_current = 0 WHERE student_id = '$studentId' AND class_id = '$classId'")
-            database.execSQL("UPDATE Semesters SET is_current = 1 WHERE id = (SELECT id FROM Semesters WHERE student_id = '$studentId' AND class_id = '$classId' ORDER BY semester_id DESC)")
-        }
-    }
-
-    private fun clearMessagesTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM Messages")
-    }
-}
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration14.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration14.kt
@ -1,26 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration14 : Migration(13, 14) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS GradesSummary")
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS GradesSummary (
-                id INTEGER PRIMARY KEY AUTOINCREMENT 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
-            )
-        """)
-    }
-}
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration15.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration15.kt
@ -1,19 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration15 : Migration(14, 15) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS MobileDevices (
-                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
-            )
-        """)
-    }
-}
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration16.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration16.kt
@ -1,20 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration16 : Migration(15, 16) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS Teachers (
-                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
-            )
-        """)
-    }
-}
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration17.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration17.kt
@ -1,29 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration17 : Migration(16, 17) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        createGradesPointsStatisticsTable(database)
-        truncateSemestersTable(database)
-    }
-
-    private fun createGradesPointsStatisticsTable(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS GradesPointsStatistics(
-                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
-            )
-        """)
-    }
-
-    private fun truncateSemestersTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM Semesters")
-    }
-}
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration18.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration18.kt
@ -1,22 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration18 : Migration(17, 18) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS School (
-                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
-            )
-        """)
-    }
-}
--- a/app/src/main/java/io/github/wulkanowy/data/exceptions/NoCurrentStudent.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/exceptions/NoCurrentStudent.kt
@ -1,3 +0,0 @@
-package io.github.wulkanowy.data.exceptions
-
-class NoCurrentStudentException : Exception("There no set current student in database")
--- a/app/src/main/java/io/github/wulkanowy/data/pojos/MobileDeviceToken.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/MobileDeviceToken.kt
@ -1,12 +0,0 @@
-package io.github.wulkanowy.data.pojos
-
-data class MobileDeviceToken(
-
-    val token: String,
-
-    val symbol: String,
-
-    val pin: String,
-
-    val qr: String
-)
--- 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
@ -6,7 +6,6 @@ import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@ -32,8 +31,8 @@ class AttendanceRepository @Inject constructor(
                        local.getAttendance(semester, dates.first, dates.second)
                            .toSingle(emptyList())
                            .doOnSuccess { oldAttendance ->
-                                local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
-                                local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
+                                local.deleteAttendance(oldAttendance - newAttendance)
+                                local.saveAttendance(newAttendance - oldAttendance)
                            }
                    }.flatMap {
                        local.getAttendance(semester, dates.first, dates.second)
--- 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
@ -4,7 +4,6 @@ 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.utils.uniqueSubtract
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@ -26,8 +25,8 @@ class AttendanceSummaryRepository @Inject constructor(
                }.flatMap { new ->
                    local.getAttendanceSummary(semester, subjectId).toSingle(emptyList())
                        .doOnSuccess { old ->
-                            local.deleteAttendanceSummary(old.uniqueSubtract(new))
-                            local.saveAttendanceSummary(new.uniqueSubtract(old))
+                            local.deleteAttendanceSummary(old - new)
+                            local.saveAttendanceSummary(new - old)
                        }
                }.flatMap { local.getAttendanceSummary(semester, subjectId).toSingle(emptyList()) })
    }
--- 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
@ -6,7 +6,6 @@ import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@ -32,8 +31,8 @@ class CompletedLessonsRepository @Inject constructor(
                            local.getCompletedLessons(semester, dates.first, dates.second)
                                .toSingle(emptyList())
                                .doOnSuccess { old ->
-                                    local.deleteCompleteLessons(old.uniqueSubtract(new))
-                                    local.saveCompletedLessons(new.uniqueSubtract(old))
+                                    local.deleteCompleteLessons(old - new)
+                                    local.saveCompletedLessons(new - old)
                                }
                        }.flatMap {
                            local.getCompletedLessons(semester, dates.first, dates.second)
--- 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
@ -6,7 +6,6 @@ import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@ -28,12 +27,12 @@ class ExamRepository @Inject constructor(
                        .flatMap {
                            if (it) remote.getExams(semester, dates.first, dates.second)
                            else Single.error(UnknownHostException())
-                        }.flatMap { new ->
+                        }.flatMap { newExams ->
                            local.getExams(semester, dates.first, dates.second)
                                .toSingle(emptyList())
-                                .doOnSuccess { old ->
-                                    local.deleteExams(old.uniqueSubtract(new))
-                                    local.saveExams(new.uniqueSubtract(old))
+                                .doOnSuccess { oldExams ->
+                                    local.deleteExams(oldExams - newExams)
+                                    local.saveExams(newExams - oldExams)
                                }
                        }.flatMap {
                            local.getExams(semester, dates.first, dates.second)
--- 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
@ -5,7 +5,6 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
 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.utils.uniqueSubtract
 import io.reactivex.Completable
 import io.reactivex.Single
 import java.net.UnknownHostException
@ -25,12 +24,13 @@ class GradeRepository @Inject constructor(
                .flatMap {
                    if (it) remote.getGrades(semester)
                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
+                }.flatMap { newGrades ->
                    local.getGrades(semester).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
-                            local.deleteGrades(old.uniqueSubtract(new))
-                            local.saveGrades(new.uniqueSubtract(old)
+                        .doOnSuccess { oldGrades ->
+                            val notifyBreakDate = oldGrades.maxBy { it.date }?.date
+                                ?: student.registrationDate.toLocalDate()
+                            local.deleteGrades(oldGrades - newGrades)
+                            local.saveGrades((newGrades - oldGrades)
                                .onEach {
                                    if (it.date >= notifyBreakDate) it.apply {
                                        isRead = false
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
@ -18,14 +18,9 @@ class GradeSummaryRemote @Inject constructor(private val api: Api) {
                    GradeSummary(
                        semesterId = semester.semesterId,
                        studentId = semester.studentId,
-                        position = it.order,
                        subject = it.name,
                        predictedGrade = it.predicted,
-                        finalGrade = it.final,
-                        pointsSum = it.pointsSum,
-                        proposedPoints = it.proposedPoints,
-                        finalPoints = it.finalPoints,
-                        average = it.average
+                        finalGrade = it.final
                    )
                }
            }
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
@ -4,7 +4,6 @@ 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.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@ -23,11 +22,11 @@ class GradeSummaryRepository @Inject constructor(
                .flatMap {
                    if (it) remote.getGradeSummary(semester)
                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
+                }.flatMap { newGradesSummary ->
                    local.getGradesSummary(semester).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteGradesSummary(old.uniqueSubtract(new))
-                            local.saveGradesSummary(new.uniqueSubtract(old))
+                        .doOnSuccess { oldGradesSummary ->
+                            local.deleteGradesSummary(oldGradesSummary - newGradesSummary)
+                            local.saveGradesSummary(newGradesSummary - oldGradesSummary)
                        }
                }.flatMap { local.getGradesSummary(semester).toSingle(emptyList()) })
    }
--- 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
@ -1,8 +1,6 @@
 package io.github.wulkanowy.data.repositories.gradestatistics

-import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
 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 io.reactivex.Maybe
@ -10,57 +8,27 @@ import javax.inject.Inject
 import javax.inject.Singleton

@Singleton
-class GradeStatisticsLocal @Inject constructor(
-    private val gradeStatisticsDb: GradeStatisticsDao,
-    private val gradePointsStatisticsDb: GradePointsStatisticsDao
-) {
+class GradeStatisticsLocal @Inject constructor(private val gradeStatisticsDb: GradeStatisticsDao) {

    fun getGradesStatistics(semester: Semester, isSemester: Boolean): Maybe<List<GradeStatistics>> {
-        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).filter { it.isNotEmpty() }
-    }
-
-    fun getGradesPointsStatistics(semester: Semester): Maybe<List<GradePointsStatistics>> {
-        return gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
+        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester)
+            .filter { !it.isEmpty() }
    }

    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)
-                }
+        return (if ("Wszystkie" == subjectName) 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)
            }
-            else -> gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)
-        }.filter { it.isNotEmpty() }
-    }
-
-    fun getGradesPointsStatistics(semester: Semester, subjectName: String): Maybe<GradePointsStatistics> {
-        return when (subjectName) {
-            "Wszystkie" -> gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).flatMap { list ->
-                if (list.isEmpty()) return@flatMap Maybe.empty<GradePointsStatistics>()
-                Maybe.just(GradePointsStatistics(semester.studentId, semester.semesterId, subjectName,
-                    list.fold(.0) { acc, e -> acc + e.others },
-                    list.fold(.0) { acc, e -> acc + e.student })
-                )
-            }
-            else -> gradePointsStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName)
        }
+        else gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)).filter { !it.isEmpty() }
    }

    fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {
        gradeStatisticsDb.insertAll(gradesStatistics)
    }

-    fun saveGradesPointsStatistics(gradePointsStatistics: List<GradePointsStatistics>) {
-        gradePointsStatisticsDb.insertAll(gradePointsStatistics)
-    }
-
    fun deleteGradesStatistics(gradesStatistics: List<GradeStatistics>) {
        gradeStatisticsDb.deleteAll(gradesStatistics)
    }
-
-    fun deleteGradesPointsStatistics(gradesPointsStatistics: List<GradePointsStatistics>) {
-        gradePointsStatisticsDb.deleteAll(gradesPointsStatistics)
-    }
 }
--- 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
@ -1,7 +1,6 @@
 package io.github.wulkanowy.data.repositories.gradestatistics

 import io.github.wulkanowy.api.Api
-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.reactivex.Single
@ -13,10 +12,7 @@ class GradeStatisticsRemote @Inject constructor(private val api: Api) {

    fun getGradeStatistics(semester: Semester, isSemester: Boolean): Single<List<GradeStatistics>> {
        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap {
-                if (isSemester) it.getGradesAnnualStatistics(semester.semesterId)
-                else it.getGradesPartialStatistics(semester.semesterId)
-            }
+            .flatMap { it.getGradesStatistics(semester.semesterId, isSemester) }
            .map { gradeStatistics ->
                gradeStatistics.map {
                    GradeStatistics(
@ -30,20 +26,4 @@ class GradeStatisticsRemote @Inject constructor(private val api: Api) {
                }
            }
    }
-
-    fun getGradePointsStatistics(semester: Semester): Single<List<GradePointsStatistics>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getGradesPointsStatistics(semester.semesterId) }
-            .map { gradePointsStatistics ->
-                gradePointsStatistics.map {
-                    GradePointsStatistics(
-                        semesterId = semester.semesterId,
-                        studentId = semester.studentId,
-                        subject = it.subject,
-                        others = it.others,
-                        student = it.student
-                    )
-                }
-            }
-    }
 }
--- 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
@ -2,11 +2,8 @@ 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.utils.uniqueSubtract
-import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@ -25,27 +22,12 @@ class GradeStatisticsRepository @Inject constructor(
                .flatMap {
                    if (it) remote.getGradeStatistics(semester, isSemester)
                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
+                }.flatMap { newGradesStats ->
                    local.getGradesStatistics(semester, isSemester).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteGradesStatistics(old.uniqueSubtract(new))
-                            local.saveGradesStatistics(new.uniqueSubtract(old))
+                        .doOnSuccess { oldGradesStats ->
+                            local.deleteGradesStatistics(oldGradesStats - newGradesStats)
+                            local.saveGradesStatistics(newGradesStats - oldGradesStats)
                        }
                }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).toSingle(emptyList()) })
    }
-
-    fun getGradesPointsStatistics(semester: Semester, subjectName: String, forceRefresh: Boolean): Maybe<GradePointsStatistics> {
-        return local.getGradesPointsStatistics(semester, subjectName).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMapMaybe {
-                    if (it) remote.getGradePointsStatistics(semester).toMaybe()
-                    else Maybe.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getGradesPointsStatistics(semester).defaultIfEmpty(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteGradesPointsStatistics(old.uniqueSubtract(new))
-                            local.saveGradesPointsStatistics(new.uniqueSubtract(old))
-                        }
-                }.flatMap { local.getGradesPointsStatistics(semester, subjectName) })
-    }
 }
--- 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
@ -6,7 +6,6 @@ import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@ -27,11 +26,11 @@ class HomeworkRepository @Inject constructor(
                    .flatMap {
                        if (it) remote.getHomework(semester, monday, friday)
                        else Single.error(UnknownHostException())
-                    }.flatMap { new ->
+                    }.flatMap { newGrades ->
                        local.getHomework(semester, monday, friday).toSingle(emptyList())
-                            .doOnSuccess { old ->
-                                local.deleteHomework(old.uniqueSubtract(new))
-                                local.saveHomework(new.uniqueSubtract(old))
+                            .doOnSuccess { oldGrades ->
+                                local.deleteHomework(oldGrades - newGrades)
+                                local.saveHomework(newGrades - oldGrades)
                            }
                    }.flatMap { local.getHomework(semester, monday, friday).toSingle(emptyList()) })
        }
--- 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
@ -23,14 +23,14 @@ class MessageLocal @Inject constructor(private val messagesDb: MessagesDao) {
        messagesDb.deleteAll(messages)
    }

-    fun getMessage(id: Long): Maybe<Message> {
-        return messagesDb.load(id)
+    fun getMessage(student: Student, id: Int): Maybe<Message> {
+        return messagesDb.load(student.studentId, 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)
+            TRASHED -> messagesDb.loadDeleted(student.studentId)
+            else -> messagesDb.loadAll(student.studentId, folder.id)
        }.filter { it.isNotEmpty() }
    }
 }
--- 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
@ -5,7 +5,6 @@ import io.github.wulkanowy.api.messages.Folder
 import io.github.wulkanowy.api.messages.SentMessage
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.toLocalDateTime
 import io.reactivex.Single
 import org.threeten.bp.LocalDateTime.now
@ -17,11 +16,11 @@ import io.github.wulkanowy.api.messages.Recipient as ApiRecipient
@Singleton
 class MessageRemote @Inject constructor(private val api: Api) {

-    fun getMessages(student: Student, folder: MessageFolder): Single<List<Message>> {
+    fun getMessages(studentId: Int, folder: MessageFolder): Single<List<Message>> {
        return api.getMessages(Folder.valueOf(folder.name)).map { messages ->
            messages.map {
                Message(
-                    studentId = student.id.toInt(),
+                    studentId = studentId,
                    realId = it.id ?: 0,
                    messageId = it.messageId ?: 0,
                    sender = it.sender.orEmpty(),
@ -59,8 +58,4 @@ class MessageRemote @Inject constructor(private val api: Api) {
            }
        )
    }
-
-    fun deleteMessage(message: Message): Single<Boolean> {
-        return api.deleteMessages(listOf(Pair(message.realId, message.folderId)))
-    }
 }
--- 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
@ -8,9 +8,7 @@ import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
-import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Completable
-import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@ -30,13 +28,13 @@ class MessageRepository @Inject constructor(
                local.getMessages(student, folder).filter { !forceRefresh }
                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                        .flatMap {
-                            if (it) remote.getMessages(student, folder)
+                            if (it) remote.getMessages(student.studentId, 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)
+                                    local.deleteMessages(old - new)
+                                    local.saveMessages((new - old)
                                        .onEach {
                                            it.isNotified = !notify
                                        })
@ -46,14 +44,14 @@ class MessageRepository @Inject constructor(
            }
    }

-    fun getMessage(student: Student, messageDbId: Long, markAsRead: Boolean = false): Single<Message> {
+    fun getMessage(student: Student, messageId: Int, markAsRead: Boolean = false): Single<Message> {
        return Single.just(apiHelper.initApi(student))
            .flatMap { _ ->
-                local.getMessage(messageDbId)
+                local.getMessage(student, messageId)
                    .filter { !it.content.isNullOrEmpty() }
                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                        .flatMap {
-                            if (it) local.getMessage(messageDbId).toSingle()
+                            if (it) local.getMessage(student, messageId).toSingle()
                            else Single.error(UnknownHostException())
                        }
                        .flatMap { dbMessage ->
@ -64,7 +62,7 @@ class MessageRepository @Inject constructor(
                                }))
                            }
                        }.flatMap {
-                            local.getMessage(messageDbId).toSingle()
+                            local.getMessage(student, messageId).toSingle()
                        }
                    )
            }
@ -91,20 +89,4 @@ class MessageRepository @Inject constructor(
                else Single.error(UnknownHostException())
            }
    }
-
-    fun deleteMessage(message: Message): Maybe<Boolean> {
-        return ReactiveNetwork.checkInternetConnectivity(settings)
-            .flatMap {
-                if (it) remote.deleteMessage(message)
-                else Single.error(UnknownHostException())
-            }
-            .filter { it }
-            .doOnSuccess {
-                if (!message.removed) local.updateMessages(listOf(message.copy(removed = true).apply {
-                    id = message.id
-                    content = message.content
-                }))
-                else local.deleteMessages(listOf(message))
-            }
-    }
 }
--- 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
@ -1,25 +0,0 @@
-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 io.github.wulkanowy.data.db.entities.Student
-import io.reactivex.Maybe
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class MobileDeviceLocal @Inject constructor(private val mobileDb: MobileDeviceDao) {
-
-    fun saveDevices(devices: List<MobileDevice>) {
-        mobileDb.insertAll(devices)
-    }
-
-    fun deleteDevices(devices: List<MobileDevice>) {
-        mobileDb.deleteAll(devices)
-    }
-
-    fun getDevices(semester: Semester): Maybe<List<MobileDevice>> {
-        return mobileDb.loadAll(semester.studentId).filter { it.isNotEmpty() }
-    }
-}
--- 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
@ -1,47 +0,0 @@
-package io.github.wulkanowy.data.repositories.mobiledevice
-
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.pojos.MobileDeviceToken
-import io.github.wulkanowy.utils.toLocalDateTime
-import io.reactivex.Single
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class MobileDeviceRemote @Inject constructor(private val api: Api) {
-
-    fun getDevices(semester: Semester): Single<List<MobileDevice>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { api.getRegisteredDevices() }
-            .map { devices ->
-                devices.map {
-                    MobileDevice(
-                        studentId = semester.studentId,
-                        date = it.date.toLocalDateTime(),
-                        deviceId = it.id,
-                        name = it.name
-                    )
-                }
-            }
-    }
-
-    fun unregisterDevice(semester: Semester, device: MobileDevice): Single<Boolean> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { api.unregisterDevice(device.deviceId) }
-    }
-
-    fun getToken(semester: Semester): Single<MobileDeviceToken> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { api.getToken() }
-            .map {
-                MobileDeviceToken(
-                    token = it.token,
-                    symbol = it.symbol,
-                    pin = it.pin,
-                    qr = it.qrCodeImage
-                )
-            }
-    }
-}
--- 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,52 +0,0 @@
-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.pojos.MobileDeviceToken
-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(semester: Semester, forceRefresh: Boolean = false): Single<List<MobileDevice>> {
-        return local.getDevices(semester).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getDevices(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()) }
-    }
-
-    fun unregisterDevice(semester: Semester, device: MobileDevice): Single<Boolean> {
-        return ReactiveNetwork.checkInternetConnectivity(settings)
-            .flatMap {
-                if (it) remote.unregisterDevice(semester, device)
-                else Single.error(UnknownHostException())
-            }
-    }
-
-    fun getToken(semester: Semester): Single<MobileDeviceToken> {
-        return ReactiveNetwork.checkInternetConnectivity(settings)
-            .flatMap {
-                if (it) remote.getToken(semester)
-                else Single.error(UnknownHostException())
-            }
-    }
-}
--- 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
@ -5,7 +5,6 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
 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.uniqueSubtract
 import io.reactivex.Completable
 import io.reactivex.Single
 import java.net.UnknownHostException
@ -28,8 +27,8 @@ class NoteRepository @Inject constructor(
                }.flatMap { new ->
                    local.getNotes(student).toSingle(emptyList())
                        .doOnSuccess { old ->
-                            local.deleteNotes(old.uniqueSubtract(new))
-                            local.saveNotes(new.uniqueSubtract(old)
+                            local.deleteNotes(old - new)
+                            local.saveNotes((new - old)
                                .onEach {
                                    if (it.date >= student.registrationDate.toLocalDate()) it.apply {
                                        isRead = false
--- 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
@ -12,60 +12,47 @@ class PreferencesRepository @Inject constructor(
    val context: Context
 ) {
    val startMenuIndex: Int
-        get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt()
+        get() = sharedPref.getString(context.getString(R.string.pref_key_start_menu), "0")?.toIntOrNull() ?: 0

    val isShowPresent: Boolean
-        get() = getBoolean(R.string.pref_key_attendance_present, R.bool.pref_default_attendance_present)
-
-    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)
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_attendance_present), true)

    val isGradeExpandable: Boolean
-        get() = !getBoolean(R.string.pref_key_expand_grade, R.bool.pref_default_expand_grade)
+        get() = !sharedPref.getBoolean(context.getString(R.string.pref_key_expand_grade), false)

-    val appThemeKey = context.getString(R.string.pref_key_app_theme)
-    val appTheme: String
-        get() = getString(appThemeKey, R.string.pref_default_app_theme)
+    val currentThemeKey: String = context.getString(R.string.pref_key_theme)
+    val currentTheme: Int
+        get() = sharedPref.getString(currentThemeKey, "1")?.toIntOrNull() ?: 1

    val gradeColorTheme: String
-        get() = getString(R.string.pref_key_grade_color_scheme, R.string.pref_default_grade_color_scheme)
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_color_scheme), "vulcan") ?: "vulcan"

-    val serviceEnableKey = context.getString(R.string.pref_key_services_enable)
+    val serviceEnableKey: String = context.getString(R.string.pref_key_services_enable)
    val isServiceEnabled: Boolean
-        get() = getBoolean(serviceEnableKey, R.bool.pref_default_services_enable)
+        get() = sharedPref.getBoolean(serviceEnableKey, true)

-    val servicesIntervalKey = context.getString(R.string.pref_key_services_interval)
+    val servicesIntervalKey: String = context.getString(R.string.pref_key_services_interval)
    val servicesInterval: Long
-        get() = getString(servicesIntervalKey, R.string.pref_default_services_interval).toLong()
+        get() = sharedPref.getString(servicesIntervalKey, "60")?.toLongOrNull() ?: 60

-    val servicesOnlyWifiKey = context.getString(R.string.pref_key_services_wifi_only)
+    val servicesOnlyWifiKey: String = context.getString(R.string.pref_key_services_wifi_only)
    val isServicesOnlyWifi: Boolean
-        get() = getBoolean(servicesOnlyWifiKey, R.bool.pref_default_services_wifi_only)
+        get() = sharedPref.getBoolean(servicesOnlyWifiKey, true)

    val isNotificationsEnable: Boolean
-        get() = getBoolean(R.string.pref_key_notifications_enable, R.bool.pref_default_notifications_enable)
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_notifications_enable), true)

-    val isDebugNotificationEnableKey = context.getString(R.string.pref_key_notification_debug)
+    val isDebugNotificationEnableKey: String = context.getString(R.string.pref_key_notification_debug)
    val isDebugNotificationEnable: Boolean
-        get() = getBoolean(isDebugNotificationEnableKey, R.bool.pref_default_notification_debug)
+        get() = sharedPref.getBoolean(isDebugNotificationEnableKey, false)

    val gradePlusModifier: Double
-        get() = getString(R.string.pref_key_grade_modifier_plus, R.string.pref_default_grade_modifier_plus).toDouble()
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_plus), "0.0")?.toDouble() ?: 0.0

    val gradeMinusModifier: Double
-        get() = getString(R.string.pref_key_grade_modifier_minus, R.string.pref_default_grade_modifier_minus).toDouble()
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_minus), "0.0")?.toDouble()
+            ?: 0.0

    val fillMessageContent: Boolean
-        get() = getBoolean(R.string.pref_key_fill_message_content, R.bool.pref_default_fill_message_content)
-
-    private fun getString(id: Int, default: Int) = getString(context.getString(id), default)
-
-    private fun getString(id: String, default: Int) = sharedPref.getString(id, context.getString(default)) ?: context.getString(default)
-
-    private fun getBoolean(id: Int, default: Int) = getBoolean(context.getString(id), default)
-
-    private fun getBoolean(id: String, default: Int) = sharedPref.getBoolean(id, context.resources.getBoolean(default))
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_fill_message_content), true)
 }
--- 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
@ -7,7 +7,6 @@ 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
@ -32,8 +31,8 @@ class RecipientRepository @Inject constructor(
                        }.flatMap { new ->
                            local.getRecipients(student, role, unit).toSingle(emptyList())
                                .doOnSuccess { old ->
-                                    local.deleteRecipients(old.uniqueSubtract(new))
-                                    local.saveRecipients(new.uniqueSubtract(old))
+                                    local.deleteRecipients(old - new)
+                                    local.saveRecipients(new - old)
                                }
                        }.flatMap {
                            local.getRecipients(student, role, unit).toSingle(emptyList())
--- a/Show more
+++ b/Show more