Version 0.9.1

Add option to force calc average by app (#400 )
Add githook plugin (#398 )
2019-06-04 02:43:50 +02:00 · 2019-06-04 02:27:15 +02:00 · 2019-06-04 01:53:20 +02:00 · 2019-06-03 22:47:35 +02:00 · 2019-06-03 18:15:42 +02:00 · 2019-06-03 18:15:41 +02:00
236 changed files with 6812 additions and 1131 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -7,11 +7,11 @@ references:

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

  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 fabricGenerateResourcesRelease -x packageRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew build -x test -x lint -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease -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 fabricGenerateResourcesRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew lint -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease --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 fabricGenerateResourcesRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew :app:test :app:jacocoTestReport -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease --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,6 +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-19;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-19;default;armeabi-v7a"
@ -113,7 +116,7 @@ jobs:
            adb shell input keyevent 82
      - run:
          name: Run instrumented tests
-          command: ./gradlew clean createDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew clean createPlayDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
      - run:
          name: Collect logs from emulator
          command: adb logcat -d > ./app/build/reports/logcat_emulator.txt
@ -159,7 +162,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 publish --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
+          command: ./gradlew publishPlayRelease --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex

 workflows:
  version: 2
--- a/.gitignore
+++ b/.gitignore
@ -48,3 +48,4 @@ app/key.p12
 app/upload-key.jks
 *.log
 .idea/assetWizardSettings.xml
+.idea/uiDesigner.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/debug/app-debug.apk .
+    - mv app/build/outputs/apk/fdroid/debug/app-fdroid-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 fabricGenerateResourcesRelease test
+    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease test
  artifacts:
    paths:
    - app/build/reports/tests
@ -39,7 +39,7 @@ lint:
     - .gradle
    policy: pull
  script:
-    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesRelease lint
+    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease lint
  artifacts:
    paths:
    - app/build/reports
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@ -21,31 +21,6 @@
      <option name="CONTINUATION_INDENT_IN_ELVIS" value="false" />
      <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
    </JetCodeStyleSettings>
-    <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" />
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@ -1,12 +0,0 @@
-<?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
@ -12,9 +12,8 @@ cache:
    - $HOME/.gradle/wrapper/

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

 android:
 licenses:
@ -48,20 +47,20 @@ before_script:
 script:
  - ./gradlew dependencies --stacktrace --daemon
  - fossa --no-ansi || true
-  - ./gradlew lint -x fabricGenerateResourcesRelease --stacktrace --daemon
-  - ./gradlew test -x fabricGenerateResourcesRelease --stacktrace --daemon
-  - ./gradlew createDebugCoverageReport --stacktrace --daemon
+  #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
+  - ./gradlew testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
+  - ./gradlew createPlayDebugCoverageReport --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 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;
+      ./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;
    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 publish -PenableCrashlytics --stacktrace;
+      ./gradlew publishPlayRelease -PenableCrashlytics --stacktrace;
    fi

 after_success:
--- a/README.md
+++ b/README.md
@ -1,6 +1,5 @@
 # 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)
@ -8,6 +7,8 @@
 [![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)](https://f-droid.org/packages/io.github.wulkanowy/)
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github)](https://github.com/wulkanowy/wulkanowy/releases)

 [Pobierz wersję beta z Google Play](https://play.google.com/store/apps/details?id=io.github.wulkanowy&amp;utm_source=vcs)

--- a/app/build.gradle
+++ b/app/build.gradle
@ -6,6 +6,7 @@ apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
+apply from: 'hooks.gradle'

 android {
    compileSdkVersion 28
@ -16,13 +17,13 @@ android {
        testApplicationId "io.github.tests.wulkanowy"
        minSdkVersion 15
        targetSdkVersion 28
-        versionCode 32
-        versionName "0.7.6"
+        versionCode 39
+        versionName "0.9.1"
        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 {
@ -63,6 +64,18 @@ android {
        }
    }

+    flavorDimensions "platform"
+    productFlavors {
+        play {
+            dimension "platform"
+        }
+
+        fdroid {
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "false"
+            dimension "platform"
+        }
+    }
+
    lintOptions {
        disable 'HardwareIds'
    }
@ -80,56 +93,57 @@ androidExtensions {
 play {
    serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
    serviceAccountCredentials = file('key.p12')
-    defaultToAppBundles = true
+    defaultToAppBundles = false
    track = 'alpha'
 }

 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation('io.github.wulkanowy:api:0.7.6') { exclude module: "threetenbp" }
+    implementation 'io.github.wulkanowy:api:0.9.1'

+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
    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 "android.arch.work:work-runtime:1.0.0"
-    implementation "android.arch.work:work-rxjava2:1.0.0"
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation "com.google.android.material:material:1.1.0-alpha05"
+    implementation 'com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f'
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'

-    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 "androidx.work:work-runtime:2.0.1"
+    implementation "androidx.work:work-rxjava2:2.0.1"

-    implementation 'com.takisoft.preferencex:preferencex:1.0.0'
+    implementation "androidx.room:room-runtime:2.1.0-rc01"
+    implementation "androidx.room:room-rxjava2:2.1.0-rc01"
+    kapt "androidx.room:room-compiler:2.1.0-rc01"

-    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 "com.google.dagger:dagger-android-support:2.23.1"
+    kapt "com.google.dagger:dagger-compiler:2.23.1"
+    kapt "com.google.dagger:dagger-android-processor:2.23.1"
+    implementation 'com.squareup.inject:assisted-inject-annotations-dagger2:0.4.0'
+    kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.4.0'

    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.2.0'

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

+    implementation 'com.google.code.gson:gson:2.8.5'
    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.mikepenz:aboutlibraries:6.2.3"
+    implementation "com.squareup.okhttp3:logging-interceptor:3.12.3"

-    implementation 'com.google.firebase:firebase-core:16.0.8'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
+    implementation "com.mikepenz:aboutlibraries:6.2.3"
+    implementation 'com.takisoft.preferencex:preferencex:1.0.0'
+
+    playImplementation 'com.google.firebase:firebase-core:16.0.9'
+    playImplementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'

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

@ -138,16 +152,22 @@ dependencies {

    testImplementation "junit:junit:4.12"
    testImplementation "io.mockk:mockk:1.9.2"
-    testImplementation "org.mockito:mockito-inline:2.25.1"
-    testImplementation 'org.threeten:threetenbp:1.3.8'
+    testImplementation 'org.threeten:threetenbp:1.4.0'
+    testImplementation "org.mockito:mockito-core:2.28.2"
+    testImplementation("org.mockito:mockito-inline:2.28.2") {
+        exclude group: 'org.mockito', module: 'mockito-core'
+    }

-    androidTestImplementation 'androidx.test:core:1.1.0'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
+    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:1.9.2"
-    androidTestImplementation 'org.mockito:mockito-android:2.25.1'
-    androidTestImplementation "androidx.room:room-testing:2.1.0-alpha06"
+    androidTestImplementation "androidx.room:room-testing:2.1.0-rc01"
    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    androidTestImplementation "org.mockito:mockito-core:2.28.2"
+    androidTestImplementation('org.mockito:mockito-android:2.28.2') {
+        exclude group: 'org.mockito', module: 'mockito-core'
+    }
 }

 apply plugin: 'com.google.gms.google-services'
--- a/app/hooks.gradle
+++ b/app/hooks.gradle
@ -0,0 +1,10 @@
+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
@ -31,17 +31,20 @@ task jacocoTestReport(type: JacocoReport) {
                    '**/*_Provide*Factory*.*',
                    '**/*_Factory.*']

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

-    sourceDirectories = files("$project.projectDir/src/main/java")
-    executionData = fileTree(
+    sourceDirectories.setFrom(files([
+            "src/main/java",
+            "src/play/java"
+    ]))
+    executionData.setFrom(fileTree(
            dir: project.projectDir,
            includes: ["**/*.exec", "**/*.ec"]
-    )
+    ))
 }
--- a/app/play-publish-lint.sh
+++ b/app/play-publish-lint.sh
@ -0,0 +1,7 @@
+#!/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/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/sonarqube.gradle
+++ b/app/sonarqube.gradle
@ -29,5 +29,6 @@ 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
@ -22,7 +22,12 @@ abstract class AbstractMigrationTest {
    fun getMigratedRoomDatabase(): AppDatabase {
        val database = Room.databaseBuilder(ApplicationProvider.getApplicationContext(),
            AppDatabase::class.java, dbName)
-            .addMigrations(Migration12(), Migration13())
+            .addMigrations(
+                Migration12(),
+                Migration13(),
+                Migration14(),
+                Migration15()
+            )
            .build()
        // close the database and release any stream resources when the test finishes
        helper.closeWhenFinished(database)
--- 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,6 +22,7 @@ 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
@ -109,4 +110,73 @@ 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/student/StudentLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
@ -39,7 +39,7 @@ class StudentLocalTest {

    @Test
    fun saveAndReadTest() {
-        studentLocal.saveStudent(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.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 = "")))
            .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 = ""): TimetableLocal {
+fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", subject: String = "", teacher: String = ""): TimetableLocal {
    return TimetableLocal(
        studentId = 1,
        diaryId = 2,
@ -20,7 +20,7 @@ fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", s
        group = "",
        room = room,
        roomOld = "",
-        teacher = "",
+        teacher = teacher,
        teacherOld = "",
        info = "",
        changes = false,
@ -28,7 +28,7 @@ fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", s
    )
 }

-fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = ""): TimetableRemote {
+fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = "", teacher: String = ""): TimetableRemote {
    return TimetableRemote(
        number = number,
        start = start.toDate(),
@ -37,7 +37,7 @@ fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subje
        subject = subject,
        group = "",
        room = room,
-        teacher = "",
+        teacher = teacher,
        info = "",
        changes = false,
        canceled = false
--- 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
@ -63,23 +63,27 @@ class TimetableRepositoryTest {
    fun copyDetailsToCompletedFromPrevious() {
        timetableLocal.saveTimetable(listOf(
            createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda"),
-            createTimetableLocal(1, of(2019, 3, 5, 8, 50), "321", "Religia"),
-            createTimetableLocal(1, of(2019, 3, 5, 9, 40), "213", "W-F")
+            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")
        ))

        every { mockApi.getTimetable(any(), any()) } returns Single.just(listOf(
            createTimetableRemote(1, of(2019, 3, 5, 8, 0), "", "Przyroda"),
-            createTimetableRemote(1, of(2019, 3, 5, 8, 50), "", "Religia"),
-            createTimetableRemote(1, of(2019, 3, 5, 9, 40), "", "W-F")
+            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")
        ))

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

-        assertEquals(3, lessons.size)
+        assertEquals(4, lessons.size)
        assertEquals("123", lessons[0].room)
        assertEquals("321", lessons[1].room)
        assertEquals("213", lessons[2].room)
+
+        assertEquals("", lessons[3].teacher)
    }
 }
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@ -0,0 +1,17 @@
+@file:Suppress("UNUSED_PARAMETER")
+
+package io.github.wulkanowy.utils
+
+import android.content.Context
+import timber.log.Timber
+
+class CrashlyticsTree : Timber.Tree() {
+
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+        // do nothing
+    }
+}
+
+fun initCrashlytics(context: Context) {
+    // do nothing
+}
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
@ -0,0 +1,13 @@
+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
@ -34,6 +34,7 @@
            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"
@ -45,13 +46,31 @@
            android:configChanges="orientation|screenSize"
            android:label="@string/send_message_title"
            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.widgets.timetable.TimetableWidgetProvider"
+            android:name=".ui.modules.timetablewidget.TimetableWidgetProvider"
            android:exported="true"
            android:label="@string/timetable_title">
            <intent-filter>
@ -62,6 +81,17 @@
                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"
            android:authorities="${applicationId}.workmanager-init"
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@ -1,36 +1,29 @@
 package io.github.wulkanowy

 import android.content.Context
-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.utils.ActivityLifecycleLogger
 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 java.lang.Exception
 import javax.inject.Inject

 class WulkanowyApp : DaggerApplication() {

-    @Inject
-    lateinit var prefRepository: PreferencesRepository
-
    @Inject
    lateinit var workerFactory: SyncWorkerFactory

@ -42,32 +35,30 @@ class WulkanowyApp : DaggerApplication() {
    override fun onCreate() {
        super.onCreate()
        AndroidThreeTen.init(this)
-        initializeFabric()
-        if (DEBUG) enableDebugLog()
-        AppCompatDelegate.setDefaultNightMode(prefRepository.currentTheme)
        WorkManager.initialize(this, Configuration.Builder().setWorkerFactory(workerFactory).build())
        RxJavaPlugins.setErrorHandler(::onError)
+
+        initCrashlytics(applicationContext)
+        initLogging()
    }

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

-    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())
-    }
-
-    private fun onError(t: Throwable) {
-        if (t is UndeliverableException && t.cause is IOException || t.cause is InterruptedException) {
-            Timber.e(t.cause, "An undeliverable error occurred")
-        } else throw t
+    private fun onError(error: Throwable) {
+        if (error is UndeliverableException && error.cause is IOException || error.cause is InterruptedException) {
+            Timber.e(error.cause, "An undeliverable error occurred")
+        } else throw error
    }

    override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
-        return DaggerAppComponent.builder().create(this)
+        return DaggerAppComponent.factory().create(this)
    }
 }
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
@ -132,4 +132,8 @@ internal class RepositoryModule {
    @Singleton
    @Provides
    fun provideRecipientDao(database: AppDatabase) = database.recipientDao
+
+    @Singleton
+    @Provides
+    fun provideMobileDevicesDao(database: AppDatabase) = database.mobileDeviceDao
 }
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@ -16,6 +16,7 @@ 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
@ -33,6 +34,7 @@ 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
@ -44,6 +46,8 @@ 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.Migration2
 import io.github.wulkanowy.data.db.migrations.Migration3
 import io.github.wulkanowy.data.db.migrations.Migration4
@ -73,7 +77,8 @@ import javax.inject.Singleton
        LuckyNumber::class,
        CompletedLesson::class,
        ReportingUnit::class,
-        Recipient::class
+        Recipient::class,
+        MobileDevice::class
    ],
    version = AppDatabase.VERSION_SCHEMA,
    exportSchema = true
@ -82,7 +87,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {

    companion object {
-        const val VERSION_SCHEMA = 13
+        const val VERSION_SCHEMA = 15

        fun newInstance(context: Context): AppDatabase {
            return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
@ -101,7 +106,9 @@ abstract class AppDatabase : RoomDatabase() {
                    Migration10(),
                    Migration11(),
                    Migration12(),
-                    Migration13()
+                    Migration13(),
+                    Migration14(),
+                    Migration15()
                )
                .build()
        }
@ -140,4 +147,6 @@ abstract class AppDatabase : RoomDatabase() {
    abstract val reportingUnitDao: ReportingUnitDao

    abstract val recipientDao: RecipientDao
+
+    abstract val mobileDeviceDao: MobileDeviceDao
 }
--- a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
@ -6,18 +6,16 @@ import javax.inject.Inject
 import javax.inject.Singleton

@Singleton
+@SuppressLint("ApplySharedPref")
 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 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/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 student_id = :studentId AND real_id = :id")
-    fun load(studentId: Int, id: Int): Maybe<Message>
+    @Query("SELECT * FROM Messages WHERE id = :id")
+    fun load(id: Long): 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
@ -0,0 +1,21 @@
+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/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 insert(student: Student): Long
+    fun insertAll(student: List<Student>): List<Long>

    @Delete
    fun delete(student: Student)
--- 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,11 +13,26 @@ data class GradeSummary(
    @ColumnInfo(name = "student_id")
    val studentId: Int,

+    val position: Int,
+
    val subject: String,

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

-    val finalGrade: 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
 ) {
    @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
@ -0,0 +1,25 @@
+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/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 AUTOINCREMENT NOT NULL,
+                id INTEGER PRIMARY KEY 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/Migration14.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration14.kt
@ -0,0 +1,26 @@
+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
@ -0,0 +1,19 @@
+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/pojos/MobileDeviceToken.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/MobileDeviceToken.kt
@ -0,0 +1,12 @@
+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,6 +6,7 @@ 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
@ -31,8 +32,8 @@ class AttendanceRepository @Inject constructor(
                        local.getAttendance(semester, dates.first, dates.second)
                            .toSingle(emptyList())
                            .doOnSuccess { oldAttendance ->
-                                local.deleteAttendance(oldAttendance - newAttendance)
-                                local.saveAttendance(newAttendance - oldAttendance)
+                                local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
+                                local.saveAttendance(newAttendance.uniqueSubtract(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,6 +4,7 @@ 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
@ -25,8 +26,8 @@ class AttendanceSummaryRepository @Inject constructor(
                }.flatMap { new ->
                    local.getAttendanceSummary(semester, subjectId).toSingle(emptyList())
                        .doOnSuccess { old ->
-                            local.deleteAttendanceSummary(old - new)
-                            local.saveAttendanceSummary(new - old)
+                            local.deleteAttendanceSummary(old.uniqueSubtract(new))
+                            local.saveAttendanceSummary(new.uniqueSubtract(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,6 +6,7 @@ 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
@ -31,8 +32,8 @@ class CompletedLessonsRepository @Inject constructor(
                            local.getCompletedLessons(semester, dates.first, dates.second)
                                .toSingle(emptyList())
                                .doOnSuccess { old ->
-                                    local.deleteCompleteLessons(old - new)
-                                    local.saveCompletedLessons(new - old)
+                                    local.deleteCompleteLessons(old.uniqueSubtract(new))
+                                    local.saveCompletedLessons(new.uniqueSubtract(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,6 +6,7 @@ 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
@ -27,12 +28,12 @@ class ExamRepository @Inject constructor(
                        .flatMap {
                            if (it) remote.getExams(semester, dates.first, dates.second)
                            else Single.error(UnknownHostException())
-                        }.flatMap { newExams ->
+                        }.flatMap { new ->
                            local.getExams(semester, dates.first, dates.second)
                                .toSingle(emptyList())
-                                .doOnSuccess { oldExams ->
-                                    local.deleteExams(oldExams - newExams)
-                                    local.saveExams(newExams - oldExams)
+                                .doOnSuccess { old ->
+                                    local.deleteExams(old.uniqueSubtract(new))
+                                    local.saveExams(new.uniqueSubtract(old))
                                }
                        }.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,6 +5,7 @@ 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
@ -24,13 +25,12 @@ class GradeRepository @Inject constructor(
                .flatMap {
                    if (it) remote.getGrades(semester)
                    else Single.error(UnknownHostException())
-                }.flatMap { newGrades ->
+                }.flatMap { new ->
                    local.getGrades(semester).toSingle(emptyList())
-                        .doOnSuccess { oldGrades ->
-                            val notifyBreakDate = oldGrades.maxBy { it.date }?.date
-                                ?: student.registrationDate.toLocalDate()
-                            local.deleteGrades(oldGrades - newGrades)
-                            local.saveGrades((newGrades - oldGrades)
+                        .doOnSuccess { old ->
+                            val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
+                            local.deleteGrades(old.uniqueSubtract(new))
+                            local.saveGrades(new.uniqueSubtract(old)
                                .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,9 +18,14 @@ 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
+                        finalGrade = it.final,
+                        pointsSum = it.pointsSum,
+                        proposedPoints = it.proposedPoints,
+                        finalPoints = it.finalPoints,
+                        average = it.average
                    )
                }
            }
--- 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,6 +4,7 @@ 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
@ -22,11 +23,11 @@ class GradeSummaryRepository @Inject constructor(
                .flatMap {
                    if (it) remote.getGradeSummary(semester)
                    else Single.error(UnknownHostException())
-                }.flatMap { newGradesSummary ->
+                }.flatMap { new ->
                    local.getGradesSummary(semester).toSingle(emptyList())
-                        .doOnSuccess { oldGradesSummary ->
-                            local.deleteGradesSummary(oldGradesSummary - newGradesSummary)
-                            local.saveGradesSummary(newGradesSummary - oldGradesSummary)
+                        .doOnSuccess { old ->
+                            local.deleteGradesSummary(old.uniqueSubtract(new))
+                            local.saveGradesSummary(new.uniqueSubtract(old))
                        }
                }.flatMap { local.getGradesSummary(semester).toSingle(emptyList()) })
    }
--- 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
@ -4,6 +4,7 @@ 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.GradeStatistics
 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
@ -22,11 +23,11 @@ class GradeStatisticsRepository @Inject constructor(
                .flatMap {
                    if (it) remote.getGradeStatistics(semester, isSemester)
                    else Single.error(UnknownHostException())
-                }.flatMap { newGradesStats ->
+                }.flatMap { new ->
                    local.getGradesStatistics(semester, isSemester).toSingle(emptyList())
-                        .doOnSuccess { oldGradesStats ->
-                            local.deleteGradesStatistics(oldGradesStats - newGradesStats)
-                            local.saveGradesStatistics(newGradesStats - oldGradesStats)
+                        .doOnSuccess { old ->
+                            local.deleteGradesStatistics(old.uniqueSubtract(new))
+                            local.saveGradesStatistics(new.uniqueSubtract(old))
                        }
                }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).toSingle(emptyList()) })
    }
--- 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,6 +6,7 @@ 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
@ -26,11 +27,11 @@ class HomeworkRepository @Inject constructor(
                    .flatMap {
                        if (it) remote.getHomework(semester, monday, friday)
                        else Single.error(UnknownHostException())
-                    }.flatMap { newGrades ->
+                    }.flatMap { new ->
                        local.getHomework(semester, monday, friday).toSingle(emptyList())
-                            .doOnSuccess { oldGrades ->
-                                local.deleteHomework(oldGrades - newGrades)
-                                local.saveHomework(newGrades - oldGrades)
+                            .doOnSuccess { old ->
+                                local.deleteHomework(old.uniqueSubtract(new))
+                                local.saveHomework(new.uniqueSubtract(old))
                            }
                    }.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,8 +23,8 @@ class MessageLocal @Inject constructor(private val messagesDb: MessagesDao) {
        messagesDb.deleteAll(messages)
    }

-    fun getMessage(student: Student, id: Int): Maybe<Message> {
-        return messagesDb.load(student.id.toInt(), id)
+    fun getMessage(id: Long): Maybe<Message> {
+        return messagesDb.load(id)
    }

    fun getMessages(student: Student, folder: MessageFolder): Maybe<List<Message>> {
--- 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
@ -59,4 +59,8 @@ 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,7 +8,9 @@ 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
@ -33,8 +35,8 @@ class MessageRepository @Inject constructor(
                        }.flatMap { new ->
                            local.getMessages(student, folder).toSingle(emptyList())
                                .doOnSuccess { old ->
-                                    local.deleteMessages(old - new)
-                                    local.saveMessages((new - old)
+                                    local.deleteMessages(old.uniqueSubtract(new))
+                                    local.saveMessages(new.uniqueSubtract(old)
                                        .onEach {
                                            it.isNotified = !notify
                                        })
@ -44,14 +46,14 @@ class MessageRepository @Inject constructor(
            }
    }

-    fun getMessage(student: Student, messageId: Int, markAsRead: Boolean = false): Single<Message> {
+    fun getMessage(student: Student, messageDbId: Long, markAsRead: Boolean = false): Single<Message> {
        return Single.just(apiHelper.initApi(student))
            .flatMap { _ ->
-                local.getMessage(student, messageId)
+                local.getMessage(messageDbId)
                    .filter { !it.content.isNullOrEmpty() }
                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                        .flatMap {
-                            if (it) local.getMessage(student, messageId).toSingle()
+                            if (it) local.getMessage(messageDbId).toSingle()
                            else Single.error(UnknownHostException())
                        }
                        .flatMap { dbMessage ->
@ -62,7 +64,7 @@ class MessageRepository @Inject constructor(
                                }))
                            }
                        }.flatMap {
-                            local.getMessage(student, messageId).toSingle()
+                            local.getMessage(messageDbId).toSingle()
                        }
                    )
            }
@ -89,4 +91,20 @@ 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
@ -0,0 +1,25 @@
+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
@ -0,0 +1,47 @@
+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
@ -0,0 +1,44 @@
+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 remote.unregisterDevice(semester, device)
+    }
+
+    fun getToken(semester: Semester): Single<MobileDeviceToken> {
+        return remote.getToken(semester)
+    }
+}
--- 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,6 +5,7 @@ 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
@ -27,8 +28,8 @@ class NoteRepository @Inject constructor(
                }.flatMap { new ->
                    local.getNotes(student).toSingle(emptyList())
                        .doOnSuccess { old ->
-                            local.deleteNotes(old - new)
-                            local.saveNotes((new - old)
+                            local.deleteNotes(old.uniqueSubtract(new))
+                            local.saveNotes(new.uniqueSubtract(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
@ -17,12 +17,18 @@ class PreferencesRepository @Inject constructor(
    val isShowPresent: Boolean
        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_attendance_present), true)

+    val gradeAverageMode: String
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_average_mode), "only_one_semester") ?: "only_one_semester"
+
+    val gradeAverageForceCalc: Boolean
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_grade_average_force_calc), false)
+
    val isGradeExpandable: Boolean
        get() = !sharedPref.getBoolean(context.getString(R.string.pref_key_expand_grade), false)

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

    val gradeColorTheme: String
        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_color_scheme), "vulcan") ?: "vulcan"
@ -37,7 +43,7 @@ class PreferencesRepository @Inject constructor(

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

    val isNotificationsEnable: Boolean
        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_notifications_enable), true)
@ -50,8 +56,7 @@ class PreferencesRepository @Inject constructor(
        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_plus), "0.0")?.toDouble() ?: 0.0

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

    val fillMessageContent: Boolean
        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,6 +7,7 @@ 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
@ -31,8 +32,8 @@ class RecipientRepository @Inject constructor(
                        }.flatMap { new ->
                            local.getRecipients(student, role, unit).toSingle(emptyList())
                                .doOnSuccess { old ->
-                                    local.deleteRecipients(old - new)
-                                    local.saveRecipients(new - old)
+                                    local.deleteRecipients(old.uniqueSubtract(new))
+                                    local.saveRecipients(new.uniqueSubtract(old))
                                }
                        }.flatMap {
                            local.getRecipients(student, role, unit).toSingle(emptyList())
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
@ -5,6 +5,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
 import io.github.wulkanowy.data.ApiHelper
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
@ -30,8 +31,8 @@ class ReportingUnitRepository @Inject constructor(
                        }.flatMap { new ->
                            local.getReportingUnits(student).toSingle(emptyList())
                                .doOnSuccess { old ->
-                                    local.deleteReportingUnits(old - new)
-                                    local.saveReportingUnits(new - old)
+                                    local.deleteReportingUnits(old.uniqueSubtract(new))
+                                    local.saveReportingUnits(new.uniqueSubtract(old))
                                }
                        }.flatMap { local.getReportingUnits(student).toSingle(emptyList()) }
                    )
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
@ -5,6 +5,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
 import io.github.wulkanowy.data.ApiHelper
 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.Maybe
 import io.reactivex.Single
 import timber.log.Timber
@ -31,8 +32,8 @@ class SemesterRepository @Inject constructor(
                    if (currentSemesters.size == 1) {
                        local.getSemesters(student).toSingle(emptyList())
                            .doOnSuccess { old ->
-                                local.deleteSemesters(old - new)
-                                local.saveSemesters(new - old)
+                                local.deleteSemesters(old.uniqueSubtract(new))
+                                local.saveSemesters(new.uniqueSubtract(old))
                            }
                    } else {
                        Timber.i("Current semesters list:\n${currentSemesters.joinToString(separator = "\n")}")
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
@ -17,8 +17,8 @@ class StudentLocal @Inject constructor(
    private val context: Context
 ) {

-    fun saveStudent(student: Student): Single<Long> {
-        return Single.fromCallable { studentDb.insert(student.copy(password = encrypt(student.password, context))) }
+    fun saveStudents(students: List<Student>): Single<List<Long>> {
+        return Single.fromCallable { studentDb.insertAll(students.map { it.copy(password = encrypt(it.password, context)) }) }
    }

    fun getStudents(decryptPass: Boolean): Maybe<List<Student>> {
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
@ -22,6 +22,8 @@ class StudentRepository @Inject constructor(

    fun isStudentSaved(): Single<Boolean> = local.getStudents(false).isEmpty.map { !it }

+    fun isCurrentStudentSet(): Single<Boolean> = local.getCurrentStudent(false).isEmpty.map { !it }
+
    fun getStudents(email: String, password: String, endpoint: String, symbol: String = ""): Single<List<Student>> {
        return ReactiveNetwork.checkInternetConnectivity(settings)
            .flatMap {
@ -41,8 +43,8 @@ class StudentRepository @Inject constructor(
            .toSingle()
    }

-    fun saveStudent(student: Student): Single<Long> {
-        return local.saveStudent(student)
+    fun saveStudents(students: List<Student>): Single<List<Long>> {
+        return local.saveStudents(students)
    }

    fun switchStudent(student: Student): Completable {
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
@ -4,6 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Subject
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@ -26,8 +27,8 @@ class SubjectRepository @Inject constructor(
                    local.getSubjects(semester)
                        .toSingle(emptyList())
                        .doOnSuccess { old ->
-                            local.deleteSubjects(old - new)
-                            local.saveSubjects(new - old)
+                            local.deleteSubjects(old.uniqueSubtract(new))
+                            local.saveSubjects(new.uniqueSubtract(old))
                        }
                }.flatMap {
                    local.getSubjects(semester).toSingle(emptyList())
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
@ -6,6 +6,7 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Timetable
 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
@ -25,17 +26,16 @@ class TimetableRepository @Inject constructor(
                .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
                    if (it) remote.getTimetable(semester, monday, friday)
                    else Single.error(UnknownHostException())
-                }.flatMap { newTimetable ->
+                }.flatMap { new ->
                    local.getTimetable(semester, monday, friday)
                        .toSingle(emptyList())
-                        .doOnSuccess { oldTimetable ->
-                            local.deleteTimetable(oldTimetable - newTimetable)
-                            local.saveTimetable((newTimetable - oldTimetable).map { item ->
+                        .doOnSuccess { old ->
+                            local.deleteTimetable(old.uniqueSubtract(new))
+                            local.saveTimetable(new.uniqueSubtract(old).map { item ->
                                item.apply {
-                                    oldTimetable.singleOrNull { this.start == it.start }?.let {
+                                    old.singleOrNull { this.start == it.start }?.let {
                                        return@map copy(
-                                            room = if (room.isEmpty()) it.room else room,
-                                            teacher = if (teacher.isEmpty()) it.teacher else teacher
+                                            room = if (room.isEmpty()) it.room else room
                                        )
                                    }
                                }
--- a/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
@ -17,6 +17,6 @@ import javax.inject.Singleton
    BuilderModule::class])
 interface AppComponent : AndroidInjector<WulkanowyApp> {

-    @Component.Builder
-    abstract class Builder : AndroidInjector.Builder<WulkanowyApp>()
+    @Component.Factory
+    interface Factory : AndroidInjector.Factory<WulkanowyApp>
 }
--- a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
@ -2,14 +2,12 @@ package io.github.wulkanowy.di

 import android.appwidget.AppWidgetManager
 import android.content.Context
-import com.google.firebase.analytics.FirebaseAnalytics
 import dagger.Module
 import dagger.Provides
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.BuildConfig.DEBUG
 import io.github.wulkanowy.WulkanowyApp
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Named
 import javax.inject.Singleton
@ -30,11 +28,7 @@ internal class AppModule {

    @Singleton
    @Provides
-    fun provideFirebaseAnalyticsHelper(context: Context) = FirebaseAnalyticsHelper(FirebaseAnalytics.getInstance(context))
-
-    @Singleton
-    @Provides
-    fun provideAppWidgetManager(context: Context) = AppWidgetManager.getInstance(context)
+    fun provideAppWidgetManager(context: Context): AppWidgetManager = AppWidgetManager.getInstance(context)

    @Singleton
    @Named("isDebug")
--- a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
@ -5,11 +5,14 @@ import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginModule
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainModule
 import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import io.github.wulkanowy.ui.modules.splash.SplashActivity
-import io.github.wulkanowy.ui.widgets.timetable.TimetableWidgetProvider
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureActivity
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider

@Module
 internal abstract class BuilderModule {
@ -29,6 +32,15 @@ internal abstract class BuilderModule {
    @ContributesAndroidInjector
    abstract fun bindMessageSendActivity(): SendMessageActivity

+    @ContributesAndroidInjector
+    abstract fun bindTimetableWidgetAccountActivity(): TimetableWidgetConfigureActivity
+
    @ContributesAndroidInjector
    abstract fun bindTimetableWidgetProvider(): TimetableWidgetProvider
+
+    @ContributesAndroidInjector
+    abstract fun bindLuckyNumberWidgetAccountActivity(): LuckyNumberWidgetConfigureActivity
+
+    @ContributesAndroidInjector
+    abstract fun bindLuckyNumberWidgetProvider(): LuckyNumberWidgetProvider
 }
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
@ -6,7 +6,7 @@ import androidx.work.BackoffPolicy.EXPONENTIAL
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy.KEEP
 import androidx.work.ExistingPeriodicWorkPolicy.REPLACE
-import androidx.work.NetworkType.METERED
+import androidx.work.NetworkType.CONNECTED
 import androidx.work.NetworkType.UNMETERED
 import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
@ -43,7 +43,7 @@ class SyncManager @Inject constructor(
                PeriodicWorkRequest.Builder(SyncWorker::class.java, preferencesRepository.servicesInterval, MINUTES, 10, MINUTES)
                    .setBackoffCriteria(EXPONENTIAL, 30, MINUTES)
                    .setConstraints(Constraints.Builder()
-                        .setRequiredNetworkType(if (preferencesRepository.isServicesOnlyWifi) METERED else UNMETERED)
+                        .setRequiredNetworkType(if (preferencesRepository.isServicesOnlyWifi) UNMETERED else CONNECTED)
                        .build())
                    .build())
        }
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
@ -35,7 +35,7 @@ class SyncWorker @AssistedInject constructor(

    override fun createWork(): Single<Result> {
        Timber.i("SyncWorker is starting")
-        return studentRepository.isStudentSaved()
+        return studentRepository.isCurrentStudentSet()
            .filter { true }
            .flatMap { studentRepository.getCurrentStudent().toMaybe() }
            .flatMapCompletable { student ->
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
@ -15,7 +15,7 @@ import io.github.wulkanowy.data.repositories.grade.GradeRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@ -47,8 +47,8 @@ class GradeWork @Inject constructor(
            .setDefaults(DEFAULT_ALL)
            .setColor(context.getCompatColor(R.color.colorPrimary))
            .setContentIntent(
-                PendingIntent.getActivity(context, 0,
-                    MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 0), FLAG_UPDATE_CURRENT))
+                PendingIntent.getActivity(context, MenuView.GRADE.id,
+                    MainActivity.getStartIntent(context, MenuView.GRADE, true), FLAG_UPDATE_CURRENT))
            .setStyle(NotificationCompat.InboxStyle().run {
                setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, grades.size, grades.size))
                grades.forEach { addLine("${it.subject}: ${it.entry}") }
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
@ -15,7 +15,7 @@ import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@ -47,9 +47,8 @@ class LuckyNumberWork @Inject constructor(
            .setPriority(PRIORITY_HIGH)
            .setColor(context.getCompatColor(R.color.colorPrimary))
            .setContentIntent(
-                PendingIntent.getActivity(context, 0,
-                    MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 4), FLAG_UPDATE_CURRENT)
-            )
+                PendingIntent.getActivity(context, MenuView.MESSAGE.id,
+                    MainActivity.getStartIntent(context, MenuView.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
            .build())
    }
 }
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
@ -16,7 +16,7 @@ import io.github.wulkanowy.data.repositories.message.MessageRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@ -48,8 +48,8 @@ class MessageWork @Inject constructor(
            .setPriority(PRIORITY_HIGH)
            .setColor(context.getCompatColor(R.color.colorPrimary))
            .setContentIntent(
-                PendingIntent.getActivity(context, 0,
-                    MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 4), FLAG_UPDATE_CURRENT)
+                PendingIntent.getActivity(context, MenuView.MESSAGE.id,
+                    MainActivity.getStartIntent(context, MenuView.MESSAGE, true), FLAG_UPDATE_CURRENT)
            )
            .setStyle(NotificationCompat.InboxStyle().run {
                setSummaryText(context.resources.getQuantityString(R.plurals.message_number_item, messages.size, messages.size))
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
@ -15,7 +15,7 @@ import io.github.wulkanowy.data.repositories.note.NoteRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@ -47,9 +47,8 @@ class NoteWork @Inject constructor(
            .setPriority(PRIORITY_HIGH)
            .setColor(context.getCompatColor(R.color.colorPrimary))
            .setContentIntent(
-                PendingIntent.getActivity(context, 0,
-                    MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 4), FLAG_UPDATE_CURRENT)
-            )
+                PendingIntent.getActivity(context, MenuView.NOTE.id,
+                    MainActivity.getStartIntent(context, MenuView.NOTE, true), FLAG_UPDATE_CURRENT))
            .setStyle(NotificationCompat.InboxStyle().run {
                setSummaryText(context.resources.getQuantityString(R.plurals.note_number_item, notes.size, notes.size))
                notes.forEach { addLine("${it.teacher}: ${it.category}") }
--- a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
@ -7,7 +7,7 @@ import io.github.wulkanowy.data.db.SharedPrefHelper
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
-import io.github.wulkanowy.ui.widgets.timetable.TimetableWidgetFactory
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetFactory
 import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject

--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
@ -1,34 +1,82 @@
 package io.github.wulkanowy.ui.base

+import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.os.Bundle
 import android.view.View
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.fragment.app.Fragment
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
-import dagger.android.support.DaggerAppCompatActivity
+import dagger.android.AndroidInjection
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.support.HasSupportFragmentInjector
 import io.github.wulkanowy.R
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.utils.FragmentLifecycleLogger
+import javax.inject.Inject

-abstract class BaseActivity : DaggerAppCompatActivity(), BaseView {
+abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity(), BaseView,
+    HasSupportFragmentInjector {

-    protected lateinit var messageContainer: View
+    @Inject
+    lateinit var supportFragmentInjector: DispatchingAndroidInjector<Fragment>
+
+    @Inject
+    lateinit var fragmentLifecycleLogger: FragmentLifecycleLogger
+
+    @Inject
+    lateinit var themeManager: ThemeManager
+
+    protected var messageContainer: View? = null
+
+    abstract var presenter: T

    public override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        themeManager.applyTheme(this)
        super.onCreate(savedInstanceState)
+        supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleLogger, true)
        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
    }

    override fun showError(text: String, error: Throwable) {
-        Snackbar.make(messageContainer, text, LENGTH_LONG).setAction(R.string.all_details) {
-            ErrorDialog.newInstance(error).show(supportFragmentManager, error.toString())
-        }.show()
+        if (messageContainer != null) {
+            Snackbar.make(messageContainer!!, text, LENGTH_LONG)
+                .setAction(R.string.all_details) {
+                    ErrorDialog.newInstance(error).show(supportFragmentManager, error.toString())
+                }
+                .show()
+        } else showMessage(text)
    }

    override fun showMessage(text: String) {
-        Snackbar.make(messageContainer, text, LENGTH_LONG).show()
+        if (messageContainer != null) Snackbar.make(messageContainer!!, text, LENGTH_LONG).show()
+        else Toast.makeText(this, text, Toast.LENGTH_LONG).show()
+    }
+
+    override fun showExpiredDialog() {
+        AlertDialog.Builder(this)
+            .setTitle(R.string.main_session_expired)
+            .setMessage(R.string.main_session_relogin)
+            .setPositiveButton(R.string.main_log_in) { _, _ -> presenter.onExpiredLoginSelected() }
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .show()
+    }
+
+    override fun openClearLoginView() {
+        startActivity(LoginActivity.getStartIntent(this)
+            .apply { addFlags(FLAG_ACTIVITY_CLEAR_TASK or FLAG_ACTIVITY_NEW_TASK) })
    }

    override fun onDestroy() {
        super.onDestroy()
        invalidateOptionsMenu()
+        presenter.onDetachView()
    }
+
+    override fun supportFragmentInjector() = supportFragmentInjector
 }
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
@ -2,6 +2,7 @@ package io.github.wulkanowy.ui.base

 import android.view.View
 import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
 import dagger.android.support.DaggerFragment
 import io.github.wulkanowy.R

@ -10,16 +11,30 @@ abstract class BaseFragment : DaggerFragment(), BaseView {
    protected var messageContainer: View? = null

    override fun showError(text: String, error: Throwable) {
-        if (messageContainer == null) (activity as? BaseActivity)?.showError(text, error)
-        else messageContainer?.also {
-            Snackbar.make(it, text, Snackbar.LENGTH_LONG).setAction(R.string.all_details) {
-                ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
-            }.show()
+        if (messageContainer != null) {
+            Snackbar.make(messageContainer!!, text, LENGTH_LONG)
+                .setAction(R.string.all_details) {
+                    if (isAdded) ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
+                }
+                .show()
+        } else {
+            (activity as? BaseActivity<*>)?.showError(text, error)
        }
    }

    override fun showMessage(text: String) {
-        if (messageContainer == null) (activity as? BaseActivity)?.showMessage(text)
-        else messageContainer?.also { Snackbar.make(it, text, Snackbar.LENGTH_LONG).show() }
+        if (messageContainer != null) {
+            Snackbar.make(messageContainer!!, text, LENGTH_LONG).show()
+        } else {
+            (activity as? BaseActivity<*>)?.showMessage(text)
+        }
+    }
+
+    override fun showExpiredDialog() {
+        (activity as? BaseActivity<*>)?.showExpiredDialog()
+    }
+
+    override fun openClearLoginView() {
+        (activity as? BaseActivity<*>)?.openClearLoginView()
    }
 }
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
@ -1,8 +1,16 @@
 package io.github.wulkanowy.ui.base

+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Completable
 import io.reactivex.disposables.CompositeDisposable
+import timber.log.Timber

-open class BasePresenter<T : BaseView>(private val errorHandler: ErrorHandler) {
+open class BasePresenter<T : BaseView>(
+    protected val errorHandler: ErrorHandler,
+    protected val studentRepository: StudentRepository,
+    protected val schedulers: SchedulersProvider
+) {

    val disposable = CompositeDisposable()

@ -10,7 +18,33 @@ open class BasePresenter<T : BaseView>(private val errorHandler: ErrorHandler) {

    open fun onAttachView(view: T) {
        this.view = view
-        errorHandler.showErrorMessage = { text, error -> view.showError(text, error) }
+        errorHandler.apply {
+            showErrorMessage = view::showError
+            onSessionExpired = view::showExpiredDialog
+            onNoCurrentStudent = view::openClearLoginView
+        }
+    }
+
+    fun onExpiredLoginSelected() {
+        Timber.i("Attempt to switch the student after the session expires")
+        disposable.add(studentRepository.getCurrentStudent(false)
+            .flatMapCompletable { studentRepository.logoutStudent(it) }
+            .andThen(studentRepository.getSavedStudents(false))
+            .flatMapCompletable {
+                if (it.isNotEmpty()) {
+                    Timber.i("Switching current student")
+                    studentRepository.switchStudent(it[0])
+                } else Completable.complete()
+            }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Switch student result: Open login view")
+                view?.openClearLoginView()
+            }, {
+                Timber.i("Switch student result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
    }

    open fun onDetachView() {
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt
@ -5,4 +5,8 @@ interface BaseView {
    fun showError(text: String, error: Throwable)

    fun showMessage(text: String)
+
+    fun showExpiredDialog()
+
+    fun openClearLoginView()
 }
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
@ -5,7 +5,10 @@ import com.readystatesoftware.chuck.api.ChuckCollector
 import io.github.wulkanowy.R
 import io.github.wulkanowy.api.interceptor.FeatureDisabledException
 import io.github.wulkanowy.api.interceptor.ServiceUnavailableException
+import io.github.wulkanowy.api.login.BadCredentialsException
 import io.github.wulkanowy.api.login.NotLoggedInException
+import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
+import io.github.wulkanowy.utils.security.ScramblerException
 import timber.log.Timber
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
@ -15,6 +18,10 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources,

    var showErrorMessage: (String, Throwable) -> Unit = { _, _ -> }

+    var onSessionExpired: () -> Unit = {}
+
+    var onNoCurrentStudent: () -> Unit = {}
+
    fun dispatch(error: Throwable) {
        chuckCollector.onError(error.javaClass.simpleName, error)
        Timber.e(error, "An exception occurred while the Wulkanowy was running")
@ -22,17 +29,23 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources,
    }

    protected open fun proceed(error: Throwable) {
-        showErrorMessage((when (error) {
-            is UnknownHostException -> resources.getString(R.string.error_no_internet)
-            is SocketTimeoutException -> resources.getString(R.string.error_timeout)
-            is NotLoggedInException -> resources.getString(R.string.error_login_failed)
-            is ServiceUnavailableException -> resources.getString(R.string.error_service_unavailable)
-            is FeatureDisabledException -> resources.getString(R.string.error_feature_disabled)
-            else -> resources.getString(R.string.error_unknown)
-        }), error)
+        resources.run {
+            when (error) {
+                is UnknownHostException -> showErrorMessage(getString(R.string.error_no_internet), error)
+                is SocketTimeoutException -> showErrorMessage(getString(R.string.error_timeout), error)
+                is NotLoggedInException -> showErrorMessage(getString(R.string.error_login_failed), error)
+                is ServiceUnavailableException -> showErrorMessage(getString(R.string.error_service_unavailable), error)
+                is FeatureDisabledException -> showErrorMessage(getString(R.string.error_feature_disabled), error)
+                is ScramblerException, is BadCredentialsException -> onSessionExpired()
+                is NoCurrentStudentException -> onNoCurrentStudent()
+                else -> showErrorMessage(getString(R.string.error_unknown), error)
+            }
+        }
    }

    open fun clear() {
        showErrorMessage = { _, _ -> }
+        onSessionExpired = {}
+        onNoCurrentStudent = {}
    }
 }
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
@ -0,0 +1,33 @@
+package io.github.wulkanowy.ui.base
+
+import android.content.pm.PackageManager.GET_ACTIVITIES
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
+import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import javax.inject.Inject
+
+class ThemeManager @Inject constructor(private val preferencesRepository: PreferencesRepository) {
+
+    fun applyTheme(activity: AppCompatActivity) {
+        if (isThemeApplicable(activity)) {
+            activity.delegate.apply {
+                when (preferencesRepository.appTheme) {
+                    "light" -> setLocalNightMode(MODE_NIGHT_NO)
+                    "dark" -> setLocalNightMode(MODE_NIGHT_YES)
+                    "black" -> {
+                        setLocalNightMode(MODE_NIGHT_YES)
+                        activity.setTheme(R.style.WulkanowyTheme_Black)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun isThemeApplicable(activity: AppCompatActivity): Boolean {
+        return activity.packageManager.getPackageInfo(activity.packageName, GET_ACTIVITIES)
+            .activities.singleOrNull { it.name == activity::class.java.canonicalName }?.theme
+            .let { it == R.style.WulkanowyTheme_Black || it == R.style.WulkanowyTheme_NoActionBar }
+    }
+}
--- a/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionFragment.kt
@ -1,21 +0,0 @@
-package io.github.wulkanowy.ui.base.session
-
-import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
-import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
-import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.login.LoginActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity
-
-open class BaseSessionFragment : BaseFragment(), BaseSessionView {
-
-    override fun showExpiredDialog() {
-        (activity as? MainActivity)?.showExpiredDialog()
-    }
-
-    override fun openLoginView() {
-        activity?.also {
-            startActivity(LoginActivity.getStartIntent(it)
-                .apply { addFlags(FLAG_ACTIVITY_CLEAR_TASK or FLAG_ACTIVITY_NEW_TASK) })
-        }
-    }
-}
--- a/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionPresenter.kt
@ -1,15 +0,0 @@
-package io.github.wulkanowy.ui.base.session
-
-import io.github.wulkanowy.ui.base.BasePresenter
-
-open class BaseSessionPresenter<T : BaseSessionView>(private val errorHandler: SessionErrorHandler) :
-    BasePresenter<T>(errorHandler) {
-
-    override fun onAttachView(view: T) {
-        super.onAttachView(view)
-        errorHandler.apply {
-            onDecryptionFail = { view.showExpiredDialog() }
-            onNoCurrentStudent = { view.openLoginView() }
-        }
-    }
-}
--- a/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionView.kt
@ -1,10 +0,0 @@
-package io.github.wulkanowy.ui.base.session
-
-import io.github.wulkanowy.ui.base.BaseView
-
-interface BaseSessionView : BaseView {
-
-    fun showExpiredDialog()
-
-    fun openLoginView()
-}
--- a/app/src/main/java/io/github/wulkanowy/ui/base/session/SessionErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/session/SessionErrorHandler.kt
@ -1,32 +0,0 @@
-package io.github.wulkanowy.ui.base.session
-
-import android.content.res.Resources
-import com.readystatesoftware.chuck.api.ChuckCollector
-import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
-import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.security.ScramblerException
-import javax.inject.Inject
-
-open class SessionErrorHandler @Inject constructor(
-    resources: Resources,
-    chuckCollector: ChuckCollector
-) : ErrorHandler(resources, chuckCollector) {
-
-    var onDecryptionFail: () -> Unit = {}
-
-    var onNoCurrentStudent: () -> Unit = {}
-
-    override fun proceed(error: Throwable) {
-        when (error) {
-            is ScramblerException -> onDecryptionFail()
-            is NoCurrentStudentException -> onNoCurrentStudent()
-            else -> super.proceed(error)
-        }
-    }
-
-    override fun clear() {
-        super.clear()
-        onDecryptionFail = {}
-        onNoCurrentStudent = {}
-    }
-}
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
@ -12,6 +12,7 @@ import io.github.wulkanowy.BuildConfig
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.openInternetBrowser
 import io.github.wulkanowy.utils.withOnExtraListener
 import javax.inject.Inject

@ -44,7 +45,7 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
                .withFields(R.string::class.java.fields)
                .withCheckCachedDetection(false)
                .withExcludedLibraries("fastadapter", "AndroidIconics", "Jsoup", "Retrofit", "okio",
-                    "OkHttp", "Butterknife", "CircleImageView")
+                    "Butterknife", "CircleImageView")
                .withOnExtraListener { presenter.onExtraSelect(it) })
        }.let {
            fragmentCompat.onCreateView(inflater.context, inflater, container, savedInstanceState, it)
@ -57,11 +58,11 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
    }

    override fun openDiscordInviteView() {
-        startActivity(Intent.parseUri("https://discord.gg/vccAQBr", 0))
+        context?.openInternetBrowser("https://discord.gg/vccAQBr", ::showMessage)
    }

    override fun openHomepageWebView() {
-        startActivity(Intent.parseUri("https://wulkanowy.github.io/", 0))
+        context?.openInternetBrowser("https://wulkanowy.github.io/", ::showMessage)
    }

    override fun openEmailClientView() {
@ -80,7 +81,7 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
            if (intent.resolveActivity(it.packageManager) != null) {
                startActivity(Intent.createChooser(intent, getString(R.string.about_feedback)))
            } else {
-                startActivity(Intent.parseUri("https://github.com/wulkanowy/wulkanowy/issues", 0))
+                it.openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
            }
        }
    }
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
@ -4,20 +4,24 @@ import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.Libs.SpecialButton.SPECIAL1
 import com.mikepenz.aboutlibraries.Libs.SpecialButton.SPECIAL2
 import com.mikepenz.aboutlibraries.Libs.SpecialButton.SPECIAL3
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject

 class AboutPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
    private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<AboutView>(errorHandler) {
+) : BasePresenter<AboutView>(errorHandler, studentRepository, schedulers) {

    override fun onAttachView(view: AboutView) {
        super.onAttachView(view)
-        Timber.i("About view is attached")
+        Timber.i("About view was initialized")
    }

    fun onExtraSelect(type: Libs.SpecialButton?) {
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
@ -1,7 +1,5 @@
 package io.github.wulkanowy.ui.modules.account

-import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
-import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@ -14,8 +12,8 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
+import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.dialog_account.*
 import javax.inject.Inject
@ -74,16 +72,17 @@ class AccountDialog : DaggerAppCompatDialogFragment(), AccountView {
    }

    override fun openLoginView() {
-        activity?.also {
+        activity?.let {
            startActivity(LoginActivity.getStartIntent(it))
        }
    }

+    override fun showExpiredDialog() {
+        (activity as? BaseActivity<*>)?.showExpiredDialog()
+    }
+
    override fun openClearLoginView() {
-        activity?.also {
-            startActivity(LoginActivity.getStartIntent(it)
-                .apply { addFlags(FLAG_ACTIVITY_CLEAR_TASK or FLAG_ACTIVITY_NEW_TASK) })
-        }
+        (activity as? BaseActivity<*>)?.openClearLoginView()
    }

    override fun showConfirmDialog() {
@ -97,11 +96,8 @@ class AccountDialog : DaggerAppCompatDialogFragment(), AccountView {
        }
    }

-    override fun recreateView() {
-        activity?.also {
-            startActivity(MainActivity.getStartIntent(it))
-            it.finish()
-        }
+    override fun recreateMainView() {
+        activity?.recreate()
    }

    override fun onDestroy() {
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
@ -11,16 +11,16 @@ import timber.log.Timber
 import javax.inject.Inject

 class AccountPresenter @Inject constructor(
-    private val errorHandler: ErrorHandler,
-    private val studentRepository: StudentRepository,
-    private val syncManager: SyncManager,
-    private val schedulers: SchedulersProvider
-) : BasePresenter<AccountView>(errorHandler) {
+    schedulers: SchedulersProvider,
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
+    private val syncManager: SyncManager
+) : BasePresenter<AccountView>(errorHandler, studentRepository, schedulers) {

    override fun onAttachView(view: AccountView) {
        super.onAttachView(view)
-        Timber.i("Account dialog is attached")
        view.initView()
+        Timber.i("Account dialog view was initialized")
        loadData()
    }

@ -54,7 +54,7 @@ class AccountPresenter @Inject constructor(
                        openClearLoginView()
                    } else {
                        Timber.i("Logout result: Switch to another student")
-                        recreateView()
+                        recreateMainView()
                    }
                }
            }, {
@ -73,9 +73,10 @@ class AccountPresenter @Inject constructor(
                disposable.add(studentRepository.switchStudent(item.student)
                    .subscribeOn(schedulers.backgroundThread)
                    .observeOn(schedulers.mainThread)
+                    .doFinally { view?.dismissView() }
                    .subscribe({
                        Timber.i("Change a student result: Success")
-                        view?.recreateView()
+                        view?.recreateMainView()
                    }, {
                        Timber.i("Change a student result: An exception occurred")
                        errorHandler.dispatch(it)
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
@ -14,8 +14,6 @@ interface AccountView : BaseView {

    fun openLoginView()

-    fun openClearLoginView()
-
-    fun recreateView()
+    fun recreateMainView()
 }

--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
@ -13,7 +13,7 @@ import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
@ -21,7 +21,7 @@ import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_attendance.*
 import javax.inject.Inject

-class AttendanceFragment : BaseSessionFragment(), AttendanceView, MainView.MainChildView, MainView.TitledView {
+class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildView, MainView.TitledView {

    @Inject
    lateinit var presenter: AttendancePresenter
@ -77,12 +77,12 @@ class AttendanceFragment : BaseSessionFragment(), AttendanceView, MainView.MainC
        attendanceNextButton.setOnClickListener { presenter.onNextDay() }
    }

-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
-        inflater?.inflate(R.menu.action_menu_attendance, menu)
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.action_menu_attendance, menu)
    }

-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        return if (item?.itemId == R.id.attendanceMenuSummary) presenter.onSummarySwitchSelected()
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == R.id.attendanceMenuSummary) presenter.onSummarySwitchSelected()
        else false
    }

@ -103,7 +103,7 @@ class AttendanceFragment : BaseSessionFragment(), AttendanceView, MainView.MainC
    }

    override fun onFragmentReselected() {
-        presenter.onViewReselected()
+        if (::presenter.isInitialized) presenter.onViewReselected()
    }

    override fun popView() {
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
@ -1,20 +1,14 @@
 package io.github.wulkanowy.ui.modules.attendance

-import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
-import io.github.wulkanowy.ui.base.session.SessionErrorHandler
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.isHolidays
-import io.github.wulkanowy.utils.nextSchoolDay
-import io.github.wulkanowy.utils.previousOrSameSchoolDay
-import io.github.wulkanowy.utils.previousSchoolDay
-import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.*
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.ofEpochDay
@ -23,22 +17,22 @@ import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject

 class AttendancePresenter @Inject constructor(
-    private val errorHandler: SessionErrorHandler,
-    private val schedulers: SchedulersProvider,
+    schedulers: SchedulersProvider,
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
    private val attendanceRepository: AttendanceRepository,
-    private val studentRepository: StudentRepository,
    private val semesterRepository: SemesterRepository,
    private val prefRepository: PreferencesRepository,
    private val analytics: FirebaseAnalyticsHelper
-) : BaseSessionPresenter<AttendanceView>(errorHandler) {
+) : BasePresenter<AttendanceView>(errorHandler, studentRepository, schedulers) {

    lateinit var currentDate: LocalDate
        private set

    fun onAttachView(view: AttendanceView, date: Long?) {
        super.onAttachView(view)
-        Timber.i("Attendance view is attached")
        view.initView()
+        Timber.i("Attendance view was initialized")
        loadData(ofEpochDay(date ?: now().previousOrSameSchoolDay.toEpochDay()))
        reloadView()
    }
@ -115,7 +109,7 @@ class AttendancePresenter @Inject constructor(
                        showEmpty(it.isEmpty())
                        showContent(it.isNotEmpty())
                    }
-                    analytics.logEvent("load_attendance", "items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd"))
+                    analytics.logEvent("load_attendance", "items" to it.size, "force_refresh" to forceRefresh)
                }) {
                    Timber.i("Loading attendance result: An exception occurred")
                    view?.run { showEmpty(isViewEmpty) }
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
@ -1,9 +1,9 @@
 package io.github.wulkanowy.ui.modules.attendance

 import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.ui.base.session.BaseSessionView
+import io.github.wulkanowy.ui.base.BaseView

-interface AttendanceView : BaseSessionView {
+interface AttendanceView : BaseView {

    val isViewEmpty: Boolean

--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
@ -13,13 +13,13 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.setOnItemSelectedListener
 import kotlinx.android.synthetic.main.fragment_attendance_summary.*
 import javax.inject.Inject

-class AttendanceSummaryFragment : BaseSessionFragment(), AttendanceSummaryView, MainView.TitledView {
+class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainView.TitledView {

    @Inject
    lateinit var presenter: AttendanceSummaryPresenter
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
@ -6,8 +6,8 @@ import io.github.wulkanowy.data.repositories.attendancesummary.AttendanceSummary
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.subject.SubjectRepository
-import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
-import io.github.wulkanowy.ui.base.session.SessionErrorHandler
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.calculatePercentage
@ -19,14 +19,14 @@ import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject

 class AttendanceSummaryPresenter @Inject constructor(
-    private val errorHandler: SessionErrorHandler,
+    schedulers: SchedulersProvider,
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
    private val attendanceSummaryRepository: AttendanceSummaryRepository,
    private val subjectRepository: SubjectRepository,
-    private val studentRepository: StudentRepository,
    private val semesterRepository: SemesterRepository,
-    private val schedulers: SchedulersProvider,
    private val analytics: FirebaseAnalyticsHelper
-) : BaseSessionPresenter<AttendanceSummaryView>(errorHandler) {
+) : BasePresenter<AttendanceSummaryView>(errorHandler, studentRepository, schedulers) {

    private var subjects = emptyList<Subject>()

@ -35,8 +35,8 @@ class AttendanceSummaryPresenter @Inject constructor(

    fun onAttachView(view: AttendanceSummaryView, subjectId: Int?) {
        super.onAttachView(view)
-        Timber.i("Attendance summary view is attached with subject id ${subjectId ?: -1}")
        view.initView()
+        Timber.i("Attendance summary view was initialized with subject id ${subjectId ?: -1}")
        loadData(subjectId ?: -1)
        loadSubjects()
    }
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
@ -1,8 +1,8 @@
 package io.github.wulkanowy.ui.modules.attendance.summary

-import io.github.wulkanowy.ui.base.session.BaseSessionView
+import io.github.wulkanowy.ui.base.BaseView

-interface AttendanceSummaryView : BaseSessionView {
+interface AttendanceSummaryView : BaseView {

    val isViewEmpty: Boolean

--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
@ -13,14 +13,14 @@ import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_exam.*
 import javax.inject.Inject

-class ExamFragment : BaseSessionFragment(), ExamView, MainView.MainChildView, MainView.TitledView {
+class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.TitledView {

    @Inject
    lateinit var presenter: ExamPresenter
@ -88,7 +88,7 @@ class ExamFragment : BaseSessionFragment(), ExamView, MainView.MainChildView, Ma
    }

    override fun onFragmentReselected() {
-        presenter.onViewReselected()
+        if (::presenter.isInitialized) presenter.onViewReselected()
    }

    override fun showEmpty(show: Boolean) {
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
@ -1,13 +1,12 @@
 package io.github.wulkanowy.ui.modules.exam

-import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.repositories.exam.ExamRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
-import io.github.wulkanowy.ui.base.session.SessionErrorHandler
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.friday
@ -23,21 +22,21 @@ import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject

 class ExamPresenter @Inject constructor(
-    private val errorHandler: SessionErrorHandler,
-    private val schedulers: SchedulersProvider,
+    schedulers: SchedulersProvider,
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
    private val examRepository: ExamRepository,
-    private val studentRepository: StudentRepository,
    private val semesterRepository: SemesterRepository,
    private val analytics: FirebaseAnalyticsHelper
-) : BaseSessionPresenter<ExamView>(errorHandler) {
+) : BasePresenter<ExamView>(errorHandler, studentRepository, schedulers) {

    lateinit var currentDate: LocalDate
        private set

    fun onAttachView(view: ExamView, date: Long?) {
        super.onAttachView(view)
-        Timber.i("Exam view is attached")
        view.initView()
+        Timber.i("Exam view was initialized")
        loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
        reloadView()
    }
@ -102,7 +101,7 @@ class ExamPresenter @Inject constructor(
                        showEmpty(it.isEmpty())
                        showContent(it.isNotEmpty())
                    }
-                    analytics.logEvent("load_exam", "items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd"))
+                    analytics.logEvent("load_exam", "items" to it.size, "force_refresh" to forceRefresh)
                }) {
                    Timber.i("Loading exam result: An exception occurred")
                    view?.run { showEmpty(isViewEmpty) }
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
@ -1,9 +1,9 @@
 package io.github.wulkanowy.ui.modules.exam

 import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.ui.base.session.BaseSessionView
+import io.github.wulkanowy.ui.base.BaseView

-interface ExamView : BaseSessionView {
+interface ExamView : BaseView {

    val isViewEmpty: Boolean

--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
@ -0,0 +1,72 @@
+package io.github.wulkanowy.ui.modules.grade
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.grade.GradeRepository
+import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.utils.calcAverage
+import io.github.wulkanowy.utils.changeModifier
+import io.reactivex.Maybe
+import io.reactivex.Single
+import javax.inject.Inject
+
+class GradeAverageProvider @Inject constructor(
+    private val preferencesRepository: PreferencesRepository,
+    private val gradeRepository: GradeRepository,
+    private val gradeSummaryRepository: GradeSummaryRepository
+) {
+
+    fun getGradeAverage(student: Student, semesters: List<Semester>, selectedSemesterId: Int, forceRefresh: Boolean): Single<Map<String, Double>> {
+        return when (preferencesRepository.gradeAverageMode) {
+            "all_year" -> getAllYearAverage(student, semesters, selectedSemesterId, forceRefresh)
+            "only_one_semester" -> getOnlyOneSemesterAverage(student, semesters, selectedSemesterId, forceRefresh)
+            else -> throw IllegalArgumentException("Incorrect grade average mode: ${preferencesRepository.gradeAverageMode} ")
+        }
+    }
+
+    private fun getAllYearAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<Map<String, Double>> {
+        val selectedSemester = semesters.single { it.semesterId == semesterId }
+        val firstSemester = semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
+        val plusModifier = preferencesRepository.gradePlusModifier
+        val minusModifier = preferencesRepository.gradeMinusModifier
+
+        return getAverageFromGradeSummary(selectedSemester, forceRefresh)
+            .switchIfEmpty(gradeRepository.getGrades(student, selectedSemester, forceRefresh)
+                .flatMap { firstGrades ->
+                    if (selectedSemester == firstSemester) Single.just(firstGrades)
+                    else {
+                        gradeRepository.getGrades(student, firstSemester)
+                            .map { secondGrades -> secondGrades + firstGrades }
+                    }
+                }.map { grades ->
+                    grades.map { it.changeModifier(plusModifier, minusModifier) }
+                        .groupBy { it.subject }
+                        .mapValues { it.value.calcAverage() }
+                })
+    }
+
+    private fun getOnlyOneSemesterAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<Map<String, Double>> {
+        val selectedSemester = semesters.single { it.semesterId == semesterId }
+        val plusModifier = preferencesRepository.gradePlusModifier
+        val minusModifier = preferencesRepository.gradeMinusModifier
+
+        return getAverageFromGradeSummary(selectedSemester, forceRefresh)
+            .switchIfEmpty(gradeRepository.getGrades(student, selectedSemester, forceRefresh)
+                .map { grades ->
+                    grades.map { it.changeModifier(plusModifier, minusModifier) }
+                        .groupBy { it.subject }
+                        .mapValues { it.value.calcAverage() }
+                })
+    }
+
+    private fun getAverageFromGradeSummary(selectedSemester: Semester, forceRefresh: Boolean): Maybe<Map<String, Double>> {
+        return gradeSummaryRepository.getGradesSummary(selectedSemester, forceRefresh)
+            .toMaybe()
+            .flatMap {
+                if (it.any { summary -> summary.average != .0 }) {
+                    Maybe.just(it.map { summary -> summary.subject to summary.average }.toMap())
+                } else Maybe.empty()
+            }.filter { !preferencesRepository.gradeAverageForceCalc }
+    }
+}
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
@ -11,8 +11,8 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import io.github.wulkanowy.R
+import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
-import io.github.wulkanowy.ui.base.session.BaseSessionFragment
 import io.github.wulkanowy.ui.modules.grade.details.GradeDetailsFragment
 import io.github.wulkanowy.ui.modules.grade.statistics.GradeStatisticsFragment
 import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
@ -21,7 +21,7 @@ import io.github.wulkanowy.utils.setOnSelectPageListener
 import kotlinx.android.synthetic.main.fragment_grade.*
 import javax.inject.Inject

-class GradeFragment : BaseSessionFragment(), GradeView, MainView.MainChildView, MainView.TitledView {
+class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainView.TitledView {

    @Inject
    lateinit var presenter: GradePresenter
@ -57,9 +57,9 @@ class GradeFragment : BaseSessionFragment(), GradeView, MainView.MainChildView,
        presenter.onAttachView(this, savedInstanceState?.getInt(SAVED_SEMESTER_KEY))
    }

-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
-        inflater?.inflate(R.menu.action_menu_grade, menu)
-        semesterSwitchMenu = menu?.findItem(R.id.gradeMenuSemester)
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.action_menu_grade, menu)
+        semesterSwitchMenu = menu.findItem(R.id.gradeMenuSemester)
        presenter.onCreateMenu()
    }

@ -82,13 +82,13 @@ class GradeFragment : BaseSessionFragment(), GradeView, MainView.MainChildView,
        gradeSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
    }

-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        return if (item?.itemId == R.id.gradeMenuSemester) presenter.onSemesterSwitch()
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == R.id.gradeMenuSemester) presenter.onSemesterSwitch()
        else false
    }

    override fun onFragmentReselected() {
-        presenter.onViewReselected()
+        if (::presenter.isInitialized) presenter.onViewReselected()
    }

    override fun showContent(show: Boolean) {
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
@ -3,20 +3,20 @@ package io.github.wulkanowy.ui.modules.grade
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
-import io.github.wulkanowy.ui.base.session.SessionErrorHandler
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject

 class GradePresenter @Inject constructor(
-    private val errorHandler: SessionErrorHandler,
-    private val schedulers: SchedulersProvider,
-    private val studentRepository: StudentRepository,
+    schedulers: SchedulersProvider,
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
    private val semesterRepository: SemesterRepository,
    private val analytics: FirebaseAnalyticsHelper
-) : BaseSessionPresenter<GradeView>(errorHandler) {
+) : BasePresenter<GradeView>(errorHandler, studentRepository, schedulers) {

    var selectedIndex = 0
        private set
@ -27,12 +27,12 @@ class GradePresenter @Inject constructor(

    fun onAttachView(view: GradeView, savedIndex: Int?) {
        super.onAttachView(view)
-        Timber.i("Grade view is attached")
        selectedIndex = savedIndex ?: 0
        view.run {
            initView()
            enableSwipe(false)
        }
+        Timber.i("Grade view was initialized with $selectedIndex index")
        loadData()
    }

--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
@ -1,8 +1,8 @@
 package io.github.wulkanowy.ui.modules.grade

-import io.github.wulkanowy.ui.base.session.BaseSessionView
+import io.github.wulkanowy.ui.base.BaseView

-interface GradeView : BaseSessionView {
+interface GradeView : BaseView {

    val currentPageIndex: Int

--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
@ -17,7 +17,7 @@ import eu.davidea.flexibleadapter.items.IExpandable
 import eu.davidea.flexibleadapter.items.IFlexible
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
 import io.github.wulkanowy.ui.modules.main.MainActivity
@ -25,7 +25,7 @@ import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_grade_details.*
 import javax.inject.Inject

-class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.GradeChildView {
+class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeChildView {

    @Inject
    lateinit var presenter: GradeDetailsPresenter
@ -67,8 +67,8 @@ class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.
        presenter.onAttachView(this)
    }

-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
-        inflater?.inflate(R.menu.action_menu_grade_details, menu)
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.action_menu_grade_details, menu)
    }

    override fun initView() {
@ -88,8 +88,8 @@ class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.
        gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
    }

-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        return if (item?.itemId == R.id.gradeDetailsMenuRead) presenter.onMarkAsReadSelected()
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == R.id.gradeDetailsMenuRead) presenter.onMarkAsReadSelected()
        else false
    }

--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
@ -6,25 +6,25 @@ import io.github.wulkanowy.data.repositories.grade.GradeRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
-import io.github.wulkanowy.ui.base.session.SessionErrorHandler
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.ui.modules.grade.GradeAverageProvider
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.calcAverage
-import io.github.wulkanowy.utils.changeModifier
 import io.github.wulkanowy.utils.getBackgroundColor
 import timber.log.Timber
 import javax.inject.Inject

 class GradeDetailsPresenter @Inject constructor(
-    private val errorHandler: SessionErrorHandler,
-    private val schedulers: SchedulersProvider,
+    schedulers: SchedulersProvider,
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
    private val gradeRepository: GradeRepository,
-    private val studentRepository: StudentRepository,
    private val semesterRepository: SemesterRepository,
    private val preferencesRepository: PreferencesRepository,
+    private val averageProvider: GradeAverageProvider,
    private val analytics: FirebaseAnalyticsHelper
-) : BaseSessionPresenter<GradeDetailsView>(errorHandler) {
+) : BasePresenter<GradeDetailsView>(errorHandler, studentRepository, schedulers) {

    private var currentSemesterId = 0

@ -109,11 +109,16 @@ class GradeDetailsPresenter @Inject constructor(
    private fun loadData(semesterId: Int, forceRefresh: Boolean) {
        Timber.i("Loading grade details data started")
        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it).map { semester -> semester to it } }
-            .flatMap { gradeRepository.getGrades(it.second, it.first.first { item -> item.semesterId == semesterId }, forceRefresh) }
-            .map { it.sortedByDescending { grade -> grade.date } }
-            .map { it.map { item -> item.changeModifier(preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier) } }
-            .map { createGradeItems(it.groupBy { grade -> grade.subject }.toSortedMap()) }
+            .flatMap { semesterRepository.getSemesters(it).map { semester -> it to semester } }
+            .flatMap { (student, semesters) ->
+                averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh)
+                    .flatMap { averages ->
+                        gradeRepository.getGrades(student, semesters.first { semester -> semester.semesterId == semesterId })
+                            .map { it.sortedByDescending { grade -> grade.date } }
+                            .map { it.groupBy { grade -> grade.subject }.toSortedMap() }
+                            .map { createGradeItems(it, averages) }
+                    }
+            }
            .subscribeOn(schedulers.backgroundThread)
            .observeOn(schedulers.mainThread)
            .doFinally {
@ -139,32 +144,36 @@ class GradeDetailsPresenter @Inject constructor(
            })
    }

-    private fun createGradeItems(items: Map<String, List<Grade>>): List<GradeDetailsHeader> {
+    private fun createGradeItems(items: Map<String, List<Grade>>, averages: Map<String, Double>): List<GradeDetailsHeader> {
+        val isGradeExpandable = preferencesRepository.isGradeExpandable
+        val gradeColorTheme = preferencesRepository.gradeColorTheme
+
+        val noDescriptionString = view?.noDescriptionString.orEmpty()
+        val weightString = view?.weightString.orEmpty()
+
        return items.map {
-            it.value.calcAverage().let { average ->
-                GradeDetailsHeader(
-                    subject = it.key,
-                    average = formatAverage(average),
-                    number = view?.getGradeNumberString(it.value.size).orEmpty(),
-                    newGrades = it.value.filter { grade -> !grade.isRead }.size,
-                    isExpandable = preferencesRepository.isGradeExpandable
-                ).apply {
-                    subItems = it.value.map { item ->
-                        GradeDetailsItem(
-                            grade = item,
-                            valueBgColor = item.getBackgroundColor(preferencesRepository.gradeColorTheme),
-                            weightString = view?.weightString.orEmpty(),
-                            noDescriptionString = view?.noDescriptionString.orEmpty()
-                        )
-                    }
+            GradeDetailsHeader(
+                subject = it.key,
+                average = formatAverage(averages[it.key]),
+                number = view?.getGradeNumberString(it.value.size).orEmpty(),
+                newGrades = it.value.filter { grade -> !grade.isRead }.size,
+                isExpandable = isGradeExpandable
+            ).apply {
+                subItems = it.value.map { item ->
+                    GradeDetailsItem(
+                        grade = item,
+                        valueBgColor = item.getBackgroundColor(gradeColorTheme),
+                        weightString = weightString,
+                        noDescriptionString = noDescriptionString
+                    )
                }
            }
        }
    }

-    private fun formatAverage(average: Double): String {
+    private fun formatAverage(average: Double?): String {
        return view?.run {
-            if (average == 0.0) emptyAverageString
+            if (average == null || average == .0) emptyAverageString
            else averageString.format(average)
        }.orEmpty()
    }
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
@ -4,9 +4,9 @@ import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import eu.davidea.flexibleadapter.items.IExpandable
 import eu.davidea.flexibleadapter.items.IFlexible
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.ui.base.session.BaseSessionView
+import io.github.wulkanowy.ui.base.BaseView

-interface GradeDetailsView : BaseSessionView {
+interface GradeDetailsView : BaseView {

    val isViewEmpty: Boolean

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mikołaj Pich	7a61b233f0	Version 0.9.1	2019-06-04 02:43:50 +02:00
Mikołaj Pich	83dbd9874e	Add option to force calc average by app (#400 )	2019-06-04 02:27:15 +02:00
Mikołaj Pich	1d9a49d552	Add githook plugin (#398 )	2019-06-04 01:53:20 +02:00
Rafał Borcz	6175081b88	Fix tab layout crash on prelolipop (#399 )	2019-06-03 22:47:35 +02:00
Rafał Borcz	116e551186	Merge tag '0.9.0' into develop 0.9.0 0.9.0	2019-06-03 18:15:42 +02:00
Rafał Borcz	713500d892	Merge branch 'release/0.9.0'	2019-06-03 18:15:41 +02:00
Rafał Borcz	dfdbe374c2	Version 0.9.0	2019-06-03 18:15:11 +02:00
Mikołaj Pich	b1e3bab5e7	Add F-Droid flavor (#349 )	2019-06-03 14:12:48 +02:00
Rafał Borcz	0b2ef367da	Change timeout string (#397 )	2019-06-03 13:15:21 +02:00
Mikołaj Pich	28f27db2b5	Add mobile access managment (#344 )	2019-06-03 00:43:54 +02:00
Rafał Borcz	5c70cd8b8c	Add session expired dialog after password change (#389 )	2019-05-31 15:12:10 +02:00
Mikołaj Pich	0f75ff3206	Show grades average from register if exist instead of calculating (#374 )	2019-05-31 14:40:53 +02:00
Rafał Borcz	383cab4dae	Fix only wifi setting (#394 )	2019-05-31 13:46:53 +02:00
dependabot-preview[bot]	e1b0db76c2	Bump material from 1.1.0-alpha06 to 1.1.0-alpha07 (#393 )	2019-05-31 11:46:29 +02:00
dependabot-preview[bot]	f10684097c	Bump dagger-compiler from 2.23 to 2.23.1 (#391 )	2019-05-31 02:02:09 +00:00
dependabot-preview[bot]	35d4342bec	Bump dagger-android-processor from 2.23 to 2.23.1 (#392 )	2019-05-31 01:42:40 +00:00
dependabot-preview[bot]	068aee215a	Bump dagger-android-support from 2.23 to 2.23.1 (#390 )	2019-05-31 01:19:26 +00:00
dependabot-preview[bot]	033074c66b	Bump room-testing from 2.1.0-beta01 to 2.1.0-rc01 (#377 )	2019-05-30 16:46:54 +02:00
dependabot-preview[bot]	0de534cb66	Bump room-rxjava2 from 2.1.0-beta01 to 2.1.0-rc01 (#385 )	2019-05-30 16:46:28 +02:00
dependabot-preview[bot]	26e4619dde	Bump room-runtime from 2.1.0-beta01 to 2.1.0-rc01 (#388 )	2019-05-30 14:06:06 +00:00
dependabot-preview[bot]	cf08d1ff24	Bump mockito-core from 2.28.1 to 2.28.2 (#387 )	2019-05-30 13:58:42 +00:00
dependabot-preview[bot]	96c400a0bd	Bump runner from 1.1.1 to 1.2.0 (#386 )	2019-05-30 13:50:28 +00:00
dependabot-preview[bot]	e238f65dde	Bump rxjava from 2.2.8 to 2.2.9 (#381 )	2019-05-30 15:22:15 +02:00
dependabot-preview[bot]	ba7966125b	Bump dagger-compiler from 2.22.1 to 2.23 (#380 )	2019-05-30 12:01:15 +00:00
dependabot-preview[bot]	1536208e45	Bump core from 1.1.0 to 1.2.0 (#383 )	2019-05-30 11:46:56 +00:00
dependabot-preview[bot]	24cc07264a	Bump dagger-android-support from 2.22.1 to 2.23 (#384 )	2019-05-30 11:31:22 +00:00
dependabot-preview[bot]	1ad5232520	Bump mockito-inline from 2.28.1 to 2.28.2 (#382 )	2019-05-30 11:29:13 +00:00
dependabot-preview[bot]	07f3333029	Bump mockito-android from 2.28.1 to 2.28.2 (#379 )	2019-05-30 11:12:44 +00:00
dependabot-preview[bot]	214afb82a6	Bump junit from 1.1.0 to 1.1.1 (#378 )	2019-05-30 11:05:05 +00:00
dependabot-preview[bot]	7a69710261	Bump dagger-android-processor from 2.22.1 to 2.23 (#376 )	2019-05-30 10:54:26 +00:00
dependabot-preview[bot]	64d3afbdb3	Bump room-compiler from 2.1.0-beta01 to 2.1.0-rc01 (#375 )	2019-05-30 10:53:35 +00:00
dependabot-preview[bot]	387e46f72d	Bump mockito-inline from 2.27.5 to 2.28.1 (#372 )	2019-05-29 00:16:10 +00:00
dependabot-preview[bot]	89acc2f384	Bump mockito-android from 2.27.5 to 2.28.1 (#373 )	2019-05-28 23:59:19 +00:00
dependabot-preview[bot]	4ef1439878	Bump mockito-core from 2.27.2 to 2.28.1 (#371 )	2019-05-29 01:57:19 +02:00
dependabot-preview[bot]	6efd170e03	Bump mockito-inline from 2.27.0 to 2.27.5 (#367 )	2019-05-28 14:57:39 +00:00
dependabot-preview[bot]	82cd39329a	Bump mockito-android from 2.27.0 to 2.27.5 (#354 )	2019-05-28 14:22:24 +00:00
dependabot-preview[bot]	b38e0d04e7	Bump threetenbp from 1.3.8 to 1.4.0 (#366 )	2019-05-28 14:41:48 +02:00
dependabot-preview[bot]	90b2ffe250	Bump logging-interceptor from 3.12.1 to 3.12.3 (#369 ) Bumps logging-interceptor from 3.12.1 to 3.12.3.	2019-05-28 14:41:27 +02:00
dependabot-preview[bot]	33951dff54	Bump crashlytics from 2.9.9 to 2.10.1 (#365 )	2019-05-28 11:30:42 +00:00
dependabot-preview[bot]	9ced00c4d7	Bump room-runtime from 2.1.0-alpha07 to 2.1.0-beta01 (#364 )	2019-05-28 11:06:56 +00:00
dependabot-preview[bot]	2ac1638911	Bump room-testing from 2.1.0-alpha07 to 2.1.0-beta01 (#363 )	2019-05-28 10:48:37 +00:00
dependabot-preview[bot]	463a7e2744	Bump gradle from 1.28.1 to 1.29.0 (#355 ) Bumps gradle from 1.28.1 to 1.29.0.	2019-05-28 02:24:36 +02:00
dependabot-preview[bot]	d14382f3b4	Bump firebase-core from 16.0.8 to 16.0.9 (#358 ) Bumps firebase-core from 16.0.8 to 16.0.9.	2019-05-28 00:58:09 +02:00
dependabot-preview[bot]	efa0b19cc1	Bump room-rxjava2 from 2.1.0-alpha07 to 2.1.0-beta01 (#357 ) Bumps room-rxjava2 from 2.1.0-alpha07 to 2.1.0-beta01.	2019-05-28 00:39:12 +02:00
dependabot-preview[bot]	7cb893a254	Bump play-publisher from 2.2.0 to 2.2.1 (#356 ) Bumps play-publisher from 2.2.0 to 2.2.1.	2019-05-28 00:37:06 +02:00
dependabot-preview[bot]	f7371f7b73	Bump room-compiler from 2.1.0-alpha07 to 2.1.0-beta01 (#350 ) Bumps room-compiler from 2.1.0-alpha07 to 2.1.0-beta01.	2019-05-27 23:04:12 +02:00
dependabot-preview[bot]	9c626ad517	Bump reactivenetwork-rx2 from 3.0.2 to 3.0.3 (#351 ) Bumps [reactivenetwork-rx2](https://github.com/pwittchen/ReactiveNetwork) from 3.0.2 to 3.0.3. - [Release notes](https://github.com/pwittchen/ReactiveNetwork/releases) - [Changelog](https://github.com/pwittchen/ReactiveNetwork/blob/RxJava2.x/CHANGELOG.md) - [Commits](https://github.com/pwittchen/ReactiveNetwork/commits)	2019-05-27 22:58:17 +02:00
dependabot-preview[bot]	9c4c6b0192	Bump material from 1.1.0-alpha05 to 1.1.0-alpha06 (#353 ) Bumps [material](https://github.com/material-components/material-components-android) from 1.1.0-alpha05 to 1.1.0-alpha06. - [Release notes](https://github.com/material-components/material-components-android/releases) - [Commits](https://github.com/material-components/material-components-android/compare/1.1.0-alpha05...1.1.0-alpha06)	2019-05-27 22:49:16 +02:00
dependabot-preview[bot]	8efc4d750d	Bump sonarqube-gradle-plugin from 2.7 to 2.7.1 (#352 ) Bumps sonarqube-gradle-plugin from 2.7 to 2.7.1.	2019-05-27 22:41:16 +02:00
Mikołaj Pich	e4a6caa13e	Version 0.8.4	2019-05-27 18:13:20 +02:00
Mikołaj Pich	209e75160a	Fix network constraint in background sync (#348 )	2019-05-25 14:34:17 +02:00
Mikołaj Pich	153e026a8d	Version 0.8.3	2019-05-20 00:21:30 +02:00
Mikołaj Pich	8731c2e1f2	Change help text when entering the symbol to a more precise one (#345 )	2019-05-19 22:47:57 +02:00
Rafał Borcz	0977282a4b	Fix no current student in services after logout all accounts (#342 )	2019-05-18 23:42:47 +02:00
Rafał Borcz	667c4b6af7	Fix empty maybe when loading message content (#343 )	2019-05-18 23:32:37 +02:00
Mikołaj Pich	1f5088cfc9	Don't copy teacher from previous lesson to completed (#341 )	2019-05-18 13:03:38 +02:00
Rafał Borcz	bf6b857a3e	Fix null returns in widgets (#340 )	2019-05-18 00:22:07 +02:00
Mikołaj Pich	80cb94c434	Version 0.8.2	2019-05-15 19:26:25 +02:00
Rafał Borcz	0cb4eda32b	Fix crash on reselecting fragment (#339 )	2019-05-15 15:11:28 +02:00
Rafał Borcz	d169f964f2	Fix crash when no webview activity (#338 )	2019-05-14 11:45:27 +02:00
Rafał Borcz	103ab95c80	Fix not attached fragment (#337 ) * Add condition for error dialog * Add safe call of forEach in LuckyNumberWidgetProvider	2019-05-09 22:06:11 +02:00
Mikołaj Pich	a191f03cdf	Version 0.8.1	2019-04-30 23:56:22 +02:00
Mikołaj Pich	63404b8576	Fix entity list comparing (#335 )	2019-04-30 19:04:05 +02:00
Rafał Borcz	1b7760ff88	Fix dark theme background with custom theme engine (#334 )	2019-04-30 17:45:37 +02:00
Rafał Borcz	24f58835e7	Fix menu view initialization and restoration (#333 )	2019-04-30 17:28:09 +02:00
Mikołaj Pich	b032c459d1	Fix theme on release build (#332 )	2019-04-30 11:16:23 +02:00
Mikołaj Pich	df0a1e59cc	Version 0.8.0	2019-04-29 20:39:35 +02:00
Kacper Ziubryniewicz	dbbc8069b1	Add showing proper fragment in notifications (#331 )	2019-04-29 19:56:23 +02:00
Mikołaj Pich	f84040109c	Add lucky number widget (#292 )	2019-04-29 14:33:33 +02:00
Dominik Korsa	baf1420193	Improve login student selection layout (#329 )	2019-04-29 00:55:30 +02:00
Rafał Borcz	4a36d78709	Add activity and fragment lifecycle logging (#327 )	2019-04-26 23:53:02 +02:00
Rafał Borcz	4464812651	Fix configure activity's theme (#325 )	2019-04-22 09:27:25 +02:00
Rafał Borcz	72a35481e5	Fix showing last message after update (#326 )	2019-04-22 09:13:26 +02:00
Mikołaj Pich	017c200115	Fix grade summary final grade string (#324 )	2019-04-20 22:19:06 +02:00
Mikołaj Pich	2bf7755157	Add AMOLED mode (#279 )	2019-04-19 23:52:34 +02:00
Rafał Borcz	269af4b7ba	Update dependencies (#323 )	2019-04-18 16:38:49 +02:00
Rafał Borcz	7431738366	Add a selection of multiple students to login (#318 )	2019-04-18 12:18:58 +02:00
Rafał Borcz	034b99c7ab	Add counting of the full-year average to the summary of grades (#322 )	2019-04-18 00:32:43 +02:00
Rafał Borcz	74e98e4430	Change style of privacy policy link (#321 )	2019-04-09 23:33:53 +02:00
Mikołaj Pich	cbf3215dd1	Merge branch '0.7.x'	2019-04-08 13:51:02 +02:00
Rafał Borcz	c18877466f	Add account picker for timetable widget (#314 ) Close #281	2019-04-08 00:18:45 +02:00
Mikołaj Pich	aa6dcaff94	Merge branch '0.7.x'	2019-04-06 01:18:03 +02:00
Kacper Ziubryniewicz	2bff468e56	Add deleting messages (#290 )	2019-03-31 22:01:04 +02:00
Mikołaj Pich	f2855d598d	Merge branch '0.7.x'	2019-03-30 20:19:34 +01:00
Mikołaj Pich	1ebc296bfe	Merge branch '0.7.x'	2019-03-26 21:22:17 +01:00
Mikołaj Pich	a2a18e5652	Merge branch '0.7.x'	2019-03-24 23:22:44 +01:00
Kacper Ziubryniewicz	cd1ceea860	Add messages forwarding (#288 )	2019-03-21 22:55:47 +01:00