.bettercodehub.yml

@@ -1,3 +1,3 @@
-component_depth: 10
+component_depth: 8
 languages:
 - kotlin

.gitignore

@@ -63,7 +63,6 @@ captures/
 .idea/dynamic.xml
 .idea/uiDesigner.xml
 .idea/runConfigurations.xml
-.idea/discord.xml
 
 # Keystore files
 *.jks

.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

@@ -4,7 +4,7 @@ jdk: oraclejdk8
 env:
  global:
     - ANDROID_API_LEVEL=29
-    - ANDROID_BUILD_TOOLS_VERSION=29.0.3
+    - ANDROID_BUILD_TOOLS_VERSION=29.0.2
 
 cache:
   directories:
@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.18.2
+    - 0.15.0
 
 android:
  licenses:
@@ -48,15 +48,20 @@ before_script:
 script:
   - ./gradlew dependencies --stacktrace --daemon
   - fossa --no-ansi || true
-  - ./gradlew -Pcoverage testPlayDebugUnitTest --stacktrace --daemon
-  - ./gradlew -Pcoverage createFdroidDebugCoverageReport --stacktrace --daemon
-  - ./gradlew -Pcoverage jacocoTestReport --stacktrace --daemon
+  #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
+  - ./gradlew testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
+  - ./gradlew createFdroidDebugCoverageReport --stacktrace --daemon
+  - ./gradlew jacocoTestReport --stacktrace --daemon
+  - if [ -z ${SONAR_HOST+x} ]; then echo "sonar scan skipped"; else
+      git fetch --unshallow;
+      ./gradlew sonarqube -x test -x lint -x fabricGenerateResourcesPlayRelease -x fabricGenerateResourcesFdroidRelease -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_KEY -Dsonar.branch.name=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} --stacktrace --daemon;
+    fi
   - |
     if [ $TRAVIS_TAG ]; then
       gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg;
-      ./gradlew publishPlayRelease -PenableFirebase --stacktrace;
+      ./gradlew publishPlayRelease -PenableCrashlytics --stacktrace;
     fi
 
 after_success:

app/build.gradle

@@ -1,30 +1,30 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'com.google.firebase.crashlytics'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
-apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
-        minSdkVersion 17
+        minSdkVersion 16
         targetSdkVersion 29
-        versionCode 61
-        versionName "0.18.2"
+        versionCode 52
+        versionName "0.15.0"
         multiDexEnabled true
-        resValue "string", "app_name", "Wulkanowy"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [
-                firebase_enabled: project.hasProperty("enableFirebase")
+                fabric_api_key     : System.getenv("FABRIC_API_KEY") ?: "null",
+                crashlytics_enabled: project.hasProperty("enableCrashlytics")
         ]
         javaCompileOptions {
             annotationProcessorOptions {
@@ -51,17 +51,18 @@ android {
 
     buildTypes {
         release {
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "true"
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
         debug {
-            resValue "string", "app_name", "Wulkanowy DEV " + defaultConfig.versionCode
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", project.hasProperty("enableCrashlytics") ? "true" : "false"
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
-            testCoverageEnabled = project.hasProperty('coverage')
-            ext.enableCrashlytics = project.hasProperty("enableFirebase")
+            testCoverageEnabled = true
+            ext.enableCrashlytics = project.hasProperty("enableCrashlytics")
         }
     }
 
@@ -73,14 +74,11 @@ android {
         }
 
         fdroid {
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "false"
             dimension "platform"
         }
     }
 
-    viewBinding {
-        enabled = true
-    }
-
     lintOptions {
         disable 'HardwareIds'
     }
@@ -98,10 +96,10 @@ android {
         exclude 'META-INF/library_release.kotlin_module'
         exclude 'META-INF/library-core_release.kotlin_module'
     }
+}
 
-    aboutLibraries {
-        configPath = "app/src/main/res/raw"
-    }
+androidExtensions {
+    experimental = true
 }
 
 play {
@@ -112,10 +110,10 @@ play {
 }
 
 ext {
-    work_manager = "2.3.4"
-    room = "2.2.5"
-    dagger = "2.28"
-    chucker = "3.2.0"
+    work_manager = "2.3.0"
+    room = "2.2.3"
+    dagger = "2.25.4"
+    chucker = "2.0.4"
     mockk = "1.9.2"
 }
 
@@ -124,24 +122,24 @@ configurations.all {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:0.18.2"
+    implementation "io.github.wulkanowy:sdk:0.15.0"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "androidx.core:core-ktx:1.2.0"
+    implementation "androidx.core:core-ktx:1.2.0-rc01"
     implementation "androidx.activity:activity-ktx:1.1.0"
-    implementation "androidx.appcompat:appcompat:1.2.0-rc01"
+    implementation "androidx.appcompat:appcompat:1.1.0"
     implementation "androidx.appcompat:appcompat-resources:1.1.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.4"
+    implementation "androidx.fragment:fragment-ktx:1.2.0"
     implementation "androidx.annotation:annotation:1.1.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
-    implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.preference:preference-ktx:1.1.0"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation "androidx.viewpager:viewpager:1.0.0"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.1.0"
+    implementation "com.google.android.material:material:1.1.0-rc02"
     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"
@@ -150,8 +148,6 @@ dependencies {
     implementation "androidx.work:work-rxjava2:$work_manager"
     implementation "androidx.work:work-gcm:$work_manager"
 
-    implementation 'com.github.PaulinaSadowska:RxWorkManagerObservers:1.0.0'
-
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-rxjava2:$room"
     implementation "androidx.room:room-ktx:$room"
@@ -163,40 +159,37 @@ dependencies {
     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.2.2"
+    implementation "com.github.YarikSOffice:lingver:1.1.0"
 
-    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.8"
+    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.19"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.17"
 
     implementation "com.google.code.gson:gson:2.8.6"
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.4"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.2"
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
-    implementation "fr.bipi.treessence:treessence:0.3.2"
-    implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
+    implementation "com.mikepenz:aboutlibraries-core:7.1.0"
     implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
-    implementation "io.coil-kt:coil:0.11.0"
-    implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
 
-    playImplementation 'com.google.firebase:firebase-analytics:17.4.2'
-    playImplementation 'com.google.firebase:firebase-inappmessaging-display-ktx:19.0.7'
-    playImplementation "com.google.firebase:firebase-inappmessaging-ktx:19.0.7"
-    playImplementation 'com.google.firebase:firebase-messaging:20.2.0'
-    playImplementation 'com.google.firebase:firebase-crashlytics:17.0.0'
-    playImplementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
+    implementation("io.coil-kt:coil:0.9.2")
 
-    releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
+    playImplementation "com.google.firebase:firebase-core:17.2.2"
+    playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
 
-    debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
+    releaseImplementation "fr.o80.chucker:library-no-op:$chucker"
+
+    debugImplementation "fr.o80.chucker:library:$chucker"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
     testImplementation "junit:junit:4.13"
     testImplementation "io.mockk:mockk:$mockk"
-    testImplementation "org.threeten:threetenbp:1.4.4"
-    testImplementation "org.mockito:mockito-inline:3.3.3"
+    testImplementation "org.threeten:threetenbp:1.4.1"
+    testImplementation "org.mockito:mockito-inline:3.2.4"
 
     androidTestImplementation "androidx.test:core:1.2.0"
     androidTestImplementation "androidx.test:runner:1.2.0"
@@ -204,7 +197,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-android:3.3.3"
+    androidTestImplementation "org.mockito:mockito-android:3.2.4"
 }
 
 apply plugin: 'com.google.gms.google-services'

app/proguard-rules.pro

@@ -43,10 +43,3 @@
 
 #Config for Material Components
 -keep class com.google.android.material.tabs.** { *; }
-
-
-#Config for About Libraries
--keep class .R
--keep class **.R$* {
-    <fields>;
-}

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

@@ -8,6 +8,7 @@ import io.github.wulkanowy.data.db.entities.Semester
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
+import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.of
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
@@ -103,45 +104,45 @@ class Migration13Test : AbstractMigrationTest() {
         val db = helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
         val semesters1 = getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 1 AND class_id = 5")
-        assertTrue { semesters1.single { it.second }.second }
+        assertTrue { semesters1.single { it.isCurrent }.isCurrent }
         semesters1[0].run {
-            assertFalse(second)
-            assertEquals(1, first.semesterId)
-            assertEquals(1, first.diaryId)
+            assertFalse(isCurrent)
+            assertEquals(1, semesterId)
+            assertEquals(1, diaryId)
         }
         semesters1[2].run {
-            assertFalse(second)
-            assertEquals(3, first.semesterId)
-            assertEquals(2, first.diaryId)
+            assertFalse(isCurrent)
+            assertEquals(3, semesterId)
+            assertEquals(2, diaryId)
         }
         semesters1[3].run {
-            assertTrue(second)
-            assertEquals(4, first.semesterId)
-            assertEquals(2, first.diaryId)
+            assertTrue(isCurrent)
+            assertEquals(4, semesterId)
+            assertEquals(2, diaryId)
         }
 
         getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
-            assertTrue { it.single { it.second }.second }
-            assertEquals(1970, it[0].first.schoolYear)
-            assertEquals(of(1970, 1, 1), it[0].first.end)
-            assertEquals(of(1970, 1, 1), it[0].first.start)
-            assertFalse(it[0].second)
-            assertFalse(it[1].second)
-            assertFalse(it[2].second)
-            assertTrue(it[3].second)
+            assertTrue { it.single { it.isCurrent }.isCurrent }
+            assertEquals(1970, it[0].schoolYear)
+            assertEquals(of(1970, 1, 1), it[0].end)
+            assertEquals(of(1970, 1, 1), it[0].start)
+            assertFalse(it[0].isCurrent)
+            assertFalse(it[1].isCurrent)
+            assertFalse(it[2].isCurrent)
+            assertTrue(it[3].isCurrent)
         }
 
         getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
-            assertTrue { it.single { it.second }.second }
-            assertFalse(it[0].second)
-            assertFalse(it[1].second)
-            assertFalse(it[2].second)
-            assertTrue(it[3].second)
+            assertTrue { it.single { it.isCurrent }.isCurrent }
+            assertFalse(it[0].isCurrent)
+            assertFalse(it[1].isCurrent)
+            assertFalse(it[2].isCurrent)
+            assertTrue(it[3].isCurrent)
         }
     }
 
-    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Pair<Semester, Boolean>> {
-        val semesters = mutableListOf<Pair<Semester, Boolean>>()
+    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Semester> {
+        val semesters = mutableListOf<Semester>()
 
         val cursor = db.query(query)
         if (cursor.moveToFirst()) {
@@ -152,12 +153,13 @@ class Migration13Test : AbstractMigrationTest() {
                     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))!!
-                ) to (cursor.getInt(6) == 1))
+                ))
             } while (cursor.moveToNext())
         }
         return semesters.toList()

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

@@ -1,29 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.entities.Student
-import org.threeten.bp.LocalDateTime
-
-fun getStudent(): Student {
-    return Student(
-        email = "test",
-        password = "test123",
-        schoolSymbol = "23",
-        scrapperBaseUrl = "fakelog.cf",
-        loginType = "AUTO",
-        isCurrent = true,
-        studentName = "",
-        schoolShortName = "",
-        schoolName = "",
-        studentId = 0,
-        classId = 1,
-        symbol = "",
-        registrationDate = LocalDateTime.now(),
-        className = "",
-        loginMode = "API",
-        certificateKey = "",
-        privateKey = "",
-        mobileBaseUrl = "",
-        userLoginId = 0,
-        isParent = false
-    )
-}

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

@@ -10,8 +10,8 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -35,19 +35,19 @@ class AttendanceLocalTest {
     @Test
     fun saveAndReadTest() {
         attendanceLocal.saveAttendance(listOf(
-            Attendance(1, 2, 3, of(2018, 9, 10), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name),
-            Attendance(1, 2, 3, of(2018, 9, 14), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.WAITING.name),
-            Attendance(1, 2, 3, of(2018, 9, 17), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name)
+            Attendance(1, 2, 3, LocalDate.of(2018, 9, 10), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name),
+            Attendance(1, 2, 3, LocalDate.of(2018, 9, 14), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.WAITING.name),
+            Attendance(1, 2, 3, LocalDate.of(2018, 9, 17), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name)
         ))
 
         val attendance = attendanceLocal
-            .getAttendance(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
-                of(2018, 9, 10),
-                of(2018, 9, 14)
-            )
-            .blockingGet()
+            .getAttendance(Semester(1, 2, "", 1, 3, 2019, true, now(), now(), 1, 1),
+                        LocalDate.of(2018, 9, 10),
+                        LocalDate.of(2018, 9, 14)
+                )
+                .blockingGet()
         assertEquals(2, attendance.size)
-        assertEquals(attendance[0].date, of(2018, 9, 10))
-        assertEquals(attendance[1].date, of(2018, 9, 14))
+        assertEquals(attendance[0].date, LocalDate.of(2018, 9, 10))
+        assertEquals(attendance[1].date, LocalDate.of(2018, 9, 14))
     }
 }

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

@@ -11,8 +11,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -37,20 +35,20 @@ class CompletedLessonsLocalTest {
     @Test
     fun saveAndReadTest() {
         completedLessonsLocal.saveCompletedLessons(listOf(
-            getCompletedLesson(of(2018, 9, 10), 1),
-            getCompletedLesson(of(2018, 9, 14), 2),
-            getCompletedLesson(of(2018, 9, 17), 3)
+            getCompletedLesson(LocalDate.of(2018, 9, 10), 1),
+            getCompletedLesson(LocalDate.of(2018, 9, 14), 2),
+            getCompletedLesson(LocalDate.of(2018, 9, 17), 3)
         ))
 
         val completed = completedLessonsLocal
-            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
-                of(2018, 9, 10),
-                of(2018, 9, 14)
+            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+                LocalDate.of(2018, 9, 10),
+                LocalDate.of(2018, 9, 14)
             )
             .blockingGet()
         assertEquals(2, completed.size)
-        assertEquals(completed[0].date, of(2018, 9, 10))
-        assertEquals(completed[1].date, of(2018, 9, 14))
+        assertEquals(completed[0].date, LocalDate.of(2018, 9, 10))
+        assertEquals(completed[1].date, LocalDate.of(2018, 9, 14))
     }
 
     private fun getCompletedLesson(date: LocalDate, number: Int): CompletedLesson {

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

@@ -10,8 +10,7 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDate
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -35,19 +34,19 @@ class ExamLocalTest {
     @Test
     fun saveAndReadTest() {
         examLocal.saveExams(listOf(
-            Exam(1, 2, of(2018, 9, 10), now(), "", "", "", "", "", ""),
-            Exam(1, 2, of(2018, 9, 14), now(), "", "", "", "", "", ""),
-            Exam(1, 2, of(2018, 9, 17), now(), "", "", "", "", "", "")
+                Exam(1, 2, LocalDate.of(2018, 9, 10), LocalDate.now(), "", "", "", "", "", ""),
+                Exam(1, 2, LocalDate.of(2018, 9, 14), LocalDate.now(), "", "", "", "", "", ""),
+                Exam(1, 2, LocalDate.of(2018, 9, 17), LocalDate.now(), "", "", "", "", "", "")
         ))
 
         val exams = examLocal
-            .getExams(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
-                of(2018, 9, 10),
-                of(2018, 9, 14)
-            )
-            .blockingGet()
+            .getExams(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+                        LocalDate.of(2018, 9, 10),
+                        LocalDate.of(2018, 9, 14)
+                )
+                .blockingGet()
         assertEquals(2, exams.size)
-        assertEquals(exams[0].date, of(2018, 9, 10))
-        assertEquals(exams[1].date, of(2018, 9, 14))
+        assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
+        assertEquals(exams[1].date, LocalDate.of(2018, 9, 14))
     }
 }

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

@@ -24,7 +24,7 @@ class GradeLocalTest {
     fun createDb() {
         testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
-        gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
+        gradeLocal = GradeLocal(testDb.gradeDao)
     }
 
     @After
@@ -40,10 +40,10 @@ class GradeLocalTest {
             createGradeLocal(3, 5.0, LocalDate.of(2019, 2, 28), "", 2)
         ))
 
-        val semester = Semester(1, 2, "", 2019, 2, 1, now(), now(), 1, 1)
+        val semester = Semester(1, 2, "", 2019, 2, 1, true, now(), now(), 1, 1)
 
         val grades = gradeLocal
-            .getGradesDetails(semester)
+            .getGrades(semester)
             .blockingGet()
 
         assertEquals(2, grades.size)

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.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.github.wulkanowy.sdk.pojo.Grade
 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
@@ -53,7 +56,7 @@ class GradeRepositoryTest {
     fun initApi() {
         MockKAnnotations.init(this)
         testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
-        gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
+        gradeLocal = GradeLocal(testDb.gradeDao)
         gradeRemote = GradeRemote(mockSdk)
 
         every { studentMock.registrationDate } returns LocalDateTime.of(2019, 2, 27, 12, 0)
@@ -76,10 +79,10 @@ class GradeRepositoryTest {
             createGradeApi(5, 4.0, of(2019, 2, 26), "przed zalogowanie w aplikacji"),
             createGradeApi(5, 4.0, of(2019, 2, 27), "Ocena z dnia logowania"),
             createGradeApi(5, 4.0, of(2019, 2, 28), "Ocena jeszcze nowsza")
-        ) to emptyList())
+        ))
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet().first.sortedByDescending { it.date }
+            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
 
         assertFalse { grades[0].isRead }
         assertFalse { grades[1].isRead }
@@ -100,10 +103,10 @@ class GradeRepositoryTest {
             createGradeApi(4, 3.0, of(2019, 2, 26), "starszą niż ostatnia lokalnie"),
             createGradeApi(3, 4.0, of(2019, 2, 27), "Ta jest z tego samego dnia co ostatnia lokalnie"),
             createGradeApi(2, 5.0, of(2019, 2, 28), "Ta jest już w ogóle nowa")
-        ) to emptyList())
+        ))
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet().first.sortedByDescending { it.date }
+            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
 
         assertFalse { grades[0].isRead }
         assertFalse { grades[1].isRead }
@@ -122,12 +125,12 @@ class GradeRepositoryTest {
         every { mockSdk.getGrades(1) } returns Single.just(listOf(
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ) to emptyList())
+        ))
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(2, grades.first.size)
+        assertEquals(2, grades.size)
     }
 
     @Test
@@ -141,12 +144,12 @@ class GradeRepositoryTest {
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ) to emptyList())
+        ))
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(3, grades.first.size)
+        assertEquals(3, grades.size)
     }
 
     @Test
@@ -157,12 +160,12 @@ class GradeRepositoryTest {
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ) to emptyList())
+        ))
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(3, grades.first.size)
+        assertEquals(3, grades.size)
     }
 
     @Test
@@ -172,11 +175,11 @@ class GradeRepositoryTest {
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         ))
 
-        every { mockSdk.getGrades(1) } returns Single.just(emptyList<Grade>() to emptyList())
+        every { mockSdk.getGrades(1) } returns Single.just(listOf())
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(0, grades.first.size)
+        assertEquals(0, grades.size)
     }
 }

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

@@ -11,7 +11,7 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -40,7 +40,10 @@ class GradeStatisticsLocalTest {
             getGradeStatistics("Fizyka", 1, 2)
         ))
 
-        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Matematyka").blockingGet()
+        val stats = gradeStatisticsLocal.getGradesStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
+            "Matematyka"
+        ).blockingGet()
         assertEquals(1, stats.size)
         assertEquals(stats[0].subject, "Matematyka")
     }
@@ -53,11 +56,12 @@ class GradeStatisticsLocalTest {
             getGradeStatistics("Fizyka", 1, 2)
         ))
 
-        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Wszystkie").blockingGet()
-        assertEquals(3, stats.size)
+        val stats = gradeStatisticsLocal.getGradesStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
+            "Wszystkie"
+        ).blockingGet()
+        assertEquals(1, stats.size)
         assertEquals(stats[0].subject, "Wszystkie")
-        assertEquals(stats[1].subject, "Matematyka")
-        assertEquals(stats[2].subject, "Chemia")
     }
 
     @Test
@@ -68,8 +72,11 @@ class GradeStatisticsLocalTest {
             getGradePointsStatistics("Fizyka", 1, 2)
         ))
 
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
-        with(stats[0]) {
+        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)
@@ -80,7 +87,10 @@ class GradeStatisticsLocalTest {
     fun saveAndRead_subjectEmpty() {
         gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
 
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            "Matematyka"
+        ).blockingGet()
         assertEquals(null, stats)
     }
 
@@ -88,14 +98,13 @@ class GradeStatisticsLocalTest {
     fun saveAndRead_allEmpty() {
         gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
 
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Wszystkie").blockingGet()
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            "Wszystkie"
+        ).blockingGet()
         assertEquals(null, stats)
     }
 
-    private fun getSemester(): Semester {
-        return Semester(2, 2, "", 2019, 1, 2, now(), now(), 1, 1)
-    }
-
     private fun getGradeStatistics(subject: String, studentId: Int, semesterId: Int): GradeStatistics {
         return GradeStatistics(studentId, semesterId, subject, 5, 5, false)
     }

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

@@ -6,13 +6,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -38,7 +36,7 @@ class LuckyNumberLocalTest {
     fun saveAndReadTest() {
         luckyNumberLocal.saveLuckyNumber(LuckyNumber(1, LocalDate.of(2019, 1, 20), 14))
 
-        val luckyNumber = luckyNumberLocal.getLuckyNumber(Student("", "", "", "", "", "", false, "", "", "", 1, 1, "", "", "", "", "", 1, false, now()),
+        val luckyNumber = luckyNumberLocal.getLuckyNumber(Semester(1, 1, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
             LocalDate.of(2019, 1, 20)
         ).blockingGet()
 

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", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", "", 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

@@ -5,11 +5,13 @@ 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.repositories.getStudent
+import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.db.entities.Student
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.threeten.bp.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -19,13 +21,14 @@ class StudentLocalTest {
 
     private lateinit var testDb: AppDatabase
 
-    private val student = getStudent()
+    private lateinit var sharedProvider: SharedPrefProvider
 
     @Before
     fun createDb() {
         val context = ApplicationProvider.getApplicationContext<Context>()
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .build()
+        sharedProvider = SharedPrefProvider(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
         studentLocal = StudentLocal(testDb.studentDao, context)
     }
 
@@ -36,7 +39,8 @@ class StudentLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        studentLocal.saveStudents(listOf(student)).blockingGet()
+        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()
         assertEquals("23", student.schoolSymbol)

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

@@ -21,7 +21,7 @@ fun createTimetableLocal(start: LocalDateTime, number: Int, room: String = "", s
         teacher = teacher,
         teacherOld = "",
         info = "",
-        isStudentPlan = true,
+        studentPlan = true,
         changes = changes,
         canceled = false
     )

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

@@ -41,7 +41,7 @@ class TimetableLocalTest {
         ))
 
         val exams = timetableDb.getTimetable(
-            Semester(1, 2, "", 1, 1, 2019, LocalDate.now(), LocalDate.now(), 1, 1),
+            Semester(1, 2, "", 1, 1, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
             LocalDate.of(2018, 9, 10),
             LocalDate.of(2018, 9, 14)
         ).blockingGet()

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

@@ -8,15 +8,11 @@ import androidx.test.filters.SdkSuppress
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 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.data.repositories.getStudent
-import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
 import io.github.wulkanowy.sdk.Sdk
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.mockk
 import io.reactivex.Single
 import org.junit.After
 import org.junit.Before
@@ -37,17 +33,9 @@ class TimetableRepositoryTest {
         .strategy(TestInternetObservingStrategy())
         .build()
 
-    @MockK
-    private lateinit var studentMock: Student
-
-    private val student = getStudent()
-
     @MockK
     private lateinit var semesterMock: Semester
 
-    @MockK
-    private lateinit var timetableNotificationSchedulerHelper: TimetableNotificationSchedulerHelper
-
     private lateinit var timetableRemote: TimetableRemote
 
     private lateinit var timetableLocal: TimetableLocal
@@ -61,17 +49,10 @@ class TimetableRepositoryTest {
         timetableLocal = TimetableLocal(testDb.timetableDao)
         timetableRemote = TimetableRemote(mockSdk)
 
-        every { timetableNotificationSchedulerHelper.scheduleNotifications(any(), any()) } returns mockk()
-        every { timetableNotificationSchedulerHelper.cancelScheduled(any(), any()) } returns mockk()
-
-        every { studentMock.studentId } returns 1
-        every { studentMock.studentName } returns "Jan Kowalski"
-
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 2
         every { semesterMock.schoolYear } returns 2019
         every { semesterMock.semesterId } returns 1
-
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
     }
 
@@ -96,8 +77,8 @@ class TimetableRepositoryTest {
             createTimetableRemote(of(2019, 3, 5, 10, 30), 4, "", "W-F")
         ))
 
-        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote, timetableNotificationSchedulerHelper)
-            .getTimetable(student, semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
+            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
             .blockingGet()
 
         assertEquals(4, lessons.size)
@@ -142,8 +123,8 @@ class TimetableRepositoryTest {
             createTimetableRemote(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true)
         ))
 
-        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote, timetableNotificationSchedulerHelper)
-            .getTimetable(student, semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true)
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
+            .getTimetable(semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true)
             .blockingGet()
 
         assertEquals(12, lessons.size)

app/src/debug/res/values/preferences_defaults.xml

@@ -1,4 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-
-    <bool name="pref_default_notification_debug">true</bool>
-</resources>

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

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

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

@@ -5,10 +5,13 @@ package io.github.wulkanowy.utils
 import android.content.Context
 import timber.log.Timber
 
-open class TimberTreeNoOp : Timber.Tree() {
-    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {}
+fun initCrashlytics(context: Context, appInfo: AppInfo) {
+    // do nothing
 }
 
-class CrashlyticsTree : TimberTreeNoOp()
+class CrashlyticsTree : Timber.Tree() {
 
-class CrashlyticsExceptionTree : TimberTreeNoOp()
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+        // do nothing
+    }
+}

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

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

app/src/main/AndroidManifest.xml

@@ -18,13 +18,11 @@
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
-        tools:replace="android:supportsRtl,android:allowBackup">
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/WulkanowyTheme.SplashScreen"
-            tools:ignore="LockedOrientationActivity">
+            android:theme="@style/WulkanowyTheme.SplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -40,14 +38,13 @@
             android:name=".ui.modules.main.MainActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/main_title"
-            android:theme="@style/WulkanowyTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:theme="@style/WulkanowyTheme.NoActionBar" />
         <activity
             android:name=".ui.modules.message.send.SendMessageActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/send_message_title"
-            android:theme="@style/WulkanowyTheme.NoActionBar"
-            android:windowSoftInputMode="adjustResize" />
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/WulkanowyTheme.NoActionBar" />
         <activity
             android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
             android:excludeFromRecents="true"
@@ -93,58 +90,17 @@
                 android:resource="@xml/provider_widget_lucky_number" />
         </receiver>
 
-        <receiver android:name=".services.alarm.TimetableNotificationReceiver" />
-
         <provider
             android:name="androidx.work.impl.WorkManagerInitializer"
             android:authorities="${applicationId}.workmanager-init"
             android:exported="false"
             tools:node="remove" />
 
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
-
-        <!-- workaround for https://github.com/firebase/firebase-android-sdk/issues/473 enabled:false -->
-        <!-- https://firebase.googleblog.com/2017/03/take-control-of-your-firebase-init-on.html -->
-        <provider
-            android:name="com.google.firebase.provider.FirebaseInitProvider"
-            android:authorities="${applicationId}.firebaseinitprovider"
-            android:enabled="${firebase_enabled}"
-            android:exported="false" />
-
         <meta-data
-            android:name="firebase_analytics_collection_enabled"
-            android:value="${firebase_enabled}" />
-
-        <meta-data
-            android:name="google_analytics_adid_collection_enabled"
-            android:value="${firebase_enabled}" />
-
+            android:name="io.fabric.ApiKey"
+            android:value="${fabric_api_key}" />
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
-            android:value="${firebase_enabled}" />
-
-        <meta-data
-            android:name="firebase_messaging_auto_init_enabled"
-            android:value="${firebase_enabled}" />
-
-        <meta-data
-            android:name="firebase_inapp_messaging_auto_data_collection_enabled"
-            android:value="${firebase_enabled}" />
-
-        <meta-data
-            android:name="com.google.firebase.messaging.default_notification_icon"
-            android:resource="@drawable/ic_stat_push" />
-
-        <meta-data
-            android:name="com.google.firebase.messaging.default_notification_channel_id"
-            android:value="push_channel" />
+            android:value="${crashlytics_enabled}" />
     </application>
 </manifest>

app/src/main/assets/creators.json

@@ -20,7 +20,7 @@
     "githubUsername": "doteq"
   },
   {
-    "displayName": "Paweł Krzyś",
+    "displayName": "Pavuloff",
     "githubUsername": "pavuloff"
   },
   {
@@ -30,9 +30,5 @@
   {
     "displayName": "Dinolek",
     "githubUsername": "Dinolek"
-  },
-  {
-    "displayName": "Mateusz Idziejczak",
-    "githubUsername": "PanTajemnic"
   }
 ]

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

@@ -1,7 +1,6 @@
 package io.github.wulkanowy
 
 import android.content.Context
-import android.util.Log.DEBUG
 import android.util.Log.INFO
 import android.util.Log.VERBOSE
 import androidx.multidex.MultiDex
@@ -10,15 +9,16 @@ import com.jakewharton.threetenabp.AndroidThreeTen
 import com.yariksoffice.lingver.Lingver
 import dagger.android.AndroidInjector
 import dagger.android.support.DaggerApplication
-import fr.bipi.tressence.file.FileLoggerTree
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.utils.Log
 import io.github.wulkanowy.di.DaggerAppComponent
 import io.github.wulkanowy.services.sync.SyncWorkerFactory
 import io.github.wulkanowy.ui.base.ThemeManager
 import io.github.wulkanowy.utils.ActivityLifecycleLogger
 import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.CrashlyticsExceptionTree
 import io.github.wulkanowy.utils.CrashlyticsTree
 import io.github.wulkanowy.utils.DebugLogTree
+import io.github.wulkanowy.utils.initCrashlytics
 import io.reactivex.exceptions.UndeliverableException
 import io.reactivex.plugins.RxJavaPlugins
 import timber.log.Timber
@@ -49,20 +49,14 @@ class WulkanowyApp : DaggerApplication(), Configuration.Provider {
         themeManager.applyDefaultTheme()
 
         initLogging()
+        initCrashlytics(this, appInfo)
     }
 
     private fun initLogging() {
         if (appInfo.isDebug) {
             Timber.plant(DebugLogTree())
-            Timber.plant(FileLoggerTree.Builder()
-                .withFileName("wulkanowy.%g.log")
-                .withDirName(applicationContext.filesDir.absolutePath)
-                .withFileLimit(10)
-                .withMinPriority(DEBUG)
-                .build()
-            )
+            FlexibleAdapter.enableLogs(Log.Level.DEBUG)
         } else {
-            Timber.plant(CrashlyticsExceptionTree())
             Timber.plant(CrashlyticsTree())
         }
         registerActivityLifecycleCallbacks(ActivityLifecycleLogger())

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

@@ -1,17 +1,15 @@
 package io.github.wulkanowy.data
 
-import android.app.AlarmManager
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.res.AssetManager
 import android.content.res.Resources
-import androidx.core.content.getSystemService
 import androidx.preference.PreferenceManager
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.WalledGardenInternetObservingStrategy
-import com.chuckerteam.chucker.api.ChuckerCollector
-import com.chuckerteam.chucker.api.ChuckerInterceptor
-import com.chuckerteam.chucker.api.RetentionManager
+import com.readystatesoftware.chuck.api.ChuckCollector
+import com.readystatesoftware.chuck.api.ChuckInterceptor
+import com.readystatesoftware.chuck.api.RetentionManager
 import dagger.Module
 import dagger.Provides
 import io.github.wulkanowy.data.db.AppDatabase
@@ -34,25 +32,23 @@ internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideSdk(chuckerCollector: ChuckerCollector, context: Context): Sdk {
+    fun provideSdk(chuckCollector: ChuckCollector, context: Context): Sdk {
         return Sdk().apply {
             androidVersion = android.os.Build.VERSION.RELEASE
             buildTag = android.os.Build.MODEL
             setSimpleHttpLogger { Timber.d(it) }
 
             // for debug only
-            addInterceptor(ChuckerInterceptor(context, chuckerCollector), true)
+            addInterceptor(ChuckInterceptor(context, chuckCollector).maxContentLength(250000L), true)
         }
     }
 
     @Singleton
     @Provides
-    fun provideChuckerCollector(context: Context, prefRepository: PreferencesRepository): ChuckerCollector {
-        return ChuckerCollector(
-            context = context,
-            showNotification = prefRepository.isDebugNotificationEnable,
-            retentionPeriod = RetentionManager.Period.ONE_HOUR
-        )
+    fun provideChuckCollector(context: Context, prefRepository: PreferencesRepository): ChuckCollector {
+        return ChuckCollector(context)
+            .showNotification(prefRepository.isDebugNotificationEnable)
+            .retentionManager(RetentionManager(context, ChuckCollector.Period.ONE_HOUR))
     }
 
     @Singleton
@@ -99,10 +95,6 @@ internal class RepositoryModule {
     @Provides
     fun provideMessagesDao(database: AppDatabase) = database.messagesDao
 
-    @Singleton
-    @Provides
-    fun provideMessageAttachmentsDao(database: AppDatabase) = database.messageAttachmentDao
-
     @Singleton
     @Provides
     fun provideExamDao(database: AppDatabase) = database.examsDao

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

@@ -17,7 +17,6 @@ import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.dao.HomeworkDao
 import io.github.wulkanowy.data.db.dao.LuckyNumberDao
-import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.dao.NoteDao
@@ -40,7 +39,6 @@ import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Recipient
@@ -64,10 +62,6 @@ import io.github.wulkanowy.data.db.migrations.Migration19
 import io.github.wulkanowy.data.db.migrations.Migration2
 import io.github.wulkanowy.data.db.migrations.Migration20
 import io.github.wulkanowy.data.db.migrations.Migration21
-import io.github.wulkanowy.data.db.migrations.Migration22
-import io.github.wulkanowy.data.db.migrations.Migration23
-import io.github.wulkanowy.data.db.migrations.Migration24
-import io.github.wulkanowy.data.db.migrations.Migration25
 import io.github.wulkanowy.data.db.migrations.Migration3
 import io.github.wulkanowy.data.db.migrations.Migration4
 import io.github.wulkanowy.data.db.migrations.Migration5
@@ -91,7 +85,6 @@ import javax.inject.Singleton
         GradeStatistics::class,
         GradePointsStatistics::class,
         Message::class,
-        MessageAttachment::class,
         Note::class,
         Homework::class,
         Subject::class,
@@ -110,7 +103,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 25
+        const val VERSION_SCHEMA = 21
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider): Array<Migration> {
             return arrayOf(
@@ -133,11 +126,7 @@ abstract class AppDatabase : RoomDatabase() {
                 Migration18(),
                 Migration19(sharedPrefProvider),
                 Migration20(),
-                Migration21(),
-                Migration22(),
-                Migration23(),
-                Migration24(),
-                Migration25()
+                Migration21()
             )
         }
 
@@ -173,8 +162,6 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val messagesDao: MessagesDao
 
-    abstract val messageAttachmentDao: MessageAttachmentDao
-
     abstract val noteDao: NoteDao
 
     abstract val homeworkDao: HomeworkDao

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

@@ -48,14 +48,4 @@ class Converters {
     fun gsonToIntList(value: String): List<Int> {
         return Gson().fromJson(value, object : TypeToken<List<Int>>() {}.type)
     }
-
-    @TypeConverter
-    fun stringPairListToGson(list: List<Pair<String, String>>): String {
-        return Gson().toJson(list)
-    }
-
-    @TypeConverter
-    fun gsonToStringPairList(value: String): List<Pair<String, String>> {
-        return Gson().fromJson(value, object : TypeToken<List<Pair<String, String>>>() {}.type)
-    }
 }

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

@@ -11,7 +11,7 @@ import javax.inject.Singleton
 interface GradePointsStatisticsDao : BaseDao<GradePointsStatistics> {
 
     @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName")
-    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String): Maybe<List<GradePointsStatistics>>
+    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/MessageAttachmentDao.kt

@@ -1,13 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import io.github.wulkanowy.data.db.entities.MessageAttachment
-
-@Dao
-interface MessageAttachmentDao : BaseDao<MessageAttachment> {
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertAttachments(items: List<MessageAttachment>): List<Long>
-}

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

@@ -2,22 +2,18 @@ package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
 import androidx.room.Query
-import androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.reactivex.Maybe
-import io.reactivex.Single
 
 @Dao
 interface MessagesDao : BaseDao<Message> {
 
-    @Transaction
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND message_id = :messageId")
-    fun loadMessageWithAttachment(studentId: Int, messageId: Int): Single<MessageWithAttachment>
-
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder AND removed = 0 ORDER BY date DESC")
     fun loadAll(studentId: Int, folder: Int): Maybe<List<Message>>
 
+    @Query("SELECT * FROM Messages WHERE id = :id")
+    fun load(id: Long): Maybe<Message>
+
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND removed = 1 ORDER BY date DESC")
     fun loadDeleted(studentId: Int): Maybe<List<Message>>
 }

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

@@ -22,9 +22,6 @@ interface StudentDao {
     @Query("SELECT * FROM Students WHERE is_current = 1")
     fun loadCurrent(): Maybe<Student>
 
-    @Query("SELECT * FROM Students WHERE id = :id")
-    fun loadById(id: Int): Maybe<Student>
-
     @Query("SELECT * FROM Students")
     fun loadAll(): Maybe<List<Student>>
 

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

@@ -27,14 +27,10 @@ data class Homework(
     val teacher: String,
 
     @ColumnInfo(name = "teacher_symbol")
-    val teacherSymbol: String,
+    val teacherSymbol: String
 
-    val attachments: List<Pair<String, String>>
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
-
-    @ColumnInfo(name = "is_done")
-    var isDone: Boolean = false
 }

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

@@ -44,10 +44,7 @@ data class Message(
     @ColumnInfo(name = "read_by")
     val readBy: Int,
 
-    val removed: Boolean,
-
-    @ColumnInfo(name = "has_attachments")
-    val hasAttachments: Boolean
+    val removed: Boolean
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

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

@@ -1,26 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-
-@Entity(tableName = "MessageAttachments")
-data class MessageAttachment(
-
-    @PrimaryKey
-    @ColumnInfo(name = "real_id")
-    val realId: Int,
-
-    @ColumnInfo(name = "message_id")
-    val messageId: Int,
-
-    @ColumnInfo(name = "one_drive_id")
-    val oneDriveId: String,
-
-    @ColumnInfo(name = "url")
-    val url: String,
-
-    @ColumnInfo(name = "filename")
-    val filename: String
-) : Serializable

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

@@ -1,12 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.Embedded
-import androidx.room.Relation
-
-data class MessageWithAttachment(
-    @Embedded
-    val message: Message,
-
-    @Relation(parentColumn = "message_id", entityColumn = "message_id")
-    val attachments: List<MessageAttachment>
-)

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

@@ -16,19 +16,8 @@ data class Note(
 
     val teacher: String,
 
-    @ColumnInfo(name = "teacher_symbol")
-    val teacherSymbol: String,
-
     val category: String,
 
-    @ColumnInfo(name = "category_type")
-    val categoryType: Int,
-
-    @ColumnInfo(name = "is_points_show")
-    val isPointsShow: Boolean,
-
-    val points: Int,
-
     val content: String
 ) : Serializable {
 

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

@@ -27,6 +27,9 @@ data class Semester(
     @ColumnInfo(name = "semester_name")
     val semesterName: Int,
 
+    @ColumnInfo(name = "is_current")
+    val isCurrent: Boolean,
+
     val start: LocalDate,
 
     val end: LocalDate,
@@ -40,8 +43,4 @@ data class Semester(
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
-
-
-    @ColumnInfo(name = "is_current")
-    var current: Boolean = false
 }

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

@@ -49,9 +49,6 @@ data class Student(
     @ColumnInfo(name = "school_id")
     val schoolSymbol: String,
 
-    @ColumnInfo(name ="school_short")
-    val schoolShortName: String,
-
     @ColumnInfo(name = "school_name")
     val schoolName: String,
 

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

@@ -41,7 +41,7 @@ data class Timetable(
     val info: String,
 
     @ColumnInfo(name = "student_plan")
-    val isStudentPlan: Boolean,
+    val studentPlan: Boolean,
 
     val changes: Boolean,
 

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

@@ -1,11 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration22 : Migration(21, 22) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN school_short TEXT NOT NULL DEFAULT ''")
-    }
-}

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

@@ -1,14 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration23 : Migration(22, 23) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Notes ADD COLUMN teacher_symbol TEXT NOT NULL DEFAULT ''")
-        database.execSQL("ALTER TABLE Notes ADD COLUMN category_type INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("ALTER TABLE Notes ADD COLUMN is_points_show INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("ALTER TABLE Notes ADD COLUMN points INTEGER NOT NULL DEFAULT 0")
-    }
-}

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

@@ -1,21 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration24 : Migration(23, 24) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Messages ADD COLUMN has_attachments INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS MessageAttachments (
-                real_id INTEGER NOT NULL,
-                message_id INTEGER NOT NULL,
-                one_drive_id TEXT NOT NULL,
-                url TEXT NOT NULL,
-                filename TEXT NOT NULL,
-                PRIMARY KEY(real_id)
-            )
-        """)
-    }
-}

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

@@ -1,12 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration25 : Migration(24, 25) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Homework ADD COLUMN is_done INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("ALTER TABLE Homework ADD COLUMN attachments TEXT NOT NULL DEFAULT \"[]\"")
-    }
-}

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

@@ -0,0 +1,3 @@
+package io.github.wulkanowy.data.pojos
+
+class AppCreator(val displayName: String, val githubUsername: String)

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

@@ -1,3 +0,0 @@
-package io.github.wulkanowy.data.pojos
-
-class Contributor(val displayName: String, val githubUsername: String)

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

@@ -1,14 +0,0 @@
-package io.github.wulkanowy.data.pojos
-
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeStatistics
-import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
-
-data class GradeStatisticsItem(
-
-    val type: ViewType,
-
-    val partial: List<GradeStatistics>,
-
-    val points: GradePointsStatistics?
-)

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

@@ -2,18 +2,18 @@ package io.github.wulkanowy.data.repositories.appcreator
 
 import android.content.res.AssetManager
 import com.google.gson.Gson
-import io.github.wulkanowy.data.pojos.Contributor
+import io.github.wulkanowy.data.pojos.AppCreator
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AppCreatorRepository @Inject constructor(private val assets: AssetManager) {
-    fun getAppCreators(): Single<List<Contributor>> {
-        return Single.fromCallable<List<Contributor>> {
+    fun getAppCreators(): Single<List<AppCreator>> {
+        return Single.fromCallable<List<AppCreator>> {
             Gson().fromJson(
-                assets.open("contributors.json").bufferedReader().use { it.readText() },
-                Array<Contributor>::class.java
+                assets.open("creators.json").bufferedReader().use { it.readText() },
+                Array<AppCreator>::class.java
             ).toList()
         }
     }

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

@@ -2,10 +2,8 @@ package io.github.wulkanowy.data.repositories.attendance
 
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Absent
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDateTime
@@ -16,9 +14,8 @@ import javax.inject.Singleton
 @Singleton
 class AttendanceRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getAttendance(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Attendance>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getAttendance(startDate, endDate, semester.semesterId)
+    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Attendance>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getAttendance(startDate, endDate, semester.semesterId)
             .map { attendance ->
                 attendance.map {
                     Attendance(
@@ -42,8 +39,8 @@ class AttendanceRemote @Inject constructor(private val sdk: Sdk) {
             }
     }
 
-    fun excuseAbsence(student: Student, semester: Semester, absenceList: List<Attendance>, reason: String?): Single<Boolean> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).excuseForAbsence(absenceList.map { attendance ->
+    fun excuseAbsence(semester: Semester, absenceList: List<Attendance>, reason: String?): Single<Boolean> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).excuseForAbsence(absenceList.map { attendance ->
             Absent(
                 date = LocalDateTime.of(attendance.date, LocalTime.of(0, 0)),
                 timeId = attendance.timeId

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

@@ -4,8 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -21,25 +20,29 @@ class AttendanceRepository @Inject constructor(
     private val remote: AttendanceRemote
 ) {
 
-    fun getAttendance(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean): Single<List<Attendance>> {
-        return local.getAttendance(semester, start.monday, end.sunday).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-                if (it) remote.getAttendance(student, semester, start.monday, end.sunday)
-                else Single.error(UnknownHostException())
-            }.flatMap { newAttendance ->
-                local.getAttendance(semester, start.monday, end.sunday)
-                    .toSingle(emptyList())
-                    .doOnSuccess { oldAttendance ->
-                        local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
-                        local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
-                    }
-            }.flatMap {
-                local.getAttendance(semester, start.monday, end.sunday)
-                    .toSingle(emptyList())
-            }).map { list -> list.filter { it.date in start..end } }
+    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean)
+        : Single<List<Attendance>> {
+        return Single.fromCallable { startDate.monday to endDate.friday }
+            .flatMap { dates ->
+                local.getAttendance(semester, dates.first, dates.second).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+                        if (it) remote.getAttendance(semester, dates.first, dates.second)
+                        else Single.error(UnknownHostException())
+                    }.flatMap { newAttendance ->
+                        local.getAttendance(semester, dates.first, dates.second)
+                            .toSingle(emptyList())
+                            .doOnSuccess { oldAttendance ->
+                                local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
+                                local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
+                            }
+                    }.flatMap {
+                        local.getAttendance(semester, dates.first, dates.second)
+                            .toSingle(emptyList())
+                    }).map { list -> list.filter { it.date in startDate..endDate } }
+            }
     }
 
-    fun excuseForAbsence(student: Student, semester: Semester, attendanceList: List<Attendance>, reason: String? = null): Single<Boolean> {
-        return remote.excuseAbsence(student, semester, attendanceList, reason)
+    fun excuseForAbsence(semester: Semester, attendanceList: List<Attendance>, reason: String? = null): Single<Boolean> {
+        return remote.excuseAbsence(semester, attendanceList, reason)
     }
 }

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

@@ -2,9 +2,7 @@ package io.github.wulkanowy.data.repositories.attendancesummary
 
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -12,9 +10,8 @@ import javax.inject.Singleton
 @Singleton
 class AttendanceSummaryRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int): Single<List<AttendanceSummary>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getAttendanceSummary(subjectId)
+    fun getAttendanceSummary(semester: Semester, subjectId: Int): Single<List<AttendanceSummary>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getAttendanceSummary(subjectId)
             .map { attendance ->
                 attendance.map {
                     AttendanceSummary(

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

@@ -4,7 +4,6 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import java.net.UnknownHostException
@@ -18,11 +17,11 @@ class AttendanceSummaryRepository @Inject constructor(
     private val remote: AttendanceSummaryRemote
 ) {
 
-    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int, forceRefresh: Boolean = false): Single<List<AttendanceSummary>> {
+    fun getAttendanceSummary(semester: Semester, subjectId: Int, forceRefresh: Boolean = false): Single<List<AttendanceSummary>> {
         return local.getAttendanceSummary(semester, subjectId).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getAttendanceSummary(student, semester, subjectId)
+                    if (it) remote.getAttendanceSummary(semester, subjectId)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getAttendanceSummary(semester, subjectId).toSingle(emptyList())

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

@@ -2,9 +2,7 @@ package io.github.wulkanowy.data.repositories.completedlessons
 
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
@@ -13,9 +11,8 @@ import javax.inject.Singleton
 @Singleton
 class CompletedLessonsRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getCompletedLessons(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<CompletedLesson>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getCompletedLessons(startDate, endDate)
+    fun getCompletedLessons(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<CompletedLesson>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getCompletedLessons(startDate, endDate)
             .map { lessons ->
                 lessons.map {
                     it.absence

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

@@ -4,8 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -21,22 +20,25 @@ class CompletedLessonsRepository @Inject constructor(
     private val remote: CompletedLessonsRemote
 ) {
 
-    fun getCompletedLessons(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<CompletedLesson>> {
-        return local.getCompletedLessons(semester, start.monday, end.sunday).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getCompletedLessons(student, semester, start.monday, end.sunday)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getCompletedLessons(semester, start.monday, end.sunday)
-                        .toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteCompleteLessons(old.uniqueSubtract(new))
-                            local.saveCompletedLessons(new.uniqueSubtract(old))
-                        }
-                }.flatMap {
-                    local.getCompletedLessons(semester, start.monday, end.sunday)
-                        .toSingle(emptyList())
-                }).map { list -> list.filter { it.date in start..end } }
+    fun getCompletedLessons(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean = false): Single<List<CompletedLesson>> {
+        return Single.fromCallable { startDate.monday to endDate.friday }
+            .flatMap { dates ->
+                local.getCompletedLessons(semester, dates.first, dates.second).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getCompletedLessons(semester, dates.first, dates.second)
+                            else Single.error(UnknownHostException())
+                        }.flatMap { new ->
+                            local.getCompletedLessons(semester, dates.first, dates.second)
+                                .toSingle(emptyList())
+                                .doOnSuccess { old ->
+                                    local.deleteCompleteLessons(old.uniqueSubtract(new))
+                                    local.saveCompletedLessons(new.uniqueSubtract(old))
+                                }
+                        }.flatMap {
+                            local.getCompletedLessons(semester, dates.first, dates.second)
+                                .toSingle(emptyList())
+                        }).map { list -> list.filter { it.date in startDate..endDate } }
+            }
     }
 }

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

@@ -2,9 +2,7 @@ package io.github.wulkanowy.data.repositories.exam
 
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
@@ -13,9 +11,8 @@ import javax.inject.Singleton
 @Singleton
 class ExamRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getExams(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Exam>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getExams(startDate, endDate, semester.semesterId)
+    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Exam>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getExams(startDate, endDate, semester.semesterId)
             .map { exams ->
                 exams.map {
                     Exam(

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

@@ -4,8 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -21,22 +20,25 @@ class ExamRepository @Inject constructor(
     private val remote: ExamRemote
 ) {
 
-    fun getExams(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Exam>> {
-        return local.getExams(semester, start.monday, end.sunday).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getExams(student, semester, start.monday, end.sunday)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getExams(semester, start.monday, end.sunday)
-                        .toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteExams(old.uniqueSubtract(new))
-                            local.saveExams(new.uniqueSubtract(old))
-                        }
-                }.flatMap {
-                    local.getExams(semester, start.monday, end.sunday)
-                        .toSingle(emptyList())
-                }).map { list -> list.filter { it.date in start..end } }
+    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean = false): Single<List<Exam>> {
+        return Single.fromCallable { startDate.monday to endDate.friday }
+            .flatMap { dates ->
+                local.getExams(semester, dates.first, dates.second).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getExams(semester, dates.first, dates.second)
+                            else Single.error(UnknownHostException())
+                        }.flatMap { new ->
+                            local.getExams(semester, dates.first, dates.second)
+                                .toSingle(emptyList())
+                                .doOnSuccess { old ->
+                                    local.deleteExams(old.uniqueSubtract(new))
+                                    local.saveExams(new.uniqueSubtract(old))
+                                }
+                        }.flatMap {
+                            local.getExams(semester, dates.first, dates.second)
+                                .toSingle(emptyList())
+                        }).map { list -> list.filter { it.date in startDate..endDate } }
+            }
     }
 }

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

@@ -1,19 +1,14 @@
 package io.github.wulkanowy.data.repositories.grade
 
 import io.github.wulkanowy.data.db.dao.GradeDao
-import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeLocal @Inject constructor(
-    private val gradeDb: GradeDao,
-    private val gradeSummaryDb: GradeSummaryDao
-) {
+class GradeLocal @Inject constructor(private val gradeDb: GradeDao) {
 
     fun saveGrades(grades: List<Grade>) {
         gradeDb.insertAll(grades)
@@ -27,19 +22,7 @@ class GradeLocal @Inject constructor(
         gradeDb.updateAll(grades)
     }
 
-    fun getGradesDetails(semester: Semester): Maybe<List<Grade>> {
+    fun getGrades(semester: Semester): Maybe<List<Grade>> {
         return gradeDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
     }
-
-    fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
-        gradeSummaryDb.insertAll(gradesSummary)
-    }
-
-    fun deleteGradesSummary(gradesSummary: List<GradeSummary>) {
-        gradeSummaryDb.deleteAll(gradesSummary)
-    }
-
-    fun getGradesSummary(semester: Semester): Maybe<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
-    }
 }

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

@@ -1,11 +1,8 @@
 package io.github.wulkanowy.data.repositories.grade
 
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -13,11 +10,10 @@ import javax.inject.Singleton
 @Singleton
 class GradeRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getGrades(student: Student, semester: Semester): Single<Pair<List<Grade>, List<GradeSummary>>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getGrades(semester.semesterId)
-            .map { (details, summary) ->
-                details.map {
+    fun getGrades(semester: Semester): Single<List<Grade>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGrades(semester.semesterId)
+            .map { grades ->
+                grades.map {
                     Grade(
                         studentId = semester.studentId,
                         semesterId = semester.semesterId,
@@ -34,19 +30,6 @@ class GradeRemote @Inject constructor(private val sdk: Sdk) {
                         date = it.date,
                         teacher = it.teacher
                     )
-                } to summary.map {
-                    GradeSummary(
-                        semesterId = semester.semesterId,
-                        studentId = semester.studentId,
-                        position = 0,
-                        subject = it.name,
-                        predictedGrade = it.predicted,
-                        finalGrade = it.final,
-                        pointsSum = it.pointsSum,
-                        proposedPoints = it.proposedPoints,
-                        finalPoints = it.finalPoints,
-                        average = it.average
-                    )
                 }
             }
     }

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

@@ -3,7 +3,6 @@ package io.github.wulkanowy.data.repositories.grade
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
@@ -20,47 +19,34 @@ class GradeRepository @Inject constructor(
     private val remote: GradeRemote
 ) {
 
-    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<Pair<List<Grade>, List<GradeSummary>>> {
-        return local.getGradesDetails(semester).flatMap { details ->
-            local.getGradesSummary(semester).map { summary -> details to summary }
-        }.filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-                if (it) remote.getGrades(student, semester)
-                else Single.error(UnknownHostException())
-            }.flatMap { (newDetails, newSummary) ->
-                local.getGradesDetails(semester).toSingle(emptyList())
-                    .doOnSuccess { old ->
-                        val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
-                        local.deleteGrades(old.uniqueSubtract(newDetails))
-                        local.saveGrades(newDetails.uniqueSubtract(old)
-                            .onEach {
-                                if (it.date >= notifyBreakDate) it.apply {
-                                    isRead = false
-                                    if (notify) isNotified = false
-                                }
-                            })
-                    }.flatMap {
-                        local.getGradesSummary(semester).toSingle(emptyList())
-                            .doOnSuccess { old ->
-                                local.deleteGradesSummary(old.uniqueSubtract(newSummary))
-                                local.saveGradesSummary(newSummary.uniqueSubtract(old))
-                            }
-                    }
-            }.flatMap {
-                local.getGradesDetails(semester).toSingle(emptyList()).flatMap { details ->
-                    local.getGradesSummary(semester).toSingle(emptyList()).map { summary ->
-                        details to summary
-                    }
-                }
-            })
+    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Grade>> {
+        return local.getGrades(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getGrades(semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getGrades(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
+                            local.deleteGrades(old.uniqueSubtract(new))
+                            local.saveGrades(new.uniqueSubtract(old)
+                                .onEach {
+                                    if (it.date >= notifyBreakDate) it.apply {
+                                        isRead = false
+                                        if (notify) isNotified = false
+                                    }
+                                })
+                        }
+                }.flatMap { local.getGrades(semester).toSingle(emptyList()) })
     }
 
     fun getUnreadGrades(semester: Semester): Single<List<Grade>> {
-        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isRead } }.toSingle(emptyList())
+        return local.getGrades(semester).map { it.filter { grade -> !grade.isRead } }.toSingle(emptyList())
     }
 
     fun getNotNotifiedGrades(semester: Semester): Single<List<Grade>> {
-        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isNotified } }.toSingle(emptyList())
+        return local.getGrades(semester).map { it.filter { grade -> !grade.isNotified } }.toSingle(emptyList())
     }
 
     fun updateGrade(grade: Grade): Completable {

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

@@ -0,0 +1,24 @@
+package io.github.wulkanowy.data.repositories.gradessummary
+
+import io.github.wulkanowy.data.db.dao.GradeSummaryDao
+import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Maybe
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeSummaryLocal @Inject constructor(private val gradeSummaryDb: GradeSummaryDao) {
+
+    fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
+        gradeSummaryDb.insertAll(gradesSummary)
+    }
+
+    fun deleteGradesSummary(gradesSummary: List<GradeSummary>) {
+        gradeSummaryDb.deleteAll(gradesSummary)
+    }
+
+    fun getGradesSummary(semester: Semester): Maybe<List<GradeSummary>> {
+        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
+    }
+}

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

@@ -0,0 +1,32 @@
+package io.github.wulkanowy.data.repositories.gradessummary
+
+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 sdk: Sdk) {
+
+    fun getGradeSummary(semester: Semester): Single<List<GradeSummary>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGradesSummary(semester.semesterId)
+            .map { gradesSummary ->
+                gradesSummary.map {
+                    GradeSummary(
+                        semesterId = semester.semesterId,
+                        studentId = semester.studentId,
+                        position = 0,
+                        subject = it.name,
+                        predictedGrade = it.predicted,
+                        finalGrade = it.final,
+                        pointsSum = it.pointsSum,
+                        proposedPoints = it.proposedPoints,
+                        finalPoints = it.finalPoints,
+                        average = it.average
+                    )
+                }
+            }
+    }
+}

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

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

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

@@ -5,6 +5,7 @@ import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.utils.roundToDecimalPlaces
 import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -29,17 +30,23 @@ class GradeStatisticsLocal @Inject constructor(
                 list.groupBy { it.grade }.map {
                     GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key,
                         it.value.fold(0) { acc, e -> acc + e.amount }, false)
-                } + list
+                }
             }
             else -> gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)
         }.filter { it.isNotEmpty() }
     }
 
-    fun getGradesPointsStatistics(semester: Semester, subjectName: String): Maybe<List<GradePointsStatistics>> {
+    fun getGradesPointsStatistics(semester: Semester, subjectName: String): Maybe<GradePointsStatistics> {
         return when (subjectName) {
-            "Wszystkie" -> gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId)
+            "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.size).roundToDecimalPlaces(2),
+                    (list.fold(.0) { acc, e -> acc + e.student } / list.size).roundToDecimalPlaces(2)
+                ))
+            }
             else -> gradePointsStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName)
-        }.filter { it.isNotEmpty() }
+        }
     }
 
     fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {

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

@@ -3,9 +3,7 @@ package io.github.wulkanowy.data.repositories.gradestatistics
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -13,8 +11,8 @@ import javax.inject.Singleton
 @Singleton
 class GradeStatisticsRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getGradeStatistics(student: Student, semester: Semester, isSemester: Boolean): Single<List<GradeStatistics>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).let {
+    fun getGradeStatistics(semester: Semester, isSemester: Boolean): Single<List<GradeStatistics>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).let {
             if (isSemester) it.getGradesAnnualStatistics(semester.semesterId)
             else it.getGradesPartialStatistics(semester.semesterId)
         }.map { gradeStatistics ->
@@ -31,9 +29,8 @@ class GradeStatisticsRemote @Inject constructor(private val sdk: Sdk) {
         }
     }
 
-    fun getGradePointsStatistics(student: Student, semester: Semester): Single<List<GradePointsStatistics>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getGradesPointsStatistics(semester.semesterId)
+    fun getGradePointsStatistics(semester: Semester): Single<List<GradePointsStatistics>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGradesPointsStatistics(semester.semesterId)
             .map { gradePointsStatistics ->
                 gradePointsStatistics.map {
                     GradePointsStatistics(

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

@@ -5,10 +5,8 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.pojos.GradeStatisticsItem
-import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -21,11 +19,11 @@ class GradeStatisticsRepository @Inject constructor(
     private val remote: GradeStatisticsRemote
 ) {
 
-    fun getGradesStatistics(student: Student, semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false): Single<List<GradeStatisticsItem>> {
-        return local.getGradesStatistics(semester, isSemester, subjectName).map { it.mapToStatisticItems() }.filter { !forceRefresh }
+    fun getGradesStatistics(semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false): Single<List<GradeStatistics>> {
+        return local.getGradesStatistics(semester, isSemester, subjectName).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getGradeStatistics(student, semester, isSemester)
+                    if (it) remote.getGradeStatistics(semester, isSemester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getGradesStatistics(semester, isSemester).toSingle(emptyList())
@@ -33,43 +31,21 @@ class GradeStatisticsRepository @Inject constructor(
                             local.deleteGradesStatistics(old.uniqueSubtract(new))
                             local.saveGradesStatistics(new.uniqueSubtract(old))
                         }
-                }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).map { it.mapToStatisticItems() }.toSingle(emptyList()) })
+                }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).toSingle(emptyList()) })
     }
 
-    fun getGradesPointsStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean): Single<List<GradeStatisticsItem>> {
-        return local.getGradesPointsStatistics(semester, subjectName).map { it.mapToStatisticsItem() }.filter { !forceRefresh }
+    fun getGradesPointsStatistics(semester: Semester, subjectName: String, forceRefresh: Boolean): Maybe<GradePointsStatistics> {
+        return local.getGradesPointsStatistics(semester, subjectName).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getGradePointsStatistics(student, semester)
-                    else Single.error(UnknownHostException())
+                .flatMapMaybe {
+                    if (it) remote.getGradePointsStatistics(semester).toMaybe()
+                    else Maybe.error(UnknownHostException())
                 }.flatMap { new ->
-                    local.getGradesPointsStatistics(semester).toSingle(emptyList())
+                    local.getGradesPointsStatistics(semester).defaultIfEmpty(emptyList())
                         .doOnSuccess { old ->
                             local.deleteGradesPointsStatistics(old.uniqueSubtract(new))
                             local.saveGradesPointsStatistics(new.uniqueSubtract(old))
                         }
-                }.flatMap { local.getGradesPointsStatistics(semester, subjectName).map { it.mapToStatisticsItem() }.toSingle(emptyList()) })
-    }
-
-    private fun List<GradeStatistics>.mapToStatisticItems(): List<GradeStatisticsItem> {
-        return groupBy { it.subject }.map {
-            GradeStatisticsItem(
-                type = ViewType.PARTIAL,
-                partial = it.value
-                    .sortedByDescending { item -> item.grade }
-                    .filter { item -> item.amount != 0 },
-                points = null
-            )
-        }
-    }
-
-    private fun List<GradePointsStatistics>.mapToStatisticsItem(): List<GradeStatisticsItem> {
-        return map {
-            GradeStatisticsItem(
-                type = ViewType.POINTS,
-                partial = emptyList(),
-                points = it
-            )
-        }
+                }.flatMap { local.getGradesPointsStatistics(semester, subjectName) })
     }
 }

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

@@ -19,10 +19,6 @@ class HomeworkLocal @Inject constructor(private val homeworkDb: HomeworkDao) {
         homeworkDb.deleteAll(homework)
     }
 
-    fun updateHomework(homework: List<Homework>) {
-        homeworkDb.updateAll(homework)
-    }
-
     fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Homework>> {
         return homeworkDb.loadAll(semester.semesterId, semester.studentId, startDate, endDate)
             .filter { it.isNotEmpty() }

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

@@ -2,9 +2,7 @@ package io.github.wulkanowy.data.repositories.homework
 
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
@@ -13,9 +11,8 @@ import javax.inject.Singleton
 @Singleton
 class HomeworkRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getHomework(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Homework>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getHomework(startDate, endDate)
+    fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Homework>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getHomework(startDate, endDate)
             .map { homework ->
                 homework.map {
                     Homework(
@@ -26,8 +23,7 @@ class HomeworkRemote @Inject constructor(private val sdk: Sdk) {
                         subject = it.subject,
                         content = it.content,
                         teacher = it.teacher,
-                        teacherSymbol = it.teacherSymbol,
-                        attachments = it.attachments.map { attachment -> attachment.url to attachment.name }
+                        teacherSymbol = it.teacherSymbol
                     )
                 }
             }

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

@@ -4,11 +4,9 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Completable
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@@ -22,12 +20,12 @@ class HomeworkRepository @Inject constructor(
     private val remote: HomeworkRemote
 ) {
 
-    fun getHomework(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Homework>> {
-        return Single.fromCallable { start.monday to end.sunday }.flatMap { (monday, friday) ->
+    fun getHomework(semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Homework>> {
+        return Single.fromCallable { start.monday to end.friday }.flatMap { (monday, friday) ->
             local.getHomework(semester, monday, friday).filter { !forceRefresh }
                 .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                     .flatMap {
-                        if (it) remote.getHomework(student, semester, monday, friday)
+                        if (it) remote.getHomework(semester, monday, friday)
                         else Single.error(UnknownHostException())
                     }.flatMap { new ->
                         local.getHomework(semester, monday, friday).toSingle(emptyList())
@@ -38,12 +36,4 @@ class HomeworkRepository @Inject constructor(
                     }.flatMap { local.getHomework(semester, monday, friday).toSingle(emptyList()) })
         }
     }
-
-    fun toggleDone(homework: Homework): Completable {
-        return Completable.fromCallable {
-            local.updateHomework(listOf(homework.apply {
-                isDone = !isDone
-            }))
-        }
-    }
 }

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

@@ -1,39 +0,0 @@
-package io.github.wulkanowy.data.repositories.logger
-
-import android.content.Context
-import io.reactivex.Single
-import java.io.File
-import java.io.FileNotFoundException
-import javax.inject.Inject
-
-class LoggerRepository @Inject constructor(private val context: Context) {
-
-    fun getLastLogLines(): Single<List<String>> {
-        return getLastModified()
-            .map { it.readText() }
-            .map { it.split("\n") }
-    }
-
-    fun getLogFiles(): Single<List<File>> {
-        return Single.fromCallable {
-            File(context.filesDir.absolutePath).listFiles(File::isFile)?.filter {
-                it.name.endsWith(".log")
-            }
-        }
-    }
-
-    private fun getLastModified(): Single<File> {
-        return Single.fromCallable {
-            var lastModifiedTime = Long.MIN_VALUE
-            var chosenFile: File? = null
-            File(context.filesDir.absolutePath).listFiles(File::isFile)?.forEach { file ->
-                if (file.lastModified() > lastModifiedTime) {
-                    lastModifiedTime = file.lastModified()
-                    chosenFile = file
-                }
-            }
-            if (chosenFile == null) throw FileNotFoundException("Log file not found")
-            chosenFile
-        }
-    }
-}

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

@@ -2,7 +2,7 @@ package io.github.wulkanowy.data.repositories.luckynumber
 
 import io.github.wulkanowy.data.db.dao.LuckyNumberDao
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
@@ -23,7 +23,7 @@ class LuckyNumberLocal @Inject constructor(private val luckyNumberDb: LuckyNumbe
         luckyNumberDb.deleteAll(listOf(luckyNumber))
     }
 
-    fun getLuckyNumber(student: Student, date: LocalDate): Maybe<LuckyNumber> {
-        return luckyNumberDb.load(student.studentId, date)
+    fun getLuckyNumber(semester: Semester, date: LocalDate): Maybe<LuckyNumber> {
+        return luckyNumberDb.load(semester.studentId, date)
     }
 }

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

@@ -1,9 +1,8 @@
 package io.github.wulkanowy.data.repositories.luckynumber
 
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
@@ -12,13 +11,14 @@ import javax.inject.Singleton
 @Singleton
 class LuckyNumberRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getLuckyNumber(student: Student): Maybe<LuckyNumber> {
-        return sdk.init(student).getLuckyNumber(student.schoolShortName).map {
-            LuckyNumber(
-                studentId = student.studentId,
-                date = LocalDate.now(),
-                luckyNumber = it
-            )
-        }
+    fun getLuckyNumber(semester: Semester): Maybe<LuckyNumber> {
+        return sdk.getLuckyNumber()
+            .map {
+                LuckyNumber(
+                    studentId = semester.studentId,
+                    date = LocalDate.now(),
+                    luckyNumber = it
+                )
+            }
     }
 }

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

@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.repositories.luckynumber
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Completable
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
@@ -18,14 +18,14 @@ class LuckyNumberRepository @Inject constructor(
     private val remote: LuckyNumberRemote
 ) {
 
-    fun getLuckyNumber(student: Student, forceRefresh: Boolean = false, notify: Boolean = false): Maybe<LuckyNumber> {
-        return local.getLuckyNumber(student, LocalDate.now()).filter { !forceRefresh }
+    fun getLuckyNumber(semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Maybe<LuckyNumber> {
+        return local.getLuckyNumber(semester, LocalDate.now()).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMapMaybe {
-                    if (it) remote.getLuckyNumber(student)
+                    if (it) remote.getLuckyNumber(semester)
                     else Maybe.error(UnknownHostException())
                 }.flatMap { new ->
-                    local.getLuckyNumber(student, LocalDate.now())
+                    local.getLuckyNumber(semester, LocalDate.now())
                         .doOnSuccess { old ->
                             if (new != old) {
                                 local.deleteLuckyNumber(old)
@@ -39,13 +39,13 @@ class LuckyNumberRepository @Inject constructor(
                                 if (notify) isNotified = false
                             })
                         }
-                }.flatMap({ local.getLuckyNumber(student, LocalDate.now()) }, { Maybe.error(it) },
-                    { local.getLuckyNumber(student, LocalDate.now()) })
+                }.flatMap({ local.getLuckyNumber(semester, LocalDate.now()) }, { Maybe.error(it) },
+                    { local.getLuckyNumber(semester, LocalDate.now()) })
             )
     }
 
-    fun getNotNotifiedLuckyNumber(student: Student): Maybe<LuckyNumber> {
-        return local.getLuckyNumber(student, LocalDate.now()).filter { !it.isNotified }
+    fun getNotNotifiedLuckyNumber(semester: Semester): Maybe<LuckyNumber> {
+        return local.getLuckyNumber(semester, LocalDate.now()).filter { !it.isNotified }
     }
 
     fun updateLuckyNumber(luckyNumber: LuckyNumber): Completable {

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

@@ -1,22 +1,15 @@
 package io.github.wulkanowy.data.repositories.message
 
-import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
-import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
 import io.reactivex.Maybe
-import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class MessageLocal @Inject constructor(
-    private val messagesDb: MessagesDao,
-    private val messageAttachmentDao: MessageAttachmentDao
-) {
+class MessageLocal @Inject constructor(private val messagesDb: MessagesDao) {
 
     fun saveMessages(messages: List<Message>) {
         messagesDb.insertAll(messages)
@@ -30,12 +23,8 @@ class MessageLocal @Inject constructor(
         messagesDb.deleteAll(messages)
     }
 
-    fun getMessageWithAttachment(student: Student, message: Message): Single<MessageWithAttachment> {
-        return messagesDb.loadMessageWithAttachment(student.id.toInt(), message.messageId)
-    }
-
-    fun saveMessageAttachments(attachments: List<MessageAttachment>) {
-        messageAttachmentDao.insertAttachments(attachments)
+    fun getMessage(id: Long): Maybe<Message> {
+        return messagesDb.load(id)
     }
 
     fun getMessages(student: Student, folder: MessageFolder): Maybe<List<Message>> {

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

@@ -1,14 +1,12 @@
 package io.github.wulkanowy.data.repositories.message
 
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
 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.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
 import io.github.wulkanowy.sdk.pojo.SentMessage
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDateTime.now
 import javax.inject.Inject
@@ -19,7 +17,7 @@ import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 class MessageRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getMessages(student: Student, semester: Semester, folder: MessageFolder): Single<List<Message>> {
-        return sdk.init(student).getMessages(Folder.valueOf(folder.name), semester.start.atStartOfDay(), semester.end.atStartOfDay()).map { messages ->
+        return sdk.getMessages(Folder.valueOf(folder.name), semester.start.atStartOfDay(), semester.end.atStartOfDay()).map { messages ->
             messages.map {
                 Message(
                     studentId = student.id.toInt(),
@@ -35,29 +33,18 @@ class MessageRemote @Inject constructor(private val sdk: Sdk) {
                     unread = it.unread ?: false,
                     unreadBy = it.unreadBy ?: 0,
                     readBy = it.readBy ?: 0,
-                    removed = it.removed,
-                    hasAttachments = it.hasAttachments
+                    removed = it.removed
                 )
             }
         }
     }
 
-    fun getMessagesContentDetails(student: Student, message: Message, markAsRead: Boolean = false): Single<Pair<String, List<MessageAttachment>>> {
-        return sdk.init(student).getMessageDetails(message.messageId, message.folderId, markAsRead, message.realId).map { details ->
-            details.content to details.attachments.map {
-                MessageAttachment(
-                    realId = it.id,
-                    messageId = it.messageId,
-                    oneDriveId = it.oneDriveId,
-                    url = it.url,
-                    filename = it.filename
-                )
-            }
-        }
+    fun getMessagesContent(message: Message, markAsRead: Boolean = false): Single<String> {
+        return sdk.getMessageContent(message.messageId, message.folderId, markAsRead, message.realId)
     }
 
-    fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
-        return sdk.init(student).sendMessage(
+    fun sendMessage(subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
+        return sdk.sendMessage(
             subject = subject,
             content = content,
             recipients = recipients.map {
@@ -74,7 +61,7 @@ class MessageRemote @Inject constructor(private val sdk: Sdk) {
         )
     }
 
-    fun deleteMessage(student: Student, message: Message): Single<Boolean> {
-        return sdk.init(student).deleteMessages(listOf(Pair(message.realId, message.folderId)))
+    fun deleteMessage(message: Message): Single<Boolean> {
+        return sdk.deleteMessages(listOf(Pair(message.realId, message.folderId)))
     }
 }

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

@@ -2,8 +2,8 @@ package io.github.wulkanowy.data.repositories.message
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
@@ -11,8 +11,8 @@ 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
 import io.reactivex.Single
-import timber.log.Timber
 import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -21,53 +21,54 @@ import javax.inject.Singleton
 class MessageRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: MessageLocal,
-    private val remote: MessageRemote
+    private val remote: MessageRemote,
+    private val sdkHelper: SdkHelper
 ) {
 
     fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Message>> {
-        return local.getMessages(student, folder).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getMessages(student, semester, folder)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getMessages(student, folder).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteMessages(old.uniqueSubtract(new))
-                            local.saveMessages(new.uniqueSubtract(old)
-                                .onEach {
-                                    it.isNotified = !notify
-                                })
-                        }
-                }.flatMap { local.getMessages(student, folder).toSingle(emptyList()) }
-            )
+        return Single.just(sdkHelper.init(student))
+            .flatMap { _ ->
+                local.getMessages(student, folder).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getMessages(student, semester, folder)
+                            else Single.error(UnknownHostException())
+                        }.flatMap { new ->
+                            local.getMessages(student, folder).toSingle(emptyList())
+                                .doOnSuccess { old ->
+                                    local.deleteMessages(old.uniqueSubtract(new))
+                                    local.saveMessages(new.uniqueSubtract(old)
+                                        .onEach {
+                                            it.isNotified = !notify
+                                        })
+                                }
+                        }.flatMap { local.getMessages(student, folder).toSingle(emptyList()) }
+                    )
+            }
     }
 
-    fun getMessage(student: Student, message: Message, markAsRead: Boolean = false): Single<MessageWithAttachment> {
-        return local.getMessageWithAttachment(student, message)
-            .filter {
-                it.message.content.isNotEmpty().also { status ->
-                    Timber.d("Message content in db empty: ${!status}")
-                } && !it.message.unread
+    fun getMessage(student: Student, messageDbId: Long, markAsRead: Boolean = false): Single<Message> {
+        return Single.just(sdkHelper.init(student))
+            .flatMap { _ ->
+                local.getMessage(messageDbId)
+                    .filter { it.content.isNotEmpty() }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) local.getMessage(messageDbId).toSingle()
+                            else Single.error(UnknownHostException())
+                        }
+                        .flatMap { dbMessage ->
+                            remote.getMessagesContent(dbMessage, markAsRead).doOnSuccess {
+                                local.updateMessages(listOf(dbMessage.copy(unread = false).apply {
+                                    id = dbMessage.id
+                                    content = content.ifBlank { it }
+                                }))
+                            }
+                        }.flatMap {
+                            local.getMessage(messageDbId).toSingle()
+                        }
+                    )
             }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) local.getMessageWithAttachment(student, message)
-                    else Single.error(UnknownHostException())
-                }
-                .flatMap { dbMessage ->
-                    remote.getMessagesContentDetails(student, dbMessage.message, markAsRead).doOnSuccess { (downloadedMessage, attachments) ->
-                        local.updateMessages(listOf(dbMessage.message.copy(unread = !markAsRead).apply {
-                            id = dbMessage.message.id
-                            content = content.ifBlank { downloadedMessage }
-                        }))
-                        local.saveMessageAttachments(attachments)
-                        Timber.d("Message ${message.messageId} with blank content: ${dbMessage.message.content.isBlank()}, marked as read")
-                    }
-                }.flatMap {
-                    local.getMessageWithAttachment(student, message)
-                }
-            )
     }
 
     fun getNotNotifiedMessages(student: Student): Single<List<Message>> {
@@ -76,24 +77,29 @@ class MessageRepository @Inject constructor(
             .toSingle(emptyList())
     }
 
+    fun updateMessage(message: Message): Completable {
+        return Completable.fromCallable { local.updateMessages(listOf(message)) }
+    }
+
     fun updateMessages(messages: List<Message>): Completable {
         return Completable.fromCallable { local.updateMessages(messages) }
     }
 
-    fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
+    fun sendMessage(subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
         return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
-                if (it) remote.sendMessage(student, subject, content, recipients)
+                if (it) remote.sendMessage(subject, content, recipients)
                 else Single.error(UnknownHostException())
             }
     }
 
-    fun deleteMessage(student: Student, message: Message): Single<Boolean> {
+    fun deleteMessage(message: Message): Maybe<Boolean> {
         return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
-                if (it) remote.deleteMessage(student, message)
+                if (it) remote.deleteMessage(message)
                 else Single.error(UnknownHostException())
             }
+            .filter { it }
             .doOnSuccess {
                 if (!message.removed) local.updateMessages(listOf(message.copy(removed = true).apply {
                     id = message.id

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

@@ -2,10 +2,8 @@ package io.github.wulkanowy.data.repositories.mobiledevice
 
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -13,14 +11,13 @@ import javax.inject.Singleton
 @Singleton
 class MobileDeviceRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getDevices(student: Student, semester: Semester): Single<List<MobileDevice>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getRegisteredDevices()
+    fun getDevices(semester: Semester): Single<List<MobileDevice>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getRegisteredDevices()
             .map { devices ->
                 devices.map {
                     MobileDevice(
                         studentId = semester.studentId,
-                        date = it.createDate,
+                        date = it.date,
                         deviceId = it.id,
                         name = it.name
                     )
@@ -28,14 +25,12 @@ class MobileDeviceRemote @Inject constructor(private val sdk: Sdk) {
             }
     }
 
-    fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Single<Boolean> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .unregisterDevice(device.deviceId)
+    fun unregisterDevice(semester: Semester, device: MobileDevice): Single<Boolean> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).unregisterDevice(device.deviceId)
     }
 
-    fun getToken(student: Student, semester: Semester): Single<MobileDeviceToken> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getToken()
+    fun getToken(semester: Semester): Single<MobileDeviceToken> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getToken()
             .map {
                 MobileDeviceToken(
                     token = it.token,

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

@@ -4,7 +4,6 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -19,11 +18,11 @@ class MobileDeviceRepository @Inject constructor(
     private val remote: MobileDeviceRemote
 ) {
 
-    fun getDevices(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<MobileDevice>> {
+    fun getDevices(semester: Semester, forceRefresh: Boolean = false): Single<List<MobileDevice>> {
         return local.getDevices(semester).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getDevices(student, semester)
+                    if (it) remote.getDevices(semester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getDevices(semester).toSingle(emptyList())
@@ -35,18 +34,18 @@ class MobileDeviceRepository @Inject constructor(
             ).flatMap { local.getDevices(semester).toSingle(emptyList()) }
     }
 
-    fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Single<Boolean> {
+    fun unregisterDevice(semester: Semester, device: MobileDevice): Single<Boolean> {
         return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
-                if (it) remote.unregisterDevice(student, semester, device)
+                if (it) remote.unregisterDevice(semester, device)
                 else Single.error(UnknownHostException())
             }
     }
 
-    fun getToken(student: Student, semester: Semester): Single<MobileDeviceToken> {
+    fun getToken(semester: Semester): Single<MobileDeviceToken> {
         return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
-                if (it) remote.getToken(student, semester)
+                if (it) remote.getToken(semester)
                 else Single.error(UnknownHostException())
             }
     }

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

@@ -2,9 +2,7 @@ package io.github.wulkanowy.data.repositories.note
 
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -12,20 +10,15 @@ import javax.inject.Singleton
 @Singleton
 class NoteRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getNotes(student: Student, semester: Semester): Single<List<Note>> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getNotes(semester.semesterId)
+    fun getNotes(semester: Semester): Single<List<Note>> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getNotes(semester.semesterId)
             .map { notes ->
                 notes.map {
                     Note(
                         studentId = semester.studentId,
                         date = it.date,
                         teacher = it.teacher,
-                        teacherSymbol = it.teacherSymbol,
                         category = it.category,
-                        categoryType = it.categoryType.id,
-                        isPointsShow = it.showPoints,
-                        points = it.points,
                         content = it.content
                     )
                 }

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

@@ -23,7 +23,7 @@ class NoteRepository @Inject constructor(
         return local.getNotes(student).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getNotes(student, semester)
+                    if (it) remote.getNotes(semester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getNotes(student).toSingle(emptyList())

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

@@ -26,9 +26,6 @@ class PreferencesRepository @Inject constructor(
     val isGradeExpandable: Boolean
         get() = !getBoolean(R.string.pref_key_expand_grade, R.bool.pref_default_expand_grade)
 
-    val showAllSubjectsOnStatisticsList: Boolean
-        get() = getBoolean(R.string.pref_key_grade_statistics_list, R.bool.pref_default_grade_statistics_list)
-
     val appThemeKey = context.getString(R.string.pref_key_app_theme)
     val appTheme: String
         get() = getString(appThemeKey, R.string.pref_default_app_theme)
@@ -55,10 +52,6 @@ class PreferencesRepository @Inject constructor(
     val isNotificationsEnable: Boolean
         get() = getBoolean(R.string.pref_key_notifications_enable, R.bool.pref_default_notifications_enable)
 
-    val isUpcomingLessonsNotificationsEnableKey = context.getString(R.string.pref_key_notifications_upcoming_lessons_enable)
-    val isUpcomingLessonsNotificationsEnable: Boolean
-        get() = getBoolean(isUpcomingLessonsNotificationsEnableKey, R.bool.pref_default_notification_upcoming_lessons_enable)
-
     val isDebugNotificationEnableKey = context.getString(R.string.pref_key_notification_debug)
     val isDebugNotificationEnable: Boolean
         get() = getBoolean(isDebugNotificationEnableKey, R.bool.pref_default_notification_debug)
@@ -75,9 +68,6 @@ class PreferencesRepository @Inject constructor(
     val showWholeClassPlan: String
         get() = getString(R.string.pref_key_timetable_show_whole_class, R.string.pref_default_timetable_show_whole_class)
 
-    val showTimetableTimers: Boolean
-        get() = getBoolean(R.string.pref_key_timetable_show_timers, R.bool.pref_default_timetable_show_timers)
-
     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)

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

@@ -3,9 +3,7 @@ package io.github.wulkanowy.data.repositories.recipient
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -14,15 +12,15 @@ import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 @Singleton
 class RecipientRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getRecipients(student: Student, role: Int, unit: ReportingUnit): Single<List<Recipient>> {
-        return sdk.init(student).getRecipients(unit.realId, role)
+    fun getRecipients(role: Int, unit: ReportingUnit): Single<List<Recipient>> {
+        return sdk.getRecipients(unit.realId, role)
             .map { recipients ->
                 recipients.map { it.toRecipient() }
             }
     }
 
-    fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
-        return sdk.init(student).getMessageRecipients(message.messageId, message.senderId)
+    fun getMessageRecipients(message: Message): Single<List<Recipient>> {
+        return sdk.getMessageRecipients(message.messageId, message.senderId)
             .map { recipients ->
                 recipients.map { it.toRecipient() }
             }

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

@@ -2,6 +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.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
@@ -16,31 +17,36 @@ import javax.inject.Singleton
 class RecipientRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: RecipientLocal,
-    private val remote: RecipientRemote
+    private val remote: RecipientRemote,
+    private val sdkHelper: SdkHelper
 ) {
 
     fun getRecipients(student: Student, role: Int, unit: ReportingUnit, forceRefresh: Boolean = false): Single<List<Recipient>> {
-        return local.getRecipients(student, role, unit).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getRecipients(student, role, unit)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getRecipients(student, role, unit).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteRecipients(old.uniqueSubtract(new))
-                            local.saveRecipients(new.uniqueSubtract(old))
+        return Single.just(sdkHelper.init(student))
+            .flatMap { _ ->
+                local.getRecipients(student, role, unit).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getRecipients(role, unit)
+                            else Single.error(UnknownHostException())
+                        }.flatMap { new ->
+                            local.getRecipients(student, role, unit).toSingle(emptyList())
+                                .doOnSuccess { old ->
+                                    local.deleteRecipients(old.uniqueSubtract(new))
+                                    local.saveRecipients(new.uniqueSubtract(old))
+                                }
+                        }.flatMap {
+                            local.getRecipients(student, role, unit).toSingle(emptyList())
                         }
-                }.flatMap {
-                    local.getRecipients(student, role, unit).toSingle(emptyList())
-                }
-            )
+                    )
+            }
     }
 
     fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
-        return ReactiveNetwork.checkInternetConnectivity(settings)
+        return Single.just(sdkHelper.init(student))
+            .flatMap { ReactiveNetwork.checkInternetConnectivity(settings) }
             .flatMap {
-                if (it) remote.getMessageRecipients(student, message)
+                if (it) remote.getMessageRecipients(message)
                 else Single.error(UnknownHostException())
             }
     }

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

@@ -1,19 +0,0 @@
-package io.github.wulkanowy.data.repositories.recover
-
-import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class RecoverRemote @Inject constructor(private val sdk: Sdk) {
-
-    fun getReCaptchaSiteKey(host: String, symbol: String): Single<Pair<String, String>> {
-        return sdk.getPasswordResetCaptchaCode(host, symbol)
-    }
-
-    fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): Single<String> {
-        return sdk.sendPasswordResetRequest(url, symbol, email, reCaptchaResponse)
-    }
-}
-

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

@@ -1,26 +0,0 @@
-package io.github.wulkanowy.data.repositories.recover
-
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.reactivex.Single
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class RecoverRepository @Inject constructor(private val settings: InternetObservingSettings, private val remote: RecoverRemote) {
-
-    fun getReCaptchaSiteKey(host: String, symbol: String): Single<Pair<String, String>> {
-        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-            if (it) remote.getReCaptchaSiteKey(host, symbol)
-            else Single.error(UnknownHostException())
-        }
-    }
-
-    fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): Single<String> {
-        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-            if (it) remote.sendRecoverRequest(url, symbol, email, reCaptchaResponse)
-            else Single.error(UnknownHostException())
-        }
-    }
-}

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

@@ -1,9 +1,7 @@
 package io.github.wulkanowy.data.repositories.reportingunit
 
 import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -11,8 +9,8 @@ import javax.inject.Singleton
 @Singleton
 class ReportingUnitRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getReportingUnits(student: Student): Single<List<ReportingUnit>> {
-        return sdk.init(student).getReportingUnits().map {
+    fun getReportingUnits(): Single<List<ReportingUnit>> {
+        return sdk.getReportingUnits().map {
             it.map { unit ->
                 ReportingUnit(
                     studentId = sdk.studentId,

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

@@ -2,6 +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.SdkHelper
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
@@ -15,34 +16,41 @@ import javax.inject.Singleton
 class ReportingUnitRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: ReportingUnitLocal,
-    private val remote: ReportingUnitRemote
+    private val remote: ReportingUnitRemote,
+    private val sdkHelper: SdkHelper
 ) {
 
     fun getReportingUnits(student: Student, forceRefresh: Boolean = false): Single<List<ReportingUnit>> {
-        return local.getReportingUnits(student).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getReportingUnits(student)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getReportingUnits(student).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteReportingUnits(old.uniqueSubtract(new))
-                            local.saveReportingUnits(new.uniqueSubtract(old))
-                        }
-                }.flatMap { local.getReportingUnits(student).toSingle(emptyList()) }
-            )
+        return Single.just(sdkHelper.init(student))
+            .flatMap { _ ->
+                local.getReportingUnits(student).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getReportingUnits()
+                            else Single.error(UnknownHostException())
+                        }.flatMap { new ->
+                            local.getReportingUnits(student).toSingle(emptyList())
+                                .doOnSuccess { old ->
+                                    local.deleteReportingUnits(old.uniqueSubtract(new))
+                                    local.saveReportingUnits(new.uniqueSubtract(old))
+                                }
+                        }.flatMap { local.getReportingUnits(student).toSingle(emptyList()) }
+                    )
+            }
     }
 
     fun getReportingUnit(student: Student, unitId: Int): Maybe<ReportingUnit> {
-        return local.getReportingUnit(student, unitId)
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) getReportingUnits(student, true)
-                    else Single.error(UnknownHostException())
-                }.flatMapMaybe {
-                    local.getReportingUnit(student, unitId)
-                }
-            )
+        return Maybe.just(sdkHelper.init(student))
+            .flatMap { _ ->
+                local.getReportingUnit(student, unitId)
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) getReportingUnits(student, true)
+                            else Single.error(UnknownHostException())
+                        }.flatMapMaybe {
+                            local.getReportingUnit(student, unitId)
+                        }
+                    )
+            }
     }
 }

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

@@ -2,17 +2,14 @@ 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.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 
 class SchoolRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getSchoolInfo(student: Student, semester: Semester): Single<School> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getSchool()
+    fun getSchoolInfo(semester: Semester): Single<School> {
+        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getSchool()
             .map {
                 School(
                     studentId = semester.studentId,

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

@@ -4,7 +4,6 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
@@ -18,11 +17,11 @@ class SchoolRepository @Inject constructor(
     private val remote: SchoolRemote
 ) {
 
-    fun getSchoolInfo(student: Student, semester: Semester, forceRefresh: Boolean = false): Maybe<School> {
+    fun getSchoolInfo(semester: Semester, forceRefresh: Boolean = false): Maybe<School> {
         return local.getSchool(semester).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getSchoolInfo(student, semester)
+                    if (it) remote.getSchoolInfo(semester)
                     else Single.error(UnknownHostException())
                 }.flatMapMaybe { new ->
                     local.getSchool(semester)

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

@@ -19,6 +19,6 @@ class SemesterLocal @Inject constructor(private val semesterDb: SemesterDao) {
     }
 
     fun getSemesters(student: Student): Maybe<List<Semester>> {
-        return semesterDb.loadAll(student.studentId, student.classId).filter { it.isNotEmpty() }
+        return semesterDb.loadAll(student.studentId, student.classId).filter { !it.isEmpty() }
     }
 }

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

@@ -3,7 +3,6 @@ package io.github.wulkanowy.data.repositories.semester
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -12,7 +11,7 @@ import javax.inject.Singleton
 class SemesterRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getSemesters(student: Student): Single<List<Semester>> {
-        return sdk.init(student).getSemesters().map { semesters ->
+        return sdk.getSemesters().map { semesters ->
             semesters.map {
                 Semester(
                     studentId = student.studentId,
@@ -21,6 +20,7 @@ class SemesterRemote @Inject constructor(private val sdk: Sdk) {
                     schoolYear = it.schoolYear,
                     semesterId = it.semesterId,
                     semesterName = it.semesterNumber,
+                    isCurrent = it.current,
                     start = it.start,
                     end = it.end,
                     classId = it.classId,

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

@@ -2,13 +2,13 @@ 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.SdkHelper
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.getCurrentOrLast
-import io.github.wulkanowy.utils.isCurrent
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Maybe
 import io.reactivex.Single
+import timber.log.Timber
 import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -17,31 +17,32 @@ import javax.inject.Singleton
 class SemesterRepository @Inject constructor(
     private val remote: SemesterRemote,
     private val local: SemesterLocal,
-    private val settings: InternetObservingSettings
+    private val settings: InternetObservingSettings,
+    private val sdkHelper: SdkHelper
 ) {
 
-    fun getSemesters(student: Student, forceRefresh: Boolean = false, refreshOnNoCurrent: Boolean = false): Single<List<Semester>> {
-        return local.getSemesters(student).filter { !forceRefresh }.filter { semesters ->
-            when {
-                Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API -> semesters.firstOrNull { it.isCurrent }?.diaryId != 0
-                refreshOnNoCurrent -> semesters.any { semester -> semester.isCurrent }
-                else -> true
-            }
-        }.switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-            .flatMap {
-                if (it) remote.getSemesters(student)
-                else Single.error(UnknownHostException())
-            }.flatMap { new ->
-                if (new.isEmpty()) throw IllegalArgumentException("Empty semester list!")
-
-                local.getSemesters(student).toSingle(emptyList()).doOnSuccess { old ->
-                    local.deleteSemesters(old.uniqueSubtract(new))
-                    local.saveSemesters(new.uniqueSubtract(old))
-                }
-            }.flatMap { local.getSemesters(student).toSingle(emptyList()) })
+    fun getSemesters(student: Student, forceRefresh: Boolean = false): Single<List<Semester>> {
+        return Maybe.just(sdkHelper.init(student))
+            .flatMap { local.getSemesters(student).filter { !forceRefresh } }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getSemesters(student) else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    val currentSemesters = new.filter { it.isCurrent }
+                    if (currentSemesters.size == 1) {
+                        local.getSemesters(student).toSingle(emptyList())
+                            .doOnSuccess { old ->
+                                local.deleteSemesters(old.uniqueSubtract(new))
+                                local.saveSemesters(new.uniqueSubtract(old))
+                            }
+                    } else {
+                        Timber.i("Current semesters list:\n${new.joinToString(separator = "\n")}")
+                        throw IllegalArgumentException("Current semester can be only one.")
+                    }
+                }.flatMap { local.getSemesters(student).toSingle(emptyList()) })
     }
 
     fun getCurrentSemester(student: Student, forceRefresh: Boolean = false): Single<Semester> {
-        return getSemesters(student, forceRefresh).map { it.getCurrentOrLast() }
+        return getSemesters(student, forceRefresh).map { item -> item.single { it.isCurrent } }
     }
 }

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

@@ -29,18 +29,10 @@ class StudentLocal @Inject constructor(
 
     fun getStudents(decryptPass: Boolean): Maybe<List<Student>> {
         return studentDb.loadAll()
-            .map { list -> list.map { it.apply { if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password) } } }
+            .map { list -> list.map { it.apply { if (decryptPass) password = decrypt(password) } } }
             .filter { it.isNotEmpty() }
     }
 
-    fun getStudentById(id: Int): Maybe<Student> {
-        return studentDb.loadById(id).map {
-            it.apply {
-                if (Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
-            }
-        }
-    }
-
     fun getCurrentStudent(decryptPass: Boolean): Maybe<Student> {
         return studentDb.loadCurrent().map {
             it.apply {

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

@@ -22,7 +22,6 @@ class StudentRemote @Inject constructor(private val sdk: Sdk) {
                 userLoginId = student.userLoginId,
                 studentName = student.studentName,
                 schoolSymbol = student.schoolSymbol,
-                schoolShortName = student.schoolShortName,
                 schoolName = student.schoolName,
                 className = student.className,
                 classId = student.classId,
@@ -39,7 +38,7 @@ class StudentRemote @Inject constructor(private val sdk: Sdk) {
     }
 
     fun getStudentsMobileApi(token: String, pin: String, symbol: String): Single<List<Student>> {
-        return sdk.getStudentsFromMobileApi(token, pin, symbol, "").map { mapStudents(it, "", "") }
+        return sdk.getStudentsFromMobileApi(token, pin, symbol).map { mapStudents(it, "", "") }
     }
 
     fun getStudentsScrapper(email: String, password: String, scrapperBaseUrl: String, symbol: String): Single<List<Student>> {
@@ -47,6 +46,6 @@ class StudentRemote @Inject constructor(private val sdk: Sdk) {
     }
 
     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) }
+        return sdk.getStudentsHybrid(email, password, scrapperBaseUrl, symbol).map { mapStudents(it, email, password) }
     }
 }