Merge branch 'release/0.14.1'

Version 0.14.0

.circleci/config.yml

@@ -98,7 +98,7 @@ jobs:
           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"
+          command: sdkmanager "system-images;android-22;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-22;default;armeabi-v7a"
       - run:
           name: Launch emulator
           command: export LD_LIBRARY_PATH=${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib && emulator64-arm -avd test -noaudio -no-boot-anim -no-window -accel on
@@ -116,7 +116,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 createFdroidDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
       - run:
           name: Collect logs from emulator
           command: adb logcat -d > ./app/build/reports/logcat_emulator.txt

.gitignore

@@ -110,4 +110,5 @@ Thumbs.db
 
 ### AndroidStudio Patch ###
 
-!/gradle/wrapper/gradle-wrapper.jar
+!/gradle/wrapper/gradle-wrapper.jar
+.idea/jarRepositories.xml

.idea/codeStyles/Project.xml

@@ -1,6 +1,9 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
+    <AndroidXmlCodeStyleSettings>
+      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>

.travis.yml

@@ -3,8 +3,8 @@ jdk: oraclejdk8
 
 env:
  global:
-    - ANDROID_API_LEVEL=28
-    - ANDROID_BUILD_TOOLS_VERSION=28.0.3
+    - ANDROID_API_LEVEL=29
+    - ANDROID_BUILD_TOOLS_VERSION=29.0.2
 
 cache:
   directories:
@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.10.2
+    - 0.14.1
 
 android:
  licenses:
@@ -34,12 +34,12 @@ android:
     - extra-android-m2repository
     - addon-google_apis-google-$ANDROID_API_LEVEL
     # Android emulator
-    - android-19
-    - sys-img-armeabi-v7a-android-19
+    - android-22
+    - sys-img-armeabi-v7a-android-22
 
 before_script:
     # Launch emulator before the execution
-    - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
+    - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
     - emulator -avd test -no-audio -no-window &
     - android-wait-for-emulator
     - adb shell input keyevent 82 &
@@ -50,7 +50,7 @@ script:
   - fossa --no-ansi || true
   #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
   - ./gradlew testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
-  - ./gradlew createPlayDebugCoverageReport --stacktrace --daemon
+  - ./gradlew createFdroidDebugCoverageReport --stacktrace --daemon
   - ./gradlew jacocoTestReport --stacktrace --daemon
   - if [ -z ${SONAR_HOST+x} ]; then echo "sonar scan skipped"; else
       git fetch --unshallow;

README.en.md

@@ -4,14 +4,14 @@
 [![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg)](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)
+[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
 
-Unofficial android VULCAN UONET+ register client for student and parent
+Unofficial android VULCAN UONET+ register client for both students and their parents
 
 ## Features
 
-* logging in using the email and password
+* logging in using the email and password OR using token and pin
 * functions from the register website:
     * grades
     * grade statistics
@@ -24,7 +24,7 @@ Unofficial android VULCAN UONET+ register client for student and parent
     * homework
     * notes
     * lucky number
-* calculation of the average
+* calculation of the average independently of school's preferences
 * notifications, e.g. about a new grade
 * dark and black (AMOLED) theme
 * offline mode
@@ -32,21 +32,21 @@ Unofficial android VULCAN UONET+ register client for student and parent
 
 ## Download
 
-You can download the current beta from the Google Play or Fdroid store
+You can download the current beta version from the Google Play or the F-Droid store
 
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
       alt="Get it on Google Play"
       height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-    alt="Get it on Fdroid"
+    alt="Get it on F-Droid"
     height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
     
-You can also download a [development version](https://wulkanowy.github.io/#download) that includes new features prepared for the next release
+You can also download a [development version](https://wulkanowy.github.io/#download) that includes new features being prepared for the next release
 
 ## Built With
 
 
-* [Wulkanowy API](https://github.com/wulkanowy/api)
+* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
 * [RxJava 2](https://github.com/ReactiveX/RxJava)
 * [Dagger 2](https://github.com/google/dagger)
 * [Room](https://developer.android.com/topic/libraries/architecture/room)

README.md

@@ -4,14 +4,14 @@
 [![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg)](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)
+[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
 
 Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 
 ## Funkcje
 
-* logowanie za pomocą e-maila i hasła
+* logowanie za pomocą e-maila i hasła LUB tokena i pinu
 * funkcje ze strony internetowej dziennika:
     * oceny
     * statystyki ocen
@@ -24,7 +24,7 @@ Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
     * zadania domowe
     * uwagi
     * szczęśliwy numerek
-* obliczanie średniej
+* obliczanie średniej niezależnie od preferencji szkoły
 * powiadomienia np. o nowej ocenie
 * ciemny i czarny (AMOLED) motyw
 * tryb offilne
@@ -32,13 +32,13 @@ Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 
 ## Pobierz
 
-Aktualną wersję beta możesz pobrać ze sklepu Google Play lub Fdroid
+Aktualną wersję beta możesz pobrać ze sklepu Google Play lub F-Droid
 
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
       alt="Pobierz z Google Play"
       height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-    alt="Pobierz z Fdroid"
+    alt="Pobierz z F-Droid"
     height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
 
 
@@ -47,7 +47,7 @@ Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#downloa
 
 ## Zbudowana za pomocą
 
-* [Wulkanowy API](https://github.com/wulkanowy/api)
+* [Wulkanowy SDK](https://github.com/wulkanowy/SDK)
 * [RxJava 2](https://github.com/ReactiveX/RxJava)
 * [Dagger 2](https://github.com/google/dagger)
 * [Room](https://developer.android.com/topic/libraries/architecture/room)
@@ -59,4 +59,4 @@ Wnieś swój wkład w projekt, tworząc PR lub wysyłając issue na GitHub.
 
 ## Licencja
 
-Ten projekt jest licencjonowany w ramach Apache License 2.0 - szczegóły w pliku [LICENSE](LICENSE)
+Ten projekt udostępniany jest na licencji Apache License 2.0 - szczegóły w pliku [LICENSE](LICENSE)

app/build.gradle

@@ -9,16 +9,16 @@ apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 16
-        targetSdkVersion 28
-        versionCode 45
-        versionName "0.10.2"
+        targetSdkVersion 29
+        versionCode 50
+        versionName "0.14.1"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -28,8 +28,10 @@ android {
         ]
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString(),
-                             "room.incremental"   : "true"]
+                arguments = [
+                        "room.schemaLocation": "$projectDir/schemas".toString(),
+                        "room.incremental"   : "true"
+                ]
             }
         }
     }
@@ -61,7 +63,6 @@ android {
             versionNameSuffix "-dev"
             testCoverageEnabled = true
             ext.enableCrashlytics = project.hasProperty("enableCrashlytics")
-            multiDexKeepProguard file('proguard-multidex-rules.pro')
         }
     }
 
@@ -109,38 +110,36 @@ play {
 }
 
 ext {
-    work_manager = "2.2.0"
-    room = "2.2.0-rc01"
-    dagger = "2.24"
+    work_manager = "2.3.0-rc01"
+    room = "2.2.3"
+    dagger = "2.25.4"
     chucker = "2.0.4"
     mockk = "1.9.2"
-    mockito_core = "3.0.7"
 }
 
 configurations.all {
     resolutionStrategy.force "androidx.constraintlayout:constraintlayout:1.1.3"
-    resolutionStrategy.force "com.google.android.material:material:1.1.0-alpha07"
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:api:0.10.2"
+    implementation "io.github.wulkanowy:sdk:0.14.1"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "androidx.core:core-ktx:1.1.0"
-    implementation "androidx.activity:activity-ktx:1.0.0"
+    implementation "androidx.core:core-ktx:1.2.0-rc01"
+    implementation "androidx.activity:activity-ktx:1.1.0-rc03"
     implementation "androidx.appcompat:appcompat:1.1.0"
     implementation "androidx.appcompat:appcompat-resources:1.1.0"
-    implementation "androidx.fragment:fragment-ktx:1.1.0"
+    implementation "androidx.fragment:fragment-ktx:1.2.0-rc05"
     implementation "androidx.annotation:annotation:1.1.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
     implementation "androidx.preference:preference-ktx:1.1.0"
-    implementation "androidx.recyclerview:recyclerview:1.1.0-beta04"
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation "androidx.viewpager:viewpager:1.0.0"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0-beta01"
-    implementation "com.google.android.material:material:1.1.0-alpha07"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
+    implementation "com.google.android.material:material:1.1.0-rc01"
     implementation "com.github.wulkanowy:material-chips-input:2.0.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation "me.zhanghai.android.materialprogressbar:library:1.6.1"
@@ -157,26 +156,28 @@ dependencies {
     implementation "com.google.dagger:dagger-android-support:$dagger"
     kapt "com.google.dagger:dagger-compiler:$dagger"
     kapt "com.google.dagger:dagger-android-processor:$dagger"
-    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.0"
-    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.0"
+    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.2"
+    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.2"
 
     implementation "eu.davidea:flexible-adapter:5.1.0"
     implementation "eu.davidea:flexible-adapter-ui:1.0.0"
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
     implementation "com.ncapdevi:frag-nav:3.3.0"
+    implementation "com.github.YarikSOffice:lingver:1.1.0"
 
     implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.12"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.16"
 
-    implementation "com.google.code.gson:gson:2.8.5"
+    implementation "com.google.code.gson:gson:2.8.6"
     implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
     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.4"
-    implementation "com.mikepenz:aboutlibraries:7.0.3"
+    implementation "com.squareup.okhttp3:logging-interceptor:3.12.7"
+    implementation "com.mikepenz:aboutlibraries-core:7.1.0"
+    implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
 
-    playImplementation "com.google.firebase:firebase-core:17.2.0"
+    playImplementation "com.google.firebase:firebase-core:17.2.1"
     playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
 
     releaseImplementation "fr.o80.chucker:library-no-op:$chucker"
@@ -184,13 +185,10 @@ dependencies {
     debugImplementation "fr.o80.chucker:library:$chucker"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
-    testImplementation "junit:junit:4.12"
+    testImplementation "junit:junit:4.13"
     testImplementation "io.mockk:mockk:$mockk"
     testImplementation "org.threeten:threetenbp:1.4.0"
-    testImplementation "org.mockito:mockito-core:$mockito_core"
-    testImplementation("org.mockito:mockito-inline:3.0.7") {
-        exclude group: "org.mockito", module: "mockito-core"
-    }
+    testImplementation "org.mockito:mockito-inline:3.2.4"
 
     androidTestImplementation "androidx.test:core:1.2.0"
     androidTestImplementation "androidx.test:runner:1.2.0"
@@ -198,10 +196,7 @@ dependencies {
     androidTestImplementation "io.mockk:mockk-android:$mockk"
     androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    androidTestImplementation "org.mockito:mockito-core:$mockito_core"
-    androidTestImplementation("org.mockito:mockito-android:3.0.7") {
-        exclude group: 'org.mockito', module: 'mockito-core'
-    }
+    androidTestImplementation "org.mockito:mockito-android:3.2.4"
 }
 
 apply plugin: 'com.google.gms.google-services'

app/proguard-multidex-rules.pro

@@ -1,3 +0,0 @@
--keep class android.support.test.internal** { *; }
--keep class org.junit.** { *; }
--keep public class io.github.wulkanowy** { *; }

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

@@ -1,11 +1,13 @@
 package io.github.wulkanowy.data.db.migrations
 
+import androidx.preference.PreferenceManager
 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 io.github.wulkanowy.data.db.SharedPrefProvider
 import org.junit.Rule
 
 abstract class AbstractMigrationTest {
@@ -22,11 +24,8 @@ abstract class AbstractMigrationTest {
     fun getMigratedRoomDatabase(): AppDatabase {
         val database = Room.databaseBuilder(ApplicationProvider.getApplicationContext(),
             AppDatabase::class.java, dbName)
-            .addMigrations(
-                Migration12(),
-                Migration13(),
-                Migration14(),
-                Migration15()
+            .addMigrations(*AppDatabase.getMigrations(SharedPrefProvider(PreferenceManager
+                .getDefaultSharedPreferences(ApplicationProvider.getApplicationContext())))
             )
             .build()
         // close the database and release any stream resources when the test finishes

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

@@ -3,10 +3,14 @@ package io.github.wulkanowy.data.db.migrations
 import android.content.ContentValues
 import android.database.sqlite.SQLiteDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
+import io.github.wulkanowy.data.db.Converters
+import io.github.wulkanowy.data.db.entities.Semester
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Test
+import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.of
+import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 class Migration13Test : AbstractMigrationTest() {
@@ -97,11 +101,9 @@ class Migration13Test : AbstractMigrationTest() {
             close()
         }
 
-        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
+        val db = helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
-        val db = getMigratedRoomDatabase()
-
-        val semesters1 = db.semesterDao.loadAll(1, 5).blockingGet()
+        val semesters1 = getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 1 AND class_id = 5")
         assertTrue { semesters1.single { it.isCurrent }.isCurrent }
         semesters1[0].run {
             assertFalse(isCurrent)
@@ -119,7 +121,7 @@ class Migration13Test : AbstractMigrationTest() {
             assertEquals(2, diaryId)
         }
 
-        db.semesterDao.loadAll(2, 5).blockingGet().let {
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
             assertTrue { it.single { it.isCurrent }.isCurrent }
             assertEquals(1970, it[0].schoolYear)
             assertEquals(of(1970, 1, 1), it[0].end)
@@ -130,7 +132,7 @@ class Migration13Test : AbstractMigrationTest() {
             assertTrue(it[3].isCurrent)
         }
 
-        db.semesterDao.loadAll(2, 5).blockingGet().let {
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
             assertTrue { it.single { it.isCurrent }.isCurrent }
             assertFalse(it[0].isCurrent)
             assertFalse(it[1].isCurrent)
@@ -139,6 +141,30 @@ class Migration13Test : AbstractMigrationTest() {
         }
     }
 
+    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Semester> {
+        val semesters = mutableListOf<Semester>()
+
+        val cursor = db.query(query)
+        if (cursor.moveToFirst()) {
+            do {
+                semesters.add(Semester(
+                    studentId = cursor.getInt(1),
+                    diaryId = cursor.getInt(2),
+                    diaryName = cursor.getString(3),
+                    semesterId = cursor.getInt(4),
+                    semesterName = cursor.getInt(5),
+                    isCurrent = cursor.getInt(6) == 1,
+                    classId = cursor.getInt(7),
+                    unitId = cursor.getInt(8),
+                    schoolYear = cursor.getInt(9),
+                    start = Converters().timestampToDate(cursor.getLong(10))!!,
+                    end = Converters().timestampToDate(cursor.getLong(11))!!
+                ))
+            } while (cursor.moveToNext())
+        }
+        return semesters.toList()
+    }
+
     private fun createStudent(db: SupportSQLiteDatabase, studentId: Int, schoolName: String = "", classId: Int = -1, schoolId: Int = 123) {
         db.insert("Students", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
             put("endpoint", "https://fakelog.cf")

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

@@ -6,15 +6,18 @@ 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.SdkHelper
 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.github.wulkanowy.sdk.Sdk
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
+import io.mockk.just
+import io.mockk.runs
 import io.reactivex.Single
 import org.junit.After
 import org.junit.Before
@@ -25,14 +28,13 @@ 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()
+    @MockK
+    private lateinit var mockSdk: Sdk
 
     private val settings = InternetObservingSettings.builder()
         .strategy(TestInternetObservingStrategy())
@@ -55,13 +57,14 @@ class GradeRepositoryTest {
         MockKAnnotations.init(this)
         testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
         gradeLocal = GradeLocal(testDb.gradeDao)
-        gradeRemote = GradeRemote(mockApi)
+        gradeRemote = GradeRemote(mockSdk)
 
-        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
+        every { semesterMock.schoolYear } returns 2019
+        every { semesterMock.semesterId } returns 1
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
     }
 
     @After
@@ -71,7 +74,7 @@ class GradeRepositoryTest {
 
     @Test
     fun markOlderThanRegisterDateAsRead() {
-        every { mockApi.getGrades(1) } returns Single.just(listOf(
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
             createGradeApi(5, 4.0, of(2019, 2, 25), "Ocena pojawiła się"),
             createGradeApi(5, 4.0, of(2019, 2, 26), "przed zalogowanie w aplikacji"),
             createGradeApi(5, 4.0, of(2019, 2, 27), "Ocena z dnia logowania"),
@@ -95,7 +98,7 @@ class GradeRepositoryTest {
             createGradeLocal(3, 5.0, of(2019, 2, 27), "Trzecia")
         ))
 
-        every { mockApi.getGrades(1) } returns Single.just(listOf(
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
             createGradeApi(5, 2.0, of(2019, 2, 25), "Ocena ma datę, jest inna, ale nie zostanie powiadomiona"),
             createGradeApi(4, 3.0, of(2019, 2, 26), "starszą niż ostatnia lokalnie"),
             createGradeApi(3, 4.0, of(2019, 2, 27), "Ta jest z tego samego dnia co ostatnia lokalnie"),
@@ -119,7 +122,7 @@ class GradeRepositoryTest {
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         ))
 
-        every { mockApi.getGrades(1) } returns Single.just(listOf(
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         ))
@@ -137,7 +140,7 @@ class GradeRepositoryTest {
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         ))
 
-        every { mockApi.getGrades(1) } returns Single.just(listOf(
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
@@ -153,7 +156,7 @@ class GradeRepositoryTest {
     fun emptyLocal() {
         gradeLocal.saveGrades(listOf())
 
-        every { mockApi.getGrades(1) } returns Single.just(listOf(
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
@@ -172,7 +175,7 @@ class GradeRepositoryTest {
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         ))
 
-        every { mockApi.getGrades(1) } returns Single.just(listOf())
+        every { mockSdk.getGrades(1) } returns Single.just(listOf())
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()

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

@@ -1,8 +1,7 @@
 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.sdk.pojo.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 {
@@ -18,17 +17,25 @@ fun createGradeLocal(value: Int, weight: Double, date: LocalDate, desc: String,
         description = desc,
         entry = "",
         gradeSymbol = "",
-        value = value,
+        value = value.toDouble(),
         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
-    }
+    return GradeRemote(
+        subject = "",
+        color = "",
+        comment = "",
+        date = date,
+        description = desc,
+        entry = "",
+        modifier = .0,
+        symbol = "",
+        teacher = "",
+        value = value.toDouble(),
+        weight = weight.toString(),
+        weightValue = weight
+    )
 }

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

@@ -4,6 +4,7 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import org.junit.After
@@ -24,7 +25,7 @@ class GradeStatisticsLocalTest {
     fun createDb() {
         testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
-        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics)
+        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics, testDb.gradePointsStatistics)
     }
 
     @After
@@ -63,7 +64,52 @@ class GradeStatisticsLocalTest {
         assertEquals(stats[0].subject, "Wszystkie")
     }
 
+    @Test
+    fun saveAndRead_points() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf(
+            getGradePointsStatistics("Matematyka", 2, 1),
+            getGradePointsStatistics("Chemia", 2, 1),
+            getGradePointsStatistics("Fizyka", 1, 2)
+        ))
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            "Matematyka"
+        ).blockingGet()
+        with(stats) {
+            assertEquals(subject, "Matematyka")
+            assertEquals(others, 5.0)
+            assertEquals(student, 5.0)
+        }
+    }
+
+    @Test
+    fun saveAndRead_subjectEmpty() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            "Matematyka"
+        ).blockingGet()
+        assertEquals(null, stats)
+    }
+
+    @Test
+    fun saveAndRead_allEmpty() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            "Wszystkie"
+        ).blockingGet()
+        assertEquals(null, stats)
+    }
+
     private fun getGradeStatistics(subject: String, studentId: Int, semesterId: Int): GradeStatistics {
         return GradeStatistics(studentId, semesterId, subject, 5, 5, false)
     }
+
+    private fun getGradePointsStatistics(subject: String, studentId: Int, semesterId: Int): GradePointsStatistics {
+        return GradePointsStatistics(studentId, semesterId, subject, 5.0, 5.0)
+    }
 }

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

@@ -42,7 +42,7 @@ class RecipientLocalTest {
         ))
 
         val recipients = recipientLocal.getRecipients(
-            Student("fakelog.cf", "AUTO", "", "", "", 1, "", "", "", "", 1, true, LocalDateTime.now()),
+            Student("fakelog.cf", "AUTO", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", 1, true, LocalDateTime.now()),
             2,
             ReportingUnit(1, 4, "", 0, "", emptyList())
         ).blockingGet()

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

@@ -39,7 +39,7 @@ class StudentLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        studentLocal.saveStudents(listOf(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = "")))
+        studentLocal.saveStudents(listOf(Student(email = "test", password = "test123", schoolSymbol = "23", scrapperBaseUrl = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = "", loginMode = "API", certificateKey = "", privateKey = "", mobileBaseUrl = "", userLoginId = 0, isParent = false)))
             .blockingGet()
 
         val student = studentLocal.getCurrentStudent(true).blockingGet()

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

@@ -1,13 +1,11 @@
 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.sdk.pojo.Timetable as TimetableRemote
 import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal
 
-fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableLocal {
+fun createTimetableLocal(start: LocalDateTime, number: Int, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableLocal {
     return TimetableLocal(
         studentId = 1,
         diaryId = 2,
@@ -28,18 +26,22 @@ fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", s
     )
 }
 
-fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = "", teacher: String = "", changes: Boolean = false): TimetableRemote {
+fun createTimetableRemote(start: LocalDateTime, number: Int = 1, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableRemote {
     return TimetableRemote(
         number = number,
-        start = start.toDate(),
-        end = start.plusMinutes(45).toDate(),
-        date = start.toLocalDate().toDate(),
+        start = start,
+        end = start.plusMinutes(45),
+        date = start.toLocalDate(),
         subject = subject,
         group = "",
         room = room,
         teacher = teacher,
         info = "",
         changes = changes,
-        canceled = false
+        canceled = false,
+        roomOld = "",
+        subjectOld = "",
+        teacherOld = "",
+        studentPlan = true
     )
 }

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

@@ -35,9 +35,9 @@ class TimetableLocalTest {
     @Test
     fun saveAndReadTest() {
         timetableDb.saveTimetable(listOf(
-            createTimetableLocal(1, of(2018, 9, 10, 0, 0, 0)),
-            createTimetableLocal(1, of(2018, 9, 14, 0, 0, 0)),
-            createTimetableLocal(1, of(2018, 9, 17, 0, 0, 0))
+            createTimetableLocal(of(2018, 9, 10, 0, 0, 0), 1),
+            createTimetableLocal(of(2018, 9, 14, 0, 0, 0), 1),
+            createTimetableLocal(of(2018, 9, 17, 0, 0, 0), 1)
         ))
 
         val exams = timetableDb.getTimetable(

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

@@ -6,14 +6,13 @@ 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.github.wulkanowy.sdk.Sdk
 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
@@ -27,8 +26,8 @@ import kotlin.test.assertEquals
 @RunWith(AndroidJUnit4::class)
 class TimetableRepositoryTest {
 
-    @SpyK
-    private var mockApi = Api()
+    @MockK
+    private lateinit var mockSdk: Sdk
 
     private val settings = InternetObservingSettings.builder()
         .strategy(TestInternetObservingStrategy())
@@ -48,10 +47,13 @@ class TimetableRepositoryTest {
         MockKAnnotations.init(this)
         testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
         timetableLocal = TimetableLocal(testDb.timetableDao)
-        timetableRemote = TimetableRemote(mockApi)
+        timetableRemote = TimetableRemote(mockSdk)
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 2
+        every { semesterMock.schoolYear } returns 2019
+        every { semesterMock.semesterId } returns 1
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
     }
 
     @After
@@ -62,17 +64,17 @@ class TimetableRepositoryTest {
     @Test
     fun copyRoomToCompletedFromPrevious() {
         timetableLocal.saveTimetable(listOf(
-            createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda"),
-            createTimetableLocal(2, of(2019, 3, 5, 8, 50), "321", "Religia"),
-            createTimetableLocal(3, of(2019, 3, 5, 9, 40), "213", "W-F"),
-            createTimetableLocal(4, of(2019, 3, 5, 10, 30), "213", "W-F", "Jan Kowalski")
+            createTimetableLocal(of(2019, 3, 5, 8, 0), 1, "123", "Przyroda"),
+            createTimetableLocal(of(2019, 3, 5, 8, 50), 2, "321", "Religia"),
+            createTimetableLocal(of(2019, 3, 5, 9, 40), 3, "213", "W-F"),
+            createTimetableLocal(of(2019, 3, 5, 10, 30),3, "213", "W-F", "Jan Kowalski")
         ))
 
-        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")
+        every { mockSdk.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(of(2019, 3, 5, 8, 0), 1, "", "Przyroda"),
+            createTimetableRemote(of(2019, 3, 5, 8, 50), 2, "", "Religia"),
+            createTimetableRemote(of(2019, 3, 5, 9, 40), 3, "", "W-F"),
+            createTimetableRemote(of(2019, 3, 5, 10, 30), 4, "", "W-F")
         ))
 
         val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
@@ -88,27 +90,58 @@ class TimetableRepositoryTest {
     @Test
     fun copyTeacherToCompletedFromPrevious() {
         timetableLocal.saveTimetable(listOf(
-            createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda", "Jan Garnkiewicz", false),
-            createTimetableLocal(2, of(2019, 3, 5, 8, 50), "321", "Religia", "Paweł Jumper", false),
-            createTimetableLocal(3, of(2019, 3, 5, 9, 40), "213", "W-F", "", true),
-            createTimetableLocal(4, of(2019, 3, 5, 10, 30), "213", "W-F", "", false)
+            createTimetableLocal(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
+            createTimetableLocal(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Paweł Poniedziałkowski", false),
+            createTimetableLocal(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Wtorkowska", true),
+            createTimetableLocal(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
+
+            createTimetableLocal(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "Joanna Wtorkowska", false),
+            createTimetableLocal(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "Joanna Wtorkowska", false),
+            createTimetableLocal(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "Joanna Środowska", true),
+            createTimetableLocal(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "Joanna Środowska", true),
+
+            createTimetableLocal(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "", false),
+            createTimetableLocal(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "", false),
+            createTimetableLocal(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "", true),
+            createTimetableLocal(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "", true)
         ))
 
-        every { mockApi.getTimetable(any(), any()) } returns Single.just(listOf(
-            createTimetableRemote(1, of(2019, 3, 5, 8, 0), "", "Przyroda", "", true), // should override local
-            createTimetableRemote(2, of(2019, 3, 5, 8, 50), "", "Religia", "", false),
-            createTimetableRemote(3, of(2019, 3, 5, 9, 40), "", "W-F", "Jan Garnkiewicz", false),
-            createTimetableRemote(4, of(2019, 3, 5, 10, 30), "", "W-F", "Paweł Jumper", false)
+        every { mockSdk.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
+            createTimetableRemote(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Jakub Wtorkowski", true),
+            createTimetableRemote(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Poniedziałkowska", false),
+            createTimetableRemote(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
+
+            createTimetableRemote(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "", false),
+            createTimetableRemote(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "", true),
+            createTimetableRemote(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "", false),
+            createTimetableRemote(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "", true),
+
+            createTimetableRemote(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "Paweł Środowski", false),
+            createTimetableRemote(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "Paweł Czwartkowski", true),
+            createTimetableRemote(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "Paweł Środowski", false),
+            createTimetableRemote(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true)
         ))
 
         val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
-            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
+            .getTimetable(semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true)
             .blockingGet()
 
-        assertEquals(4, lessons.size)
-        assertEquals("", lessons[0].teacher)
-        assertEquals("Paweł Jumper", lessons[1].teacher)
-        assertEquals("Jan Garnkiewicz", lessons[2].teacher)
-        assertEquals("Paweł Jumper", lessons[3].teacher)
+        assertEquals(12, lessons.size)
+
+        assertEquals("Paweł Poniedziałkowski", lessons[0].teacher)
+        assertEquals("Jakub Wtorkowski", lessons[1].teacher)
+        assertEquals("Joanna Poniedziałkowska", lessons[2].teacher)
+        assertEquals("Joanna Wtorkowska", lessons[3].teacher)
+
+        assertEquals("Joanna Wtorkowska", lessons[4].teacher)
+        assertEquals("", lessons[5].teacher)
+        assertEquals("", lessons[6].teacher)
+        assertEquals("", lessons[7].teacher)
+
+        assertEquals("Paweł Środowski", lessons[8].teacher)
+        assertEquals("Paweł Czwartkowski", lessons[9].teacher)
+        assertEquals("Paweł Środowski", lessons[10].teacher)
+        assertEquals("Paweł Czwartkowski", lessons[11].teacher)
     }
 }

app/src/debug/res/values-pl/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Wulkanowy DEV</string>
-</resources>

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

@@ -6,6 +6,7 @@ import android.util.Log.VERBOSE
 import androidx.multidex.MultiDex
 import androidx.work.Configuration
 import com.jakewharton.threetenabp.AndroidThreeTen
+import com.yariksoffice.lingver.Lingver
 import dagger.android.AndroidInjector
 import dagger.android.support.DaggerApplication
 import eu.davidea.flexibleadapter.FlexibleAdapter
@@ -44,6 +45,7 @@ class WulkanowyApp : DaggerApplication(), Configuration.Provider {
         super.onCreate()
         AndroidThreeTen.init(this)
         RxJavaPlugins.setErrorHandler(::onError)
+        Lingver.init(this)
         themeManager.applyDefaultTheme()
 
         initLogging()

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

@@ -1,35 +0,0 @@
-package io.github.wulkanowy.data
-
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.entities.Student
-import java.net.URL
-import javax.inject.Inject
-
-class ApiHelper @Inject constructor(private val api: Api) {
-
-    fun initApi(student: Student) {
-        api.apply {
-            email = student.email
-            password = student.password
-            symbol = student.symbol
-            schoolSymbol = student.schoolSymbol
-            studentId = student.studentId
-            classId = student.classId
-            host = URL(student.endpoint).run { host + ":$port".removeSuffix(":-1") }
-            ssl = student.endpoint.startsWith("https")
-            loginType = Api.LoginType.valueOf(student.loginType)
-            useNewStudent = true
-        }
-    }
-
-    fun initApi(email: String, password: String, symbol: String, endpoint: String) {
-        api.apply {
-            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

@@ -11,12 +11,10 @@ import com.readystatesoftware.chuck.api.ChuckInterceptor
 import com.readystatesoftware.chuck.api.RetentionManager
 import dagger.Module
 import dagger.Provides
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import okhttp3.logging.HttpLoggingInterceptor
-import okhttp3.logging.HttpLoggingInterceptor.Level.BASIC
-import okhttp3.logging.HttpLoggingInterceptor.Level.NONE
+import io.github.wulkanowy.sdk.Sdk
 import timber.log.Timber
 import javax.inject.Singleton
 
@@ -33,15 +31,14 @@ internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideApi(chuckCollector: ChuckCollector, context: Context): Api {
-        return Api().apply {
-            logLevel = NONE
+    fun provideSdk(chuckCollector: ChuckCollector, context: Context): Sdk {
+        return Sdk().apply {
             androidVersion = android.os.Build.VERSION.RELEASE
             buildTag = android.os.Build.MODEL
-            setInterceptor(HttpLoggingInterceptor(HttpLoggingInterceptor.Logger { Timber.d(it) }).setLevel(BASIC))
+            setSimpleHttpLogger { Timber.d(it) }
 
             // for debug only
-            setInterceptor(ChuckInterceptor(context, chuckCollector).maxContentLength(250000L), true, 0)
+            addInterceptor(ChuckInterceptor(context, chuckCollector).maxContentLength(250000L), true)
         }
     }
 
@@ -55,7 +52,7 @@ internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideDatabase(context: Context) = AppDatabase.newInstance(context)
+    fun provideDatabase(context: Context, sharedPrefProvider: SharedPrefProvider) = AppDatabase.newInstance(context, sharedPrefProvider)
 
     @Singleton
     @Provides
@@ -85,6 +82,10 @@ internal class RepositoryModule {
     @Provides
     fun provideGradeStatisticsDao(database: AppDatabase) = database.gradeStatistics
 
+    @Singleton
+    @Provides
+    fun provideGradePointsStatisticsDao(database: AppDatabase) = database.gradePointsStatistics
+
     @Singleton
     @Provides
     fun provideMessagesDao(database: AppDatabase) = database.messagesDao
@@ -136,4 +137,12 @@ internal class RepositoryModule {
     @Singleton
     @Provides
     fun provideMobileDevicesDao(database: AppDatabase) = database.mobileDeviceDao
+
+    @Singleton
+    @Provides
+    fun provideTeacherDao(database: AppDatabase) = database.teacherDao
+
+    @Singleton
+    @Provides
+    fun provideSchoolInfoDao(database: AppDatabase) = database.schoolDao
 }

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

@@ -0,0 +1,30 @@
+package io.github.wulkanowy.data
+
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import javax.inject.Inject
+
+class SdkHelper @Inject constructor(private val sdk: Sdk) {
+
+    fun init(student: Student) {
+        sdk.apply {
+            email = student.email
+            password = student.password
+            symbol = student.symbol
+            schoolSymbol = student.schoolSymbol
+            studentId = student.studentId
+            classId = student.classId
+
+            if (Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
+                scrapperBaseUrl = student.scrapperBaseUrl
+                loginType = Sdk.ScrapperLoginType.valueOf(student.loginType)
+            }
+            loginId = student.userLoginId
+
+            mode = Sdk.Mode.valueOf(student.loginMode)
+            mobileBaseUrl = student.mobileBaseUrl
+            certKey = student.certificateKey
+            privateKey = student.privateKey
+        }
+    }
+}

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

@@ -6,11 +6,13 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.RoomDatabase.JournalMode.TRUNCATE
 import androidx.room.TypeConverters
+import androidx.room.migration.Migration
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.db.dao.GradeDao
+import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.dao.HomeworkDao
@@ -20,15 +22,18 @@ import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.dao.NoteDao
 import io.github.wulkanowy.data.db.dao.RecipientDao
 import io.github.wulkanowy.data.db.dao.ReportingUnitDao
+import io.github.wulkanowy.data.db.dao.SchoolDao
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.dao.SubjectDao
+import io.github.wulkanowy.data.db.dao.TeacherDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Homework
@@ -38,9 +43,11 @@ import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Subject
+import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.db.migrations.Migration10
 import io.github.wulkanowy.data.db.migrations.Migration11
@@ -48,6 +55,10 @@ import io.github.wulkanowy.data.db.migrations.Migration12
 import io.github.wulkanowy.data.db.migrations.Migration13
 import io.github.wulkanowy.data.db.migrations.Migration14
 import io.github.wulkanowy.data.db.migrations.Migration15
+import io.github.wulkanowy.data.db.migrations.Migration16
+import io.github.wulkanowy.data.db.migrations.Migration17
+import io.github.wulkanowy.data.db.migrations.Migration18
+import io.github.wulkanowy.data.db.migrations.Migration19
 import io.github.wulkanowy.data.db.migrations.Migration2
 import io.github.wulkanowy.data.db.migrations.Migration3
 import io.github.wulkanowy.data.db.migrations.Migration4
@@ -70,6 +81,7 @@ import javax.inject.Singleton
         Grade::class,
         GradeSummary::class,
         GradeStatistics::class,
+        GradePointsStatistics::class,
         Message::class,
         Note::class,
         Homework::class,
@@ -78,7 +90,9 @@ import javax.inject.Singleton
         CompletedLesson::class,
         ReportingUnit::class,
         Recipient::class,
-        MobileDevice::class
+        MobileDevice::class,
+        Teacher::class,
+        School::class
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -87,29 +101,37 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 15
+        const val VERSION_SCHEMA = 19
 
-        fun newInstance(context: Context): AppDatabase {
+        fun getMigrations(sharedPrefProvider: SharedPrefProvider): Array<Migration> {
+            return arrayOf(
+                Migration2(),
+                Migration3(),
+                Migration4(),
+                Migration5(),
+                Migration6(),
+                Migration7(),
+                Migration8(),
+                Migration9(),
+                Migration10(),
+                Migration11(),
+                Migration12(),
+                Migration13(),
+                Migration14(),
+                Migration15(),
+                Migration16(),
+                Migration17(),
+                Migration18(),
+                Migration19(sharedPrefProvider)
+            )
+        }
+
+        fun newInstance(context: Context, sharedPrefProvider: SharedPrefProvider): 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()
-                )
+                .addMigrations(*getMigrations(sharedPrefProvider))
                 .build()
         }
     }
@@ -132,6 +154,8 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val gradeStatistics: GradeStatisticsDao
 
+    abstract val gradePointsStatistics: GradePointsStatisticsDao
+
     abstract val messagesDao: MessagesDao
 
     abstract val noteDao: NoteDao
@@ -149,4 +173,8 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val recipientDao: RecipientDao
 
     abstract val mobileDeviceDao: MobileDeviceDao
+
+    abstract val teacherDao: TeacherDao
+
+    abstract val schoolDao: SchoolDao
 }

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

@@ -8,12 +8,22 @@ import javax.inject.Singleton
 @Singleton
 class SharedPrefProvider @Inject constructor(private val sharedPref: SharedPreferences) {
 
+    companion object {
+        const val APP_VERSION_CODE_KEY = "app_version_code"
+    }
+
     fun putLong(key: String, value: Long, sync: Boolean = false) {
         sharedPref.edit(sync) { putLong(key, value) }
     }
 
     fun getLong(key: String, defaultValue: Long) = sharedPref.getLong(key, defaultValue)
 
+    fun getString(key: String, defaultValue: String): String = sharedPref.getString(key, defaultValue) ?: defaultValue
+
+    fun putString(key: String, value: String, sync: Boolean = false) {
+        sharedPref.edit(sync) { putString(key, value) }
+    }
+
     fun delete(key: String) {
         sharedPref.edit().remove(key).apply()
     }

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

@@ -1,8 +1,6 @@
 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.Attendance
 import io.reactivex.Maybe
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface AttendanceDao {
-
-    @Insert
-    fun insertAll(exams: List<Attendance>): List<Long>
-
-    @Delete
-    fun deleteAll(exams: List<Attendance>)
+interface AttendanceDao : BaseDao<Attendance> {
 
     @Query("SELECT * FROM Attendance WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Attendance>>

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

@@ -1,20 +1,12 @@
 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.AttendanceSummary
 import io.reactivex.Maybe
 
 @Dao
-interface AttendanceSummaryDao {
-
-    @Insert
-    fun insertAll(exams: List<AttendanceSummary>): List<Long>
-
-    @Delete
-    fun deleteAll(exams: List<AttendanceSummary>)
+interface AttendanceSummaryDao : BaseDao<AttendanceSummary> {
 
     @Query("SELECT * FROM AttendanceSummary WHERE diary_id = :diaryId AND student_id = :studentId AND subject_id = :subjectId")
     fun loadAll(diaryId: Int, studentId: Int, subjectId: Int): Maybe<List<AttendanceSummary>>

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

@@ -0,0 +1,17 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Update
+
+interface BaseDao<T> {
+
+    @Insert
+    fun insertAll(items: List<T>): List<Long>
+
+    @Update
+    fun updateAll(items: List<T>)
+
+    @Delete
+    fun deleteAll(items: List<T>)
+}

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

@@ -1,8 +1,6 @@
 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
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface CompletedLessonsDao {
-
-    @Insert
-    fun insertAll(exams: List<CompletedLesson>)
-
-    @Delete
-    fun deleteAll(exams: List<CompletedLesson>)
+interface CompletedLessonsDao : BaseDao<CompletedLesson> {
 
     @Query("SELECT * FROM CompletedLesson WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>>

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

@@ -1,8 +1,6 @@
 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.Exam
 import io.reactivex.Maybe
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface ExamDao {
-
-    @Insert
-    fun insertAll(exams: List<Exam>): List<Long>
-
-    @Delete
-    fun deleteAll(exams: List<Exam>)
+interface ExamDao : BaseDao<Exam> {
 
     @Query("SELECT * FROM Exams WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Exam>>

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

@@ -1,26 +1,14 @@
 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.Grade
 import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface GradeDao {
-
-    @Insert
-    fun insertAll(grades: List<Grade>)
-
-    @Update
-    fun updateAll(grade: List<Grade>)
-
-    @Delete
-    fun deleteAll(grades: List<Grade>)
+interface GradeDao : BaseDao<Grade> {
 
     @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId")
     fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Grade>>

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

@@ -0,0 +1,18 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
+import io.reactivex.Maybe
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface GradePointsStatisticsDao : BaseDao<GradePointsStatistics> {
+
+    @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName")
+    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String): Maybe<GradePointsStatistics>
+
+    @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId")
+    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradePointsStatistics>>
+}

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

@@ -1,8 +1,6 @@
 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
@@ -10,13 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface GradeStatisticsDao {
-
-    @Insert
-    fun insertAll(gradesStatistics: List<GradeStatistics>)
-
-    @Delete
-    fun deleteAll(gradesStatistics: List<GradeStatistics>)
+interface GradeStatisticsDao : BaseDao<GradeStatistics> {
 
     @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName AND is_semester = :isSemester")
     fun loadSubject(semesterId: Int, studentId: Int, subjectName: String, isSemester: Boolean): Maybe<List<GradeStatistics>>

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

@@ -1,8 +1,6 @@
 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.GradeSummary
 import io.reactivex.Maybe
@@ -10,13 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface GradeSummaryDao {
-
-    @Insert
-    fun insertAll(gradesSummary: List<GradeSummary>)
-
-    @Delete
-    fun deleteAll(gradesSummary: List<GradeSummary>)
+interface GradeSummaryDao : BaseDao<GradeSummary> {
 
     @Query("SELECT * FROM GradesSummary 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

@@ -1,8 +1,6 @@
 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.Homework
 import io.reactivex.Maybe
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface HomeworkDao {
-
-    @Insert
-    fun insertAll(homework: List<Homework>)
-
-    @Delete
-    fun deleteAll(homework: List<Homework>)
+interface HomeworkDao : BaseDao<Homework> {
 
     @Query("SELECT * FROM Homework WHERE semester_id = :semesterId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(semesterId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Homework>>

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

@@ -1,10 +1,7 @@
 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
@@ -12,18 +9,8 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface LuckyNumberDao {
-
-    @Insert
-    fun insert(luckyNumber: LuckyNumber)
-
-    @Update
-    fun update(luckyNumber: LuckyNumber)
-
-    @Delete
-    fun delete(luckyNumber: LuckyNumber)
+interface LuckyNumberDao : BaseDao<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

@@ -1,24 +1,12 @@
 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.Message
 import io.reactivex.Maybe
 
 @Dao
-interface MessagesDao {
-
-    @Insert
-    fun insertAll(messages: List<Message>)
-
-    @Delete
-    fun deleteAll(messages: List<Message>)
-
-    @Update
-    fun updateAll(messages: List<Message>)
+interface MessagesDao : BaseDao<Message> {
 
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder AND removed = 0 ORDER BY date DESC")
     fun loadAll(studentId: Int, folder: Int): Maybe<List<Message>>

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

@@ -1,20 +1,12 @@
 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>)
+interface MobileDeviceDao : BaseDao<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

@@ -1,28 +1,15 @@
 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.Note
 import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface NoteDao {
-
-    @Insert
-    fun insertAll(notes: List<Note>)
-
-    @Update
-    fun updateAll(notes: List<Note>)
-
-    @Delete
-    fun deleteAll(notes: List<Note>)
+interface NoteDao : BaseDao<Note> {
 
     @Query("SELECT * FROM Notes WHERE student_id = :studentId")
     fun loadAll(studentId: Int): Maybe<List<Note>>
-
 }

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

@@ -1,8 +1,6 @@
 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
@@ -10,13 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface RecipientDao {
-
-    @Insert
-    fun insertAll(messages: List<Recipient>)
-
-    @Delete
-    fun deleteAll(messages: List<Recipient>)
+interface RecipientDao : BaseDao<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,8 +1,6 @@
 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
@@ -10,13 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface ReportingUnitDao {
-
-    @Insert
-    fun insertAll(reportingUnits: List<ReportingUnit>)
-
-    @Delete
-    fun deleteAll(reportingUnits: List<ReportingUnit>)
+interface ReportingUnitDao : BaseDao<ReportingUnit> {
 
     @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId")
     fun load(studentId: Int): Maybe<List<ReportingUnit>>

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

@@ -0,0 +1,15 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.School
+import io.reactivex.Maybe
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface SchoolDao : BaseDao<School> {
+
+    @Query("SELECT * FROM School WHERE student_id = :studentId AND class_id = :classId")
+    fun load(studentId: Int, classId: Int): Maybe<School>
+}

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

@@ -1,8 +1,6 @@
 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.Semester
 import io.reactivex.Maybe
@@ -10,13 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface SemesterDao {
-
-    @Insert
-    fun insertAll(semester: List<Semester>)
-
-    @Delete
-    fun deleteAll(semester: List<Semester>)
+interface SemesterDao : BaseDao<Semester> {
 
     @Query("SELECT * FROM Semesters WHERE student_id = :studentId AND class_id = :classId")
     fun loadAll(studentId: Int, classId: Int): Maybe<List<Semester>>

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

@@ -1,20 +1,12 @@
 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.Subject
 import io.reactivex.Maybe
 
 @Dao
-interface SubjectDao {
-
-    @Insert
-    fun insertAll(subjects: List<Subject>): List<Long>
-
-    @Delete
-    fun deleteAll(subjects: List<Subject>)
+interface SubjectDao : BaseDao<Subject> {
 
     @Query("SELECT * FROM Subjects WHERE diary_id = :diaryId AND student_id = :studentId")
     fun loadAll(diaryId: Int, studentId: Int): Maybe<List<Subject>>

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

@@ -0,0 +1,15 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.Teacher
+import io.reactivex.Maybe
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface TeacherDao : BaseDao<Teacher> {
+
+    @Query("SELECT * FROM Teachers WHERE student_id = :studentId AND class_id = :classId")
+    fun loadAll(studentId: Int, classId: Int): Maybe<List<Teacher>>
+}

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

@@ -1,8 +1,6 @@
 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.Timetable
 import io.reactivex.Maybe
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface TimetableDao {
-
-    @Insert
-    fun insertAll(exams: List<Timetable>): List<Long>
-
-    @Delete
-    fun deleteAll(exams: List<Timetable>)
+interface TimetableDao : BaseDao<Timetable> {
 
     @Query("SELECT * FROM Timetable WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Timetable>>

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

@@ -19,7 +19,7 @@ data class Grade(
 
     val entry: String,
 
-    val value: Int,
+    val value: Double,
 
     val modifier: Double,
 

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

@@ -0,0 +1,24 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "GradesPointsStatistics")
+data class GradePointsStatistics(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "semester_id")
+    val semesterId: Int,
+
+    val subject: String,
+
+    val others: Double,
+
+    val student: Double
+) {
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}

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

@@ -29,6 +29,8 @@ data class Message(
 
     val subject: String,
 
+    var content: String,
+
     val date: LocalDateTime,
 
     @ColumnInfo(name = "folder_id")
@@ -50,6 +52,4 @@ data class Message(
 
     @ColumnInfo(name = "is_notified")
     var isNotified: Boolean = true
-
-    var content: String? = null
 }

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

@@ -0,0 +1,30 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+
+@Entity(tableName = "School")
+data class School(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "class_id")
+    val classId: Int,
+
+    val name: String,
+
+    val address: String,
+
+    val contact: String,
+
+    val headmaster: String,
+
+    val pedagogue: String
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}

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

@@ -10,10 +10,27 @@ import java.io.Serializable
 @Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id", "class_id"], unique = true)])
 data class Student(
 
-    val endpoint: String,
+    @ColumnInfo(name = "scrapper_base_url")
+    val scrapperBaseUrl: String,
 
+    @ColumnInfo(name = "mobile_base_url")
+    val mobileBaseUrl: String,
+
+    @ColumnInfo(name = "login_type")
     val loginType: String,
 
+    @ColumnInfo(name = "login_mode")
+    val loginMode: String,
+
+    @ColumnInfo(name = "certificate_key")
+    val certificateKey: String,
+
+    @ColumnInfo(name = "private_key")
+    val privateKey: String,
+
+    @ColumnInfo(name = "is_parent")
+    val isParent: Boolean,
+
     val email: String,
 
     var password: String,
@@ -23,6 +40,9 @@ data class Student(
     @ColumnInfo(name = "student_id")
     val studentId: Int,
 
+    @ColumnInfo(name = "user_login_id")
+    val userLoginId: Int,
+
     @ColumnInfo(name = "student_name")
     val studentName: String,
 

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

@@ -0,0 +1,27 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+
+@Entity(tableName = "Teachers")
+data class Teacher(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "class_id")
+    val classId: Int,
+
+    val subject: String,
+
+    val name: String,
+
+    @ColumnInfo(name = "short_name")
+    val shortName: String
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}

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

@@ -0,0 +1,20 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration16 : Migration(15, 16) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Teachers (
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                student_id INTEGER NOT NULL,
+                class_id INTEGER NOT NULL,
+                subject TEXT NOT NULL,
+                name TEXT NOT NULL,
+                short_name TEXT NOT NULL
+            )
+        """)
+    }
+}

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

@@ -0,0 +1,29 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration17 : Migration(16, 17) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        createGradesPointsStatisticsTable(database)
+        truncateSemestersTable(database)
+    }
+
+    private fun createGradesPointsStatisticsTable(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS GradesPointsStatistics(
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                student_id INTEGER NOT NULL,
+                semester_id INTEGER NOT NULL,
+                subject TEXT NOT NULL,
+                others REAL NOT NULL,
+                student REAL NOT NULL
+            )
+        """)
+    }
+
+    private fun truncateSemestersTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DELETE FROM Semesters")
+    }
+}

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

@@ -0,0 +1,22 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration18 : Migration(17, 18) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS School (
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                student_id INTEGER NOT NULL,
+                class_id INTEGER NOT NULL,
+                name TEXT NOT NULL,
+                address TEXT NOT NULL,
+                contact TEXT NOT NULL,
+                headmaster TEXT NOT NULL,
+                pedagogue TEXT NOT NULL
+            )
+        """)
+    }
+}

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

@@ -0,0 +1,119 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import io.github.wulkanowy.data.db.SharedPrefProvider
+
+class Migration19(private val sharedPrefProvider: SharedPrefProvider) : Migration(18, 19) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        migrateMessages(database)
+        migrateGrades(database)
+        migrateStudents(database)
+        migrateSharedPreferences()
+    }
+
+    private fun migrateMessages(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE Messages")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Messages (
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                is_notified INTEGER NOT NULL,
+                student_id INTEGER NOT NULL,
+                real_id INTEGER NOT NULL,
+                message_id INTEGER NOT NULL,
+                sender_name TEXT NOT NULL,
+                sender_id INTEGER NOT NULL,
+                recipient_name TEXT NOT NULL,
+                subject TEXT NOT NULL,
+                content TEXT NOT NULL,
+                date INTEGER NOT NULL,
+                folder_id INTEGER NOT NULL,
+                unread INTEGER NOT NULL,
+                unread_by INTEGER NOT NULL,
+                read_by INTEGER NOT NULL,
+                removed INTEGER NOT NULL
+            )
+        """)
+    }
+
+    private fun migrateGrades(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE Grades")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Grades (
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                is_read INTEGER NOT NULL,
+                is_notified INTEGER NOT NULL,
+                semester_id INTEGER NOT NULL,
+                student_id INTEGER NOT NULL,
+                subject TEXT NOT NULL,
+                entry TEXT NOT NULL,
+                value REAL NOT NULL,
+                modifier REAL NOT NULL,
+                comment TEXT NOT NULL,
+                color TEXT NOT NULL,
+                grade_symbol TEXT NOT NULL,
+                description TEXT NOT NULL,
+                weight TEXT NOT NULL,
+                weightValue REAL NOT NULL,
+                date INTEGER NOT NULL,
+                teacher TEXT NOT NULL
+            )
+        """)
+    }
+
+    private fun migrateStudents(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Students_tmp (
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                scrapper_base_url TEXT NOT NULL,
+                mobile_base_url TEXT NOT NULL,
+                is_parent INTEGER NOT NULL,
+                login_type TEXT NOT NULL,
+                login_mode TEXT NOT NULL,
+                certificate_key TEXT NOT NULL,
+                private_key TEXT NOT NULL,
+                email TEXT NOT NULL,
+                password TEXT NOT NULL,
+                symbol TEXT NOT NULL,
+                student_id INTEGER NOT NULL,
+                user_login_id INTEGER NOT NULL,
+                student_name TEXT NOT NULL,
+                school_id TEXT NOT NULL,
+                school_name TEXT NOT NULL,
+                class_name TEXT NOT NULL,
+                class_id INTEGER NOT NULL,
+                is_current INTEGER NOT NULL,
+                registration_date INTEGER NOT NULL
+            )
+        """)
+
+        database.execSQL("ALTER TABLE Students ADD COLUMN scrapperBaseUrl TEXT NOT NULL DEFAULT \"\";")
+        database.execSQL("ALTER TABLE Students ADD COLUMN apiBaseUrl TEXT NOT NULL DEFAULT \"\";")
+        database.execSQL("ALTER TABLE Students ADD COLUMN is_parent INT NOT NULL DEFAULT 0;")
+        database.execSQL("ALTER TABLE Students ADD COLUMN loginMode TEXT NOT NULL DEFAULT \"\";")
+        database.execSQL("ALTER TABLE Students ADD COLUMN certificateKey TEXT NOT NULL DEFAULT \"\";")
+        database.execSQL("ALTER TABLE Students ADD COLUMN privateKey TEXT NOT NULL DEFAULT \"\";")
+        database.execSQL("ALTER TABLE Students ADD COLUMN user_login_id INTEGER NOT NULL DEFAULT 0;")
+
+        database.execSQL("""
+            INSERT INTO Students_tmp(
+            id, scrapper_base_url, mobile_base_url, is_parent, login_type, login_mode, certificate_key, private_key, email, password, symbol, student_id, user_login_id, student_name, school_id, school_name, school_id, school_name, class_name, class_id, is_current, registration_date)
+            SELECT
+            id, endpoint, apiBaseUrl, is_parent, loginType, "SCRAPPER", certificateKey, privateKey, email, password, symbol, student_id, user_login_id, student_name, school_id, school_name, school_id, school_name, class_name, class_id, is_current, registration_date
+            FROM Students
+        """)
+        database.execSQL("DROP TABLE Students")
+        database.execSQL("ALTER TABLE Students_tmp RENAME TO Students")
+        database.execSQL("CREATE UNIQUE INDEX index_Students_email_symbol_student_id_school_id_class_id ON Students (email, symbol, student_id, school_id, class_id)")
+    }
+
+    private fun migrateSharedPreferences() {
+        if (sharedPrefProvider.getString("grade_modifier_plus", "0.0") == "0.0") {
+            sharedPrefProvider.putString("grade_modifier_plus", "0.33")
+        }
+        if (sharedPrefProvider.getString("grade_modifier_minus", "0.0") == "0.0") {
+            sharedPrefProvider.putString("grade_modifier_minus", "0.33")
+        }
+    }
+}

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

@@ -1,25 +1,24 @@
 package io.github.wulkanowy.data.repositories.attendance
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.toLocalDate
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class AttendanceRemote @Inject constructor(private val api: Api) {
+class AttendanceRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Attendance>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getAttendance(startDate, endDate) }.map { attendance ->
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getAttendance(startDate, endDate, semester.semesterId)
+            .map { attendance ->
                 attendance.map {
                     Attendance(
                         studentId = semester.studentId,
                         diaryId = semester.diaryId,
-                        date = it.date.toLocalDate(),
+                        date = it.date,
                         number = it.number,
                         subject = it.subject,
                         name = it.name,

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

@@ -1,18 +1,18 @@
 package io.github.wulkanowy.data.repositories.attendancesummary
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class AttendanceSummaryRemote @Inject constructor(private val api: Api) {
+class AttendanceSummaryRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getAttendanceSummary(semester: Semester, subjectId: Int): Single<List<AttendanceSummary>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { api.getAttendanceSummary(subjectId) }.map { attendance ->
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getAttendanceSummary(subjectId)
+            .map { attendance ->
                 attendance.map {
                     AttendanceSummary(
                         studentId = semester.studentId,

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

@@ -1,27 +1,25 @@
 package io.github.wulkanowy.data.repositories.completedlessons
 
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.api.toLocalDate
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class CompletedLessonsRemote @Inject constructor(private val api: Api) {
+class CompletedLessonsRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getCompletedLessons(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<CompletedLesson>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getCompletedLessons(startDate, endDate) }
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getCompletedLessons(startDate, endDate)
             .map { lessons ->
                 lessons.map {
                     it.absence
                     CompletedLesson(
                         studentId = semester.studentId,
                         diaryId = semester.diaryId,
-                        date = it.date.toLocalDate(),
+                        date = it.date,
                         number = it.number,
                         subject = it.subject,
                         topic = it.topic,

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

@@ -1,26 +1,25 @@
 package io.github.wulkanowy.data.repositories.exam
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.toLocalDate
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class ExamRemote @Inject constructor(private val api: Api) {
+class ExamRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Exam>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getExams(startDate, endDate) }.map { exams ->
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getExams(startDate, endDate, semester.semesterId)
+            .map { exams ->
                 exams.map {
                     Exam(
                         studentId = semester.studentId,
                         diaryId = semester.diaryId,
-                        date = it.date.toLocalDate(),
-                        entryDate = it.entryDate.toLocalDate(),
+                        date = it.date,
+                        entryDate = it.entryDate,
                         subject = it.subject,
                         group = it.group,
                         type = it.type,

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

@@ -1,35 +1,33 @@
 package io.github.wulkanowy.data.repositories.grade
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.toLocalDate
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeRemote @Inject constructor(private val api: Api) {
+class GradeRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getGrades(semester: Semester): Single<List<Grade>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getGrades(semester.semesterId) }
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGrades(semester.semesterId)
             .map { grades ->
                 grades.map {
                     Grade(
-                        semesterId = semester.semesterId,
                         studentId = semester.studentId,
+                        semesterId = semester.semesterId,
                         subject = it.subject,
                         entry = it.entry,
                         value = it.value,
                         modifier = it.modifier,
                         comment = it.comment,
                         color = it.color,
-                        gradeSymbol = it.symbol.orEmpty(),
-                        description = it.description.orEmpty(),
+                        gradeSymbol = it.symbol,
+                        description = it.description,
                         weight = it.weight,
                         weightValue = it.weightValue,
-                        date = it.date.toLocalDate(),
+                        date = it.date,
                         teacher = it.teacher
                     )
                 }

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

@@ -1,24 +1,23 @@
 package io.github.wulkanowy.data.repositories.gradessummary
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeSummaryRemote @Inject constructor(private val api: Api) {
+class GradeSummaryRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getGradeSummary(semester: Semester): Single<List<GradeSummary>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getGradesSummary(semester.semesterId) }
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGradesSummary(semester.semesterId)
             .map { gradesSummary ->
                 gradesSummary.map {
                     GradeSummary(
                         semesterId = semester.semesterId,
                         studentId = semester.studentId,
-                        position = it.order,
+                        position = 0,
                         subject = it.name,
                         predictedGrade = it.predicted,
                         finalGrade = it.final,

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

@@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.repositories.gradestatistics
 
+import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
@@ -8,27 +10,57 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeStatisticsLocal @Inject constructor(private val gradeStatisticsDb: GradeStatisticsDao) {
+class GradeStatisticsLocal @Inject constructor(
+    private val gradeStatisticsDb: GradeStatisticsDao,
+    private val gradePointsStatisticsDb: GradePointsStatisticsDao
+) {
 
     fun getGradesStatistics(semester: Semester, isSemester: Boolean): Maybe<List<GradeStatistics>> {
-        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester)
-            .filter { !it.isEmpty() }
+        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).filter { it.isNotEmpty() }
+    }
+
+    fun getGradesPointsStatistics(semester: Semester): Maybe<List<GradePointsStatistics>> {
+        return gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
     }
 
     fun getGradesStatistics(semester: Semester, isSemester: Boolean, subjectName: String): Maybe<List<GradeStatistics>> {
-        return (if ("Wszystkie" == subjectName) gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).map { list ->
-            list.groupBy { it.grade }.map {
-                GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key, it.value.fold(0) { acc, e -> acc + e.amount }, false)
+        return when (subjectName) {
+            "Wszystkie" -> gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).map { list ->
+                list.groupBy { it.grade }.map {
+                    GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key,
+                        it.value.fold(0) { acc, e -> acc + e.amount }, false)
+                }
             }
+            else -> gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)
+        }.filter { it.isNotEmpty() }
+    }
+
+    fun getGradesPointsStatistics(semester: Semester, subjectName: String): Maybe<GradePointsStatistics> {
+        return when (subjectName) {
+            "Wszystkie" -> gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).flatMap { list ->
+                if (list.isEmpty()) return@flatMap Maybe.empty<GradePointsStatistics>()
+                Maybe.just(GradePointsStatistics(semester.studentId, semester.semesterId, subjectName,
+                    list.fold(.0) { acc, e -> acc + e.others },
+                    list.fold(.0) { acc, e -> acc + e.student })
+                )
+            }
+            else -> gradePointsStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName)
         }
-        else gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)).filter { !it.isEmpty() }
     }
 
     fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {
         gradeStatisticsDb.insertAll(gradesStatistics)
     }
 
+    fun saveGradesPointsStatistics(gradePointsStatistics: List<GradePointsStatistics>) {
+        gradePointsStatisticsDb.insertAll(gradePointsStatistics)
+    }
+
     fun deleteGradesStatistics(gradesStatistics: List<GradeStatistics>) {
         gradeStatisticsDb.deleteAll(gradesStatistics)
     }
+
+    fun deleteGradesPointsStatistics(gradesPointsStatistics: List<GradePointsStatistics>) {
+        gradePointsStatisticsDb.deleteAll(gradesPointsStatistics)
+    }
 }

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

@@ -1,27 +1,44 @@
 package io.github.wulkanowy.data.repositories.gradestatistics
 
-import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeStatisticsRemote @Inject constructor(private val api: Api) {
+class GradeStatisticsRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getGradeStatistics(semester: Semester, isSemester: Boolean): Single<List<GradeStatistics>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getGradesStatistics(semester.semesterId, isSemester) }
-            .map { gradeStatistics ->
-                gradeStatistics.map {
-                    GradeStatistics(
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).let {
+            if (isSemester) it.getGradesAnnualStatistics(semester.semesterId)
+            else it.getGradesPartialStatistics(semester.semesterId)
+        }.map { gradeStatistics ->
+            gradeStatistics.map {
+                GradeStatistics(
+                    semesterId = semester.semesterId,
+                    studentId = semester.studentId,
+                    subject = it.subject,
+                    grade = it.gradeValue,
+                    amount = it.amount,
+                    semester = isSemester
+                )
+            }
+        }
+    }
+
+    fun getGradePointsStatistics(semester: Semester): Single<List<GradePointsStatistics>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGradesPointsStatistics(semester.semesterId)
+            .map { gradePointsStatistics ->
+                gradePointsStatistics.map {
+                    GradePointsStatistics(
                         semesterId = semester.semesterId,
                         studentId = semester.studentId,
                         subject = it.subject,
-                        grade = it.gradeValue,
-                        amount = it.amount ?: 0,
-                        semester = isSemester
+                        others = it.others,
+                        student = it.student
                     )
                 }
             }

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

@@ -2,9 +2,11 @@ package io.github.wulkanowy.data.repositories.gradestatistics
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -31,4 +33,19 @@ class GradeStatisticsRepository @Inject constructor(
                         }
                 }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).toSingle(emptyList()) })
     }
+
+    fun getGradesPointsStatistics(semester: Semester, subjectName: String, forceRefresh: Boolean): Maybe<GradePointsStatistics> {
+        return local.getGradesPointsStatistics(semester, subjectName).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMapMaybe {
+                    if (it) remote.getGradePointsStatistics(semester).toMaybe()
+                    else Maybe.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getGradesPointsStatistics(semester).defaultIfEmpty(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteGradesPointsStatistics(old.uniqueSubtract(new))
+                            local.saveGradesPointsStatistics(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getGradesPointsStatistics(semester, subjectName) })
+    }
 }

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

@@ -1,27 +1,25 @@
 package io.github.wulkanowy.data.repositories.homework
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.toLocalDate
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class HomeworkRemote @Inject constructor(private val api: Api) {
+class HomeworkRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Homework>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getHomework(startDate, endDate) }
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getHomework(startDate, endDate)
             .map { homework ->
                 homework.map {
                     Homework(
                         semesterId = semester.semesterId,
                         studentId = semester.studentId,
-                        date = it.date.toLocalDate(),
-                        entryDate = it.entryDate.toLocalDate(),
+                        date = it.date,
+                        entryDate = it.entryDate,
                         subject = it.subject,
                         content = it.content,
                         teacher = it.teacher,

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

@@ -12,15 +12,15 @@ import javax.inject.Singleton
 class LuckyNumberLocal @Inject constructor(private val luckyNumberDb: LuckyNumberDao) {
 
     fun saveLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.insert(luckyNumber)
+        luckyNumberDb.insertAll(listOf(luckyNumber))
     }
 
     fun updateLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.update(luckyNumber)
+        luckyNumberDb.updateAll(listOf(luckyNumber))
     }
 
     fun deleteLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.delete(luckyNumber)
+        luckyNumberDb.deleteAll(listOf(luckyNumber))
     }
 
     fun getLuckyNumber(semester: Semester, date: LocalDate): Maybe<LuckyNumber> {

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

@@ -1,20 +1,18 @@
 package io.github.wulkanowy.data.repositories.luckynumber
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Maybe
-import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class LuckyNumberRemote @Inject constructor(private val api: Api) {
+class LuckyNumberRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getLuckyNumber(semester: Semester): Maybe<LuckyNumber> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMapMaybe { it.getLuckyNumber() }
+        return sdk.getLuckyNumber()
             .map {
                 LuckyNumber(
                     studentId = semester.studentId,

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

@@ -1,24 +1,23 @@
 package io.github.wulkanowy.data.repositories.message
 
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.api.messages.Folder
-import io.github.wulkanowy.api.messages.SentMessage
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.toLocalDateTime
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.Folder
+import io.github.wulkanowy.sdk.pojo.SentMessage
 import io.reactivex.Single
 import org.threeten.bp.LocalDateTime.now
 import javax.inject.Inject
 import javax.inject.Singleton
-import io.github.wulkanowy.api.messages.Message as ApiMessage
-import io.github.wulkanowy.api.messages.Recipient as ApiRecipient
+import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 
 @Singleton
-class MessageRemote @Inject constructor(private val api: Api) {
+class MessageRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getMessages(student: Student, folder: MessageFolder): Single<List<Message>> {
-        return api.getMessages(Folder.valueOf(folder.name)).map { messages ->
+    fun getMessages(student: Student, semester: Semester, folder: MessageFolder): Single<List<Message>> {
+        return sdk.getMessages(Folder.valueOf(folder.name), semester.start.atStartOfDay(), semester.end.atStartOfDay()).map { messages ->
             messages.map {
                 Message(
                     studentId = student.id.toInt(),
@@ -28,7 +27,8 @@ class MessageRemote @Inject constructor(private val api: Api) {
                     senderId = it.senderId ?: 0,
                     recipient = it.recipient.orEmpty(),
                     subject = it.subject.trim(),
-                    date = it.date?.toLocalDateTime() ?: now(),
+                    date = it.date ?: now(),
+                    content = it.content.orEmpty(),
                     folderId = it.folderId,
                     unread = it.unread ?: false,
                     unreadBy = it.unreadBy ?: 0,
@@ -40,27 +40,28 @@ class MessageRemote @Inject constructor(private val api: Api) {
     }
 
     fun getMessagesContent(message: Message, markAsRead: Boolean = false): Single<String> {
-        return api.getMessageContent(message.messageId, message.folderId, markAsRead, message.realId)
+        return sdk.getMessageContent(message.messageId, message.folderId, markAsRead, message.realId)
     }
 
     fun sendMessage(subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
-        return api.sendMessage(
+        return sdk.sendMessage(
             subject = subject,
             content = content,
             recipients = recipients.map {
-                ApiRecipient(
+                SdkRecipient(
                     id = it.realId,
                     name = it.realName,
                     loginId = it.loginId,
                     reportingUnitId = it.unitId,
                     role = it.role,
-                    hash = it.hash
+                    hash = it.hash,
+                    shortName = it.name
                 )
             }
         )
     }
 
     fun deleteMessage(message: Message): Single<Boolean> {
-        return api.deleteMessages(listOf(Pair(message.realId, message.folderId)))
+        return sdk.deleteMessages(listOf(Pair(message.realId, message.folderId)))
     }
 }

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

@@ -2,12 +2,13 @@ package io.github.wulkanowy.data.repositories.message
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.api.messages.SentMessage
-import io.github.wulkanowy.data.ApiHelper
+import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
+import io.github.wulkanowy.sdk.pojo.SentMessage
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Completable
 import io.reactivex.Maybe
@@ -21,16 +22,16 @@ class MessageRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: MessageLocal,
     private val remote: MessageRemote,
-    private val apiHelper: ApiHelper
+    private val sdkHelper: SdkHelper
 ) {
 
-    fun getMessages(student: Student, folder: MessageFolder, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Message>> {
-        return Single.just(apiHelper.initApi(student))
+    fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Message>> {
+        return Single.just(sdkHelper.init(student))
             .flatMap { _ ->
                 local.getMessages(student, folder).filter { !forceRefresh }
                     .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                         .flatMap {
-                            if (it) remote.getMessages(student, folder)
+                            if (it) remote.getMessages(student, semester, folder)
                             else Single.error(UnknownHostException())
                         }.flatMap { new ->
                             local.getMessages(student, folder).toSingle(emptyList())
@@ -47,10 +48,10 @@ class MessageRepository @Inject constructor(
     }
 
     fun getMessage(student: Student, messageDbId: Long, markAsRead: Boolean = false): Single<Message> {
-        return Single.just(apiHelper.initApi(student))
+        return Single.just(sdkHelper.init(student))
             .flatMap { _ ->
                 local.getMessage(messageDbId)
-                    .filter { !it.content.isNullOrEmpty() }
+                    .filter { it.content.isNotEmpty() }
                     .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                         .flatMap {
                             if (it) local.getMessage(messageDbId).toSingle()
@@ -60,7 +61,7 @@ class MessageRepository @Inject constructor(
                             remote.getMessagesContent(dbMessage, markAsRead).doOnSuccess {
                                 local.updateMessages(listOf(dbMessage.copy(unread = false).apply {
                                     id = dbMessage.id
-                                    content = it
+                                    content = content.ifBlank { it }
                                 }))
                             }
                         }.flatMap {

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

@@ -3,7 +3,6 @@ package io.github.wulkanowy.data.repositories.mobiledevice
 import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton

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

@@ -1,25 +1,23 @@
 package io.github.wulkanowy.data.repositories.mobiledevice
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
-import io.github.wulkanowy.utils.toLocalDateTime
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class MobileDeviceRemote @Inject constructor(private val api: Api) {
+class MobileDeviceRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getDevices(semester: Semester): Single<List<MobileDevice>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { api.getRegisteredDevices() }
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getRegisteredDevices()
             .map { devices ->
                 devices.map {
                     MobileDevice(
                         studentId = semester.studentId,
-                        date = it.date.toLocalDateTime(),
+                        date = it.date,
                         deviceId = it.id,
                         name = it.name
                     )
@@ -28,13 +26,11 @@ class MobileDeviceRemote @Inject constructor(private val api: Api) {
     }
 
     fun unregisterDevice(semester: Semester, device: MobileDevice): Single<Boolean> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { api.unregisterDevice(device.deviceId) }
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).unregisterDevice(device.deviceId)
     }
 
     fun getToken(semester: Semester): Single<MobileDeviceToken> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { api.getToken() }
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getToken()
             .map {
                 MobileDeviceToken(
                     token = it.token,

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

@@ -1,24 +1,22 @@
 package io.github.wulkanowy.data.repositories.note
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.toLocalDate
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class NoteRemote @Inject constructor(private val api: Api) {
+class NoteRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getNotes(semester: Semester): Single<List<Note>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getNotes() }
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getNotes(semester.semesterId)
             .map { notes ->
                 notes.map {
                     Note(
                         studentId = semester.studentId,
-                        date = it.date.toLocalDate(),
+                        date = it.date,
                         teacher = it.teacher,
                         category = it.category,
                         content = it.content

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

@@ -12,52 +12,64 @@ class PreferencesRepository @Inject constructor(
     val context: Context
 ) {
     val startMenuIndex: Int
-        get() = sharedPref.getString(context.getString(R.string.pref_key_start_menu), "0")?.toIntOrNull() ?: 0
+        get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt()
 
     val isShowPresent: Boolean
-        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_attendance_present), true)
+        get() = getBoolean(R.string.pref_key_attendance_present, R.bool.pref_default_attendance_present)
 
     val gradeAverageMode: String
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_average_mode), "only_one_semester") ?: "only_one_semester"
+        get() = getString(R.string.pref_key_grade_average_mode, R.string.pref_default_grade_average_mode)
 
     val gradeAverageForceCalc: Boolean
-        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_grade_average_force_calc), false)
+        get() = getBoolean(R.string.pref_key_grade_average_force_calc, R.bool.pref_default_grade_average_force_calc)
 
     val isGradeExpandable: Boolean
-        get() = !sharedPref.getBoolean(context.getString(R.string.pref_key_expand_grade), false)
+        get() = !getBoolean(R.string.pref_key_expand_grade, R.bool.pref_default_expand_grade)
 
-    val appThemeKey: String = context.getString(R.string.pref_key_app_theme)
+    val appThemeKey = context.getString(R.string.pref_key_app_theme)
     val appTheme: String
-        get() = sharedPref.getString(appThemeKey, "light") ?: "light"
+        get() = getString(appThemeKey, R.string.pref_default_app_theme)
 
     val gradeColorTheme: String
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_color_scheme), "vulcan") ?: "vulcan"
+        get() = getString(R.string.pref_key_grade_color_scheme, R.string.pref_default_grade_color_scheme)
 
-    val serviceEnableKey: String = context.getString(R.string.pref_key_services_enable)
+    val appLanguageKey = context.getString(R.string.pref_key_app_language)
+    val appLanguage
+        get() = getString(appLanguageKey, R.string.pref_default_app_language)
+
+    val serviceEnableKey = context.getString(R.string.pref_key_services_enable)
     val isServiceEnabled: Boolean
-        get() = sharedPref.getBoolean(serviceEnableKey, true)
+        get() = getBoolean(serviceEnableKey, R.bool.pref_default_services_enable)
 
-    val servicesIntervalKey: String = context.getString(R.string.pref_key_services_interval)
+    val servicesIntervalKey = context.getString(R.string.pref_key_services_interval)
     val servicesInterval: Long
-        get() = sharedPref.getString(servicesIntervalKey, "60")?.toLongOrNull() ?: 60
+        get() = getString(servicesIntervalKey, R.string.pref_default_services_interval).toLong()
 
-    val servicesOnlyWifiKey: String = context.getString(R.string.pref_key_services_wifi_only)
+    val servicesOnlyWifiKey = context.getString(R.string.pref_key_services_wifi_only)
     val isServicesOnlyWifi: Boolean
-        get() = sharedPref.getBoolean(servicesOnlyWifiKey, false)
+        get() = getBoolean(servicesOnlyWifiKey, R.bool.pref_default_services_wifi_only)
 
     val isNotificationsEnable: Boolean
-        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_notifications_enable), true)
+        get() = getBoolean(R.string.pref_key_notifications_enable, R.bool.pref_default_notifications_enable)
 
-    val isDebugNotificationEnableKey: String = context.getString(R.string.pref_key_notification_debug)
+    val isDebugNotificationEnableKey = context.getString(R.string.pref_key_notification_debug)
     val isDebugNotificationEnable: Boolean
-        get() = sharedPref.getBoolean(isDebugNotificationEnableKey, false)
+        get() = getBoolean(isDebugNotificationEnableKey, R.bool.pref_default_notification_debug)
 
     val gradePlusModifier: Double
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_plus), "0.0")?.toDouble() ?: 0.0
+        get() = getString(R.string.pref_key_grade_modifier_plus, R.string.pref_default_grade_modifier_plus).toDouble()
 
     val gradeMinusModifier: Double
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_minus), "0.0")?.toDouble() ?: 0.0
+        get() = getString(R.string.pref_key_grade_modifier_minus, R.string.pref_default_grade_modifier_minus).toDouble()
 
     val fillMessageContent: Boolean
-        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_fill_message_content), true)
+        get() = getBoolean(R.string.pref_key_fill_message_content, R.bool.pref_default_fill_message_content)
+
+    private fun getString(id: Int, default: Int) = getString(context.getString(id), default)
+
+    private fun getString(id: String, default: Int) = sharedPref.getString(id, context.getString(default)) ?: context.getString(default)
+
+    private fun getBoolean(id: Int, default: Int) = getBoolean(context.getString(id), default)
+
+    private fun getBoolean(id: String, default: Int) = sharedPref.getBoolean(id, context.resources.getBoolean(default))
 }

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

@@ -15,7 +15,7 @@ class RecipientLocal @Inject constructor(private val recipientDb: RecipientDao)
         return recipientDb.load(student.studentId, role, unit.realId).filter { !it.isEmpty() }
     }
 
-    fun saveRecipients(recipients: List<Recipient>) {
+    fun saveRecipients(recipients: List<Recipient>): List<Long> {
         return recipientDb.insertAll(recipients)
     }
 

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

@@ -1,34 +1,34 @@
 package io.github.wulkanowy.data.repositories.recipient
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
-import io.github.wulkanowy.api.messages.Recipient as ApiRecipient
+import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 
 @Singleton
-class RecipientRemote @Inject constructor(private val api: Api) {
+class RecipientRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getRecipients(role: Int, unit: ReportingUnit): Single<List<Recipient>> {
-        return api.getRecipients(unit.realId, role)
+        return sdk.getRecipients(unit.realId, role)
             .map { recipients ->
                 recipients.map { it.toRecipient() }
             }
     }
 
     fun getMessageRecipients(message: Message): Single<List<Recipient>> {
-        return api.getMessageRecipients(message.messageId, message.senderId)
+        return sdk.getMessageRecipients(message.messageId, message.senderId)
             .map { recipients ->
                 recipients.map { it.toRecipient() }
             }
     }
 
-    private fun ApiRecipient.toRecipient(): Recipient {
+    private fun SdkRecipient.toRecipient(): Recipient {
         return Recipient(
-            studentId = api.studentId,
+            studentId = sdk.studentId,
             realId = id,
             realName = name,
             name = shortName,

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

@@ -2,7 +2,7 @@ package io.github.wulkanowy.data.repositories.recipient
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.ApiHelper
+import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
@@ -18,11 +18,11 @@ class RecipientRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: RecipientLocal,
     private val remote: RecipientRemote,
-    private val apiHelper: ApiHelper
+    private val sdkHelper: SdkHelper
 ) {
 
     fun getRecipients(student: Student, role: Int, unit: ReportingUnit, forceRefresh: Boolean = false): Single<List<Recipient>> {
-        return Single.just(apiHelper.initApi(student))
+        return Single.just(sdkHelper.init(student))
             .flatMap { _ ->
                 local.getRecipients(student, role, unit).filter { !forceRefresh }
                     .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
@@ -43,7 +43,7 @@ class RecipientRepository @Inject constructor(
     }
 
     fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
-        return Single.just(apiHelper.initApi(student))
+        return Single.just(sdkHelper.init(student))
             .flatMap { ReactiveNetwork.checkInternetConnectivity(settings) }
             .flatMap {
                 if (it) remote.getMessageRecipients(message)

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

@@ -18,7 +18,7 @@ class ReportingUnitLocal @Inject constructor(private val reportingUnitDb: Report
         return reportingUnitDb.loadOne(student.studentId, unitId)
     }
 
-    fun saveReportingUnits(reportingUnits: List<ReportingUnit>) {
+    fun saveReportingUnits(reportingUnits: List<ReportingUnit>): List<Long> {
         return reportingUnitDb.insertAll(reportingUnits)
     }
 

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

@@ -1,19 +1,19 @@
 package io.github.wulkanowy.data.repositories.reportingunit
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class ReportingUnitRemote @Inject constructor(private val api: Api) {
+class ReportingUnitRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getReportingUnits(): Single<List<ReportingUnit>> {
-        return api.getReportingUnits().map {
+        return sdk.getReportingUnits().map {
             it.map { unit ->
                 ReportingUnit(
-                    studentId = api.studentId,
+                    studentId = sdk.studentId,
                     realId = unit.id,
                     roles = unit.roles,
                     senderId = unit.senderId,

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

@@ -2,7 +2,7 @@ package io.github.wulkanowy.data.repositories.reportingunit
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.ApiHelper
+import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
@@ -17,11 +17,11 @@ class ReportingUnitRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: ReportingUnitLocal,
     private val remote: ReportingUnitRemote,
-    private val apiHelper: ApiHelper
+    private val sdkHelper: SdkHelper
 ) {
 
     fun getReportingUnits(student: Student, forceRefresh: Boolean = false): Single<List<ReportingUnit>> {
-        return Single.just(apiHelper.initApi(student))
+        return Single.just(sdkHelper.init(student))
             .flatMap { _ ->
                 local.getReportingUnits(student).filter { !forceRefresh }
                     .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
@@ -40,7 +40,7 @@ class ReportingUnitRepository @Inject constructor(
     }
 
     fun getReportingUnit(student: Student, unitId: Int): Maybe<ReportingUnit> {
-        return Maybe.just(apiHelper.initApi(student))
+        return Maybe.just(sdkHelper.init(student))
             .flatMap { _ ->
                 local.getReportingUnit(student, unitId)
                     .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)

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

@@ -0,0 +1,22 @@
+package io.github.wulkanowy.data.repositories.school
+
+import io.github.wulkanowy.data.db.dao.SchoolDao
+import io.github.wulkanowy.data.db.entities.School
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Maybe
+import javax.inject.Inject
+
+class SchoolLocal @Inject constructor(private val schoolDb: SchoolDao) {
+
+    fun saveSchool(school: School) {
+        schoolDb.insertAll(listOf(school))
+    }
+
+    fun deleteSchool(school: School) {
+        schoolDb.deleteAll(listOf(school))
+    }
+
+    fun getSchool(semester: Semester): Maybe<School> {
+        return schoolDb.load(semester.studentId, semester.classId)
+    }
+}

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

@@ -0,0 +1,25 @@
+package io.github.wulkanowy.data.repositories.school
+
+import io.github.wulkanowy.data.db.entities.School
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.Sdk
+import io.reactivex.Single
+import javax.inject.Inject
+
+class SchoolRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getSchoolInfo(semester: Semester): Single<School> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getSchool()
+            .map {
+                School(
+                    studentId = semester.studentId,
+                    classId = semester.classId,
+                    name = it.name,
+                    address = it.address,
+                    contact = it.contact,
+                    headmaster = it.headmaster,
+                    pedagogue = it.pedagogue
+                )
+            }
+    }
+}

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

@@ -0,0 +1,41 @@
+package io.github.wulkanowy.data.repositories.school
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.School
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Maybe
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SchoolRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: SchoolLocal,
+    private val remote: SchoolRemote
+) {
+
+    fun getSchoolInfo(semester: Semester, forceRefresh: Boolean = false): Maybe<School> {
+        return local.getSchool(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getSchoolInfo(semester)
+                    else Single.error(UnknownHostException())
+                }.flatMapMaybe { new ->
+                    local.getSchool(semester)
+                        .doOnSuccess { old ->
+                            if (new != old) {
+                                local.deleteSchool(old)
+                                local.saveSchool(new)
+                            }
+                        }
+                        .doOnComplete {
+                            local.saveSchool(new)
+                        }
+                }.flatMap({ local.getSchool(semester) }, { Maybe.error(it) },
+                    { local.getSchool(semester) })
+            )
+    }
+}

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

@@ -1,35 +1,32 @@
 package io.github.wulkanowy.data.repositories.semester
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class SemesterRemote @Inject constructor(private val api: Api) {
+class SemesterRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getSemesters(student: Student): Single<List<Semester>> {
-        return api.getSemesters().map { semesters ->
-            semesters.map { semester ->
+        return sdk.getSemesters().map { semesters ->
+            semesters.map {
                 Semester(
                     studentId = student.studentId,
-                    diaryId = semester.diaryId,
-                    diaryName = semester.diaryName,
-                    schoolYear = semester.schoolYear,
-                    semesterId = semester.semesterId,
-                    semesterName = semester.semesterNumber,
-                    isCurrent = semester.current,
-                    start = semester.start,
-                    end = semester.end,
-                    classId = semester.classId,
-                    unitId = semester.unitId
+                    diaryId = it.diaryId,
+                    diaryName = it.diaryName,
+                    schoolYear = it.schoolYear,
+                    semesterId = it.semesterId,
+                    semesterName = it.semesterNumber,
+                    isCurrent = it.current,
+                    start = it.start,
+                    end = it.end,
+                    classId = it.classId,
+                    unitId = it.unitId
                 )
             }
-
         }
     }
 }
-
-

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

@@ -2,7 +2,7 @@ package io.github.wulkanowy.data.repositories.semester
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.ApiHelper
+import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
@@ -18,11 +18,11 @@ class SemesterRepository @Inject constructor(
     private val remote: SemesterRemote,
     private val local: SemesterLocal,
     private val settings: InternetObservingSettings,
-    private val apiHelper: ApiHelper
+    private val sdkHelper: SdkHelper
 ) {
 
     fun getSemesters(student: Student, forceRefresh: Boolean = false): Single<List<Semester>> {
-        return Maybe.just(apiHelper.initApi(student))
+        return Maybe.just(sdkHelper.init(student))
             .flatMap { local.getSemesters(student).filter { !forceRefresh } }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {

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

@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories.student
 import android.content.Context
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.security.decrypt
 import io.github.wulkanowy.utils.security.encrypt
 import io.reactivex.Completable
@@ -18,17 +19,26 @@ class StudentLocal @Inject constructor(
 ) {
 
     fun saveStudents(students: List<Student>): Single<List<Long>> {
-        return Single.fromCallable { studentDb.insertAll(students.map { it.copy(password = encrypt(it.password, context)) }) }
+        return Single.fromCallable {
+            studentDb.insertAll(students.map {
+                if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.API) it.copy(password = encrypt(it.password, context))
+                else it
+            })
+        }
     }
 
     fun getStudents(decryptPass: Boolean): Maybe<List<Student>> {
         return studentDb.loadAll()
             .map { list -> list.map { it.apply { if (decryptPass) password = decrypt(password) } } }
-            .filter { !it.isEmpty() }
+            .filter { it.isNotEmpty() }
     }
 
     fun getCurrentStudent(decryptPass: Boolean): Maybe<Student> {
-        return studentDb.loadCurrent().map { it.apply { if (decryptPass) password = decrypt(password) } }
+        return studentDb.loadCurrent().map {
+            it.apply {
+                if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
+            }
+        }
     }
 
     fun setCurrentStudent(student: Student): Completable {

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

@@ -1,34 +1,51 @@
 package io.github.wulkanowy.data.repositories.student
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import org.threeten.bp.LocalDateTime.now
 import javax.inject.Inject
 import javax.inject.Singleton
+import io.github.wulkanowy.sdk.pojo.Student as SdkStudent
 
 @Singleton
-class StudentRemote @Inject constructor(private val api: Api) {
+class StudentRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getStudents(email: String, password: String, endpoint: String): Single<List<Student>> {
-        return api.getStudents().map { students ->
-            students.map { student ->
-                Student(
-                    email = email,
-                    password = password,
-                    symbol = student.symbol,
-                    studentId = student.studentId,
-                    studentName = student.studentName,
-                    schoolSymbol = student.schoolSymbol,
-                    schoolName = student.schoolName,
-                    className = student.className,
-                    classId = student.classId,
-                    endpoint = endpoint,
-                    loginType = student.loginType.name,
-                    isCurrent = false,
-                    registrationDate = now()
-                )
-            }
+    private fun mapStudents(students: List<SdkStudent>, email: String, password: String): List<Student> {
+        return students.map { student ->
+            Student(
+                email = email,
+                password = password,
+                isParent = student.isParent,
+                symbol = student.symbol,
+                studentId = student.studentId,
+                userLoginId = student.userLoginId,
+                studentName = student.studentName,
+                schoolSymbol = student.schoolSymbol,
+                schoolName = student.schoolName,
+                className = student.className,
+                classId = student.classId,
+                scrapperBaseUrl = student.scrapperBaseUrl,
+                loginType = student.loginType.name,
+                isCurrent = false,
+                registrationDate = now(),
+                mobileBaseUrl = student.mobileBaseUrl,
+                privateKey = student.privateKey,
+                certificateKey = student.certificateKey,
+                loginMode = student.loginMode.name
+            )
         }
     }
+
+    fun getStudentsMobileApi(token: String, pin: String, symbol: String): Single<List<Student>> {
+        return sdk.getStudentsFromMobileApi(token, pin, symbol).map { mapStudents(it, "", "") }
+    }
+
+    fun getStudentsScrapper(email: String, password: String, scrapperBaseUrl: String, symbol: String): Single<List<Student>> {
+        return sdk.getStudentsFromScrapper(email, password, scrapperBaseUrl, symbol).map { mapStudents(it, email, password) }
+    }
+
+    fun getStudentsHybrid(email: String, password: String, scrapperBaseUrl: String, symbol: String): Single<List<Student>> {
+        return sdk.getStudentsHybrid(email, password, scrapperBaseUrl, symbol).map { mapStudents(it, email, password) }
+    }
 }

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

@@ -2,7 +2,6 @@ package io.github.wulkanowy.data.repositories.student
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.ApiHelper
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.reactivex.Completable
@@ -16,21 +15,32 @@ import javax.inject.Singleton
 class StudentRepository @Inject constructor(
     private val local: StudentLocal,
     private val remote: StudentRemote,
-    private val settings: InternetObservingSettings,
-    private val apiHelper: ApiHelper
+    private val settings: InternetObservingSettings
 ) {
 
     fun isStudentSaved(): Single<Boolean> = local.getStudents(false).isEmpty.map { !it }
 
     fun isCurrentStudentSet(): Single<Boolean> = local.getCurrentStudent(false).isEmpty.map { !it }
 
-    fun getStudents(email: String, password: String, endpoint: String, symbol: String = ""): Single<List<Student>> {
-        return ReactiveNetwork.checkInternetConnectivity(settings)
-            .flatMap {
-                apiHelper.initApi(email, password, symbol, endpoint)
-                if (it) remote.getStudents(email, password, endpoint)
-                else Single.error(UnknownHostException("No internet connection"))
-            }
+    fun getStudentsApi(pin: String, symbol: String, token: String): Single<List<Student>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getStudentsMobileApi(token, pin, symbol)
+            else Single.error(UnknownHostException("No internet connection"))
+        }
+    }
+
+    fun getStudentsScrapper(email: String, password: String, endpoint: String, symbol: String = ""): Single<List<Student>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getStudentsScrapper(email, password, endpoint, symbol)
+            else Single.error(UnknownHostException("No internet connection"))
+        }
+    }
+
+    fun getStudentsHybrid(email: String, password: String, endpoint: String, symbol: String): Single<List<Student>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getStudentsHybrid(email, password, endpoint, symbol)
+            else Single.error(UnknownHostException("No internet connection"))
+        }
     }
 
     fun getSavedStudents(decryptPass: Boolean = true): Single<List<Student>> {

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

@@ -1,25 +1,24 @@
 package io.github.wulkanowy.data.repositories.subject
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Subject
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class SubjectRemote @Inject constructor(private val api: Api) {
+class SubjectRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getSubjects(semester: Semester): Single<List<Subject>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { api.getSubjects() }
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getSubjects()
             .map { subjects ->
                 subjects.map {
                     Subject(
                         studentId = semester.studentId,
                         diaryId = semester.diaryId,
                         name = it.name,
-                        realId = it.value
+                        realId = it.id
                     )
                 }
             }

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

@@ -0,0 +1,22 @@
+package io.github.wulkanowy.data.repositories.teacher
+
+import io.github.wulkanowy.data.db.dao.TeacherDao
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Teacher
+import io.reactivex.Maybe
+import javax.inject.Inject
+
+class TeacherLocal @Inject constructor(private val teacherDb: TeacherDao) {
+
+    fun saveTeachers(teachers: List<Teacher>) {
+        teacherDb.insertAll(teachers)
+    }
+
+    fun deleteTeachers(teachers: List<Teacher>) {
+        teacherDb.deleteAll(teachers)
+    }
+
+    fun getTeachers(semester: Semester): Maybe<List<Teacher>> {
+        return teacherDb.loadAll(semester.studentId, semester.classId).filter { it.isNotEmpty() }
+    }
+}

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

@@ -0,0 +1,27 @@
+package io.github.wulkanowy.data.repositories.teacher
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Teacher
+import io.github.wulkanowy.sdk.Sdk
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TeacherRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getTeachers(semester: Semester): Single<List<Teacher>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getTeachers(semester.semesterId)
+            .map { teachers ->
+                teachers.map {
+                    Teacher(
+                        studentId = semester.studentId,
+                        name = it.name,
+                        subject = it.subject,
+                        shortName = it.short,
+                        classId = semester.classId
+                    )
+                }
+            }
+    }
+}

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

@@ -0,0 +1,34 @@
+package io.github.wulkanowy.data.repositories.teacher
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Teacher
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TeacherRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: TeacherLocal,
+    private val remote: TeacherRemote
+) {
+
+    fun getTeachers(semester: Semester, forceRefresh: Boolean = false): Single<List<Teacher>> {
+        return local.getTeachers(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getTeachers(semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getTeachers(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteTeachers(old.uniqueSubtract(new))
+                            local.saveTeachers(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getTeachers(semester).toSingle(emptyList()) })
+    }
+}

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

@@ -1,30 +1,27 @@
 package io.github.wulkanowy.data.repositories.timetable
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.utils.toLocalDate
-import io.github.wulkanowy.utils.toLocalDateTime
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class TimetableRemote @Inject constructor(private val api: Api) {
+class TimetableRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Timetable>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getTimetable(startDate, endDate) }
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getTimetable(startDate, endDate)
             .map { lessons ->
                 lessons.map {
                     Timetable(
                         studentId = semester.studentId,
                         diaryId = semester.diaryId,
                         number = it.number,
-                        start = it.start.toLocalDateTime(),
-                        end = it.end.toLocalDateTime(),
-                        date = it.date.toLocalDate(),
+                        start = it.start,
+                        end = it.end,
+                        date = it.date,
                         subject = it.subject,
                         subjectOld = it.subjectOld,
                         group = it.group,

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

@@ -36,7 +36,7 @@ class TimetableRepository @Inject constructor(
                                     old.singleOrNull { new.start == it.start }?.let { old ->
                                         return@map new.copy(
                                             room = if (new.room.isEmpty()) old.room else new.room,
-                                            teacher = if (new.teacher.isEmpty() && !new.changes) old.teacher else new.teacher
+                                            teacher = if (new.teacher.isEmpty() && !new.changes && !old.changes) old.teacher else new.teacher
                                         )
                                     }
                                 }

app/src/main/java/io/github/wulkanowy/di/AppModule.kt

@@ -2,6 +2,7 @@ package io.github.wulkanowy.di
 
 import android.appwidget.AppWidgetManager
 import android.content.Context
+import com.yariksoffice.lingver.Lingver
 import dagger.Module
 import dagger.Provides
 import eu.davidea.flexibleadapter.FlexibleAdapter
@@ -32,4 +33,8 @@ internal class AppModule {
     @Singleton
     @Provides
     fun provideAppInfo() = AppInfo()
+
+    @Singleton
+    @Provides
+    fun provideLingver() = Lingver.getInstance()
 }

app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt

@@ -21,6 +21,7 @@ import io.github.wulkanowy.services.sync.works.LuckyNumberWork
 import io.github.wulkanowy.services.sync.works.MessageWork
 import io.github.wulkanowy.services.sync.works.NoteWork
 import io.github.wulkanowy.services.sync.works.RecipientWork
+import io.github.wulkanowy.services.sync.works.TeacherWork
 import io.github.wulkanowy.services.sync.works.TimetableWork
 import io.github.wulkanowy.services.sync.works.Work
 import io.github.wulkanowy.services.widgets.TimetableWidgetService
@@ -28,17 +29,15 @@ import javax.inject.Singleton
 
 @Suppress("unused")
 @AssistedModule
-@Module(includes = [AssistedInject_ServicesModule::class])
+@Module(includes = [AssistedInject_ServicesModule::class, ServicesModule.Static::class])
 abstract class ServicesModule {
 
     @Module
-    companion object {
+    object Static {
 
-        @JvmStatic
         @Provides
         fun provideWorkManager(context: Context) = WorkManager.getInstance(context)
 
-        @JvmStatic
         @Singleton
         @Provides
         fun provideNotificationManager(context: Context) = NotificationManagerCompat.from(context)
@@ -75,6 +74,10 @@ abstract class ServicesModule {
     @IntoSet
     abstract fun provideTimetableWork(work: TimetableWork): Work
 
+    @Binds
+    @IntoSet
+    abstract fun provideTeacherWork(work: TeacherWork): Work
+
     @Binds
     @IntoSet
     abstract fun provideLuckyNumberWork(work: LuckyNumberWork): Work