app/build.gradle

@@ -16,8 +16,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 31
-        versionName "0.7.5"
+        versionCode 27
+        versionName "0.7.1"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -25,15 +25,6 @@ android {
                 fabric_api_key: System.getenv("FABRIC_API_KEY") ?: "null",
                 crashlytics_enabled: project.hasProperty("enableCrashlytics")
         ]
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
-            }
-        }
-    }
-
-    sourceSets {
-        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
 
     signingConfigs {
@@ -86,7 +77,7 @@ play {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation('io.github.wulkanowy:api:0.7.5') { exclude module: "threetenbp" }
+    implementation('io.github.wulkanowy:api:0.7.1') { exclude module: "threetenbp" }
 
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.appcompat:appcompat:1.0.2"
@@ -95,15 +86,11 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.multidex:multidex:2.0.1'
 
-    implementation "android.arch.work:work-runtime:1.0.0"
-    implementation "android.arch.work:work-rxjava2:1.0.0"
-
-    implementation "androidx.room:room-runtime:2.1.0-alpha06"
-    implementation "androidx.room:room-rxjava2:2.1.0-alpha06"
-    kapt "androidx.room:room-compiler:2.1.0-alpha06"
-
     implementation 'com.takisoft.preferencex:preferencex:1.0.0'
 
+    implementation "android.arch.work:work-rxjava2:1.0.0"
+    implementation "android.arch.work:work-runtime:1.0.0"
+
     implementation 'com.squareup.inject:assisted-inject-annotations-dagger2:0.3.3'
     kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.3.3'
 
@@ -111,13 +98,17 @@ dependencies {
     kapt "com.google.dagger:dagger-compiler:2.21"
     kapt "com.google.dagger:dagger-android-processor:2.21"
 
+    implementation "androidx.room:room-runtime:2.1.0-alpha05"
+    implementation "androidx.room:room-rxjava2:2.1.0-alpha05"
+    kapt "androidx.room:room-compiler:2.1.0-alpha05"
+
     implementation "eu.davidea:flexible-adapter:5.1.0"
     implementation "eu.davidea:flexible-adapter-ui:1.0.0"
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
-    implementation 'com.ncapdevi:frag-nav:3.2.0'
+    implementation 'com.ncapdevi:frag-nav:3.1.0'
 
     implementation 'com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f'
-    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
+    implementation 'com.github.PhilJay:MPAndroidChart:971640b29d'
 
     implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.2'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
@@ -137,16 +128,15 @@ dependencies {
     debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
     testImplementation "junit:junit:4.12"
-    testImplementation "io.mockk:mockk:1.9.2"
-    testImplementation "org.mockito:mockito-inline:2.25.1"
+    testImplementation "io.mockk:mockk:1.9.1"
+    testImplementation "org.mockito:mockito-inline:2.25.0"
     testImplementation 'org.threeten:threetenbp:1.3.8'
 
+    androidTestImplementation "io.mockk:mockk-android:1.9.1"
     androidTestImplementation 'androidx.test:core:1.1.0'
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation "io.mockk:mockk-android:1.9.2"
-    androidTestImplementation 'org.mockito:mockito-android:2.25.1'
-    androidTestImplementation "androidx.room:room-testing:2.1.0-alpha06"
+    androidTestImplementation 'org.mockito:mockito-android:2.25.0'
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 }
 

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

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

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

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

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

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

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

@@ -11,7 +11,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -41,7 +40,7 @@ class AttendanceLocalTest {
         ))
 
         val attendance = attendanceLocal
-            .getAttendance(Semester(1, 2, "", 1, 3, 2019, true, now(), now(), 1, 1),
+            .getAttendance(Semester(1, 2, "", 1, 3, true, 1, 1),
                         LocalDate.of(2018, 9, 10),
                         LocalDate.of(2018, 9, 14)
                 )

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

@@ -41,7 +41,7 @@ class CompletedLessonsLocalTest {
         ))
 
         val completed = completedLessonsLocal
-            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            .getCompletedLessons(Semester(1, 2, "", 1, 3, true, 1, 1),
                 LocalDate.of(2018, 9, 10),
                 LocalDate.of(2018, 9, 14)
             )

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

@@ -40,7 +40,7 @@ class ExamLocalTest {
         ))
 
         val exams = examLocal
-            .getExams(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            .getExams(Semester(1, 2, "", 1, 3, true, 1, 1),
                         LocalDate.of(2018, 9, 10),
                         LocalDate.of(2018, 9, 14)
                 )

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

@@ -10,7 +10,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -40,10 +39,8 @@ class GradeLocalTest {
             createGradeLocal(3, 5.0, LocalDate.of(2019, 2, 28), "", 2)
         ))
 
-        val semester = Semester(1, 2, "", 2019, 2, 1, true, now(), now(), 1, 1)
-
         val grades = gradeLocal
-            .getGrades(semester)
+            .getGrades(Semester(1, 2, "", 2, 3, true, 1, 1))
             .blockingGet()
 
         assertEquals(2, grades.size)

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

@@ -10,7 +10,6 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -40,7 +39,7 @@ class GradeStatisticsLocalTest {
         ))
 
         val stats = gradeStatisticsLocal.getGradesStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
+            Semester(2, 2, "", 1, 2, true, 1, 1), false,
             "Matematyka"
         ).blockingGet()
         assertEquals(1, stats.size)
@@ -56,7 +55,7 @@ class GradeStatisticsLocalTest {
         ))
 
         val stats = gradeStatisticsLocal.getGradesStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
+            Semester(2, 2, "", 1, 2, true, 1, 1), false,
             "Wszystkie"
         ).blockingGet()
         assertEquals(1, stats.size)

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

@@ -36,7 +36,7 @@ class LuckyNumberLocalTest {
     fun saveAndReadTest() {
         luckyNumberLocal.saveLuckyNumber(LuckyNumber(1, LocalDate.of(2019, 1, 20), 14))
 
-        val luckyNumber = luckyNumberLocal.getLuckyNumber(Semester(1, 1, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+        val luckyNumber = luckyNumberLocal.getLuckyNumber(Semester(1, 1, "", 1, 3, true, 1, 1),
             LocalDate.of(2019, 1, 20)
         ).blockingGet()
 

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

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

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

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

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

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

app/src/main/AndroidManifest.xml

@@ -52,7 +52,6 @@
 
         <receiver
             android:name=".ui.widgets.timetable.TimetableWidgetProvider"
-            android:exported="true"
             android:label="@string/timetable_title">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

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

@@ -19,11 +19,7 @@ import io.github.wulkanowy.di.DaggerAppComponent
 import io.github.wulkanowy.services.sync.SyncWorkerFactory
 import io.github.wulkanowy.utils.CrashlyticsTree
 import io.github.wulkanowy.utils.DebugLogTree
-import io.reactivex.exceptions.UndeliverableException
-import io.reactivex.plugins.RxJavaPlugins
 import timber.log.Timber
-import java.io.IOException
-import java.lang.Exception
 import javax.inject.Inject
 
 class WulkanowyApp : DaggerApplication() {
@@ -46,7 +42,6 @@ class WulkanowyApp : DaggerApplication() {
         if (DEBUG) enableDebugLog()
         AppCompatDelegate.setDefaultNightMode(prefRepository.currentTheme)
         WorkManager.initialize(this, Configuration.Builder().setWorkerFactory(workerFactory).build())
-        RxJavaPlugins.setErrorHandler(::onError)
     }
 
     private fun enableDebugLog() {
@@ -61,12 +56,6 @@ class WulkanowyApp : DaggerApplication() {
         Timber.plant(CrashlyticsTree())
     }
 
-    private fun onError(t: Throwable) {
-        if (t is UndeliverableException && t.cause is IOException || t.cause is InterruptedException) {
-            Timber.e(t.cause, "An undeliverable error occurred")
-        } else throw t
-    }
-
     override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
         return DaggerAppComponent.builder().create(this)
     }

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

@@ -14,7 +14,6 @@ class ApiHelper @Inject constructor(private val api: Api) {
             symbol = student.symbol
             schoolSymbol = student.schoolSymbol
             studentId = student.studentId
-            classId = student.classId
             host = URL(student.endpoint).run { host + ":$port".removeSuffix(":-1") }
             ssl = student.endpoint.startsWith("https")
             loginType = Api.LoginType.valueOf(student.loginType)
@@ -29,7 +28,6 @@ class ApiHelper @Inject constructor(private val api: Api) {
             this.symbol = symbol
             host = URL(endpoint).run { host + ":$port".removeSuffix(":-1") }
             ssl = endpoint.startsWith("https")
-            useNewStudent = true
         }
     }
 }

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

@@ -42,8 +42,6 @@ import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.db.migrations.Migration10
 import io.github.wulkanowy.data.db.migrations.Migration11
-import io.github.wulkanowy.data.db.migrations.Migration12
-import io.github.wulkanowy.data.db.migrations.Migration13
 import io.github.wulkanowy.data.db.migrations.Migration2
 import io.github.wulkanowy.data.db.migrations.Migration3
 import io.github.wulkanowy.data.db.migrations.Migration4
@@ -76,13 +74,13 @@ import javax.inject.Singleton
         Recipient::class
     ],
     version = AppDatabase.VERSION_SCHEMA,
-    exportSchema = true
+    exportSchema = false
 )
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 13
+        const val VERSION_SCHEMA = 11
 
         fun newInstance(context: Context): AppDatabase {
             return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
@@ -99,9 +97,7 @@ abstract class AppDatabase : RoomDatabase() {
                     Migration8(),
                     Migration9(),
                     Migration10(),
-                    Migration11(),
-                    Migration12(),
-                    Migration13()
+                    Migration11()
                 )
                 .build()
         }

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

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

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

@@ -25,8 +25,8 @@ interface StudentDao {
     @Query("SELECT * FROM Students")
     fun loadAll(): Maybe<List<Student>>
 
-    @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
-    fun updateCurrent(id: Long)
+    @Query("UPDATE Students SET is_current = 1 WHERE student_id = :studentId")
+    fun updateCurrent(studentId: Int)
 
     @Query("UPDATE Students SET is_current = 0")
     fun resetCurrent()

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

@@ -4,7 +4,6 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
 
 @Entity(tableName = "Semesters", indices = [Index(value = ["student_id", "diary_id", "semester_id"], unique = true)])
 data class Semester(
@@ -18,9 +17,6 @@ data class Semester(
     @ColumnInfo(name = "diary_name")
     val diaryName: String,
 
-    @ColumnInfo(name = "school_year")
-    val schoolYear: Int,
-
     @ColumnInfo(name = "semester_id")
     val semesterId: Int,
 
@@ -30,10 +26,6 @@ data class Semester(
     @ColumnInfo(name = "is_current")
     val isCurrent: Boolean,
 
-    val start: LocalDate,
-
-    val end: LocalDate,
-
     @ColumnInfo(name = "class_id")
     val classId: Int,
 

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

@@ -7,7 +7,7 @@ import androidx.room.PrimaryKey
 import org.threeten.bp.LocalDateTime
 import java.io.Serializable
 
-@Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id", "class_id"], unique = true)])
+@Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id"], unique = true)])
 data class Student(
 
     val endpoint: String,
@@ -32,12 +32,6 @@ data class Student(
     @ColumnInfo(name = "school_name")
     val schoolName: String,
 
-    @ColumnInfo(name = "class_name")
-    val className: String,
-
-    @ColumnInfo(name = "class_id")
-    val classId: Int,
-
     @ColumnInfo(name = "is_current")
     val isCurrent: Boolean,
 

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

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

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

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

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

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

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

@@ -24,13 +24,13 @@ class MessageLocal @Inject constructor(private val messagesDb: MessagesDao) {
     }
 
     fun getMessage(student: Student, id: Int): Maybe<Message> {
-        return messagesDb.load(student.id.toInt(), id)
+        return messagesDb.load(student.studentId, id)
     }
 
     fun getMessages(student: Student, folder: MessageFolder): Maybe<List<Message>> {
         return when (folder) {
-            TRASHED -> messagesDb.loadDeleted(student.id.toInt())
-            else -> messagesDb.loadAll(student.id.toInt(), folder.id)
+            TRASHED -> messagesDb.loadDeleted(student.studentId)
+            else -> messagesDb.loadAll(student.studentId, folder.id)
         }.filter { it.isNotEmpty() }
     }
 }

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

@@ -5,7 +5,6 @@ import io.github.wulkanowy.api.messages.Folder
 import io.github.wulkanowy.api.messages.SentMessage
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.toLocalDateTime
 import io.reactivex.Single
 import org.threeten.bp.LocalDateTime.now
@@ -17,11 +16,11 @@ import io.github.wulkanowy.api.messages.Recipient as ApiRecipient
 @Singleton
 class MessageRemote @Inject constructor(private val api: Api) {
 
-    fun getMessages(student: Student, folder: MessageFolder): Single<List<Message>> {
+    fun getMessages(studentId: Int, folder: MessageFolder): Single<List<Message>> {
         return api.getMessages(Folder.valueOf(folder.name)).map { messages ->
             messages.map {
                 Message(
-                    studentId = student.id.toInt(),
+                    studentId = studentId,
                     realId = it.id ?: 0,
                     messageId = it.messageId ?: 0,
                     sender = it.sender.orEmpty(),

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

@@ -28,7 +28,7 @@ class MessageRepository @Inject constructor(
                 local.getMessages(student, folder).filter { !forceRefresh }
                     .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                         .flatMap {
-                            if (it) remote.getMessages(student, folder)
+                            if (it) remote.getMessages(student.studentId, folder)
                             else Single.error(UnknownHostException())
                         }.flatMap { new ->
                             local.getMessages(student, folder).toSingle(emptyList())

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

@@ -11,14 +11,17 @@ import javax.inject.Singleton
 class SemesterLocal @Inject constructor(private val semesterDb: SemesterDao) {
 
     fun saveSemesters(semesters: List<Semester>) {
-        semesterDb.insertAll(semesters)
-    }
-
-    fun deleteSemesters(semesters: List<Semester>) {
-        semesterDb.deleteAll(semesters)
+        return semesterDb.insertAll(semesters)
     }
 
     fun getSemesters(student: Student): Maybe<List<Semester>> {
-        return semesterDb.loadAll(student.studentId, student.classId).filter { !it.isEmpty() }
+        return semesterDb.loadAll(student.studentId).filter { !it.isEmpty() }
+    }
+
+    fun setCurrentSemester(semester: Semester) {
+        semesterDb.run {
+            resetCurrent(semester.studentId)
+            updateCurrent(semester.semesterId, semester.diaryId)
+        }
     }
 }

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

@@ -17,12 +17,9 @@ class SemesterRemote @Inject constructor(private val api: Api) {
                     studentId = student.studentId,
                     diaryId = semester.diaryId,
                     diaryName = semester.diaryName,
-                    schoolYear = semester.schoolYear,
                     semesterId = semester.semesterId,
                     semesterName = semester.semesterNumber,
                     isCurrent = semester.current,
-                    start = semester.start,
-                    end = semester.end,
                     classId = semester.classId,
                     unitId = semester.unitId
                 )

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

@@ -7,7 +7,6 @@ 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 timber.log.Timber
 import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -26,17 +25,10 @@ class SemesterRepository @Inject constructor(
             .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 - new)
-                                local.saveSemesters(new - old)
-                            }
-                    } else {
-                        Timber.i("Current semesters list:\n${currentSemesters.joinToString(separator = "\n")}")
-                        throw IllegalArgumentException("Current semester can be only one.")
+                }.map { newSemesters ->
+                    local.apply {
+                        saveSemesters(newSemesters)
+                        setCurrentSemester(newSemesters.single { it.isCurrent })
                     }
                 }.flatMap { local.getSemesters(student).toSingle(emptyList()) })
     }

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

@@ -35,7 +35,7 @@ class StudentLocal @Inject constructor(
         return Completable.fromCallable {
             studentDb.run {
                 resetCurrent()
-                updateCurrent(student.id)
+                updateCurrent(student.studentId)
             }
         }
     }

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

@@ -21,8 +21,6 @@ class StudentRemote @Inject constructor(private val api: Api) {
                     studentName = student.studentName,
                     schoolSymbol = student.schoolSymbol,
                     schoolName = student.schoolName,
-                    className = student.className,
-                    classId = student.classId,
                     endpoint = endpoint,
                     loginType = student.loginType.name,
                     isCurrent = false,

app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.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.ApiHelper
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.reactivex.Completable
 import io.reactivex.Maybe
 import io.reactivex.Single
@@ -37,7 +36,7 @@ class StudentRepository @Inject constructor(
 
     fun getCurrentStudent(decryptPass: Boolean = true): Single<Student> {
         return local.getCurrentStudent(decryptPass)
-            .switchIfEmpty(Maybe.error(NoCurrentStudentException()))
+            .switchIfEmpty(Maybe.error(NoSuchElementException("No current student")))
             .toSingle()
     }
 

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

@@ -3,6 +3,7 @@ package io.github.wulkanowy.di
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerActivity
+import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginModule
 import io.github.wulkanowy.ui.modules.main.MainActivity
@@ -29,6 +30,9 @@ internal abstract class BuilderModule {
     @ContributesAndroidInjector
     abstract fun bindMessageSendActivity(): SendMessageActivity
 
+    @ContributesAndroidInjector
+    abstract fun bindTimetableWidgetService(): TimetableWidgetService
+
     @ContributesAndroidInjector
     abstract fun bindTimetableWidgetProvider(): TimetableWidgetProvider
 }

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

@@ -9,7 +9,6 @@ import com.squareup.inject.assisted.dagger2.AssistedModule
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import dagger.android.ContributesAndroidInjector
 import dagger.multibindings.IntoSet
 import io.github.wulkanowy.services.sync.works.AttendanceSummaryWork
 import io.github.wulkanowy.services.sync.works.AttendanceWork
@@ -25,7 +24,6 @@ import io.github.wulkanowy.services.sync.works.NoteWork
 import io.github.wulkanowy.services.sync.works.RecipientWork
 import io.github.wulkanowy.services.sync.works.TimetableWork
 import io.github.wulkanowy.services.sync.works.Work
-import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import javax.inject.Singleton
 
 @AssistedModule
@@ -50,9 +48,6 @@ abstract class ServicesModule {
         fun provideNotificationManager(context: Context) = context.getSystemService(NOTIFICATION_SERVICE) as NotificationManager
     }
 
-    @ContributesAndroidInjector
-    abstract fun bindTimetableWidgetService(): TimetableWidgetService
-
     @Binds
     @IntoSet
     abstract fun provideGradeWork(work: GradeWork): Work

app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt

@@ -40,7 +40,7 @@ class SyncManager @Inject constructor(
     fun startSyncWorker(restart: Boolean = false) {
         if (preferencesRepository.isServiceEnabled && !now().isHolidays) {
             workManager.enqueueUniquePeriodicWork(SyncWorker::class.java.simpleName, if (restart) REPLACE else KEEP,
-                PeriodicWorkRequest.Builder(SyncWorker::class.java, preferencesRepository.servicesInterval, MINUTES, 10, MINUTES)
+                PeriodicWorkRequest.Builder(SyncWorker::class.java, preferencesRepository.servicesInterval, MINUTES)
                     .setBackoffCriteria(EXPONENTIAL, 30, MINUTES)
                     .setConstraints(Constraints.Builder()
                         .setRequiredNetworkType(if (preferencesRepository.isServicesOnlyWifi) METERED else UNMETERED)

app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt

@@ -11,7 +11,6 @@ import androidx.work.WorkerParameters
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import io.github.wulkanowy.R
-import io.github.wulkanowy.api.interceptor.FeatureDisabledException
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
@@ -34,31 +33,19 @@ class SyncWorker @AssistedInject constructor(
 ) : RxWorker(appContext, workerParameters) {
 
     override fun createWork(): Single<Result> {
-        Timber.i("SyncWorker is starting")
-        return studentRepository.isStudentSaved()
-            .filter { true }
-            .flatMap { studentRepository.getCurrentStudent().toMaybe() }
+        return studentRepository.getCurrentStudent()
             .flatMapCompletable { student ->
                 semesterRepository.getCurrentSemester(student, true)
                     .flatMapCompletable { semester ->
-                        Completable.mergeDelayError(works.map { work ->
-                            work.create(student, semester)
-                                .doOnSubscribe { Timber.i("${work::class.java.simpleName} is starting") }
-                                .doOnError { Timber.i("${work::class.java.simpleName} result: An exception occurred") }
-                                .doOnComplete { Timber.i("${work::class.java.simpleName} result: Success") }
-                        })
+                        Completable.mergeDelayError(works.map { it.create(student, semester) })
                     }
             }
             .toSingleDefault(Result.success())
             .onErrorReturn {
                 Timber.e(it, "There was an error during synchronization")
-                if (it is FeatureDisabledException) Result.success()
-                else Result.retry()
-            }
-            .doOnSuccess {
-                if (preferencesRepository.isDebugNotificationEnable) notify(it)
-                Timber.i("SyncWorker result: $it")
+                Result.retry()
             }
+            .doOnSuccess { if (preferencesRepository.isDebugNotificationEnable) notify(it) }
     }
 
     private fun notify(result: Result) {

app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt

@@ -13,10 +13,10 @@ class RecipientWork @Inject constructor(
 ) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return reportingUnitRepository.getReportingUnits(student, true)
+        return reportingUnitRepository.getReportingUnits(student)
             .flatMapCompletable { units ->
                 Completable.mergeDelayError(units.map {
-                    recipientRepository.getRecipients(student, 2, it, true).ignoreElement()
+                    recipientRepository.getRecipients(student, 2, it).ignoreElement()
                 })
             }
     }

app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionFragment.kt

@@ -1,9 +1,6 @@
 package io.github.wulkanowy.ui.base.session
 
-import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
-import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
 
 open class BaseSessionFragment : BaseFragment(), BaseSessionView {
@@ -11,11 +8,4 @@ open class BaseSessionFragment : BaseFragment(), BaseSessionView {
     override fun showExpiredDialog() {
         (activity as? MainActivity)?.showExpiredDialog()
     }
-
-    override fun openLoginView() {
-        activity?.also {
-            startActivity(LoginActivity.getStartIntent(it)
-                .apply { addFlags(FLAG_ACTIVITY_CLEAR_TASK or FLAG_ACTIVITY_NEW_TASK) })
-        }
-    }
 }

app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionPresenter.kt

@@ -7,9 +7,6 @@ open class BaseSessionPresenter<T : BaseSessionView>(private val errorHandler: S
 
     override fun onAttachView(view: T) {
         super.onAttachView(view)
-        errorHandler.apply {
-            onDecryptionFail = { view.showExpiredDialog() }
-            onNoCurrentStudent = { view.openLoginView() }
-        }
+        errorHandler.onDecryptionFail = { view.showExpiredDialog() }
     }
 }

app/src/main/java/io/github/wulkanowy/ui/base/session/BaseSessionView.kt

@@ -5,6 +5,4 @@ import io.github.wulkanowy.ui.base.BaseView
 interface BaseSessionView : BaseView {
 
     fun showExpiredDialog()
-
-    fun openLoginView()
 }

app/src/main/java/io/github/wulkanowy/ui/base/session/SessionErrorHandler.kt

@@ -2,7 +2,6 @@ package io.github.wulkanowy.ui.base.session
 
 import android.content.res.Resources
 import com.readystatesoftware.chuck.api.ChuckCollector
-import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.security.ScramblerException
 import javax.inject.Inject
@@ -14,12 +13,9 @@ open class SessionErrorHandler @Inject constructor(
 
     var onDecryptionFail: () -> Unit = {}
 
-    var onNoCurrentStudent: () -> Unit = {}
-
     override fun proceed(error: Throwable) {
         when (error) {
             is ScramblerException -> onDecryptionFail()
-            is NoCurrentStudentException -> onNoCurrentStudent()
             else -> super.proceed(error)
         }
     }
@@ -27,6 +23,5 @@ open class SessionErrorHandler @Inject constructor(
     override fun clear() {
         super.clear()
         onDecryptionFail = {}
-        onNoCurrentStudent = {}
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt

@@ -43,8 +43,7 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
                 .withAboutSpecial3(getString(R.string.about_feedback))
                 .withFields(R.string::class.java.fields)
                 .withCheckCachedDetection(false)
-                .withExcludedLibraries("fastadapter", "AndroidIconics", "Jsoup", "Retrofit", "okio",
-                    "OkHttp", "Butterknife", "CircleImageView")
+                .withExcludedLibraries("fastadapter", "AndroidIconics", "gson", "Jsoup", "Retrofit", "okio", "OkHttp")
                 .withOnExtraListener { presenter.onExtraSelect(it) })
         }.let {
             fragmentCompat.onCreateView(inflater.context, inflater, container, savedInstanceState, it)
@@ -69,7 +68,7 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
             data = Uri.parse("mailto:")
             putExtra(Intent.EXTRA_EMAIL, Array(1) { "wulkanowyinc@gmail.com" })
             putExtra(Intent.EXTRA_SUBJECT, "Zgłoszenie błędu")
-            putExtra(Intent.EXTRA_TEXT, "Tu umieść treść zgłoszenia\n\n" + "-".repeat(40) + "\n" + """
+            putExtra(Intent.EXTRA_TEXT,"Tu umieść treść zgłoszenia\n\n" + "-".repeat(40) + "\n" + """
                 Build: ${BuildConfig.VERSION_CODE}
                 SDK: ${android.os.Build.VERSION.SDK_INT}
                 Device: ${android.os.Build.MANUFACTURER} ${android.os.Build.MODEL}

app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt

@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.account
 
-import android.annotation.SuppressLint
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
@@ -15,14 +14,13 @@ class AccountItem(val student: Student) : AbstractFlexibleItem<AccountItem.ViewH
 
     override fun getLayoutRes() = R.layout.item_account
 
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
         return ViewHolder(view, adapter)
     }
 
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            accountItemName.text = "${student.studentName} ${student.className}"
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder?, position: Int, payloads: MutableList<Any>?) {
+        holder?.apply {
+            accountItemName.text = student.studentName
             accountItemSchool.text = student.schoolName
             accountItemImage.setBackgroundResource(if (student.isCurrent) R.drawable.ic_account_circular_border else 0)
         }
@@ -40,13 +38,14 @@ class AccountItem(val student: Student) : AbstractFlexibleItem<AccountItem.ViewH
     }
 
     override fun hashCode(): Int {
-        var result = student.hashCode()
-        result = 31 * result + student.id.toInt()
-        return result
+        return student.hashCode()
     }
 
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View?
             get() = contentView
     }
 }
+

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceItem.kt

@@ -14,13 +14,14 @@ import kotlinx.android.synthetic.main.item_attendance.*
 
 class AttendanceItem(val attendance: Attendance) : AbstractFlexibleItem<AttendanceItem.ViewHolder>() {
 
-    override fun getLayoutRes() = R.layout.item_attendance
-
     override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
         return ViewHolder(view, adapter)
     }
 
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+    override fun getLayoutRes(): Int = R.layout.item_attendance
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder,
+                                position: Int, payloads: MutableList<Any>?) {
         holder.apply {
             attendanceItemNumber.text = attendance.number.toString()
             attendanceItemSubject.text = attendance.subject
@@ -36,17 +37,16 @@ class AttendanceItem(val attendance: Attendance) : AbstractFlexibleItem<Attendan
         other as AttendanceItem
 
         if (attendance != other.attendance) return false
-
         return true
     }
 
     override fun hashCode(): Int {
-        var result = attendance.hashCode()
-        result = 31 * result + attendance.id.toInt()
-        return result
+        return attendance.hashCode()
     }
 
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
+            LayoutContainer {
+
         override val containerView: View
             get() = contentView
     }

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt

@@ -135,7 +135,7 @@ class AttendancePresenter @Inject constructor(
             clearData()
             showNextButton(!currentDate.plusDays(1).isHolidays)
             showPreButton(!currentDate.minusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
+            updateNavigationDay(currentDate.toFormattedString("EEEE \n dd.MM.YYYY").capitalize())
         }
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryItem.kt

@@ -23,12 +23,12 @@ class AttendanceSummaryItem(
 
     override fun getLayoutRes() = R.layout.item_attendance_summary
 
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
         return ViewHolder(view, adapter)
     }
 
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder?, position: Int, payloads: MutableList<Any>?) {
+        holder?.apply {
             attendanceSummaryMonth.text = month
             attendanceSummaryPercentage.text = percentage
             attendanceSummaryPresent.text = present
@@ -73,8 +73,10 @@ class AttendanceSummaryItem(
         return result
     }
 
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View?
             get() = contentView
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt

@@ -18,7 +18,8 @@ class ExamItem(header: ExamHeader, val exam: Exam) : AbstractSectionableItem<Exa
         return ViewHolder(view, adapter)
     }
 
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder,
+                                position: Int, payloads: MutableList<Any>?) {
         holder.run {
             examItemSubject.text = exam.subject
             examItemTeacher.text = exam.teacher
@@ -38,12 +39,12 @@ class ExamItem(header: ExamHeader, val exam: Exam) : AbstractSectionableItem<Exa
     }
 
     override fun hashCode(): Int {
-        var result = exam.hashCode()
-        result = 31 * result + exam.id.toInt()
-        return result
+        return exam.hashCode()
     }
 
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
+            LayoutContainer {
+
         override val containerView: View
             get() = contentView
     }

app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt

@@ -7,7 +7,9 @@ import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Completable
 import timber.log.Timber
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class GradePresenter @Inject constructor(
@@ -28,12 +30,15 @@ class GradePresenter @Inject constructor(
     fun onAttachView(view: GradeView, savedIndex: Int?) {
         super.onAttachView(view)
         Timber.i("Grade view is attached")
-        selectedIndex = savedIndex ?: 0
-        view.run {
-            initView()
-            enableSwipe(false)
-        }
-        loadData()
+        disposable.add(Completable.timer(150, MILLISECONDS, schedulers.mainThread)
+            .subscribe {
+                selectedIndex = savedIndex ?: 0
+                view.run {
+                    initView()
+                    enableSwipe(false)
+                }
+                loadData()
+            })
     }
 
     fun onCreateMenu() {
@@ -77,7 +82,7 @@ class GradePresenter @Inject constructor(
     }
 
     fun onPageSelected(index: Int) {
-        if (semesters.isNotEmpty()) loadChild(index)
+        loadChild(index)
     }
 
     fun onSwipeRefresh() {

app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt

@@ -28,7 +28,10 @@ class GradeDetailsItem(
     }
 
     @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+    override fun bindViewHolder(
+        adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder,
+        position: Int, payloads: MutableList<Any>?
+    ) {
         holder.run {
             gradeItemValue.run {
                 text = grade.entry
@@ -67,7 +70,9 @@ class GradeDetailsItem(
         return result
     }
 
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
         override val containerView: View
             get() = contentView
     }

app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt

@@ -63,7 +63,7 @@ class GradeStatisticsPresenter @Inject constructor(
     }
 
     fun onSubjectSelected(name: String) {
-        Timber.i("Select grade stats subject $name")
+        Timber.i("Select attendance stats subject $name")
         view?.run {
             showContent(false)
             showProgress(true)
@@ -77,7 +77,7 @@ class GradeStatisticsPresenter @Inject constructor(
     }
 
     fun onTypeChange(isSemester: Boolean) {
-        Timber.i("Select grade stats semester: $isSemester")
+        Timber.i("Select attendance stats semester: $isSemester")
         disposable.clear()
         view?.run {
             showContent(false)

app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt

@@ -18,12 +18,15 @@ class GradeSummaryItem(
 
     override fun getLayoutRes() = R.layout.item_grade_summary
 
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
         return ViewHolder(view, adapter)
     }
 
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.run {
+    override fun bindViewHolder(
+        adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder?,
+        position: Int, payloads: MutableList<Any>?
+    ) {
+        holder?.run {
             gradeSummaryItemTitle.text = title
             gradeSummaryItemAverage.text = average
             gradeSummaryItemPredicted.text = predictedGrade
@@ -53,8 +56,10 @@ class GradeSummaryItem(
         return result
     }
 
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View?
             get() = contentView
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt

@@ -10,8 +10,9 @@ import io.github.wulkanowy.data.db.entities.Homework
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.item_homework.*
 
-class HomeworkItem(header: HomeworkHeader, val homework: Homework) :
-    AbstractSectionableItem<HomeworkItem.ViewHolder, HomeworkHeader>(header) {
+class HomeworkItem(
+    header: HomeworkHeader, val homework: Homework
+) : AbstractSectionableItem<HomeworkItem.ViewHolder, HomeworkHeader>(header) {
 
     override fun getLayoutRes() = R.layout.item_homework
 
@@ -19,7 +20,10 @@ class HomeworkItem(header: HomeworkHeader, val homework: Homework) :
         return ViewHolder(view, adapter)
     }
 
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+    override fun bindViewHolder(
+        adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder,
+        position: Int, payloads: MutableList<Any>?
+    ) {
         holder.apply {
             homeworkItemSubject.text = homework.subject
             homeworkItemTeacher.text = homework.teacher
@@ -38,12 +42,12 @@ class HomeworkItem(header: HomeworkHeader, val homework: Homework) :
     }
 
     override fun hashCode(): Int {
-        var result = homework.hashCode()
-        result = 31 * result + homework.id.toInt()
-        return result
+        return homework.hashCode()
     }
 
-    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
         override val containerView: View
             get() = contentView
     }

app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt

@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
-import android.annotation.SuppressLint
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
@@ -9,22 +8,19 @@ import eu.davidea.viewholders.FlexibleViewHolder
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
 import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_login_student_select.*
+import kotlinx.android.synthetic.main.item_login_student_select.view.*
 
 class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem<LoginStudentSelectItem.ItemViewHolder>() {
 
     override fun getLayoutRes(): Int = R.layout.item_login_student_select
 
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ItemViewHolder {
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ItemViewHolder {
         return ItemViewHolder(view, adapter)
     }
 
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ItemViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.run {
-            loginItemName.text = "${student.studentName} ${student.className}"
-            loginItemSchool.text = student.schoolName
-        }
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ItemViewHolder?,
+                                position: Int, payloads: MutableList<Any>?) {
+        holder?.bind(student)
     }
 
     override fun equals(other: Any?): Boolean {
@@ -42,8 +38,17 @@ class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem<LoginS
         return student.hashCode()
     }
 
-    class ItemViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
+    class ItemViewHolder(view: View?, adapter: FlexibleAdapter<*>?)
+        : FlexibleViewHolder(view, adapter), LayoutContainer {
+
+        override val containerView: View?
             get() = itemView
+
+        fun bind(item: Student) {
+            itemView.run {
+                loginItemName.text = item.studentName
+                loginItemSchool.text = item.schoolName
+            }
+        }
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt

@@ -22,11 +22,7 @@ class LuckyNumberPresenter @Inject constructor(
     override fun onAttachView(view: LuckyNumberView) {
         super.onAttachView(view)
         Timber.i("Lucky number view is attached")
-        view.run {
-            initView()
-            showContent(false)
-            enableSwipe(false)
-        }
+        view.initView()
         loadData()
     }
 
@@ -39,6 +35,12 @@ class LuckyNumberPresenter @Inject constructor(
                 .flatMapMaybe { luckyNumberRepository.getLuckyNumber(it, forceRefresh) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.run {
+                        showContent(false)
+                        enableSwipe(false)
+                    }
+                }
                 .doFinally {
                     view?.run {
                         hideRefresh()

app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt

@@ -2,10 +2,7 @@ package io.github.wulkanowy.ui.modules.main
 
 import android.content.Context
 import android.content.Intent
-import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
-import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.os.Bundle
-import android.os.Handler
 import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
@@ -71,6 +68,11 @@ class MainActivity : BaseActivity(), MainView {
         return true
     }
 
+    override fun onStart() {
+        super.onStart()
+        presenter.onViewChange()
+    }
+
     override fun initView() {
         mainBottomNav.run {
             addItems(
@@ -142,9 +144,7 @@ class MainActivity : BaseActivity(), MainView {
     }
 
     override fun notifyMenuViewReselected() {
-        Handler().postDelayed({
-            (navController.currentStack?.get(0) as? MainView.MainChildView)?.onFragmentReselected()
-        }, 250)
+        (navController.currentStack?.get(0) as? MainView.MainChildView)?.onFragmentReselected()
     }
 
     fun showDialogFragment(dialog: DialogFragment) {
@@ -165,7 +165,7 @@ class MainActivity : BaseActivity(), MainView {
 
     override fun openLoginView() {
         startActivity(LoginActivity.getStartIntent(this)
-            .apply { addFlags(FLAG_ACTIVITY_CLEAR_TASK or FLAG_ACTIVITY_NEW_TASK) })
+            .apply { addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) })
     }
 
     override fun onSaveInstanceState(outState: Bundle?) {

app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt

@@ -5,6 +5,7 @@ import dagger.Module
 import dagger.Provides
 import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.R
+import io.github.wulkanowy.di.scopes.PerActivity
 import io.github.wulkanowy.di.scopes.PerFragment
 import io.github.wulkanowy.ui.modules.about.AboutFragment
 import io.github.wulkanowy.ui.modules.about.AboutModule
@@ -32,6 +33,7 @@ abstract class MainModule {
     companion object {
 
         @JvmStatic
+        @PerActivity
         @Provides
         fun provideFragNavController(activity: MainActivity): FragNavController {
             return FragNavController(activity.supportFragmentManager, R.id.mainFragmentContainer)

app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt

@@ -24,9 +24,9 @@ class MainPresenter @Inject constructor(
 
     fun onAttachView(view: MainView, initMenuIndex: Int) {
         super.onAttachView(view)
+        Timber.i("Main view is attached with $initMenuIndex menu index")
         view.run {
             startMenuIndex = if (initMenuIndex != -1) initMenuIndex else prefRepository.startMenuIndex
-            Timber.i("Main view is attached with $startMenuIndex menu index")
             initView()
         }
 

app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt

@@ -20,9 +20,12 @@ class MessageItem(val message: Message, private val noSubjectString: String) :
         return ViewHolder(view, adapter)
     }
 
-    override fun getLayoutRes() = R.layout.item_message
+    override fun getLayoutRes(): Int = R.layout.item_message
 
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+    override fun bindViewHolder(
+        adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder,
+        position: Int, payloads: MutableList<Any>?
+    ) {
         holder.apply {
             val style = if (message.unread) BOLD else NORMAL
 
@@ -55,7 +58,9 @@ class MessageItem(val message: Message, private val noSubjectString: String) :
         return message.hashCode()
     }
 
-    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
         override val containerView: View
             get() = contentView
     }

app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt

@@ -14,12 +14,12 @@ class MoreItem(val title: String, private val drawable: Drawable?) : AbstractFle
 
     override fun getLayoutRes() = R.layout.item_more
 
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
         return ViewHolder(view, adapter)
     }
 
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder?, position: Int, payloads: MutableList<Any>?) {
+        holder?.apply {
             moreItemTitle.text = title
             moreItemImage.setImageDrawable(drawable)
         }
@@ -40,8 +40,9 @@ class MoreItem(val title: String, private val drawable: Drawable?) : AbstractFle
         return title.hashCode()
     }
 
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<*>?) : FlexibleViewHolder(view, adapter), LayoutContainer {
+
+        override val containerView: View?
             get() = contentView
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt

@@ -15,13 +15,16 @@ import kotlinx.android.synthetic.main.item_note.*
 
 class NoteItem(val note: Note) : AbstractFlexibleItem<NoteItem.ViewHolder>() {
 
-    override fun getLayoutRes() = R.layout.item_note
-
     override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): NoteItem.ViewHolder {
         return NoteItem.ViewHolder(view, adapter)
     }
 
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: NoteItem.ViewHolder, position: Int, payloads: MutableList<Any>?) {
+    override fun getLayoutRes(): Int = R.layout.item_note
+
+    override fun bindViewHolder(
+        adapter: FlexibleAdapter<IFlexible<*>>,
+        holder: NoteItem.ViewHolder, position: Int, payloads: MutableList<Any>?
+    ) {
         holder.apply {
             noteItemDate.apply {
                 text = note.date.toFormattedString()
@@ -54,6 +57,7 @@ class NoteItem(val note: Note) : AbstractFlexibleItem<NoteItem.ViewHolder>() {
     }
 
     class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+
         override val containerView: View
             get() = contentView
     }

app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt

@@ -15,17 +15,18 @@ import io.github.wulkanowy.utils.toFormattedString
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.item_timetable.*
 
-class TimetableItem(val lesson: Timetable, private val roomText: String) :
-    AbstractFlexibleItem<TimetableItem.ViewHolder>() {
+class TimetableItem(val lesson: Timetable, private val roomText: String)
+    : AbstractFlexibleItem<TimetableItem.ViewHolder>() {
 
-    override fun getLayoutRes() = R.layout.item_timetable
+    override fun getLayoutRes(): Int = R.layout.item_timetable
 
     override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
         return ViewHolder(view, adapter)
     }
 
     @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder,
+                                position: Int, payloads: MutableList<Any>?) {
         holder.apply {
             timetableItemNumber.text = lesson.number.toString()
             timetableItemSubject.text = lesson.subject
@@ -33,8 +34,8 @@ class TimetableItem(val lesson: Timetable, private val roomText: String) :
             timetableItemTime.text = "${lesson.start.toFormattedString("HH:mm")} - ${lesson.end.toFormattedString("HH:mm")}"
             timetableItemAlert.visibility = if (lesson.changes || lesson.canceled) VISIBLE else GONE
             timetableItemSubject.paintFlags =
-                if (lesson.canceled) timetableItemSubject.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
-                else timetableItemSubject.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
+                    if (lesson.canceled) timetableItemSubject.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+                    else timetableItemSubject.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
         }
     }
 
@@ -49,12 +50,12 @@ class TimetableItem(val lesson: Timetable, private val roomText: String) :
     }
 
     override fun hashCode(): Int {
-        var result = lesson.hashCode()
-        result = 31 * result + lesson.id.toInt()
-        return result
+        return lesson.hashCode()
     }
 
-    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
+            LayoutContainer {
+
         override val containerView: View
             get() = contentView
     }

app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt

@@ -128,7 +128,7 @@ class TimetablePresenter @Inject constructor(
             clearData()
             showNextButton(!currentDate.plusDays(1).isHolidays)
             showPreButton(!currentDate.minusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
+            updateNavigationDay(currentDate.toFormattedString("EEEE \n dd.MM.YYYY").capitalize())
         }
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt

@@ -112,7 +112,7 @@ class CompletedLessonsPresenter @Inject constructor(
             clearData()
             showNextButton(!currentDate.plusDays(1).isHolidays)
             showPreButton(!currentDate.minusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
+            updateNavigationDay(currentDate.toFormattedString("EEEE \n dd.MM.YYYY").capitalize())
         }
     }
 }

app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt

@@ -17,7 +17,6 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.toFormattedString
-import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import timber.log.Timber
 
@@ -52,13 +51,9 @@ class TimetableWidgetFactory(
             ?.let { date ->
                 try {
                     lessons = studentRepository.isStudentSaved()
-                        .flatMap { isSaved ->
-                            if (isSaved) {
-                                studentRepository.getCurrentStudent()
-                                    .flatMap { semesterRepository.getCurrentSemester(it) }
-                                    .flatMap { timetableRepository.getTimetable(it, date, date) }
-                            } else Single.just(emptyList())
-                        }
+                        .flatMap { studentRepository.getCurrentStudent() }
+                        .flatMap { semesterRepository.getCurrentSemester(it) }
+                        .flatMap { timetableRepository.getTimetable(it, date, date) }
                         .map { item -> item.sortedBy { it.number } }
                         .subscribeOn(schedulers.backgroundThread)
                         .blockingGet()

app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetProvider.kt

@@ -62,7 +62,7 @@ class TimetableWidgetProvider : BroadcastReceiver() {
 
     private fun onUpdate(context: Context, intent: Intent) {
         if (intent.getStringExtra(EXTRA_BUTTON_TYPE) === null) {
-            intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS)?.forEach { appWidgetId ->
+            intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS).forEach { appWidgetId ->
                 updateWidget(context, appWidgetId, now().nextOrSameSchoolDay)
             }
         } else {
@@ -95,7 +95,7 @@ class TimetableWidgetProvider : BroadcastReceiver() {
                 .apply { action = createWidgetKey(appWidgetId) })
             setOnClickPendingIntent(R.id.timetableWidgetNext, createNavIntent(context, appWidgetId, appWidgetId, BUTTON_NEXT))
             setOnClickPendingIntent(R.id.timetableWidgetPrev, createNavIntent(context, -appWidgetId, appWidgetId, BUTTON_PREV))
-            createNavIntent(context, Int.MAX_VALUE - appWidgetId, appWidgetId, BUTTON_RESET).also {
+            createNavIntent(context, Int.MAX_VALUE, appWidgetId, BUTTON_RESET).also {
                 setOnClickPendingIntent(R.id.timetableWidgetDate, it)
                 setOnClickPendingIntent(R.id.timetableWidgetDay, it)
             }

app/src/main/play/release-notes/pl-PL/default.txt

@@ -1,9 +1,18 @@
-Wersja 0.7.5
+Dodaliśmy:
+- szczęśliwy numerek
+- lekcje zrealizowane
+- wysyłanie wiadomości
+- ucznia na tle klasy
+- opcję zmiany kolorów ocen
+
+Zmieniliśmy:
+- wygląd ekranu logowania
+- sposób wyświetlania zastępstw
+- widok zadań domowych na tygodniowy
 
 Naprawiliśmy:
-- problem z brakiem aktywnego semestru (jeśli doświadczysz jakichś problemów - wyloguj i zaloguj się ponownie)
-- logowanie w niestandardowych dziennikach na vulcan.net.pl
-- oznaczanie lekcji w planie jako odwołanej, jeśli brak opisu tej zmiany
-- ładowanie wiadomości, jeśli byli zalogowani jednocześnie uczeń i rodzic
+- automatyczne przełączanie widżetu na nowy dzień
+- wyświetlanie powiadomień o starych ocenach
+- znikające numery sal w planie lekcji
 
-Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases/tag/0.7.5
+Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases/tag/0.7.0

app/src/main/res/drawable/ic_login_outlined_border.xml

@@ -1,5 +1,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@null" />
     <stroke
         android:width="1dip"
         android:color="#61000000" />

app/src/main/res/layout/item_account.xml

@@ -30,10 +30,8 @@
         android:layout_marginLeft="20dp"
         android:layout_toEndOf="@id/accountItemImage"
         android:layout_toRightOf="@id/accountItemImage"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textSize="16sp"
-        tools:text="@tools:sample/lorem/random" />
+        android:text="@string/app_name"
+        android:textSize="16sp" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/accountItemSchool"
@@ -47,6 +45,6 @@
         android:layout_toRightOf="@id/accountItemImage"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textSize="12sp"
-        tools:text="@tools:sample/lorem/random" />
+        android:text="@string/app_name"
+        android:textSize="12sp" />
 </RelativeLayout>

app/src/main/res/values-pl/value_prefernces.xml

@@ -22,7 +22,6 @@
         <item>0,25</item>
         <item>0,33</item>
         <item>0,5</item>
-        <item>0,75</item>
     </string-array>
 
     <string-array name="grade_color_scheme_entries">

app/src/main/res/values/value_prefernces.xml

@@ -50,14 +50,12 @@
         <item>0,25</item>
         <item>0,33</item>
         <item>0,5</item>
-        <item>0,75</item>
     </string-array>
     <string-array name="grade_modifier_value" translatable="false">
         <item>0.0</item>
         <item>0.25</item>
         <item>0.33</item>
         <item>0.5</item>
-        <item>0.75</item>
     </string-array>
 
     <string-array name="grade_color_scheme_entries">

app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt

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

app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt

@@ -1,8 +1,9 @@
-package io.github.wulkanowy.data.repositories.attendance
+package io.github.wulkanowy.data.repositories.remote
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.api.attendance.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.attendance.AttendanceRemote
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK

app/src/test/java/io/github/wulkanowy/data/repositories/remote/CompletedLessonsRemoteTest.kt

@@ -1,8 +1,9 @@
-package io.github.wulkanowy.data.repositories.completedlessons
+package io.github.wulkanowy.data.repositories.remote
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.api.timetable.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRemote
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK

app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt

@@ -1,8 +1,9 @@
-package io.github.wulkanowy.data.repositories.exam
+package io.github.wulkanowy.data.repositories.remote
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.api.exams.Exam
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.exam.ExamRemote
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK

app/src/test/java/io/github/wulkanowy/data/repositories/remote/GradeStatisticsRemoteTest.kt

@@ -1,8 +1,9 @@
-package io.github.wulkanowy.data.repositories.gradestatistics
+package io.github.wulkanowy.data.repositories.remote
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.api.grades.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.gradestatistics.GradeStatisticsRemote
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK

app/src/test/java/io/github/wulkanowy/data/repositories/remote/LuckyNumberRemoteTest.kt

@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.luckynumber
+package io.github.wulkanowy.data.repositories.remote
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Semester

app/src/test/java/io/github/wulkanowy/data/repositories/remote/StudentRemoteTest.kt

@@ -1,7 +1,8 @@
-package io.github.wulkanowy.data.repositories.student
+package io.github.wulkanowy.data.repositories.remote
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.api.register.Student
+import io.github.wulkanowy.data.repositories.student.StudentRemote
 import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -22,7 +23,7 @@ class StudentRemoteTest {
 
     @Test
     fun testRemoteAll() {
-        doReturn(Single.just(listOf(Student("", "", 1, "test", "", "", "", 1, Api.LoginType.AUTO))))
+        doReturn(Single.just(listOf(Student("", "", 1, "test", "", "", Api.LoginType.AUTO))))
             .`when`(mockApi).getStudents()
 
         val students = StudentRemote(mockApi).getStudents("", "", "").blockingGet()

app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt

@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.timetable
+package io.github.wulkanowy.data.repositories.remote
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.api.timetable.Timetable

app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt

@@ -1,74 +0,0 @@
-package io.github.wulkanowy.data.repositories.semester
-
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.ApiHelper
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
-import io.reactivex.Maybe
-import io.reactivex.Single
-import org.junit.Before
-import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito.doNothing
-import org.mockito.Mockito.doReturn
-import org.mockito.Mockito.verify
-import org.mockito.MockitoAnnotations
-
-class SemesterRepositoryTest {
-
-    @Mock
-    private lateinit var semesterRemote: SemesterRemote
-
-    @Mock
-    private lateinit var semesterLocal: SemesterLocal
-
-    @Mock
-    private lateinit var apiHelper: ApiHelper
-
-    @Mock
-    private lateinit var student: Student
-
-    private lateinit var semesterRepository: SemesterRepository
-
-    private val settings = InternetObservingSettings.builder()
-        .strategy(UnitTestInternetObservingStrategy())
-        .build()
-
-    @Before
-    fun initTest() {
-        MockitoAnnotations.initMocks(this)
-        semesterRepository = SemesterRepository(semesterRemote, semesterLocal, settings, apiHelper)
-    }
-
-    @Test
-    fun singleCurrentSemesterTest() {
-        val semesters = listOf(
-            createSemesterEntity(false),
-            createSemesterEntity(true)
-        )
-
-        doNothing().`when`(apiHelper).initApi(student)
-        doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
-        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
-
-        semesterRepository.getSemesters(student).blockingGet()
-
-        verify(semesterLocal).deleteSemesters(emptyList())
-        verify(semesterLocal).saveSemesters(semesters)
-    }
-
-    @Test(expected = IllegalArgumentException::class)
-    fun twoCurrentSemesterTest() {
-        val semesters = listOf(
-            createSemesterEntity(true),
-            createSemesterEntity(true)
-        )
-
-        doNothing().`when`(apiHelper).initApi(student)
-        doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
-        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
-
-        semesterRepository.getSemesters(student).blockingGet()
-    }
-}

app/src/test/java/io/github/wulkanowy/data/repositories/semester/TestSemesterEnityCreator.kt

@@ -1,20 +0,0 @@
-package io.github.wulkanowy.data.repositories.semester
-
-import io.github.wulkanowy.data.db.entities.Semester
-import org.threeten.bp.LocalDate.now
-
-fun createSemesterEntity(current: Boolean): Semester {
-    return Semester(
-        studentId = 0,
-        diaryId = 0,
-        semesterId = 0,
-        diaryName = "",
-        schoolYear = 1970,
-        classId = 0,
-        isCurrent = current,
-        semesterName = 0,
-        unitId = 0,
-        start = now(),
-        end = now()
-    )
-}

app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt

@@ -86,7 +86,7 @@ class LoginFormPresenterTest {
 
     @Test
     fun loginTest() {
-        val studentTest = Student(email = "test@", password = "123", endpoint = "https://fakelog.cf", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, classId = 1, isCurrent = false, symbol = "", registrationDate = now(), className = "")
+        val studentTest = Student(email = "test@", password = "123", endpoint = "https://fakelog.cf", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, isCurrent = false, symbol = "", registrationDate = now())
         doReturn(Single.just(listOf(studentTest)))
             .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
 

app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt

@@ -32,7 +32,7 @@ class LoginStudentSelectPresenterTest {
 
     private lateinit var presenter: LoginStudentSelectPresenter
 
-    private val testStudent by lazy { Student(email = "test", password = "test123", endpoint = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", classId = 1, studentName = "", registrationDate = now(), className = "") }
+    private val testStudent by lazy { Student(email = "test", password = "test123", endpoint = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", studentName = "", registrationDate = now()) }
 
     private val testException by lazy { RuntimeException("Problem") }