.circleci/config.yml

@@ -7,11 +7,11 @@ references:
 
   container_config: &container_config
     docker:
-      - image: circleci/android@sha256:5cdc8626cc6f13efe5ed982cdcdb432b0472f8740fed8743a6461e025ad6cdfc
+      - image: circleci/android:api-28-alpha
     working_directory: *workspace_root
     environment:
       environment:
-        _JAVA_OPTS: -Xmx3072m
+        JVM_OPTS: -Xmx3200m
 
   attach_workspace: &attach_workspace
     attach_workspace:
@@ -35,7 +35,7 @@ jobs:
           command: ./gradlew dependencies --no-daemon --stacktrace --console=plain -PdisablePreDex || true
       - run:
           name: Initial build
-          command: ./gradlew build -x test -x lint -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease -x packageRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew build -x test -x lint -x fabricGenerateResourcesRelease -x packageRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
       - run:
           name: Run FOSSA
           command: fossa --no-ansi || true
@@ -56,7 +56,7 @@ jobs:
           <<: *general_cache_key
       - run:
           name: Run lint
-          command: ./gradlew lint -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew lint -x fabricGenerateResourcesRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
       - store_artifacts:
           path: ./app/build/reports/
           destination: lint_reports/app/
@@ -75,7 +75,7 @@ jobs:
           <<: *general_cache_key
       - run:
           name: Run app tests
-          command: ./gradlew :app:test :app:jacocoTestReport -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew :app:test :app:jacocoTestReport -x fabricGenerateResourcesRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
       - run:
           name: Upload unit code coverage to codecov
           command: bash <(curl -s https://codecov.io/bash) -F app
@@ -93,9 +93,6 @@ 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"
@@ -116,7 +113,7 @@ jobs:
             adb shell input keyevent 82
       - run:
           name: Run instrumented tests
-          command: ./gradlew clean createPlayDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew clean createDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
       - run:
           name: Collect logs from emulator
           command: adb logcat -d > ./app/build/reports/logcat_emulator.txt
@@ -162,7 +159,7 @@ jobs:
             openssl aes-256-cbc -d -in ./app/upload-key-encrypted.jks -k $ENCRYPT_KEY >> ./app/upload-key.jks
       - run:
           name: Publish release
-          command: ./gradlew publishPlayRelease --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
+          command: ./gradlew publishRelease --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
 
 workflows:
   version: 2

.gitignore

@@ -48,4 +48,3 @@ app/key.p12
 app/upload-key.jks
 *.log
 .idea/assetWizardSettings.xml
-.idea/uiDesigner.xml

.gitlab-ci.yml

@@ -12,7 +12,7 @@ build:
   script:
     - ./gradlew --no-daemon --stacktrace dependencies || true
     - ./gradlew --no-daemon --stacktrace assembleDebug
-    - mv app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk .
+    - mv app/build/outputs/apk/debug/app-debug.apk .
   artifacts:
     name: "${CI_PROJECT_NAME}_${CI_BUILD_REF_NAME}-${CI_BUILD_ID}"
     paths:
@@ -26,7 +26,7 @@ tests:
      - .gradle
     policy: pull
   script:
-    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease test
+    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesRelease test
   artifacts:
     paths:
     - app/build/reports/tests
@@ -39,7 +39,7 @@ lint:
      - .gradle
     policy: pull
   script:
-    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease lint
+    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesRelease lint
   artifacts:
     paths:
     - app/build/reports

.idea/codeStyles/Project.xml

@@ -19,8 +19,33 @@
       <option name="CONTINUATION_INDENT_IN_SUPERTYPE_LISTS" value="false" />
       <option name="CONTINUATION_INDENT_IN_IF_CONDITIONS" value="false" />
       <option name="CONTINUATION_INDENT_IN_ELVIS" value="false" />
-      <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
+      <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
     </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" />

.idea/runConfigurations.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

.travis.yml

@@ -11,10 +11,6 @@ cache:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 
-#branches:
-# only:
-#   - develop
-
 android:
  licenses:
     - android-sdk-preview-license-.+
@@ -45,22 +41,22 @@ before_script:
     - "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash"
 
 script:
-  - ./gradlew dependencies --stacktrace --daemon
+  - ./gradlew build -x test -x lint -x fabricGenerateResourcesRelease -x packageRelease --stacktrace --daemon
   - fossa --no-ansi || true
-  #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
+  - ./gradlew lint -x fabricGenerateResourcesRelease --stacktrace --daemon
-  - ./gradlew testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
+  - ./gradlew test -x fabricGenerateResourcesRelease --stacktrace --daemon
-  - ./gradlew createPlayDebugCoverageReport --stacktrace --daemon
+  - ./gradlew createDebugCoverageReport --stacktrace --daemon
   - ./gradlew jacocoTestReport --stacktrace --daemon
   - if [ -z ${SONAR_HOST+x} ]; then echo "sonar scan skipped"; else
       git fetch --unshallow;
-      ./gradlew sonarqube -x test -x lint -x fabricGenerateResourcesPlayRelease -x fabricGenerateResourcesFdroidRelease -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_KEY -Dsonar.branch.name=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} --stacktrace --daemon;
+      ./gradlew sonarqube -x test -x lint -x fabricGenerateResourcesRelease -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_KEY -Dsonar.branch.name=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} --stacktrace --daemon;
     fi
   - |
     if [ $TRAVIS_TAG ]; then
       gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg;
-      ./gradlew publishPlayRelease -PenableCrashlytics --stacktrace;
+      ./gradlew publishRelease -PenableCrashlytics --stacktrace;
     fi
 
 after_success:

README.md

@@ -1,18 +1,17 @@
 # Wulkanowy
 
+[![CircleCI](https://img.shields.io/circleci/project/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://circleci.com/gh/wulkanowy/wulkanowy)
 [![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
 [![Bitrise](https://img.shields.io/bitrise/daeff1893f3c8128/master.svg?token=Hjm1ACamk86JDeVVJHOeqQ&style=flat-square)](https://www.bitrise.io/app/daeff1893f3c8128)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![BCH compliance](https://bettercodehub.com/edge/badge/wulkanowy/wulkanowy?branch=master)](https://bettercodehub.com/)
 [![Sonarcloud](https://sonarcloud.io/api/project_badges/measure?project=io.github.wulkanowy%3Aapp&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=io.github.wulkanowy%3Aapp)
-[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy.svg?type=shield)](https://app.fossa.com/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy?ref=badge_shield)
+[![FOSSA Status](https://app.fossa.io/api/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git.svg?type=shield)](https://app.fossa.io/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git?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&utm_source=vcs)
 
-[Pobierz wersję DEV](https://bitrise-redirector.herokuapp.com/v0.1/apps/f841f20d8f8b1dc8/builds/master/artifacts/0)
+[Pobierz wersję DEV](https://bitrise-redirector.herokuapp.com/v0.1/apps/daeff1893f3c8128/builds/master/artifacts/0)
 [(Więcej wersji DEV)](https://wulkanowy.github.io/dev.html)
 
 Androidowy klient dziennika VULCAN UONET+.
@@ -20,4 +19,4 @@ Androidowy klient dziennika VULCAN UONET+.
 
 ## License
 
-[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy.svg?type=large)](https://app.fossa.com/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy?ref=badge_large)
+[![FOSSA Status](https://app.fossa.io/api/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git.svg?type=large)](https://app.fossa.io/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git?ref=badge_large)

app/build.gradle

@@ -6,35 +6,33 @@ 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
     buildToolsVersion '28.0.3'
 
+    playAccountConfigs {
+        defaultAccountConfig {
+            serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL")
+            pk12File = file('key.p12')
+        }
+    }
+
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 39
+        versionCode 24
-        versionName "0.9.1"
+        versionName "0.6.5"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
+        playAccountConfig = playAccountConfigs.defaultAccountConfig
         manifestPlaceholders = [
-                fabric_api_key     : System.getenv("FABRIC_API_KEY") ?: "null",
+                fabric_api_key: System.getenv("FABRIC_API_KEY") ?: "null",
                 crashlytics_enabled: project.hasProperty("enableCrashlytics")
         ]
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
-            }
-        }
-    }
-
-    sourceSets {
-        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
 
     signingConfigs {
@@ -64,26 +62,9 @@ android {
         }
     }
 
-    flavorDimensions "platform"
-    productFlavors {
-        play {
-            dimension "platform"
-        }
-
-        fdroid {
-            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "false"
-            dimension "platform"
-        }
-    }
-
     lintOptions {
         disable 'HardwareIds'
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
 }
 
 androidExtensions {
@@ -91,83 +72,66 @@ androidExtensions {
 }
 
 play {
-    serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
-    serviceAccountCredentials = file('key.p12')
-    defaultToAppBundles = false
     track = 'alpha'
+    uploadImages = false
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:api:0.9.1'
-
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation('io.github.wulkanowy:api:0.6.4') { exclude module: "threetenbp" }
+
     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.multidex:multidex:2.0.1'
 
-    implementation "androidx.cardview:cardview:1.0.0"
+    implementation 'com.takisoft.preferencex:preferencex:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation "com.mikepenz:aboutlibraries:6.2.0"
-    implementation "com.google.android.material:material:1.1.0-alpha05"
+    implementation "com.firebase:firebase-jobdispatcher:0.8.5"
-    implementation 'com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f'
-    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
 
-    implementation "androidx.work:work-runtime:2.0.1"
+    implementation "com.google.dagger:dagger-android-support:2.21"
-    implementation "androidx.work:work-rxjava2:2.0.1"
+    kapt "com.google.dagger:dagger-compiler:2.21"
+    kapt "com.google.dagger:dagger-android-processor:2.21"
 
-    implementation "androidx.room:room-runtime:2.1.0-rc01"
+    implementation "androidx.room:room-runtime:2.1.0-alpha03"
-    implementation "androidx.room:room-rxjava2:2.1.0-rc01"
+    implementation "androidx.room:room-rxjava2:2.1.0-alpha03"
-    kapt "androidx.room:room-compiler:2.1.0-rc01"
+    kapt "androidx.room:room-compiler:2.1.0-alpha03"
-
-    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.ncapdevi:frag-nav:3.1.0'
 
-    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.3'
+    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.2'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    implementation "io.reactivex.rxjava2:rxjava:2.2.9"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.5"
+
+    implementation "com.jakewharton.threetenabp:threetenabp:1.1.1"
 
-    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.squareup.okhttp3:logging-interceptor:3.12.3"
 
-    implementation "com.mikepenz:aboutlibraries:6.2.3"
+    implementation 'com.google.firebase:firebase-core:16.0.6'
-    implementation 'com.takisoft.preferencex:preferencex:1.0.0'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8'
 
-    playImplementation 'com.google.firebase:firebase-core:16.0.9'
+    releaseImplementation 'fr.o80.chucker:library-no-op:2.0.3'
-    playImplementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
+    debugImplementation 'fr.o80.chucker:library:2.0.3'
 
-    releaseImplementation 'fr.o80.chucker:library-no-op:2.0.4'
+    debugImplementation "com.amitshekhar.android:debug-db:1.0.4"
-
-    debugImplementation 'fr.o80.chucker:library:2.0.4'
-    debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
     testImplementation "junit:junit:4.12"
-    testImplementation "io.mockk:mockk:1.9.2"
+    testImplementation "io.mockk:mockk:1.9"
-    testImplementation 'org.threeten:threetenbp:1.4.0'
+    testImplementation "org.mockito:mockito-inline:2.23.4"
-    testImplementation "org.mockito:mockito-core:2.28.2"
+    testImplementation 'org.threeten:threetenbp:1.3.8'
-    testImplementation("org.mockito:mockito-inline:2.28.2") {
-        exclude group: 'org.mockito', module: 'mockito-core'
-    }
 
-    androidTestImplementation 'androidx.test:core:1.2.0'
+    androidTestImplementation 'androidx.test:core:1.1.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation "io.mockk:mockk-android:1.9.2"
+    androidTestImplementation 'org.mockito:mockito-android:2.23.4'
-    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'

app/hooks.gradle

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

app/jacoco.gradle

@@ -1,7 +1,7 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.3"
+    toolVersion "0.8.2"
     reportsDir = file("$buildDir/reports")
 }
 
@@ -31,20 +31,17 @@ task jacocoTestReport(type: JacocoReport) {
                     '**/*_Provide*Factory*.*',
                     '**/*_Factory.*']
 
-    classDirectories.setFrom(fileTree(
+    classDirectories = fileTree(
             dir: "$buildDir/intermediates/classes/debug",
             excludes: excludes
     ) + fileTree(
-            dir: "$buildDir/tmp/kotlin-classes/playDebug",
+            dir: "$buildDir/tmp/kotlin-classes/debug",
             excludes: excludes
-    ))
+    )
 
-    sourceDirectories.setFrom(files([
+    sourceDirectories = files("$project.projectDir/src/main/java")
-            "src/main/java",
+    executionData = fileTree(
-            "src/play/java"
-    ]))
-    executionData.setFrom(fileTree(
             dir: project.projectDir,
             includes: ["**/*.exec", "**/*.ec"]
-    ))
+    )
 }

app/play-publish-lint.sh

@@ -1,7 +0,0 @@
-#!/bin/bash -
-
-content=$(cat < "app/src/main/play/release-notes/pl-PL/default.txt") || exit
-if [[ "${#content}" -gt 500 ]]; then
-    echo >&2 "Release notes content has reached the limit of 500 characters"
-    exit 1
-fi

app/proguard-rules.pro

@@ -14,6 +14,7 @@
 #Config for anallitycs
 -keepattributes *Annotation*
 -keepattributes SourceFile,LineNumberTable
+-renamesourcefileattribute SourceFile
 -keep class com.crashlytics.** {*;}
 -keep public class * extends java.lang.Exception
 -dontwarn com.crashlytics.**
@@ -32,8 +33,5 @@
 -dontwarn rx.internal.util.**
 -dontwarn sun.misc.Unsafe
 
-#Config for MPAndroidChart
--keep class com.github.mikephil.charting.** { *; }
-
 #Config for API
 -keep class io.github.wulkanowy.api.** {*;}

app/sonarqube.gradle

@@ -29,6 +29,5 @@ sonarqube {
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.android.lint.report", "build/reports/lint-results.xml"
         property "sonar.jacoco.reportPaths", fileTree(dir: project.projectDir, includes: ['**/*.exec', '**/*.ec'])
-        property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacocoTestReport/jacocoTestReport.xml"
     }
 }

app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt

@@ -1,36 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.Room
-import androidx.room.testing.MigrationTestHelper
-import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.platform.app.InstrumentationRegistry
-import io.github.wulkanowy.data.db.AppDatabase
-import org.junit.Rule
-
-abstract class AbstractMigrationTest {
-
-    val dbName = "migration-test"
-
-    @get:Rule
-    val helper: MigrationTestHelper = MigrationTestHelper(
-        InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java.canonicalName,
-        FrameworkSQLiteOpenHelperFactory()
-    )
-
-    fun getMigratedRoomDatabase(): AppDatabase {
-        val database = Room.databaseBuilder(ApplicationProvider.getApplicationContext(),
-            AppDatabase::class.java, dbName)
-            .addMigrations(
-                Migration12(),
-                Migration13(),
-                Migration14(),
-                Migration15()
-            )
-            .build()
-        // close the database and release any stream resources when the test finishes
-        helper.closeWhenFinished(database)
-        return database
-    }
-}

app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt

@@ -1,133 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import android.content.ContentValues
-import android.database.sqlite.SQLiteDatabase.CONFLICT_FAIL
-import androidx.sqlite.db.SupportSQLiteDatabase
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Test
-import org.junit.runner.RunWith
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class Migration12Test : AbstractMigrationTest() {
-
-    @Test
-    fun twoNotRelatedStudents() {
-        helper.createDatabase(dbName, 11).apply {
-            // user 1
-            createStudent(this, 1, true)
-            createSemester(this, 1, false, 5, 1)
-            createSemester(this, 1, true, 5, 2)
-
-            // user 2
-            createStudent(this, 2, true)
-            createSemester(this, 2, false, 6, 1)
-            createSemester(this, 2, true, 6, 2)
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
-
-        val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
-
-        assertEquals(2, students.size)
-
-        students[0].run {
-            assertEquals(1, studentId)
-            assertEquals(5, classId)
-        }
-
-        students[1].run {
-            assertEquals(2, studentId)
-            assertEquals(6, classId)
-        }
-    }
-
-    @Test
-    fun removeStudentsWithoutClassId() {
-        helper.createDatabase(dbName, 11).apply {
-            // user 1
-            createStudent(this, 1, true)
-            createSemester(this, 1, false, 0, 2)
-            createStudent(this, 2, true)
-            createSemester(this, 2, true, 1, 2)
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
-
-        val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
-
-        assertEquals(1, students.size)
-
-        students[0].run {
-            assertEquals(2, studentId)
-            assertEquals(1, classId)
-        }
-    }
-
-    @Test
-    fun ensureThereIsOnlyOneCurrentStudent() {
-        helper.createDatabase(dbName, 11).apply {
-            // user 1
-            createStudent(this, 1, true)
-            createSemester(this, 1, true, 5, 2)
-            createStudent(this, 2, true)
-            createSemester(this, 2, true, 6, 2)
-            createStudent(this, 3, true)
-            createSemester(this, 3, false, 7, 2)
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
-
-        val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
-
-        assertEquals(3, students.size)
-
-        students[0].run {
-            assertEquals(studentId, 1)
-            assertEquals(false, isCurrent)
-        }
-        students[1].run {
-            assertEquals(studentId, 2)
-            assertEquals(false, isCurrent)
-        }
-        students[2].run {
-            assertEquals(studentId, 3)
-            assertEquals(true, isCurrent)
-        }
-    }
-
-    private fun createStudent(db: SupportSQLiteDatabase, studentId: Int, isCurrent: Boolean) {
-        db.insert("Students", CONFLICT_FAIL, ContentValues().apply {
-            put("endpoint", "https://fakelog.cf")
-            put("loginType", "STANDARD")
-            put("email", "jan@fakelog.cf")
-            put("password", "******")
-            put("symbol", "Default")
-            put("student_id", studentId)
-            put("student_name", "Jan Kowalski")
-            put("school_id", "000123")
-            put("school_name", "")
-            put("is_current", isCurrent)
-            put("registration_date", "0")
-        })
-    }
-
-    private fun createSemester(db: SupportSQLiteDatabase, studentId: Int, isCurrent: Boolean, classId: Int, diaryId: Int) {
-        db.insert("Semesters", CONFLICT_FAIL, ContentValues().apply {
-            put("student_id", studentId)
-            put("diary_id", diaryId)
-            put("diary_name", "IA")
-            put("semester_id", diaryId * 5)
-            put("semester_name", "1")
-            put("is_current", isCurrent)
-            put("class_id", classId)
-            put("unit_id", "99")
-        })
-    }
-}

app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt

@@ -1,171 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import android.content.ContentValues
-import android.database.sqlite.SQLiteDatabase
-import androidx.sqlite.db.SupportSQLiteDatabase
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Test
-import org.threeten.bp.LocalDate.of
-import kotlin.test.assertTrue
-
-class Migration13Test : AbstractMigrationTest() {
-
-    @Test
-    fun studentsWithSchoolNameWithClassName() {
-        helper.createDatabase(dbName, 12).apply {
-            createStudent(this, 1, "Klasa A - Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", 1, 1)
-            createStudent(this, 2, "Klasa B - Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", 2, 1)
-            createStudent(this, 2, "Klasa C - Publiczna szkoła Wulkanowego-fejka nr 2 w fakelog.cf", 1, 2)
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
-
-        val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
-
-        assertEquals(3, students.size)
-
-        students[0].run {
-            assertEquals(1, studentId)
-            assertEquals("A", className)
-            assertEquals("Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", schoolName)
-        }
-
-        students[1].run {
-            assertEquals(2, studentId)
-            assertEquals("B", className)
-            assertEquals("Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", schoolName)
-        }
-
-        students[2].run {
-            assertEquals(2, studentId)
-            assertEquals("C", className)
-            assertEquals("Publiczna szkoła Wulkanowego-fejka nr 2 w fakelog.cf", schoolName)
-        }
-    }
-
-    @Test
-    fun studentsWithSchoolNameWithoutClassName() {
-        helper.createDatabase(dbName, 12).apply {
-            createStudent(this, 1, "Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", 1)
-            createStudent(this, 2, "Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", 1)
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
-
-        val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
-
-        assertEquals(2, students.size)
-
-        students[0].run {
-            assertEquals(1, studentId)
-            assertEquals("", className)
-            assertEquals("Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", schoolName)
-        }
-
-        students[1].run {
-            assertEquals(2, studentId)
-            assertEquals("", className)
-            assertEquals("Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", schoolName)
-        }
-    }
-
-    @Test
-    fun markAtLeastAndOnlyOneSemesterAtCurrent() {
-        helper.createDatabase(dbName, 12).apply {
-            createStudent(this, 1, "", 5)
-            createSemester(this, 1, 5, 1, 1, false)
-            createSemester(this, 1, 5, 2, 1, false)
-            createSemester(this, 1, 5, 3, 2, false)
-            createSemester(this, 1, 5, 4, 2, false)
-
-            createStudent(this, 2, "", 5)
-            createSemester(this, 2, 5, 5, 5, true)
-            createSemester(this, 2, 5, 6, 5, true)
-            createSemester(this, 2, 5, 7, 55, true)
-            createSemester(this, 2, 5, 8, 55, true)
-
-            createStudent(this, 3, "", 5)
-            createSemester(this, 3, 5, 11, 99, false)
-            createSemester(this, 3, 5, 12, 99, false)
-            createSemester(this, 3, 5, 13, 100, false)
-            createSemester(this, 3, 5, 14, 100, true)
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
-
-        val db = getMigratedRoomDatabase()
-
-        val semesters1 = db.semesterDao.loadAll(1, 5).blockingGet()
-        assertTrue { semesters1.single { it.isCurrent }.isCurrent }
-        semesters1[0].run {
-            assertFalse(isCurrent)
-            assertEquals(1, semesterId)
-            assertEquals(1, diaryId)
-        }
-        semesters1[2].run {
-            assertFalse(isCurrent)
-            assertEquals(3, semesterId)
-            assertEquals(2, diaryId)
-        }
-        semesters1[3].run {
-            assertTrue(isCurrent)
-            assertEquals(4, semesterId)
-            assertEquals(2, diaryId)
-        }
-
-        db.semesterDao.loadAll(2, 5).blockingGet().let {
-            assertTrue { it.single { it.isCurrent }.isCurrent }
-            assertEquals(1970, it[0].schoolYear)
-            assertEquals(of(1970, 1, 1), it[0].end)
-            assertEquals(of(1970, 1, 1), it[0].start)
-            assertFalse(it[0].isCurrent)
-            assertFalse(it[1].isCurrent)
-            assertFalse(it[2].isCurrent)
-            assertTrue(it[3].isCurrent)
-        }
-
-        db.semesterDao.loadAll(2, 5).blockingGet().let {
-            assertTrue { it.single { it.isCurrent }.isCurrent }
-            assertFalse(it[0].isCurrent)
-            assertFalse(it[1].isCurrent)
-            assertFalse(it[2].isCurrent)
-            assertTrue(it[3].isCurrent)
-        }
-    }
-
-    private fun createStudent(db: SupportSQLiteDatabase, studentId: Int, schoolName: String = "", classId: Int = -1, schoolId: Int = 123) {
-        db.insert("Students", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
-            put("endpoint", "https://fakelog.cf")
-            put("loginType", "STANDARD")
-            put("email", "jan@fakelog.cf")
-            put("password", "******")
-            put("symbol", "Default")
-            put("student_id", studentId)
-            put("class_id", classId)
-            put("student_name", "Jan Kowalski")
-            put("school_id", schoolId)
-            put("school_name", schoolName)
-            put("is_current", false)
-            put("registration_date", "0")
-        })
-    }
-
-    private fun createSemester(db: SupportSQLiteDatabase, studentId: Int, classId: Int, semesterId: Int, diaryId: Int, isCurrent: Boolean = false) {
-        db.insert("Semesters", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
-            put("student_id", studentId)
-            put("diary_id", diaryId)
-            put("diary_name", "IA")
-            put("semester_id", semesterId)
-            put("semester_name", "1")
-            put("is_current", isCurrent)
-            put("class_id", classId)
-            put("unit_id", "99")
-        })
-    }
-}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt

@@ -1,19 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingStrategy
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error.ErrorHandler
-import io.reactivex.Observable
-import io.reactivex.Single
-
-class TestInternetObservingStrategy : InternetObservingStrategy {
-
-    override fun checkInternetConnectivity(host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Single<Boolean> {
-        return Single.just(true)
-    }
-
-    override fun observeInternetConnectivity(initialIntervalInMs: Int, intervalInMs: Int, host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Observable<Boolean> {
-        return Observable.just(true)
-    }
-
-    override fun getDefaultPingHost() = "localhost"
-}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt

@@ -1,57 +0,0 @@
-package io.github.wulkanowy.data.repositories.completedlessons
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.data.db.entities.Semester
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class CompletedLessonsLocalTest {
-
-    private lateinit var completedLessonsLocal: CompletedLessonsLocal
-
-    private lateinit var testDb: AppDatabase
-
-    @Before
-    fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
-            .build()
-        completedLessonsLocal = CompletedLessonsLocal(testDb.completedLessonsDao)
-    }
-
-    @After
-    fun closeDb() {
-        testDb.close()
-    }
-
-    @Test
-    fun saveAndReadTest() {
-        completedLessonsLocal.saveCompletedLessons(listOf(
-            getCompletedLesson(LocalDate.of(2018, 9, 10), 1),
-            getCompletedLesson(LocalDate.of(2018, 9, 14), 2),
-            getCompletedLesson(LocalDate.of(2018, 9, 17), 3)
-        ))
-
-        val completed = completedLessonsLocal
-            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
-                LocalDate.of(2018, 9, 10),
-                LocalDate.of(2018, 9, 14)
-            )
-            .blockingGet()
-        assertEquals(2, completed.size)
-        assertEquals(completed[0].date, LocalDate.of(2018, 9, 10))
-        assertEquals(completed[1].date, LocalDate.of(2018, 9, 14))
-    }
-
-    private fun getCompletedLesson(date: LocalDate, number: Int): CompletedLesson {
-        return CompletedLesson(1, 2, date, number, "", "", "", "", "", "", "")
-    }
-}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt

@@ -1,53 +0,0 @@
-package io.github.wulkanowy.data.repositories.grade
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.Semester
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class GradeLocalTest {
-
-    private lateinit var gradeLocal: GradeLocal
-
-    private lateinit var testDb: AppDatabase
-
-    @Before
-    fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
-            .build()
-        gradeLocal = GradeLocal(testDb.gradeDao)
-    }
-
-    @After
-    fun closeDb() {
-        testDb.close()
-    }
-
-    @Test
-    fun saveAndReadTest() {
-        gradeLocal.saveGrades(listOf(
-            createGradeLocal(5, 3.0, LocalDate.of(2018, 9, 10), "", 1),
-            createGradeLocal(4, 4.0, LocalDate.of(2019, 2, 27), "", 2),
-            createGradeLocal(3, 5.0, LocalDate.of(2019, 2, 28), "", 2)
-        ))
-
-        val semester = Semester(1, 2, "", 2019, 2, 1, true, now(), now(), 1, 1)
-
-        val grades = gradeLocal
-            .getGrades(semester)
-            .blockingGet()
-
-        assertEquals(2, grades.size)
-        assertEquals(grades[0].date, LocalDate.of(2019, 2, 27))
-        assertEquals(grades[1].date, LocalDate.of(2019, 2, 28))
-    }
-}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt

@@ -1,182 +0,0 @@
-package io.github.wulkanowy.data.repositories.grade
-
-import android.os.Build.VERSION_CODES.P
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider.getApplicationContext
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.SdkSuppress
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
-import io.mockk.MockKAnnotations
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
-import io.reactivex.Single
-import org.junit.After
-import org.junit.Before
-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
-
-@SdkSuppress(minSdkVersion = P)
-@RunWith(AndroidJUnit4::class)
-class GradeRepositoryTest {
-
-    @SpyK
-    private var mockApi = Api()
-
-    private val settings = InternetObservingSettings.builder()
-        .strategy(TestInternetObservingStrategy())
-        .build()
-
-    @MockK
-    private lateinit var semesterMock: Semester
-
-    @MockK
-    private lateinit var studentMock: Student
-
-    private lateinit var gradeRemote: GradeRemote
-
-    private lateinit var gradeLocal: GradeLocal
-
-    private lateinit var testDb: AppDatabase
-
-    @Before
-    fun initApi() {
-        MockKAnnotations.init(this)
-        testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
-        gradeLocal = GradeLocal(testDb.gradeDao)
-        gradeRemote = GradeRemote(mockApi)
-
-        every { mockApi.diaryId } returns 1
-        every { studentMock.registrationDate } returns LocalDateTime.of(2019, 2, 27, 12, 0)
-        every { semesterMock.studentId } returns 1
-        every { semesterMock.semesterId } returns 1
-        every { semesterMock.diaryId } returns 1
-    }
-
-    @After
-    fun closeDb() {
-        testDb.close()
-    }
-
-    @Test
-    fun markOlderThanRegisterDateAsRead() {
-        every { mockApi.getGrades(1) } returns Single.just(listOf(
-            createGradeApi(5, 4.0, of(2019, 2, 25), "Ocena pojawiła się"),
-            createGradeApi(5, 4.0, of(2019, 2, 26), "przed zalogowanie w aplikacji"),
-            createGradeApi(5, 4.0, of(2019, 2, 27), "Ocena z dnia logowania"),
-            createGradeApi(5, 4.0, of(2019, 2, 28), "Ocena jeszcze nowsza")
-        ))
-
-        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
-
-        assertFalse { grades[0].isRead }
-        assertFalse { grades[1].isRead }
-        assertTrue { grades[2].isRead }
-        assertTrue { grades[3].isRead }
-    }
-
-    @Test
-    fun mitigateOldGradesNotifications() {
-        gradeLocal.saveGrades(listOf(
-            createGradeLocal(5, 3.0, of(2019, 2, 25), "Jedna ocena"),
-            createGradeLocal(4, 4.0, of(2019, 2, 26), "Druga"),
-            createGradeLocal(3, 5.0, of(2019, 2, 27), "Trzecia")
-        ))
-
-        every { mockApi.getGrades(1) } returns Single.just(listOf(
-            createGradeApi(5, 2.0, of(2019, 2, 25), "Ocena ma datę, jest inna, ale nie zostanie powiadomiona"),
-            createGradeApi(4, 3.0, of(2019, 2, 26), "starszą niż ostatnia lokalnie"),
-            createGradeApi(3, 4.0, of(2019, 2, 27), "Ta jest z tego samego dnia co ostatnia lokalnie"),
-            createGradeApi(2, 5.0, of(2019, 2, 28), "Ta jest już w ogóle nowa")
-        ))
-
-        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
-
-        assertFalse { grades[0].isRead }
-        assertFalse { grades[1].isRead }
-        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)
-    }
-}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt

@@ -1,34 +0,0 @@
-package io.github.wulkanowy.data.repositories.grade
-
-import io.github.wulkanowy.api.toDate
-import org.threeten.bp.LocalDate
-import io.github.wulkanowy.api.grades.Grade as GradeRemote
-import io.github.wulkanowy.data.db.entities.Grade as GradeLocal
-
-fun createGradeLocal(value: Int, weight: Double, date: LocalDate, desc: String, semesterId: Int = 1): GradeLocal {
-    return GradeLocal(
-        semesterId = semesterId,
-        studentId = 1,
-        modifier = .0,
-        teacher = "",
-        subject = "",
-        date = date,
-        color = "",
-        comment = "",
-        description = desc,
-        entry = "",
-        gradeSymbol = "",
-        value = value,
-        weight = "",
-        weightValue = weight
-    )
-}
-
-fun createGradeApi(value: Int, weight: Double, date: LocalDate, desc: String): GradeRemote {
-    return GradeRemote().apply {
-        this.value = value
-        this.weightValue = weight
-        this.date = date.toDate()
-        this.description = desc
-    }
-}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt

@@ -1,69 +0,0 @@
-package io.github.wulkanowy.data.repositories.gradestatistics
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.GradeStatistics
-import io.github.wulkanowy.data.db.entities.Semester
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class GradeStatisticsLocalTest {
-
-    private lateinit var gradeStatisticsLocal: GradeStatisticsLocal
-
-    private lateinit var testDb: AppDatabase
-
-    @Before
-    fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
-            .build()
-        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics)
-    }
-
-    @After
-    fun closeDb() {
-        testDb.close()
-    }
-
-    @Test
-    fun saveAndRead_subject() {
-        gradeStatisticsLocal.saveGradesStatistics(listOf(
-            getGradeStatistics("Matematyka", 2, 1),
-            getGradeStatistics("Fizyka", 1, 2)
-        ))
-
-        val stats = gradeStatisticsLocal.getGradesStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
-            "Matematyka"
-        ).blockingGet()
-        assertEquals(1, stats.size)
-        assertEquals(stats[0].subject, "Matematyka")
-    }
-
-    @Test
-    fun saveAndRead_all() {
-        gradeStatisticsLocal.saveGradesStatistics(listOf(
-            getGradeStatistics("Matematyka", 2, 1),
-            getGradeStatistics("Chemia", 2, 1),
-            getGradeStatistics("Fizyka", 1, 2)
-        ))
-
-        val stats = gradeStatisticsLocal.getGradesStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
-            "Wszystkie"
-        ).blockingGet()
-        assertEquals(1, stats.size)
-        assertEquals(stats[0].subject, "Wszystkie")
-    }
-
-    private fun getGradeStatistics(subject: String, studentId: Int, semesterId: Int): GradeStatistics {
-        return GradeStatistics(studentId, semesterId, subject, 5, 5, false)
-    }
-}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt

@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.attendance
+package io.github.wulkanowy.data.repositories.local
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
@@ -11,7 +11,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -35,13 +34,13 @@ class AttendanceLocalTest {
     @Test
     fun saveAndReadTest() {
         attendanceLocal.saveAttendance(listOf(
-                Attendance(1, 2, LocalDate.of(2018, 9, 10), 0, "", "", false, false, false, false, false, false),
+                Attendance(1, 2, LocalDate.of(2018, 9, 10), 0, "", ""),
-                Attendance(1, 2, LocalDate.of(2018, 9, 14), 0, "", "", false, false, false, false, false, false),
+                Attendance(1, 2, LocalDate.of(2018, 9, 14), 0, "", ""),
-                Attendance(1, 2, LocalDate.of(2018, 9, 17), 0, "", "", false, false, false, false, false, false)
+                Attendance(1, 2, LocalDate.of(2018, 9, 17), 0, "", "")
         ))
 
         val attendance = attendanceLocal
-            .getAttendance(Semester(1, 2, "", 1, 3, 2019, true, now(), now(), 1, 1),
+                .getAttendance(Semester(1, 1, 2, "", 3, 1),
                         LocalDate.of(2018, 9, 10),
                         LocalDate.of(2018, 9, 14)
                 )

app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt

@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.exam
+package io.github.wulkanowy.data.repositories.local
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
@@ -40,7 +40,7 @@ class ExamLocalTest {
         ))
 
         val exams = examLocal
-            .getExams(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+                .getExams(Semester(1, 1, 2, "", 3, 1),
                         LocalDate.of(2018, 9, 10),
                         LocalDate.of(2018, 9, 14)
                 )

app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/StudentLocalTest.kt

@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.student
+package io.github.wulkanowy.data.repositories.local
 
 import android.content.Context
 import androidx.room.Room
@@ -11,7 +11,6 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -29,7 +28,7 @@ class StudentLocalTest {
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .build()
         sharedHelper = SharedPrefHelper(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
-        studentLocal = StudentLocal(testDb.studentDao, context)
+        studentLocal = StudentLocal(testDb.studentDao, sharedHelper, context)
     }
 
     @After
@@ -39,8 +38,9 @@ class StudentLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        studentLocal.saveStudents(listOf(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = "")))
+        studentLocal.saveStudent(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true))
             .blockingGet()
+        assert(studentLocal.isStudentSaved)
 
         val student = studentLocal.getCurrentStudent(true).blockingGet()
         assertEquals("23", student.schoolSymbol)

app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt

@@ -1,16 +1,17 @@
-package io.github.wulkanowy.data.repositories.timetable
+package io.github.wulkanowy.data.repositories.local
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Timetable
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime.of
+import org.threeten.bp.LocalDateTime
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -22,8 +23,7 @@ class TimetableLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java).build()
-            .build()
         timetableDb = TimetableLocal(testDb.timetableDao)
     }
 
@@ -35,17 +35,19 @@ class TimetableLocalTest {
     @Test
     fun saveAndReadTest() {
         timetableDb.saveTimetable(listOf(
-            createTimetableLocal(1, of(2018, 9, 10, 0, 0, 0)),
+                Timetable(1, 2, 1, LocalDateTime.now(), LocalDateTime.now(),
-            createTimetableLocal(1, of(2018, 9, 14, 0, 0, 0)),
+                        LocalDate.of(2018, 9, 10), "", "", "", "", ""),
-            createTimetableLocal(1, of(2018, 9, 17, 0, 0, 0))
+                Timetable(1, 2, 1, LocalDateTime.now(), LocalDateTime.now(),
+                        LocalDate.of(2018, 9, 14), "", "", "", "", ""),
+                Timetable(1, 2, 1, LocalDateTime.now(), LocalDateTime.now(),
+                        LocalDate.of(2018, 9, 17), "", "", "", "", "")
         ))
 
         val exams = timetableDb.getTimetable(
-            Semester(1, 2, "", 1, 1, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+                Semester(0, 1, 2, "3", 1, 1),
                 LocalDate.of(2018, 9, 10),
                 LocalDate.of(2018, 9, 14)
         ).blockingGet()
-
         assertEquals(2, exams.size)
         assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
         assertEquals(exams[1].date, LocalDate.of(2018, 9, 14))

app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt

@@ -1,47 +0,0 @@
-package io.github.wulkanowy.data.repositories.luckynumber
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Semester
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class LuckyNumberLocalTest {
-
-    private lateinit var luckyNumberLocal: LuckyNumberLocal
-
-    private lateinit var testDb: AppDatabase
-
-    @Before
-    fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
-            .build()
-        luckyNumberLocal = LuckyNumberLocal(testDb.luckyNumberDao)
-    }
-
-    @After
-    fun closeDb() {
-        testDb.close()
-    }
-
-    @Test
-    fun saveAndReadTest() {
-        luckyNumberLocal.saveLuckyNumber(LuckyNumber(1, LocalDate.of(2019, 1, 20), 14))
-
-        val luckyNumber = luckyNumberLocal.getLuckyNumber(Semester(1, 1, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
-            LocalDate.of(2019, 1, 20)
-        ).blockingGet()
-
-        assertEquals(1, luckyNumber.studentId)
-        assertEquals(LocalDate.of(2019, 1, 20), luckyNumber.date)
-        assertEquals(14, luckyNumber.luckyNumber)
-    }
-}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt

@@ -1,60 +0,0 @@
-package io.github.wulkanowy.data.repositories.recipient
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.threeten.bp.LocalDateTime
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class RecipientLocalTest {
-
-    private lateinit var recipientLocal: RecipientLocal
-
-    private lateinit var testDb: AppDatabase
-
-    @Before
-    fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
-            .build()
-        recipientLocal = RecipientLocal(testDb.recipientDao)
-    }
-
-    @After
-    fun closeDb() {
-        testDb.close()
-    }
-
-    @Test
-    fun saveAndReadTest() {
-        recipientLocal.saveRecipients(listOf(
-            Recipient(1, "2rPracownik", "Kowalski Jan", "Kowalski Jan [KJ] - Pracownik (Fake123456)", 3, 4, 2, "hash"),
-            Recipient(1, "3rPracownik", "Kowalska Karolina", "Kowalska Karolina [KK] - Pracownik (Fake123456)", 4, 4, 2, "hash"),
-            Recipient(1, "4rPracownik", "Krupa Stanisław", "Krupa Stanisław [KS] - Uczeń (Fake123456)", 5, 4, 1, "hash")
-        ))
-
-        val recipients = recipientLocal.getRecipients(
-            Student("fakelog.cf", "AUTO", "", "", "", 1, "", "", "", "", 1, true, LocalDateTime.now()),
-            2,
-            ReportingUnit(1, 4, "", 0, "", emptyList())
-        ).blockingGet()
-
-        assertEquals(2, recipients.size)
-        assertEquals(1, recipients[0].studentId)
-        assertEquals("3rPracownik", recipients[1].realId)
-        assertEquals("Kowalski Jan", recipients[0].name)
-        assertEquals("Kowalska Karolina [KK] - Pracownik (Fake123456)", recipients[1].realName)
-        assertEquals(3, recipients[0].loginId)
-        assertEquals(4, recipients[1].unitId)
-        assertEquals(2, recipients[0].role)
-        assertEquals("hash", recipients[1].hash)
-    }
-}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt

@@ -1,45 +0,0 @@
-package io.github.wulkanowy.data.repositories.timetable
-
-import io.github.wulkanowy.api.toDate
-import io.github.wulkanowy.utils.toDate
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.LocalDateTime.now
-import io.github.wulkanowy.api.timetable.Timetable as TimetableRemote
-import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal
-
-fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", subject: String = "", teacher: String = ""): TimetableLocal {
-    return TimetableLocal(
-        studentId = 1,
-        diaryId = 2,
-        number = number,
-        start = start,
-        end = now(),
-        date = start.toLocalDate(),
-        subject = subject,
-        subjectOld = "",
-        group = "",
-        room = room,
-        roomOld = "",
-        teacher = teacher,
-        teacherOld = "",
-        info = "",
-        changes = false,
-        canceled = false
-    )
-}
-
-fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = "", teacher: String = ""): TimetableRemote {
-    return TimetableRemote(
-        number = number,
-        start = start.toDate(),
-        end = start.plusMinutes(45).toDate(),
-        date = start.toLocalDate().toDate(),
-        subject = subject,
-        group = "",
-        room = room,
-        teacher = teacher,
-        info = "",
-        changes = false,
-        canceled = false
-    )
-}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt

@@ -1,89 +0,0 @@
-package io.github.wulkanowy.data.repositories.timetable
-
-import android.os.Build.VERSION_CODES.P
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider.getApplicationContext
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.SdkSuppress
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
-import io.mockk.MockKAnnotations
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
-import io.reactivex.Single
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime.of
-import kotlin.test.assertEquals
-
-@SdkSuppress(minSdkVersion = P)
-@RunWith(AndroidJUnit4::class)
-class TimetableRepositoryTest {
-
-    @SpyK
-    private var mockApi = Api()
-
-    private val settings = InternetObservingSettings.builder()
-        .strategy(TestInternetObservingStrategy())
-        .build()
-
-    @MockK
-    private lateinit var semesterMock: Semester
-
-    private lateinit var timetableRemote: TimetableRemote
-
-    private lateinit var timetableLocal: TimetableLocal
-
-    private lateinit var testDb: AppDatabase
-
-    @Before
-    fun initApi() {
-        MockKAnnotations.init(this)
-        testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
-        timetableLocal = TimetableLocal(testDb.timetableDao)
-        timetableRemote = TimetableRemote(mockApi)
-
-        every { semesterMock.studentId } returns 1
-        every { semesterMock.diaryId } returns 2
-    }
-
-    @After
-    fun closeDb() {
-        testDb.close()
-    }
-
-    @Test
-    fun copyDetailsToCompletedFromPrevious() {
-        timetableLocal.saveTimetable(listOf(
-            createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda"),
-            createTimetableLocal(2, of(2019, 3, 5, 8, 50), "321", "Religia"),
-            createTimetableLocal(3, of(2019, 3, 5, 9, 40), "213", "W-F"),
-            createTimetableLocal(4, of(2019, 3, 5, 10, 30), "213", "W-F", "Jan Kowalski")
-        ))
-
-        every { mockApi.getTimetable(any(), any()) } returns Single.just(listOf(
-            createTimetableRemote(1, of(2019, 3, 5, 8, 0), "", "Przyroda"),
-            createTimetableRemote(2, of(2019, 3, 5, 8, 50), "", "Religia"),
-            createTimetableRemote(3, of(2019, 3, 5, 9, 40), "", "W-F"),
-            createTimetableRemote(4, of(2019, 3, 5, 10, 30), "", "W-F")
-        ))
-
-        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
-            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
-            .blockingGet()
-
-        assertEquals(4, lessons.size)
-        assertEquals("123", lessons[0].room)
-        assertEquals("321", lessons[1].room)
-        assertEquals("213", lessons[2].room)
-
-        assertEquals("", lessons[3].teacher)
-    }
-}

app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt

@@ -1,17 +0,0 @@
-@file:Suppress("UNUSED_PARAMETER")
-
-package io.github.wulkanowy.utils
-
-import android.content.Context
-import timber.log.Timber
-
-class CrashlyticsTree : Timber.Tree() {
-
-    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-        // do nothing
-    }
-}
-
-fun initCrashlytics(context: Context) {
-    // do nothing
-}

app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt

@@ -1,13 +0,0 @@
-package io.github.wulkanowy.utils
-
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class FirebaseAnalyticsHelper @Inject constructor() {
-
-    @Suppress("UNUSED_PARAMETER")
-    fun logEvent(name: String, vararg params: Pair<String, Any?>) {
-        // do nothing
-    }
-}

app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     package="io.github.wulkanowy"
     android:installLocation="internalOnly">
 
-    <uses-sdk tools:overrideLibrary="com.readystatesoftware.chuck" />
+    <uses-sdk tools:overrideLibrary="com.readystatesoftware.chuck"/>
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -20,13 +20,14 @@
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
+        tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:screenOrientation="portrait"
             android:theme="@style/WulkanowyTheme.SplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -34,44 +35,26 @@
             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"
             android:configChanges="orientation|screenSize"
             android:label="@string/main_title"
             android:theme="@style/WulkanowyTheme.NoActionBar" />
-        <activity
-            android:name=".ui.modules.message.send.SendMessageActivity"
-            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.job.SyncWorker"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.firebase.jobdispatcher.ACTION_EXECUTE" />
+            </intent-filter>
+        </service>
         <service
             android:name=".services.widgets.TimetableWidgetService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
 
         <receiver
-            android:name=".ui.modules.timetablewidget.TimetableWidgetProvider"
+            android:name=".ui.widgets.timetable.TimetableWidgetProvider"
-            android:exported="true"
             android:label="@string/timetable_title">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -81,23 +64,6 @@
                 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"
-            android:exported="false"
-            tools:node="remove" />
-
         <meta-data
             android:name="io.fabric.ApiKey"
             android:value="${fabric_api_key}" />

app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt

@@ -1,31 +1,28 @@
 package io.github.wulkanowy
 
 import android.content.Context
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.multidex.MultiDex
-import androidx.work.Configuration
+import com.crashlytics.android.Crashlytics
-import androidx.work.WorkManager
+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.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 javax.inject.Inject
 
 class WulkanowyApp : DaggerApplication() {
 
     @Inject
-    lateinit var workerFactory: SyncWorkerFactory
+    lateinit var prefRepository: PreferencesRepository
 
     override fun attachBaseContext(base: Context?) {
         super.attachBaseContext(base)
@@ -35,30 +32,24 @@ class WulkanowyApp : DaggerApplication() {
     override fun onCreate() {
         super.onCreate()
         AndroidThreeTen.init(this)
-        WorkManager.initialize(this, Configuration.Builder().setWorkerFactory(workerFactory).build())
+        initializeFabric()
-        RxJavaPlugins.setErrorHandler(::onError)
+        if (DEBUG) enableDebugLog()
-
+        AppCompatDelegate.setDefaultNightMode(prefRepository.currentTheme)
-        initCrashlytics(applicationContext)
-        initLogging()
     }
 
-    private fun initLogging() {
+    private fun enableDebugLog() {
-        if (DEBUG) {
         Timber.plant(DebugLogTree())
         FlexibleAdapter.enableLogs(Log.Level.DEBUG)
-        } else {
-            Timber.plant(CrashlyticsTree())
-        }
-        registerActivityLifecycleCallbacks(ActivityLifecycleLogger())
     }
 
-    private fun onError(error: Throwable) {
+    private fun initializeFabric() {
-        if (error is UndeliverableException && error.cause is IOException || error.cause is InterruptedException) {
+        Fabric.with(Fabric.Builder(this).kits(
-            Timber.e(error.cause, "An undeliverable error occurred")
+            Crashlytics.Builder().core(CrashlyticsCore.Builder().disabled(!BuildConfig.CRASHLYTICS_ENABLED).build()).build()
-        } else throw error
+        ).debuggable(BuildConfig.DEBUG).build())
+        Timber.plant(CrashlyticsTree())
     }
 
     override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
-        return DaggerAppComponent.factory().create(this)
+        return DaggerAppComponent.builder().create(this)
     }
 }

app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt

@@ -14,22 +14,14 @@ class ApiHelper @Inject constructor(private val api: Api) {
             symbol = student.symbol
             schoolSymbol = student.schoolSymbol
             studentId = student.studentId
-            classId = student.classId
+            useNewStudent = false
             host = URL(student.endpoint).run { host + ":$port".removeSuffix(":-1") }
             ssl = student.endpoint.startsWith("https")
             loginType = Api.LoginType.valueOf(student.loginType)
-            useNewStudent = true
         }
     }
 
     fun initApi(email: String, password: String, symbol: String, endpoint: String) {
-        api.apply {
+        initApi(Student(email = email, password = password, symbol = symbol, endpoint = endpoint, loginType = "AUTO"))
-            this.email = email
-            this.password = password
-            this.symbol = symbol
-            host = URL(endpoint).run { host + ":$port".removeSuffix(":-1") }
-            ssl = endpoint.startsWith("https")
-            useNewStudent = true
-        }
     }
 }

app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt

@@ -5,7 +5,7 @@ import android.content.SharedPreferences
 import android.content.res.Resources
 import androidx.preference.PreferenceManager
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.WalledGardenInternetObservingStrategy
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.SocketInternetObservingStrategy
 import com.readystatesoftware.chuck.api.ChuckCollector
 import com.readystatesoftware.chuck.api.ChuckInterceptor
 import com.readystatesoftware.chuck.api.RetentionManager
@@ -13,7 +13,7 @@ import dagger.Module
 import dagger.Provides
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import okhttp3.logging.HttpLoggingInterceptor
 import okhttp3.logging.HttpLoggingInterceptor.Level.BASIC
 import okhttp3.logging.HttpLoggingInterceptor.Level.NONE
@@ -27,7 +27,8 @@ internal class RepositoryModule {
     @Provides
     fun provideInternetObservingSettings(): InternetObservingSettings {
         return InternetObservingSettings.builder()
-            .strategy(WalledGardenInternetObservingStrategy())
+            .strategy(SocketInternetObservingStrategy())
+            .host("www.google.com")
             .build()
     }
 
@@ -49,7 +50,7 @@ internal class RepositoryModule {
     @Provides
     fun provideChuckCollector(context: Context, prefRepository: PreferencesRepository): ChuckCollector {
         return ChuckCollector(context)
-            .showNotification(prefRepository.isDebugNotificationEnable)
+            .showNotification(prefRepository.isShowChuckerNotification)
             .retentionManager(RetentionManager(context, ChuckCollector.Period.ONE_HOUR))
     }
 
@@ -81,10 +82,6 @@ internal class RepositoryModule {
     @Provides
     fun provideGradeSummaryDao(database: AppDatabase) = database.gradeSummaryDao
 
-    @Singleton
-    @Provides
-    fun provideGradeStatisticsDao(database: AppDatabase) = database.gradeStatistics
-
     @Singleton
     @Provides
     fun provideMessagesDao(database: AppDatabase) = database.messagesDao
@@ -116,24 +113,4 @@ internal class RepositoryModule {
     @Singleton
     @Provides
     fun provideSubjectDao(database: AppDatabase) = database.subjectDao
-
-    @Singleton
-    @Provides
-    fun provideLuckyNumberDao(database: AppDatabase) = database.luckyNumberDao
-
-    @Singleton
-    @Provides
-    fun provideCompletedLessonsDao(database: AppDatabase) = database.completedLessonsDao
-
-    @Singleton
-    @Provides
-    fun provideReportingUnitDao(database: AppDatabase) = database.reportingUnitDao
-
-    @Singleton
-    @Provides
-    fun provideRecipientDao(database: AppDatabase) = database.recipientDao
-
-    @Singleton
-    @Provides
-    fun provideMobileDevicesDao(database: AppDatabase) = database.mobileDeviceDao
 }

app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt

@@ -8,54 +8,28 @@ import androidx.room.RoomDatabase.JournalMode.TRUNCATE
 import androidx.room.TypeConverters
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
-import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.db.dao.GradeDao
-import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
-import io.github.wulkanowy.data.db.dao.HomeworkDao
-import io.github.wulkanowy.data.db.dao.LuckyNumberDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
-import io.github.wulkanowy.data.db.dao.MobileDeviceDao
+import io.github.wulkanowy.data.db.dao.HomeworkDao
 import io.github.wulkanowy.data.db.dao.NoteDao
-import io.github.wulkanowy.data.db.dao.RecipientDao
-import io.github.wulkanowy.data.db.dao.ReportingUnitDao
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.dao.SubjectDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MobileDevice
+import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.db.migrations.Migration10
-import io.github.wulkanowy.data.db.migrations.Migration11
-import io.github.wulkanowy.data.db.migrations.Migration12
-import io.github.wulkanowy.data.db.migrations.Migration13
-import io.github.wulkanowy.data.db.migrations.Migration14
-import io.github.wulkanowy.data.db.migrations.Migration15
-import io.github.wulkanowy.data.db.migrations.Migration2
-import io.github.wulkanowy.data.db.migrations.Migration3
-import io.github.wulkanowy.data.db.migrations.Migration4
-import io.github.wulkanowy.data.db.migrations.Migration5
-import io.github.wulkanowy.data.db.migrations.Migration6
-import io.github.wulkanowy.data.db.migrations.Migration7
-import io.github.wulkanowy.data.db.migrations.Migration8
-import io.github.wulkanowy.data.db.migrations.Migration9
 import javax.inject.Singleton
 
 @Singleton
@@ -69,47 +43,21 @@ import javax.inject.Singleton
         AttendanceSummary::class,
         Grade::class,
         GradeSummary::class,
-        GradeStatistics::class,
         Message::class,
         Note::class,
         Homework::class,
-        Subject::class,
+        Subject::class
-        LuckyNumber::class,
-        CompletedLesson::class,
-        ReportingUnit::class,
-        Recipient::class,
-        MobileDevice::class
     ],
-    version = AppDatabase.VERSION_SCHEMA,
+    version = 1,
-    exportSchema = true
+    exportSchema = false
 )
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 15
-
         fun newInstance(context: Context): AppDatabase {
             return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
                 .setJournalMode(TRUNCATE)
-                .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
-                .fallbackToDestructiveMigrationOnDowngrade()
-                .addMigrations(
-                    Migration2(),
-                    Migration3(),
-                    Migration4(),
-                    Migration5(),
-                    Migration6(),
-                    Migration7(),
-                    Migration8(),
-                    Migration9(),
-                    Migration10(),
-                    Migration11(),
-                    Migration12(),
-                    Migration13(),
-                    Migration14(),
-                    Migration15()
-                )
                 .build()
         }
     }
@@ -130,8 +78,6 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val gradeSummaryDao: GradeSummaryDao
 
-    abstract val gradeStatistics: GradeStatisticsDao
-
     abstract val messagesDao: MessagesDao
 
     abstract val noteDao: NoteDao
@@ -139,14 +85,4 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val homeworkDao: HomeworkDao
 
     abstract val subjectDao: SubjectDao
-
-    abstract val luckyNumberDao: LuckyNumberDao
-
-    abstract val completedLessonsDao: CompletedLessonsDao
-
-    abstract val reportingUnitDao: ReportingUnitDao
-
-    abstract val recipientDao: RecipientDao
-
-    abstract val mobileDeviceDao: MobileDeviceDao
 }

app/src/main/java/io/github/wulkanowy/data/db/Converters.kt

@@ -1,8 +1,6 @@
 package io.github.wulkanowy.data.db
 
 import androidx.room.TypeConverter
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 import org.threeten.bp.DateTimeUtils
 import org.threeten.bp.Instant
 import org.threeten.bp.LocalDate
@@ -38,14 +36,4 @@ class Converters {
 
     @TypeConverter
     fun intToMonth(value: Int?) = value?.let { Month.of(it) }
-
-    @TypeConverter
-    fun intListToGson(list: List<Int>): String {
-        return Gson().toJson(list)
-    }
-
-    @TypeConverter
-    fun gsonToIntList(value: String): List<Int> {
-        return Gson().fromJson(value, object : TypeToken<List<Int>>() {}.type)
-    }
 }

app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt

@@ -6,16 +6,26 @@ 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) = sharedPref.getLong(key, defaultValue)
+    fun getLong(key: String, defaultValue: Long): Long {
+        return sharedPref.getLong(key, defaultValue)
+    }
+
+    fun putBoolean(key: String, value: Boolean) {
+        sharedPref.edit().putBoolean(key, value).apply()
+    }
+
+    fun getBoolean(key: String, defaultValue: Boolean): Boolean {
+        return sharedPref.getBoolean(key, defaultValue)
+    }
 
     fun delete(key: String) {
         sharedPref.edit().remove(key).apply()

app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt

@@ -1,24 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface CompletedLessonsDao {
-
-    @Insert
-    fun insertAll(exams: List<CompletedLesson>)
-
-    @Delete
-    fun deleteAll(exams: List<CompletedLesson>)
-
-    @Query("SELECT * FROM CompletedLesson WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>>
-}

app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt

@@ -16,6 +16,9 @@ interface GradeDao {
     @Insert
     fun insertAll(grades: List<Grade>)
 
+    @Update
+    fun update(grade: Grade)
+
     @Update
     fun updateAll(grade: List<Grade>)
 
@@ -25,4 +28,6 @@ interface GradeDao {
     @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId")
     fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Grade>>
 
+    @Query("SELECT * FROM Grades WHERE is_read = 0 AND semester_id = :semesterId AND student_id = :studentId")
+    fun loadAllNew(semesterId: Int, studentId: Int): Maybe<List<Grade>>
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt

@@ -1,26 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.GradeStatistics
-import io.reactivex.Maybe
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface GradeStatisticsDao {
-
-    @Insert
-    fun insertAll(gradesStatistics: List<GradeStatistics>)
-
-    @Delete
-    fun deleteAll(gradesStatistics: List<GradeStatistics>)
-
-    @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName AND is_semester = :isSemester")
-    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String, isSemester: Boolean): Maybe<List<GradeStatistics>>
-
-    @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND is_semester = :isSemester")
-    fun loadAll(semesterId: Int, studentId: Int, isSemester: Boolean): Maybe<List<GradeStatistics>>
-}

app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt

@@ -18,6 +18,6 @@ interface GradeSummaryDao {
     @Delete
     fun deleteAll(gradesSummary: List<GradeSummary>)
 
-    @Query("SELECT * FROM GradesSummary WHERE student_id = :studentId AND semester_id = :semesterId")
+    @Query("SELECT * FROM grades_summary WHERE student_id = :studentId AND semester_id = :semesterId")
     fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradeSummary>>
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt

@@ -19,6 +19,6 @@ interface HomeworkDao {
     @Delete
     fun deleteAll(homework: List<Homework>)
 
-    @Query("SELECT * FROM Homework WHERE semester_id = :semesterId AND student_id = :studentId AND date >= :from AND date <= :end")
+    @Query("SELECT * FROM Homework WHERE semester_id = :semesterId AND student_id = :studentId AND date = :date")
-    fun loadAll(semesterId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Homework>>
+    fun loadAll(semesterId: Int, studentId: Int, date: LocalDate): Maybe<List<Homework>>
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt

@@ -1,29 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import androidx.room.Update
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface LuckyNumberDao {
-
-    @Insert
-    fun insert(luckyNumber: LuckyNumber)
-
-    @Update
-    fun update(luckyNumber: LuckyNumber)
-
-    @Delete
-    fun delete(luckyNumber: LuckyNumber)
-
-    @Query("SELECT * FROM LuckyNumbers WHERE student_id = :studentId AND date = :date")
-    fun load(studentId: Int, date: LocalDate): Maybe<LuckyNumber>
-
-}

app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt

@@ -12,20 +12,26 @@ import io.reactivex.Maybe
 interface MessagesDao {
 
     @Insert
-    fun insertAll(messages: List<Message>)
+    fun insertAll(messages: List<Message>): List<Long>
 
     @Delete
     fun deleteAll(messages: List<Message>)
 
+    @Update
+    fun update(message: Message)
+
     @Update
     fun updateAll(messages: List<Message>)
 
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder AND removed = 0 ORDER BY date DESC")
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND real_id = :id")
-    fun loadAll(studentId: Int, folder: Int): Maybe<List<Message>>
+    fun loadOne(studentId: Int, id: Int): Maybe<Message>
 
-    @Query("SELECT * FROM Messages WHERE id = :id")
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder ORDER BY date DESC")
-    fun load(id: Long): Maybe<Message>
+    fun load(studentId: Int, folder: Int): Maybe<List<Message>>
 
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND removed = 1 ORDER BY date DESC")
     fun loadDeleted(studentId: Int): Maybe<List<Message>>
+
+    @Query("SELECT * FROM Messages WHERE unread = 1 AND student_id = :studentId")
+    fun loadNewMessages(studentId: Int): Maybe<List<Message>>
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt

@@ -1,21 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.reactivex.Maybe
-
-@Dao
-interface MobileDeviceDao {
-
-    @Insert
-    fun insertAll(devices: List<MobileDevice>)
-
-    @Delete
-    fun deleteAll(devices: List<MobileDevice>)
-
-    @Query("SELECT * FROM MobileDevices WHERE student_id = :studentId ORDER BY date DESC")
-    fun loadAll(studentId: Int): Maybe<List<MobileDevice>>
-}

app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt

@@ -16,13 +16,18 @@ interface NoteDao {
     @Insert
     fun insertAll(notes: List<Note>)
 
+    @Update
+    fun update(note: Note)
+
     @Update
     fun updateAll(notes: List<Note>)
 
     @Delete
     fun deleteAll(notes: List<Note>)
 
-    @Query("SELECT * FROM Notes WHERE student_id = :studentId")
+    @Query("SELECT * FROM Notes WHERE semester_id = :semesterId AND student_id = :studentId")
-    fun loadAll(studentId: Int): Maybe<List<Note>>
+    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Note>>
 
+    @Query("SELECT * FROM Notes WHERE is_read = 0 AND semester_id = :semesterId AND student_id = :studentId")
+    fun loadNew(semesterId: Int, studentId: Int): Maybe<List<Note>>
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt

@@ -1,23 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.reactivex.Maybe
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface RecipientDao {
-
-    @Insert
-    fun insertAll(messages: List<Recipient>)
-
-    @Delete
-    fun deleteAll(messages: List<Recipient>)
-
-    @Query("SELECT * FROM Recipients WHERE student_id = :studentId AND role = :role AND unit_id = :unitId")
-    fun load(studentId: Int, role: Int, unitId: Int): Maybe<List<Recipient>>
-}

app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt

@@ -1,26 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.reactivex.Maybe
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface ReportingUnitDao {
-
-    @Insert
-    fun insertAll(reportingUnits: List<ReportingUnit>)
-
-    @Delete
-    fun deleteAll(reportingUnits: List<ReportingUnit>)
-
-    @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId")
-    fun load(studentId: Int): Maybe<List<ReportingUnit>>
-
-    @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId AND real_id = :unitId")
-    fun loadOne(studentId: Int, unitId: Int): Maybe<ReportingUnit>
-}

app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt

@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
-import androidx.room.Delete
 import androidx.room.Insert
+import androidx.room.OnConflictStrategy.IGNORE
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
@@ -12,12 +12,15 @@ import javax.inject.Singleton
 @Dao
 interface SemesterDao {
 
-    @Insert
+    @Insert(onConflict = IGNORE)
     fun insertAll(semester: List<Semester>)
 
-    @Delete
+    @Query("SELECT * FROM Semesters WHERE student_id = :studentId")
-    fun deleteAll(semester: List<Semester>)
+    fun loadAll(studentId: Int): Maybe<List<Semester>>
 
-    @Query("SELECT * FROM Semesters WHERE student_id = :studentId AND class_id = :classId")
+    @Query("UPDATE Semesters SET is_current = 1 WHERE semester_id = :semesterId AND diary_id = :diaryId")
-    fun loadAll(studentId: Int, classId: Int): Maybe<List<Semester>>
+    fun updateCurrent(semesterId: Int, diaryId: Int)
+
+    @Query("UPDATE Semesters SET is_current = 0 WHERE student_id = :studentId")
+    fun resetCurrent(studentId: Int)
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt

@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
-import androidx.room.OnConflictStrategy.ABORT
+import androidx.room.OnConflictStrategy.FAIL
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Student
 import io.reactivex.Maybe
@@ -13,8 +13,8 @@ import javax.inject.Singleton
 @Dao
 interface StudentDao {
 
-    @Insert(onConflict = ABORT)
+    @Insert(onConflict = FAIL)
-    fun insertAll(student: List<Student>): List<Long>
+    fun insert(student: Student): Long
 
     @Delete
     fun delete(student: Student)
@@ -25,8 +25,8 @@ interface StudentDao {
     @Query("SELECT * FROM Students")
     fun loadAll(): Maybe<List<Student>>
 
-    @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
+    @Query("UPDATE Students SET is_current = 1 WHERE student_id = :studentId")
-    fun updateCurrent(id: Long)
+    fun updateCurrent(studentId: Int)
 
     @Query("UPDATE Students SET is_current = 0")
     fun resetCurrent()

app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt

@@ -10,30 +10,30 @@ import java.io.Serializable
 data class Attendance(
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
+    var diaryId: Int,
 
-    val date: LocalDate,
+    var date: LocalDate,
 
-    val number: Int,
+    var number: Int,
 
-    val subject: String,
+    var subject: String,
 
-    val name: String,
+    var name: String,
 
-    val presence: Boolean,
+    var presence: Boolean = false,
 
-    val absence: Boolean,
+    var absence: Boolean = false,
 
-    val exemption: Boolean,
+    var exemption: Boolean = false,
 
-    val lateness: Boolean,
+    var lateness: Boolean = false,
 
-    val excused: Boolean,
+    var excused: Boolean = false,
 
-    val deleted: Boolean
+    var deleted: Boolean = false
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt

@@ -10,13 +10,13 @@ import java.io.Serializable
 data class AttendanceSummary(
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
+    var diaryId: Int,
 
     @ColumnInfo(name = "subject_id")
-    val subjectId: Int,
+    var subjectId: Int = 0,
 
     val month: Month,
 

app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt

@@ -1,40 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
-import java.io.Serializable
-
-@Entity(tableName = "CompletedLesson")
-data class CompletedLesson(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
-
-    val date: LocalDate,
-
-    val number: Int,
-
-    val subject: String,
-
-    val topic: String,
-
-    val teacher: String,
-
-    @ColumnInfo(name = "teacher_symbol")
-    val teacherSymbol: String,
-
-    val substitution: String,
-
-    val absence: String,
-
-    val resources: String
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}

app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt

@@ -10,28 +10,28 @@ import java.io.Serializable
 data class Exam(
 
         @ColumnInfo(name = "student_id")
-    val studentId: Int,
+        var studentId: Int,
 
         @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
+        var diaryId: Int,
 
-    val date: LocalDate,
+        var date: LocalDate,
 
         @ColumnInfo(name = "entry_date")
-    val entryDate: LocalDate,
+        var entryDate: LocalDate = LocalDate.now(),
 
-    val subject: String,
+        var subject: String,
 
-    val group: String,
+        var group: String,
 
-    val type: String,
+        var type: String,
 
-    val description: String,
+        var description: String,
 
-    val teacher: String,
+        var teacher: String,
 
         @ColumnInfo(name = "teacher_symbol")
-    val teacherSymbol: String
+        var teacherSymbol: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt

@@ -10,35 +10,35 @@ import java.io.Serializable
 data class Grade(
 
     @ColumnInfo(name = "semester_id")
-    val semesterId: Int,
+    var semesterId: Int,
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int,
 
-    val subject: String,
+    var subject: String,
 
-    val entry: String,
+    var entry: String,
 
-    val value: Int,
+    var value: Int,
 
-    val modifier: Double,
+    var modifier: Double,
 
-    val comment: String,
+    var comment: String,
 
-    val color: String,
+    var color: String,
 
     @ColumnInfo(name = "grade_symbol")
-    val gradeSymbol: String,
+    var gradeSymbol: String,
 
-    val description: String,
+    var description: String,
 
-    val weight: String,
+    var weight: String,
 
-    val weightValue: Double,
+    var weightValue: Int,
 
-    val date: LocalDate,
+    var date: LocalDate,
 
-    val teacher: String
+    var teacher: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

app/src/main/java/io/github/wulkanowy/data/db/entities/GradeStatistics.kt

@@ -1,27 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "GradesStatistics")
-data class GradeStatistics(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "semester_id")
-    val semesterId: Int,
-
-    val subject: String,
-
-    val grade: Int,
-
-    val amount: Int,
-
-    @ColumnInfo(name = "is_semester")
-    val semester: Boolean
-) {
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}

app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt

@@ -4,36 +4,22 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 
-@Entity(tableName = "GradesSummary")
+@Entity(tableName = "Grades_Summary")
 data class GradeSummary(
 
         @ColumnInfo(name = "semester_id")
-    val semesterId: Int,
+        var semesterId: Int,
 
         @ColumnInfo(name = "student_id")
-    val studentId: Int,
+        var studentId: Int,
 
-    val position: Int,
+        var subject: String,
 
-    val subject: String,
+        var predictedGrade: String,
 
-    @ColumnInfo(name = "predicted_grade")
+        var finalGrade: String
-    val predictedGrade: String,
-
-    @ColumnInfo(name = "final_grade")
-    val finalGrade: String,
-
-    @ColumnInfo(name = "proposed_points")
-    val proposedPoints: String,
-
-    @ColumnInfo(name = "final_points")
-    val finalPoints: String,
-
-    @ColumnInfo(name = "points_sum")
-    val pointsSum: String,
-
-    val average: Double
 ) {
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
+
 }

app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt

@@ -10,24 +10,24 @@ import java.io.Serializable
 data class Homework(
 
     @ColumnInfo(name = "semester_id")
-    val semesterId: Int,
+    var semesterId: Int,
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int,
 
-    val date: LocalDate,
+    var date: LocalDate,
 
     @ColumnInfo(name = "entry_date")
-    val entryDate: LocalDate,
+    var entryDate: LocalDate,
 
-    val subject: String,
+    var subject: String,
 
-    val content: String,
+    var content: String,
 
-    val teacher: String,
+    var teacher: String,
 
     @ColumnInfo(name = "teacher_symbol")
-    val teacherSymbol: String
+    var teacherSymbol: String
 
 ) : Serializable {
 

app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt

@@ -1,27 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
-import java.io.Serializable
-
-@Entity(tableName = "LuckyNumbers")
-data class LuckyNumber (
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    val date: LocalDate,
-
-    @ColumnInfo(name = "lucky_number")
-    val luckyNumber: Int
-
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-
-    @ColumnInfo(name = "is_notified")
-    var isNotified: Boolean = true
-}

app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt

@@ -10,39 +10,40 @@ import java.io.Serializable
 data class Message(
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int? = null,
 
     @ColumnInfo(name = "real_id")
-    val realId: Int,
+    val realId: Int? = null,
 
     @ColumnInfo(name = "message_id")
-    val messageId: Int,
+    val messageId: Int? = null,
 
     @ColumnInfo(name = "sender_name")
-    val sender: String,
+    val sender: String? = null,
 
     @ColumnInfo(name = "sender_id")
-    val senderId: Int,
+    val senderId: Int? = null,
+
+    @ColumnInfo(name = "recipient_id")
+    val recipientId: Int? = null,
 
     @ColumnInfo(name = "recipient_name")
-    val recipient: String,
+    val recipient: String? = "",
 
-    val subject: String,
+    val subject: String = "",
 
-    val date: LocalDateTime,
+    val date: LocalDateTime? = null,
 
     @ColumnInfo(name = "folder_id")
-    val folderId: Int,
+    val folderId: Int = 0,
 
-    var unread: Boolean,
+    var unread: Boolean? = false,
 
-    @ColumnInfo(name = "unread_by")
+    val unreadBy: Int? = 0,
-    val unreadBy: Int,
 
-    @ColumnInfo(name = "read_by")
+    val readBy: Int? = 0,
-    val readBy: Int,
 
-    val removed: Boolean
+    val removed: Boolean = false
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt

@@ -1,25 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDateTime
-import java.io.Serializable
-
-@Entity(tableName = "MobileDevices")
-data class MobileDevice(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "device_id")
-    val deviceId: Int,
-
-    val name: String,
-
-    val date: LocalDateTime
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}

app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt

@@ -9,23 +9,26 @@ import java.io.Serializable
 @Entity(tableName = "Notes")
 data class Note(
 
+    @ColumnInfo(name = "semester_id")
+    var semesterId: Int,
+
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int,
 
-    val date: LocalDate,
+    var date: LocalDate,
 
-    val teacher: String,
+    var teacher: String,
 
-    val category: String,
+    var category: String,
 
-    val content: String
+    var content: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
 
     @ColumnInfo(name = "is_read")
-    var isRead: Boolean = true
+    var isRead: Boolean = false
 
     @ColumnInfo(name = "is_notified")
     var isNotified: Boolean = true

app/src/main/java/io/github/wulkanowy/data/db/entities/Recipient.kt

@@ -1,38 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-
-@Entity(tableName = "Recipients")
-data class Recipient(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "real_id")
-    val realId: String,
-
-    val name: String,
-
-    @ColumnInfo(name = "real_name")
-    val realName: String,
-
-    @ColumnInfo(name = "login_id")
-    val loginId: Int,
-
-    @ColumnInfo(name = "unit_id")
-    val unitId: Int,
-
-    val role: Int,
-
-    val hash: String
-
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-
-    override fun toString() = name
-}

app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt

@@ -1,32 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-
-@Entity(tableName = "ReportingUnits")
-data class ReportingUnit(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "real_id")
-    val realId: Int,
-
-    @ColumnInfo(name = "short")
-    val shortName: String,
-
-    @ColumnInfo(name = "sender_id")
-    val senderId: Int,
-
-    @ColumnInfo(name = "sender_name")
-    val senderName: String,
-
-    val roles: List<Int>
-
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}

app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt

@@ -4,43 +4,28 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
 
 @Entity(tableName = "Semesters", indices = [Index(value = ["student_id", "diary_id", "semester_id"], unique = true)])
 data class Semester(
 
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0,
+
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
+    var diaryId: Int,
 
     @ColumnInfo(name = "diary_name")
-    val diaryName: String,
+    var diaryName: String,
-
-    @ColumnInfo(name = "school_year")
-    val schoolYear: Int,
 
     @ColumnInfo(name = "semester_id")
-    val semesterId: Int,
+    var semesterId: Int,
 
     @ColumnInfo(name = "semester_name")
-    val semesterName: Int,
+    var semesterName: Int,
 
     @ColumnInfo(name = "is_current")
-    val isCurrent: Boolean,
+    var isCurrent: Boolean = false
-
+)
-    val start: LocalDate,
-
-    val end: LocalDate,
-
-    @ColumnInfo(name = "class_id")
-    val classId: Int,
-
-    @ColumnInfo(name = "unit_id")
-    val unitId: Int
-) {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}

app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt

@@ -4,47 +4,35 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDateTime
-import java.io.Serializable
 
-@Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id", "class_id"], unique = true)])
+@Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id"], unique = true)])
 data class Student(
 
-    val endpoint: String,
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0,
 
-    val loginType: String,
+    var endpoint: String,
 
-    val email: String,
+    var loginType: String,
+
+    var email: String,
 
     var password: String,
 
-    val symbol: String,
+    var symbol: String = "",
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int = 0,
 
     @ColumnInfo(name = "student_name")
-    val studentName: String,
+    var studentName: String = "",
 
     @ColumnInfo(name = "school_id")
-    val schoolSymbol: String,
+    var schoolSymbol: String = "",
 
     @ColumnInfo(name = "school_name")
-    val schoolName: String,
+    var schoolName: String = "",
-
-    @ColumnInfo(name = "class_name")
-    val className: String,
-
-    @ColumnInfo(name = "class_id")
-    val classId: Int,
 
     @ColumnInfo(name = "is_current")
-    val isCurrent: Boolean,
+    var isCurrent: Boolean = false
-
+)
-    @ColumnInfo(name = "registration_date")
-    val registrationDate: LocalDateTime
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}

app/src/main/java/io/github/wulkanowy/data/db/entities/Subject.kt

@@ -9,15 +9,15 @@ import java.io.Serializable
 data class Subject(
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
+    var diaryId: Int,
 
     @ColumnInfo(name = "real_id")
-    val realId: Int,
+    var realId: Int,
 
-    val name: String
+    var name: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt

@@ -11,38 +11,32 @@ import java.io.Serializable
 data class Timetable(
 
         @ColumnInfo(name = "student_id")
-    val studentId: Int,
+        var studentId: Int,
 
         @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
+        var diaryId: Int,
 
-    val number: Int,
+        val number: Int = 0,
 
-    val start: LocalDateTime,
+        val start: LocalDateTime = LocalDateTime.now(),
 
-    val end: LocalDateTime,
+        val end: LocalDateTime = LocalDateTime.now(),
 
         val date: LocalDate,
 
         val subject: String,
 
-    val subjectOld: String,
-
         val group: String,
 
         val room: String,
 
-    val roomOld: String,
-
         val teacher: String,
 
-    val teacherOld: String,
-
         val info: String,
 
-    val changes: Boolean,
+        val changes: Boolean = false,
 
-    val canceled: Boolean
+        val canceled: Boolean = false
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration10.kt

@@ -1,11 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration10 : Migration(9, 10) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Grades_Summary RENAME TO GradesSummary")
-    }
-}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration11.kt

@@ -1,34 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration11 : Migration(10, 11) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS Grades_temp (
-                id INTEGER PRIMARY KEY NOT NULL,
-                is_read INTEGER NOT NULL,
-                is_notified INTEGER NOT NULL,
-                semester_id INTEGER NOT NULL,
-                student_id INTEGER NOT NULL,
-                subject TEXT NOT NULL,
-                entry TEXT NOT NULL,
-                value INTEGER NOT NULL,
-                modifier REAL NOT NULL,
-                comment TEXT NOT NULL,
-                color TEXT NOT NULL,
-                grade_symbol TEXT NOT NULL,
-                description TEXT NOT NULL,
-                weight TEXT NOT NULL,
-                weightValue REAL NOT NULL,
-                date INTEGER NOT NULL,
-                teacher TEXT NOT NULL
-            )
-        """)
-        database.execSQL("INSERT INTO Grades_temp SELECT * FROM Grades")
-        database.execSQL("DROP TABLE Grades")
-        database.execSQL("ALTER TABLE Grades_temp RENAME TO Grades")
-    }
-}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration12.kt

@@ -1,69 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration12 : Migration(11, 12) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        createTempStudentsTable(database)
-        replaceStudentTable(database)
-        updateStudentsWithClassId(database, getStudentsIds(database))
-        removeStudentsWithNoClassId(database)
-        ensureThereIsOnlyOneCurrentStudent(database)
-    }
-
-    private fun createTempStudentsTable(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS Students_tmp (
-                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-                endpoint TEXT NOT NULL,
-                loginType TEXT NOT NULL,
-                email TEXT NOT NULL,
-                password TEXT NOT NULL,
-                symbol TEXT NOT NULL,
-                student_id INTEGER NOT NULL,
-                student_name TEXT NOT NULL,
-                school_id TEXT NOT NULL,
-                school_name TEXT NOT NULL,
-                is_current INTEGER NOT NULL,
-                registration_date INTEGER NOT NULL,
-                class_id INTEGER NOT NULL
-            )
-        """)
-        database.execSQL("CREATE UNIQUE INDEX index_Students_email_symbol_student_id_school_id_class_id ON Students_tmp (email, symbol, student_id, school_id, class_id)")
-    }
-
-    private fun replaceStudentTable(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN class_id INTEGER DEFAULT 0 NOT NULL")
-        database.execSQL("INSERT INTO Students_tmp SELECT * FROM Students")
-        database.execSQL("DROP TABLE Students")
-        database.execSQL("ALTER TABLE Students_tmp RENAME TO Students")
-    }
-
-    private fun getStudentsIds(database: SupportSQLiteDatabase): List<Int> {
-        val students = mutableListOf<Int>()
-        val studentsCursor = database.query("SELECT student_id FROM Students")
-        if (studentsCursor.moveToFirst()) {
-            do {
-                students.add(studentsCursor.getInt(0))
-            } while (studentsCursor.moveToNext())
-        }
-        return students
-    }
-
-    private fun updateStudentsWithClassId(database: SupportSQLiteDatabase, students: List<Int>) {
-        students.forEach {
-            database.execSQL("UPDATE Students SET class_id = IFNULL((SELECT class_id FROM Semesters WHERE student_id = $it), 0) WHERE student_id = $it")
-        }
-    }
-
-    private fun removeStudentsWithNoClassId(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM Students WHERE class_id = 0")
-    }
-
-    private fun ensureThereIsOnlyOneCurrentStudent(database: SupportSQLiteDatabase) {
-        database.execSQL("UPDATE Students SET is_current = 0")
-        database.execSQL("UPDATE Students SET is_current = 1 WHERE id = (SELECT MAX(id) FROM Students)")
-    }
-}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration13.kt

@@ -1,64 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration13 : Migration(12, 13) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        addClassNameToStudents(database, getStudentsIds(database))
-        updateSemestersTable(database)
-        markAtLeastAndOnlyOneSemesterAtCurrent(database, getStudentsAndClassIds(database))
-        clearMessagesTable(database)
-    }
-
-    private fun addClassNameToStudents(database: SupportSQLiteDatabase, students: List<Pair<Int, String>>) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN class_name TEXT DEFAULT \"\" NOT NULL")
-
-        students.forEach { (id, name) ->
-            val schoolName = name.substringAfter(" - ")
-            val className = name.substringBefore(" - ", "").replace("Klasa ", "")
-            database.execSQL("UPDATE Students SET class_name = '$className' WHERE id = '$id'")
-            database.execSQL("UPDATE Students SET school_name = '$schoolName' WHERE id = '$id'")
-        }
-    }
-
-    private fun getStudentsIds(database: SupportSQLiteDatabase): MutableList<Pair<Int, String>> {
-        val students = mutableListOf<Pair<Int, String>>()
-        val studentsCursor = database.query("SELECT id, school_name FROM Students")
-        if (studentsCursor.moveToFirst()) {
-            do {
-                students.add(studentsCursor.getInt(0) to studentsCursor.getString(1))
-            } while (studentsCursor.moveToNext())
-        }
-        return students
-    }
-
-    private fun updateSemestersTable(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN school_year INTEGER DEFAULT 1970 NOT NULL")
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN start INTEGER DEFAULT 0 NOT NULL")
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN `end` INTEGER DEFAULT 0 NOT NULL")
-    }
-
-    private fun getStudentsAndClassIds(database: SupportSQLiteDatabase): List<Pair<Int, Int>> {
-        val students = mutableListOf<Pair<Int, Int>>()
-        val studentsCursor = database.query("SELECT student_id, class_id FROM Students")
-        if (studentsCursor.moveToFirst()) {
-            do {
-                students.add(studentsCursor.getInt(0) to studentsCursor.getInt(1))
-            } while (studentsCursor.moveToNext())
-        }
-        return students
-    }
-
-    private fun markAtLeastAndOnlyOneSemesterAtCurrent(database: SupportSQLiteDatabase, students: List<Pair<Int, Int>>) {
-        students.forEach { (studentId, classId) ->
-            database.execSQL("UPDATE Semesters SET is_current = 0 WHERE student_id = '$studentId' AND class_id = '$classId'")
-            database.execSQL("UPDATE Semesters SET is_current = 1 WHERE id = (SELECT id FROM Semesters WHERE student_id = '$studentId' AND class_id = '$classId' ORDER BY semester_id DESC)")
-        }
-    }
-
-    private fun clearMessagesTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM Messages")
-    }
-}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration14.kt

@@ -1,26 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration14 : Migration(13, 14) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS GradesSummary")
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS GradesSummary (
-                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-                semester_id INTEGER NOT NULL,
-                student_id INTEGER NOT NULL,
-                position INTEGER NOT NULL,
-                subject TEXT NOT NULL,
-                predicted_grade TEXT NOT NULL,
-                final_grade TEXT NOT NULL,
-                proposed_points TEXT NOT NULL,
-                final_points TEXT NOT NULL,
-                points_sum TEXT NOT NULL,
-                average REAL NOT NULL
-            )
-        """)
-    }
-}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration15.kt

@@ -1,19 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration15 : Migration(14, 15) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS MobileDevices (
-                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-                student_id INTEGER NOT NULL,
-                device_id INTEGER NOT NULL,
-                name TEXT NOT NULL,
-                date INTEGER NOT NULL
-            )
-        """)
-    }
-}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration2.kt

@@ -1,18 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration2 : Migration(1, 2) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS LuckyNumbers (
-                id INTEGER PRIMARY KEY NOT NULL,
-                is_notified INTEGER NOT NULL,
-                student_id INTEGER NOT NULL,
-                date INTEGER NOT NULL,
-                lucky_number INTEGER NOT NULL)
-            """)
-    }
-}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration3.kt

@@ -1,25 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration3 : Migration(2, 3) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS CompletedLesson (
-                id INTEGER PRIMARY KEY NOT NULL,
-                student_id INTEGER NOT NULL,
-                diary_id INTEGER NOT NULL,
-                date INTEGER NOT NULL,
-                number INTEGER NOT NULL,
-                subject TEXT NOT NULL,
-                topic TEXT NOT NULL,
-                teacher TEXT NOT NULL,
-                teacher_symbol TEXT NOT NULL,
-                substitution TEXT NOT NULL,
-                absence TEXT NOT NULL,
-                resources TEXT NOT NULL)
-            """)
-    }
-}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration4.kt

@@ -1,31 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration4 : Migration(3, 4) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS Messages")
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS Messages (
-                id INTEGER PRIMARY KEY NOT NULL,
-                is_notified INTEGER NOT NULL,
-                content TEXT,
-                student_id INTEGER NOT NULL,
-                real_id INTEGER NOT NULL,
-                message_id INTEGER NOT NULL,
-                sender_name TEXT NOT NULL,
-                sender_id INTEGER NOT NULL,
-                recipient_id INTEGER NOT NULL,
-                recipient_name TEXT NOT NULL,
-                subject TEXT NOT NULL,
-                date INTEGER NOT NULL,
-                folder_id INTEGER NOT NULL,
-                unread INTEGER NOT NULL,
-                unreadBy INTEGER NOT NULL,
-                readBy INTEGER NOT NULL,
-                removed INTEGER NOT NULL)
-            """)
-    }
-}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt

@@ -1,26 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-import org.threeten.bp.LocalDateTime.now
-import org.threeten.bp.ZoneOffset
-
-class Migration5 : Migration(4, 5) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN registration_date INTEGER DEFAULT 0 NOT NULL")
-        database.execSQL("UPDATE Students SET registration_date = '${now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli()}'")
-        database.execSQL("DROP TABLE IF EXISTS Notes")
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS Notes (
-                id INTEGER PRIMARY KEY NOT NULL,
-                is_read INTEGER NOT NULL,
-                is_notified INTEGER NOT NULL,
-                student_id INTEGER NOT NULL,
-                date INTEGER NOT NULL,
-                teacher TEXT NOT NULL,
-                category TEXT NOT NULL,
-                content TEXT NOT NULL)
-            """)
-    }
-}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration6.kt

@@ -1,37 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration6 : Migration(5, 6) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS ReportingUnits (
-                id INTEGER PRIMARY KEY NOT NULL,
-                student_id INTEGER NOT NULL,
-                real_id INTEGER NOT NULL,
-                short TEXT NOT NULL,
-                sender_id INTEGER NOT NULL,
-                sender_name TEXT NOT NULL,
-                roles TEXT NOT NULL)
-                """)
-
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS Recipients (
-                id INTEGER PRIMARY KEY NOT NULL,
-                student_id INTEGER NOT NULL,
-                real_id TEXT NOT NULL,
-                name TEXT NOT NULL,
-                real_name TEXT NOT NULL,
-                login_id INTEGER NOT NULL,
-                unit_id INTEGER NOT NULL,
-                role INTEGER NOT NULL,
-                hash TEXT NOT NULL)
-                """)
-
-        database.execSQL("DELETE FROM Semesters WHERE 1")
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN class_id INTEGER DEFAULT 0 NOT NULL")
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN unit_id INTEGER DEFAULT 0 NOT NULL")
-    }
-}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration7.kt

@@ -1,20 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration7 : Migration(6, 7) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS GradesStatistics (
-                id INTEGER PRIMARY KEY NOT NULL,
-                student_id INTEGER NOT NULL,
-                semester_id INTEGER NOT NULL,
-                subject TEXT NOT NULL,
-                grade INTEGER NOT NULL,
-                amount INTEGER NOT NULL,
-                is_semester INTEGER NOT NULL)
-            """)
-    }
-}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration8.kt

@@ -1,13 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration8 : Migration(7, 8) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Timetable ADD COLUMN subjectOld TEXT DEFAULT \"\" NOT NULL")
-        database.execSQL("ALTER TABLE Timetable ADD COLUMN roomOld TEXT DEFAULT \"\" NOT NULL")
-        database.execSQL("ALTER TABLE Timetable ADD COLUMN teacherOld TEXT DEFAULT \"\" NOT NULL")
-    }
-}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration9.kt

@@ -1,30 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration9 : Migration(8, 9) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS Messages")
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS Messages (
-                id INTEGER PRIMARY KEY NOT NULL,
-                student_id INTEGER NOT NULL,
-                real_id INTEGER NOT NULL,
-                message_id INTEGER NOT NULL,
-                sender_name TEXT NOT NULL,
-                sender_id INTEGER NOT NULL,
-                recipient_name TEXT NOT NULL,
-                subject TEXT NOT NULL,
-                date INTEGER NOT NULL,
-                folder_id INTEGER NOT NULL,
-                unread INTEGER NOT NULL,
-                unread_by INTEGER NOT NULL,
-                read_by INTEGER NOT NULL,
-                removed INTEGER NOT NULL,
-                is_notified INTEGER NOT NULL,
-                content TEXT)
-            """)
-    }
-}

app/src/main/java/io/github/wulkanowy/data/exceptions/NoCurrentStudent.kt

@@ -1,3 +0,0 @@
-package io.github.wulkanowy.data.exceptions
-
-class NoCurrentStudentException : Exception("There no set current student in database")

app/src/main/java/io/github/wulkanowy/data/pojos/MobileDeviceToken.kt

@@ -1,12 +0,0 @@
-package io.github.wulkanowy.data.pojos
-
-data class MobileDeviceToken(
-
-    val token: String,
-
-    val symbol: String,
-
-    val pin: String,
-
-    val qr: String
-)

app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt

@@ -1,12 +1,13 @@
-package io.github.wulkanowy.data.repositories.attendance
+package io.github.wulkanowy.data.repositories
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.local.AttendanceLocal
+import io.github.wulkanowy.data.repositories.remote.AttendanceRemote
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@@ -32,8 +33,8 @@ class AttendanceRepository @Inject constructor(
                         local.getAttendance(semester, dates.first, dates.second)
                             .toSingle(emptyList())
                             .doOnSuccess { oldAttendance ->
-                                local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
+                                local.deleteAttendance(oldAttendance - newAttendance)
-                                local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
+                                local.saveAttendance(newAttendance - oldAttendance)
                             }
                     }.flatMap {
                         local.getAttendance(semester, dates.first, dates.second)

app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt

@@ -1,10 +1,11 @@
-package io.github.wulkanowy.data.repositories.attendancesummary
+package io.github.wulkanowy.data.repositories
 
 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.github.wulkanowy.data.repositories.local.AttendanceSummaryLocal
+import io.github.wulkanowy.data.repositories.remote.AttendanceSummaryRemote
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -17,7 +18,7 @@ class AttendanceSummaryRepository @Inject constructor(
     private val remote: AttendanceSummaryRemote
 ) {
 
-    fun getAttendanceSummary(semester: Semester, subjectId: Int, forceRefresh: Boolean = false): Single<List<AttendanceSummary>> {
+    fun getAttendanceSummary(semester: Semester, subjectId: Int, forceRefresh: Boolean = false): Single<List<AttendanceSummary>>? {
         return local.getAttendanceSummary(semester, subjectId).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
@@ -26,8 +27,8 @@ class AttendanceSummaryRepository @Inject constructor(
                 }.flatMap { new ->
                     local.getAttendanceSummary(semester, subjectId).toSingle(emptyList())
                         .doOnSuccess { old ->
-                            local.deleteAttendanceSummary(old.uniqueSubtract(new))
+                            local.deleteAttendanceSummary(old - new)
-                            local.saveAttendanceSummary(new.uniqueSubtract(old))
+                            local.saveAttendanceSummary(new - old)
                         }
                 }.flatMap { local.getAttendanceSummary(semester, subjectId).toSingle(emptyList()) })
     }

app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt

@@ -1,12 +1,13 @@
-package io.github.wulkanowy.data.repositories.exam
+package io.github.wulkanowy.data.repositories
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.local.ExamLocal
+import io.github.wulkanowy.data.repositories.remote.ExamRemote
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@@ -28,12 +29,12 @@ class ExamRepository @Inject constructor(
                         .flatMap {
                             if (it) remote.getExams(semester, dates.first, dates.second)
                             else Single.error(UnknownHostException())
-                        }.flatMap { new ->
+                        }.flatMap { newExams ->
                             local.getExams(semester, dates.first, dates.second)
                                 .toSingle(emptyList())
-                                .doOnSuccess { old ->
+                                .doOnSuccess { oldExams ->
-                                    local.deleteExams(old.uniqueSubtract(new))
+                                    local.deleteExams(oldExams - newExams)
-                                    local.saveExams(new.uniqueSubtract(old))
+                                    local.saveExams(newExams - oldExams)
                                 }
                         }.flatMap {
                             local.getExams(semester, dates.first, dates.second)

app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt

@@ -0,0 +1,52 @@
+package io.github.wulkanowy.data.repositories
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.local.GradeLocal
+import io.github.wulkanowy.data.repositories.remote.GradeRemote
+import io.reactivex.Completable
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: GradeLocal,
+    private val remote: GradeRemote
+) {
+
+    fun getGrades(semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Grade>> {
+        return local.getGrades(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getGrades(semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { newGrades ->
+                    local.getGrades(semester).toSingle(emptyList())
+                        .doOnSuccess { oldGrades ->
+                            local.deleteGrades(oldGrades - newGrades)
+                            local.saveGrades((newGrades - oldGrades)
+                                .onEach {
+                                    if (oldGrades.isNotEmpty()) it.isRead = false
+                                    if (notify) it.isNotified = false
+                                })
+                        }
+                }.flatMap { local.getGrades(semester).toSingle(emptyList()) })
+    }
+
+    fun getNewGrades(semester: Semester): Single<List<Grade>> {
+        return local.getNewGrades(semester).toSingle(emptyList())
+    }
+
+    fun updateGrade(grade: Grade): Completable {
+        return local.updateGrade(grade)
+    }
+
+    fun updateGrades(grades: List<Grade>): Completable {
+        return local.updateGrades(grades)
+    }
+}

app/src/main/java/io/github/wulkanowy/data/repositories/GradeSummaryRepository.kt

@@ -1,10 +1,11 @@
-package io.github.wulkanowy.data.repositories.gradessummary
+package io.github.wulkanowy.data.repositories
 
 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.github.wulkanowy.data.repositories.local.GradeSummaryLocal
+import io.github.wulkanowy.data.repositories.remote.GradeSummaryRemote
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -23,11 +24,11 @@ class GradeSummaryRepository @Inject constructor(
                 .flatMap {
                     if (it) remote.getGradeSummary(semester)
                     else Single.error(UnknownHostException())
-                }.flatMap { new ->
+                }.flatMap { newGradesSummary ->
                     local.getGradesSummary(semester).toSingle(emptyList())
-                        .doOnSuccess { old ->
+                        .doOnSuccess { oldGradesSummary ->
-                            local.deleteGradesSummary(old.uniqueSubtract(new))
+                            local.deleteGradesSummary(oldGradesSummary - newGradesSummary)
-                            local.saveGradesSummary(new.uniqueSubtract(old))
+                            local.saveGradesSummary(newGradesSummary - oldGradesSummary)
                         }
                 }.flatMap { local.getGradesSummary(semester).toSingle(emptyList()) })
     }

app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt

@@ -0,0 +1,36 @@
+package io.github.wulkanowy.data.repositories
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.local.HomeworkLocal
+import io.github.wulkanowy.data.repositories.remote.HomeworkRemote
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class HomeworkRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: HomeworkLocal,
+    private val remote: HomeworkRemote
+) {
+
+    fun getHomework(semester: Semester, date: LocalDate, forceRefresh: Boolean = false): Single<List<Homework>> {
+        return local.getHomework(semester, date).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getHomework(semester, date)
+                    else Single.error(UnknownHostException())
+                }.flatMap { newGrades ->
+                    local.getHomework(semester, date).toSingle(emptyList())
+                        .doOnSuccess { oldGrades ->
+                            local.deleteHomework(oldGrades - newGrades)
+                            local.saveHomework(newGrades - oldGrades)
+                        }
+                }.flatMap { local.getHomework(semester, date).toSingle(emptyList()) })
+    }
+}

app/src/main/java/io/github/wulkanowy/data/repositories/MessagesRepository.kt

@@ -0,0 +1,87 @@
+package io.github.wulkanowy.data.repositories
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.ApiHelper
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.local.MessagesLocal
+import io.github.wulkanowy.data.repositories.remote.MessagesRemote
+import io.reactivex.Completable
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MessagesRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: MessagesLocal,
+    private val remote: MessagesRemote,
+    private val apiHelper: ApiHelper
+) {
+
+    enum class MessageFolder(val id: Int = 1) {
+        RECEIVED(1),
+        SENT(2),
+        TRASHED(3)
+    }
+
+    fun getMessages(student: Student, folder: MessageFolder, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Message>> {
+        return Single.just(apiHelper.initApi(student))
+            .flatMap { _ ->
+                local.getMessages(student.studentId, folder).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getMessages(student.studentId, folder)
+                            else Single.error(UnknownHostException())
+                        }.flatMap { new ->
+                            local.getMessages(student.studentId, folder).toSingle(emptyList())
+                                .doOnSuccess { old ->
+                                    local.deleteMessages(old - new)
+                                    local.saveMessages((new - old)
+                                        .onEach {
+                                            it.isNotified = !notify
+                                        })
+                                }
+                        }.flatMap { local.getMessages(student.studentId, folder).toSingle(emptyList()) }
+                    )
+            }
+    }
+
+    fun getMessage(student: Student, messageId: Int, markAsRead: Boolean = false): Single<Message> {
+        return Single.just(apiHelper.initApi(student))
+            .flatMap { _ ->
+                local.getMessage(student.studentId, messageId)
+                    .filter { !it.content.isNullOrEmpty() }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) local.getMessage(student.studentId, messageId).toSingle()
+                            else Single.error(UnknownHostException())
+                        }
+                        .flatMap { dbMessage ->
+                            remote.getMessagesContent(dbMessage, markAsRead).doOnSuccess {
+                                local.updateMessage(dbMessage.copy(unread = false).apply {
+                                    id = dbMessage.id
+                                    content = it
+                                })
+                            }
+                        }.flatMap {
+                            local.getMessage(student.studentId, messageId).toSingle()
+                        }
+                    )
+            }
+    }
+
+    fun getNewMessages(student: Student): Single<List<Message>> {
+        return local.getNewMessages(student).toSingle(emptyList())
+    }
+
+    fun updateMessage(message: Message): Completable {
+        return Completable.fromCallable { local.updateMessage(message) }
+    }
+
+    fun updateMessages(messages: List<Message>): Completable {
+        return Completable.fromCallable { local.updateMessages(messages) }
+    }
+}

app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt

@@ -0,0 +1,52 @@
+package io.github.wulkanowy.data.repositories
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.local.NoteLocal
+import io.github.wulkanowy.data.repositories.remote.NoteRemote
+import io.reactivex.Completable
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NoteRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: NoteLocal,
+    private val remote: NoteRemote
+) {
+
+    fun getNotes(semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Note>> {
+        return local.getNotes(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getNotes(semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getNotes(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteNotes(old - new)
+                            local.saveNotes((new - old)
+                                .onEach {
+                                    if (notify) it.isNotified = false
+                                })
+                        }
+                }.flatMap { local.getNotes(semester).toSingle(emptyList()) }
+            )
+    }
+
+    fun getNewNotes(semester: Semester): Single<List<Note>> {
+        return local.getNewNotes(semester).toSingle(emptyList())
+    }
+
+    fun updateNote(note: Note): Completable {
+        return local.updateNote(note)
+    }
+
+    fun updateNotes(notes: List<Note>): Completable {
+        return local.updateNotes(notes)
+    }
+}