Merge branch 'release/0.17.2'

Version 0.17.1

.travis.yml

@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.16.0
+    - 0.17.2
 
 android:
  licenses:

app/build.gradle

@@ -4,6 +4,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
+apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
@@ -17,8 +18,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 53
+        versionCode 56
-        versionName "0.16.0"
+        versionName "0.17.2"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -96,6 +97,10 @@ android {
         exclude 'META-INF/library_release.kotlin_module'
         exclude 'META-INF/library-core_release.kotlin_module'
     }
+
+    aboutLibraries {
+        configPath = "app/src/main/res/raw"
+    }
 }
 
 androidExtensions {
@@ -110,10 +115,11 @@ play {
 }
 
 ext {
-    work_manager = "2.3.2"
+    work_manager = "2.3.4"
-    room = "2.2.4"
+    room = "2.2.5"
-    dagger = "2.26"
+    dagger = "2.27"
-    chucker = "2.0.4"
+    // don't update https://github.com/ChuckerTeam/chucker/issues/242
+    chucker = "3.2.0"
     mockk = "1.9.2"
 }
 
@@ -122,21 +128,21 @@ configurations.all {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:0.16.0"
+    implementation "io.github.wulkanowy:sdk:0.17.2"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "androidx.core:core-ktx:1.2.0"
     implementation "androidx.activity:activity-ktx:1.1.0"
-    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.appcompat:appcompat:1.2.0-beta01"
     implementation "androidx.appcompat:appcompat-resources:1.1.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.2"
+    implementation "androidx.fragment:fragment-ktx:1.2.4"
     implementation "androidx.annotation:annotation:1.1.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
-    implementation "androidx.preference:preference-ktx:1.1.0"
+    implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation "androidx.viewpager:viewpager:1.0.0"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
     implementation "com.google.android.material:material:1.1.0"
@@ -148,6 +154,8 @@ dependencies {
     implementation "androidx.work:work-rxjava2:$work_manager"
     implementation "androidx.work:work-gcm:$work_manager"
 
+    implementation 'com.github.PaulinaSadowska:RxWorkManagerObservers:1.0.0'
+
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-rxjava2:$room"
     implementation "androidx.room:room-ktx:$room"
@@ -163,34 +171,37 @@ dependencies {
     implementation "eu.davidea:flexible-adapter-ui:1.0.0"
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
     implementation "com.ncapdevi:frag-nav:3.3.0"
-    implementation "com.github.YarikSOffice:lingver:1.1.0"
+    implementation "com.github.YarikSOffice:lingver:1.2.1"
 
     implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.18"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.19"
 
     implementation "com.google.code.gson:gson:2.8.6"
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.2"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.3"
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
     implementation "fr.bipi.treessence:treessence:0.3.2"
-    implementation "com.mikepenz:aboutlibraries-core:7.1.0"
+    implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
     implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
+    implementation "io.coil-kt:coil:0.9.5"
 
-    implementation("io.coil-kt:coil:0.9.5")
+    playImplementation 'com.google.firebase:firebase-analytics:17.3.0'
-
+    playImplementation 'com.google.firebase:firebase-inappmessaging-display-ktx:19.0.5'
-    playImplementation "com.google.firebase:firebase-core:17.2.3"
+    playImplementation "com.google.firebase:firebase-inappmessaging-ktx:19.0.5"
+    playImplementation "com.google.firebase:firebase-messaging:20.1.0"
     playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
+    playImplementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
 
-    releaseImplementation "fr.o80.chucker:library-no-op:$chucker"
+    releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 
-    debugImplementation "fr.o80.chucker:library:$chucker"
+    debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
     testImplementation "junit:junit:4.13"
     testImplementation "io.mockk:mockk:$mockk"
-    testImplementation "org.threeten:threetenbp:1.4.1"
+    testImplementation "org.threeten:threetenbp:1.4.3"
-    testImplementation "org.mockito:mockito-inline:3.3.1"
+    testImplementation "org.mockito:mockito-inline:3.3.3"
 
     androidTestImplementation "androidx.test:core:1.2.0"
     androidTestImplementation "androidx.test:runner:1.2.0"
@@ -198,7 +209,7 @@ dependencies {
     androidTestImplementation "io.mockk:mockk-android:$mockk"
     androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    androidTestImplementation "org.mockito:mockito-android:3.3.1"
+    androidTestImplementation "org.mockito:mockito-android:3.3.3"
 }
 
 apply plugin: 'com.google.gms.google-services'

app/proguard-rules.pro

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

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

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

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

@@ -5,13 +5,11 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.repositories.getStudent
-import io.github.wulkanowy.data.db.entities.Student
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -21,14 +19,13 @@ class StudentLocalTest {
 
     private lateinit var testDb: AppDatabase
 
-    private lateinit var sharedProvider: SharedPrefProvider
+    private val student = getStudent()
 
     @Before
     fun createDb() {
         val context = ApplicationProvider.getApplicationContext<Context>()
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .build()
-        sharedProvider = SharedPrefProvider(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
         studentLocal = StudentLocal(testDb.studentDao, context)
     }
 
@@ -39,8 +36,7 @@ class StudentLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        studentLocal.saveStudents(listOf(Student(email = "test", password = "test123", schoolSymbol = "23", scrapperBaseUrl = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolShortName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = "", loginMode = "API", certificateKey = "", privateKey = "", mobileBaseUrl = "", userLoginId = 0, isParent = false)))
+        studentLocal.saveStudents(listOf(student)).blockingGet()
-            .blockingGet()
 
         val student = studentLocal.getCurrentStudent(true).blockingGet()
         assertEquals("23", student.schoolSymbol)

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

@@ -9,6 +9,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
+import io.github.wulkanowy.data.repositories.getStudent
 import io.github.wulkanowy.sdk.Sdk
 import io.mockk.MockKAnnotations
 import io.mockk.every
@@ -33,6 +34,8 @@ class TimetableRepositoryTest {
         .strategy(TestInternetObservingStrategy())
         .build()
 
+    private val student = getStudent()
+
     @MockK
     private lateinit var semesterMock: Semester
 
@@ -78,7 +81,7 @@ class TimetableRepositoryTest {
         ))
 
         val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
-            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
+            .getTimetable(student, semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
             .blockingGet()
 
         assertEquals(4, lessons.size)
@@ -124,7 +127,7 @@ class TimetableRepositoryTest {
         ))
 
         val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
-            .getTimetable(semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true)
+            .getTimetable(student, semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true)
             .blockingGet()
 
         assertEquals(12, lessons.size)

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

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

app/src/main/AndroidManifest.xml

@@ -22,7 +22,8 @@
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/WulkanowyTheme.SplashScreen">
+            android:theme="@style/WulkanowyTheme.SplashScreen"
+            tools:ignore="LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -112,5 +113,13 @@
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
             android:value="${crashlytics_enabled}" />
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/ic_stat_push" />
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="push_channel" />
     </application>
 </manifest>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,9 @@ package io.github.wulkanowy.data.repositories.grade
 
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -10,8 +12,9 @@ import javax.inject.Singleton
 @Singleton
 class GradeRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getGrades(semester: Semester): Single<List<Grade>> {
+    fun getGrades(student: Student, semester: Semester): Single<List<Grade>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGrades(semester.semesterId)
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getGrades(semester.semesterId)
             .map { grades ->
                 grades.map {
                     Grade(

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

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

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

@@ -2,7 +2,9 @@ package io.github.wulkanowy.data.repositories.gradessummary
 
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -10,8 +12,9 @@ import javax.inject.Singleton
 @Singleton
 class GradeSummaryRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getGradeSummary(semester: Semester): Single<List<GradeSummary>> {
+    fun getGradeSummary(student: Student, semester: Semester): Single<List<GradeSummary>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGradesSummary(semester.semesterId)
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getGradesSummary(semester.semesterId)
             .map { gradesSummary ->
                 gradesSummary.map {
                     GradeSummary(

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

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

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

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

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

@@ -5,6 +5,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.GradeStatisticsItem
 import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
 import io.github.wulkanowy.utils.uniqueSubtract
@@ -20,11 +21,11 @@ class GradeStatisticsRepository @Inject constructor(
     private val remote: GradeStatisticsRemote
 ) {
 
-    fun getGradesStatistics(semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false): Single<List<GradeStatisticsItem>> {
+    fun getGradesStatistics(student: Student, semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false): Single<List<GradeStatisticsItem>> {
         return local.getGradesStatistics(semester, isSemester, subjectName).map { it.mapToStatisticItems() }.filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getGradeStatistics(semester, isSemester)
+                    if (it) remote.getGradeStatistics(student, semester, isSemester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getGradesStatistics(semester, isSemester).toSingle(emptyList())
@@ -35,11 +36,11 @@ class GradeStatisticsRepository @Inject constructor(
                 }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).map { it.mapToStatisticItems() }.toSingle(emptyList()) })
     }
 
-    fun getGradesPointsStatistics(semester: Semester, subjectName: String, forceRefresh: Boolean): Single<List<GradeStatisticsItem>> {
+    fun getGradesPointsStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean): Single<List<GradeStatisticsItem>> {
         return local.getGradesPointsStatistics(semester, subjectName).map { it.mapToStatisticsItem() }.filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getGradePointsStatistics(semester)
+                    if (it) remote.getGradePointsStatistics(student, semester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getGradesPointsStatistics(semester).toSingle(emptyList())

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,6 @@ package io.github.wulkanowy.data.repositories.recipient
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
@@ -17,36 +16,31 @@ import javax.inject.Singleton
 class RecipientRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: RecipientLocal,
-    private val remote: RecipientRemote,
+    private val remote: RecipientRemote
-    private val sdkHelper: SdkHelper
 ) {
 
     fun getRecipients(student: Student, role: Int, unit: ReportingUnit, forceRefresh: Boolean = false): Single<List<Recipient>> {
-        return Single.just(sdkHelper.init(student))
+        return local.getRecipients(student, role, unit).filter { !forceRefresh }
-            .flatMap { _ ->
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                local.getRecipients(student, role, unit).filter { !forceRefresh }
+                .flatMap {
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                    if (it) remote.getRecipients(student, role, unit)
-                        .flatMap {
+                    else Single.error(UnknownHostException())
-                            if (it) remote.getRecipients(role, unit)
+                }.flatMap { new ->
-                            else Single.error(UnknownHostException())
+                    local.getRecipients(student, role, unit).toSingle(emptyList())
-                        }.flatMap { new ->
+                        .doOnSuccess { old ->
-                            local.getRecipients(student, role, unit).toSingle(emptyList())
+                            local.deleteRecipients(old.uniqueSubtract(new))
-                                .doOnSuccess { old ->
+                            local.saveRecipients(new.uniqueSubtract(old))
-                                    local.deleteRecipients(old.uniqueSubtract(new))
-                                    local.saveRecipients(new.uniqueSubtract(old))
-                                }
-                        }.flatMap {
-                            local.getRecipients(student, role, unit).toSingle(emptyList())
                         }
-                    )
+                }.flatMap {
-            }
+                    local.getRecipients(student, role, unit).toSingle(emptyList())
+                }
+            )
     }
 
     fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
-        return Single.just(sdkHelper.init(student))
+        return ReactiveNetwork.checkInternetConnectivity(settings)
-            .flatMap { ReactiveNetwork.checkInternetConnectivity(settings) }
             .flatMap {
-                if (it) remote.getMessageRecipients(message)
+                if (it) remote.getMessageRecipients(student, message)
                 else Single.error(UnknownHostException())
             }
     }

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

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

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

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

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

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

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

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

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

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

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

@@ -2,13 +2,12 @@ package io.github.wulkanowy.data.repositories.semester
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.getCurrentOrLast
 import io.github.wulkanowy.utils.isCurrent
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -18,31 +17,28 @@ import javax.inject.Singleton
 class SemesterRepository @Inject constructor(
     private val remote: SemesterRemote,
     private val local: SemesterLocal,
-    private val settings: InternetObservingSettings,
+    private val settings: InternetObservingSettings
-    private val sdkHelper: SdkHelper
 ) {
 
     fun getSemesters(student: Student, forceRefresh: Boolean = false, refreshOnNoCurrent: Boolean = false): Single<List<Semester>> {
-        return Maybe.just(sdkHelper.init(student))
+        return local.getSemesters(student).filter { !forceRefresh }.filter { semesters ->
-            .flatMap {
+            when {
-                local.getSemesters(student).filter { !forceRefresh }.filter {
+                Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API -> semesters.firstOrNull { it.isCurrent }?.diaryId != 0
-                    if (refreshOnNoCurrent) {
+                refreshOnNoCurrent -> semesters.any { semester -> semester.isCurrent }
-                        it.any { semester -> semester.isCurrent }
+                else -> true
-                    } else true
-                }
             }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+        }.switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
+            .flatMap {
-                    if (it) remote.getSemesters(student)
+                if (it) remote.getSemesters(student)
-                    else Single.error(UnknownHostException())
+                else Single.error(UnknownHostException())
-                }.flatMap { new ->
+            }.flatMap { new ->
-                    if (new.isEmpty()) throw IllegalArgumentException("Empty semester list!")
+                if (new.isEmpty()) throw IllegalArgumentException("Empty semester list!")
 
-                    local.getSemesters(student).toSingle(emptyList()).doOnSuccess { old ->
+                local.getSemesters(student).toSingle(emptyList()).doOnSuccess { old ->
-                        local.deleteSemesters(old.uniqueSubtract(new))
+                    local.deleteSemesters(old.uniqueSubtract(new))
-                        local.saveSemesters(new.uniqueSubtract(old))
+                    local.saveSemesters(new.uniqueSubtract(old))
-                    }
+                }
-                }.flatMap { local.getSemesters(student).toSingle(emptyList()) })
+            }.flatMap { local.getSemesters(student).toSingle(emptyList()) })
     }
 
     fun getCurrentSemester(student: Student, forceRefresh: Boolean = false): Single<Semester> {

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

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

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

@@ -47,6 +47,12 @@ class StudentRepository @Inject constructor(
         return local.getStudents(decryptPass).toSingle(emptyList())
     }
 
+    fun getStudentById(id: Int): Single<Student> {
+        return local.getStudentById(id)
+            .switchIfEmpty(Maybe.error(NoCurrentStudentException()))
+            .toSingle()
+    }
+
     fun getCurrentStudent(decryptPass: Boolean = true): Single<Student> {
         return local.getCurrentStudent(decryptPass)
             .switchIfEmpty(Maybe.error(NoCurrentStudentException()))

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

@@ -12,7 +12,7 @@ class SubjectLocal @Inject constructor(private val subjectDao: SubjectDao) {
 
     fun getSubjects(semester: Semester): Maybe<List<Subject>> {
         return subjectDao.loadAll(semester.diaryId, semester.studentId)
-            .filter { !it.isEmpty() }
+            .filter { it.isNotEmpty() }
     }
 
     fun saveSubjects(subjects: List<Subject>) {

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

@@ -1,8 +1,10 @@
 package io.github.wulkanowy.data.repositories.subject
 
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -10,8 +12,9 @@ import javax.inject.Singleton
 @Singleton
 class SubjectRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getSubjects(semester: Semester): Single<List<Subject>> {
+    fun getSubjects(student: Student, semester: Semester): Single<List<Subject>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getSubjects()
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getSubjects()
             .map { subjects ->
                 subjects.map {
                     Subject(

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

@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories.subject
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -17,11 +18,11 @@ class SubjectRepository @Inject constructor(
     private val remote: SubjectRemote
 ) {
 
-    fun getSubjects(semester: Semester, forceRefresh: Boolean = false): Single<List<Subject>> {
+    fun getSubjects(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<Subject>> {
         return local.getSubjects(semester).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getSubjects(semester)
+                    if (it) remote.getSubjects(student, semester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getSubjects(semester)

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

@@ -1,8 +1,10 @@
 package io.github.wulkanowy.data.repositories.teacher
 
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -10,8 +12,9 @@ import javax.inject.Singleton
 @Singleton
 class TeacherRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getTeachers(semester: Semester): Single<List<Teacher>> {
+    fun getTeachers(student: Student, semester: Semester): Single<List<Teacher>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getTeachers(semester.semesterId)
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getTeachers(semester.semesterId)
             .map { teachers ->
                 teachers.map {
                     Teacher(

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

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

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

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

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

@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories.timetable
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
@@ -20,11 +21,11 @@ class TimetableRepository @Inject constructor(
     private val remote: TimetableRemote
 ) {
 
-    fun getTimetable(semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Timetable>> {
+    fun getTimetable(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Timetable>> {
         return Single.fromCallable { start.monday to end.friday }.flatMap { (monday, friday) ->
             local.getTimetable(semester, monday, friday).filter { !forceRefresh }
                 .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-                    if (it) remote.getTimetable(semester, monday, friday)
+                    if (it) remote.getTimetable(student, semester, monday, friday)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getTimetable(semester, monday, friday)

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

@@ -15,6 +15,7 @@ import io.github.wulkanowy.services.sync.channels.LuckyNumberChannel
 import io.github.wulkanowy.services.sync.channels.NewGradesChannel
 import io.github.wulkanowy.services.sync.channels.NewMessagesChannel
 import io.github.wulkanowy.services.sync.channels.NewNotesChannel
+import io.github.wulkanowy.services.sync.channels.PushChannel
 import io.github.wulkanowy.services.sync.works.AttendanceSummaryWork
 import io.github.wulkanowy.services.sync.works.AttendanceWork
 import io.github.wulkanowy.services.sync.works.CompletedLessonWork
@@ -126,4 +127,8 @@ abstract class ServicesModule {
     @Binds
     @IntoSet
     abstract fun provideNewNotesChannel(channel: NewNotesChannel): Channel
+
+    @Binds
+    @IntoSet
+    abstract fun providePushChannel(channel: PushChannel): Channel
 }

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

@@ -5,18 +5,24 @@ import android.os.Build.VERSION_CODES.O
 import androidx.core.app.NotificationManagerCompat
 import androidx.work.BackoffPolicy.EXPONENTIAL
 import androidx.work.Constraints
+import androidx.work.Data
 import androidx.work.ExistingPeriodicWorkPolicy.KEEP
 import androidx.work.ExistingPeriodicWorkPolicy.REPLACE
+import androidx.work.ExistingWorkPolicy
 import androidx.work.NetworkType.CONNECTED
 import androidx.work.NetworkType.UNMETERED
+import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkInfo
 import androidx.work.WorkManager
+import com.paulinasadowska.rxworkmanagerobservers.extensions.getWorkInfoByIdObservable
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.SharedPrefProvider.Companion.APP_VERSION_CODE_KEY
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.Channel
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.isHolidays
+import io.reactivex.Observable
 import org.threeten.bp.LocalDate.now
 import timber.log.Timber
 import java.util.concurrent.TimeUnit.MINUTES
@@ -42,13 +48,13 @@ class SyncManager @Inject constructor(
         }
 
         if (sharedPrefProvider.getLong(APP_VERSION_CODE_KEY, -1L) != appInfo.versionCode.toLong()) {
-            startSyncWorker(true)
+            startPeriodicSyncWorker(true)
             sharedPrefProvider.putLong(APP_VERSION_CODE_KEY, appInfo.versionCode.toLong(), true)
         }
         Timber.i("SyncManager was initialized")
     }
 
-    fun startSyncWorker(restart: Boolean = false) {
+    fun startPeriodicSyncWorker(restart: Boolean = false) {
         if (preferencesRepository.isServiceEnabled && !now().isHolidays) {
             workManager.enqueueUniquePeriodicWork(SyncWorker::class.java.simpleName, if (restart) REPLACE else KEEP,
                 PeriodicWorkRequestBuilder<SyncWorker>(preferencesRepository.servicesInterval, MINUTES)
@@ -61,6 +67,19 @@ class SyncManager @Inject constructor(
         }
     }
 
+    fun startOneTimeSyncWorker(): Observable<WorkInfo> {
+        val work = OneTimeWorkRequestBuilder<SyncWorker>()
+            .setInputData(
+                Data.Builder()
+                    .putBoolean("one_time", true)
+                    .build()
+            )
+            .build()
+
+        workManager.enqueueUniqueWork("${SyncWorker::class.java.simpleName}_one_time", ExistingWorkPolicy.REPLACE, work)
+        return workManager.getWorkInfoByIdObservable(work.id)
+    }
+
     fun stopSyncWorker() {
         workManager.cancelUniqueWork(SyncWorker::class.java.simpleName)
     }

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

@@ -5,6 +5,7 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.BigTextStyle
 import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
 import androidx.core.app.NotificationManagerCompat
+import androidx.work.Data
 import androidx.work.ListenableWorker
 import androidx.work.RxWorker
 import androidx.work.WorkerParameters
@@ -15,6 +16,7 @@ import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.sdk.exception.FeatureDisabledException
+import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
 import io.github.wulkanowy.services.sync.channels.DebugChannel
 import io.github.wulkanowy.services.sync.works.Work
 import io.github.wulkanowy.utils.getCompatColor
@@ -43,6 +45,10 @@ class SyncWorker @AssistedInject constructor(
                     .flatMapCompletable { semester ->
                         Completable.mergeDelayError(works.map { work ->
                             work.create(student, semester)
+                                .onErrorResumeNext {
+                                    if (it is FeatureDisabledException || it is FeatureNotAvailableException) Completable.complete()
+                                    else Completable.error(it)
+                                }
                                 .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") }
@@ -52,8 +58,15 @@ class SyncWorker @AssistedInject constructor(
             .toSingleDefault(Result.success())
             .onErrorReturn {
                 Timber.e(it, "There was an error during synchronization")
-                if (it is FeatureDisabledException) Result.success()
+                when {
-                else Result.retry()
+                    inputData.getBoolean("one_time", false) -> {
+                        Result.failure(Data.Builder()
+                            .putString("error", it.toString())
+                            .build()
+                        )
+                    }
+                    else -> Result.retry()
+                }
             }
             .doOnSuccess {
                 if (preferencesRepository.isDebugNotificationEnable) notify(it)
@@ -64,7 +77,7 @@ class SyncWorker @AssistedInject constructor(
     private fun notify(result: Result) {
         notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(applicationContext, DebugChannel.CHANNEL_ID)
             .setContentTitle("Debug notification")
-            .setSmallIcon(R.drawable.ic_more_settings)
+            .setSmallIcon(R.drawable.ic_stat_push)
             .setAutoCancel(true)
             .setColor(applicationContext.getCompatColor(R.color.colorPrimary))
             .setStyle(BigTextStyle().bigText("${SyncWorker::class.java.simpleName} result: $result"))

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

@@ -0,0 +1,32 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class PushChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
+    private val context: Context
+) : Channel {
+
+    companion object {
+        const val CHANNEL_ID = "push_channel"
+    }
+
+    override fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_push), NotificationManager.IMPORTANCE_HIGH)
+                .apply {
+                    enableLights(true)
+                    enableVibration(true)
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                }
+        )
+    }
+}

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

@@ -11,7 +11,7 @@ class AttendanceSummaryWork @Inject constructor(
 ) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return attendanceSummaryRepository.getAttendanceSummary(semester, -1, true).ignoreElement()
+        return attendanceSummaryRepository.getAttendanceSummary(student, semester, -1, true).ignoreElement()
     }
 }
 

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

@@ -12,7 +12,7 @@ import javax.inject.Inject
 class AttendanceWork @Inject constructor(private val attendanceRepository: AttendanceRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return attendanceRepository.getAttendance(semester, now().monday, now().friday, true)
+        return attendanceRepository.getAttendance(student, semester, now().monday, now().friday, true)
             .ignoreElement()
     }
 }

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

@@ -14,7 +14,7 @@ class CompletedLessonWork @Inject constructor(
 ) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return completedLessonsRepository.getCompletedLessons(semester, now().monday, now().friday, true)
+        return completedLessonsRepository.getCompletedLessons(student, semester, now().monday, now().friday, true)
             .ignoreElement()
     }
 }

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

@@ -12,6 +12,6 @@ import javax.inject.Inject
 class ExamWork @Inject constructor(private val examRepository: ExamRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return examRepository.getExams(semester, now().monday, now().friday, true).ignoreElement()
+        return examRepository.getExams(student, semester, now().monday, now().friday, true).ignoreElement()
     }
 }

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

@@ -9,7 +9,7 @@ import javax.inject.Inject
 class GradeStatisticsWork @Inject constructor(private val gradeStatisticsRepository: GradeStatisticsRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return gradeStatisticsRepository.getGradesStatistics(semester, "Wszystkie", false, true)
+        return gradeStatisticsRepository.getGradesStatistics(student, semester, "Wszystkie", false, true)
             .ignoreElement()
     }
 }

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

@@ -9,6 +9,6 @@ import javax.inject.Inject
 class GradeSummaryWork @Inject constructor(private val gradeSummaryRepository: GradeSummaryRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return gradeSummaryRepository.getGradesSummary(semester, true).ignoreElement()
+        return gradeSummaryRepository.getGradesSummary(student, semester, true).ignoreElement()
     }
 }

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

@@ -12,6 +12,6 @@ import javax.inject.Inject
 class HomeworkWork @Inject constructor(private val homeworkRepository: HomeworkRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return homeworkRepository.getHomework(semester, now().monday, now().friday, true).ignoreElement()
+        return homeworkRepository.getHomework(student, semester, now().monday, now().friday, true).ignoreElement()
     }
 }

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

@@ -9,6 +9,6 @@ import javax.inject.Inject
 class TeacherWork @Inject constructor(private val teacherRepository: TeacherRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return teacherRepository.getTeachers(semester, true).ignoreElement()
+        return teacherRepository.getTeachers(student, semester, true).ignoreElement()
     }
 }

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

@@ -12,7 +12,7 @@ import javax.inject.Inject
 class TimetableWork @Inject constructor(private val timetableRepository: TimetableRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return timetableRepository.getTimetable(semester, now().monday, now().friday, true)
+        return timetableRepository.getTimetable(student, semester, now().monday, now().friday, true)
             .ignoreElement()
     }
 }

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

@@ -6,19 +6,32 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.HorizontalScrollView
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.core.content.getSystemService
-import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
+import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
+import io.github.wulkanowy.sdk.exception.ServiceUnavailableException
+import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.getString
+import io.github.wulkanowy.utils.openEmailClient
+import io.github.wulkanowy.utils.openInternetBrowser
 import kotlinx.android.synthetic.main.dialog_error.*
 import java.io.PrintWriter
 import java.io.StringWriter
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+import javax.inject.Inject
 
-class ErrorDialog : DialogFragment() {
+class ErrorDialog : BaseDialogFragment() {
 
     private lateinit var error: Throwable
 
+    @Inject
+    lateinit var appInfo: AppInfo
+
     companion object {
         private const val ARGUMENT_KEY = "Data"
 
@@ -49,6 +62,9 @@ class ErrorDialog : DialogFragment() {
         }
 
         errorDialogContent.text = stringWriter.toString()
+        with(errorDialogHorizontalScroll) {
+            post { fullScroll(HorizontalScrollView.FOCUS_LEFT) }
+        }
         errorDialogCopy.setOnClickListener {
             val clip = ClipData.newPlainText("wulkanowy", stringWriter.toString())
             activity?.getSystemService<ClipboardManager>()?.setPrimaryClip(clip)
@@ -56,6 +72,29 @@ class ErrorDialog : DialogFragment() {
             Toast.makeText(context, R.string.all_copied, LENGTH_LONG).show()
         }
         errorDialogCancel.setOnClickListener { dismiss() }
+        errorDialogReport.setOnClickListener { openEmailClient(stringWriter.toString()) }
+        errorDialogMessage.text = resources.getString(error)
+        errorDialogReport.isEnabled = when (error) {
+            is UnknownHostException,
+            is SocketTimeoutException,
+            is ServiceUnavailableException,
+            is FeatureDisabledException,
+            is FeatureNotAvailableException -> false
+            else -> true
+        }
+    }
+
+    private fun openEmailClient(content: String) {
+        requireContext().openEmailClient(
+            chooserTitle = getString(R.string.about_feedback),
+            email = "wulkanowyinc@gmail.com",
+            subject = "Zgłoszenie błędu",
+            body = requireContext().getString(R.string.about_feedback_template,
+                "${appInfo.systemManufacturer} ${appInfo.systemModel}", appInfo.systemVersion.toString(), appInfo.versionName
+            ) + "\n" + content,
+            onActivityNotFound = {
+                requireContext().openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
+            }
+        )
     }
 }
-

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

@@ -1,21 +1,15 @@
 package io.github.wulkanowy.ui.base
 
 import android.content.res.Resources
-import com.readystatesoftware.chuck.api.ChuckCollector
+import com.chuckerteam.chucker.api.ChuckerCollector
-import io.github.wulkanowy.R
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.sdk.exception.BadCredentialsException
-import io.github.wulkanowy.sdk.exception.FeatureDisabledException
+import io.github.wulkanowy.utils.getString
-import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
-import io.github.wulkanowy.sdk.exception.NotLoggedInException
-import io.github.wulkanowy.sdk.exception.ServiceUnavailableException
 import io.github.wulkanowy.utils.security.ScramblerException
 import timber.log.Timber
-import java.net.SocketTimeoutException
-import java.net.UnknownHostException
 import javax.inject.Inject
 
-open class ErrorHandler @Inject constructor(protected val resources: Resources, private val chuckCollector: ChuckCollector) {
+open class ErrorHandler @Inject constructor(protected val resources: Resources, private val chuckerCollector: ChuckerCollector) {
 
     var showErrorMessage: (String, Throwable) -> Unit = { _, _ -> }
 
@@ -24,24 +18,16 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources,
     var onNoCurrentStudent: () -> Unit = {}
 
     fun dispatch(error: Throwable) {
-        chuckCollector.onError(error.javaClass.simpleName, error)
+        chuckerCollector.onError(error.javaClass.simpleName, error)
         Timber.e(error, "An exception occurred while the Wulkanowy was running")
         proceed(error)
     }
 
     protected open fun proceed(error: Throwable) {
-        resources.run {
+        when (error) {
-            when (error) {
+            is ScramblerException, is BadCredentialsException -> onSessionExpired()
-                is UnknownHostException -> showErrorMessage(getString(R.string.error_no_internet), error)
+            is NoCurrentStudentException -> onNoCurrentStudent()
-                is SocketTimeoutException -> showErrorMessage(getString(R.string.error_timeout), error)
+            else -> showErrorMessage(resources.getString(error), error)
-                is NotLoggedInException -> showErrorMessage(getString(R.string.error_login_failed), error)
-                is ServiceUnavailableException -> showErrorMessage(getString(R.string.error_service_unavailable), error)
-                is FeatureDisabledException -> showErrorMessage(getString(R.string.error_feature_disabled), error)
-                is ScramblerException, is BadCredentialsException -> onSessionExpired()
-                is NoCurrentStudentException -> onNoCurrentStudent()
-                is FeatureNotAvailableException -> showErrorMessage(getString(R.string.error_feature_not_available), error)
-                else -> showErrorMessage(getString(R.string.error_unknown), error)
-            }
         }
     }
 

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

@@ -1,12 +1,6 @@
 package io.github.wulkanowy.ui.modules.about
 
-import android.content.Intent
-import android.content.Intent.ACTION_SENDTO
-import android.content.Intent.EXTRA_EMAIL
-import android.content.Intent.EXTRA_SUBJECT
-import android.content.Intent.EXTRA_TEXT
 import android.graphics.drawable.Drawable
-import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -23,6 +17,7 @@ import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.getCompatDrawable
+import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_about.*
@@ -124,26 +119,17 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
     }
 
     override fun openEmailClient() {
-        val intent = Intent(ACTION_SENDTO)
+        requireContext().openEmailClient(
-            .apply {
+            chooserTitle = getString(R.string.about_feedback),
-                data = Uri.parse("mailto:")
+            email = "wulkanowyinc@gmail.com",
-                putExtra(EXTRA_EMAIL, arrayOf("wulkanowyinc@gmail.com"))
+            subject = "Zgłoszenie błędu",
-                putExtra(EXTRA_SUBJECT, "Zgłoszenie błędu")
+            body = requireContext().getString(R.string.about_feedback_template,
-                putExtra(EXTRA_TEXT, "Tu umieść treść zgłoszenia\n\n${"-".repeat(40)}\n " +
+                "${appInfo.systemManufacturer} ${appInfo.systemModel}", appInfo.systemVersion.toString(), appInfo.versionName
-                    """
+            ),
-                        Build: ${appInfo.versionCode}
+            onActivityNotFound = {
-                        SDK: ${appInfo.systemVersion}
+                requireContext().openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
-                        Device: ${appInfo.systemManufacturer} ${appInfo.systemModel}
-                    """.trimIndent())
             }
-
+        )
-        context?.let {
-            if (intent.resolveActivity(it.packageManager) != null) {
-                startActivity(Intent.createChooser(intent, getString(R.string.about_feedback)))
-            } else {
-                it.openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
-            }
-        }
     }
 
     override fun openFaqPage() {

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

@@ -19,7 +19,7 @@ class LicenseItem(val library: Library) : AbstractFlexibleItem<LicenseItem.ViewH
     override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
         with(holder) {
             licenseItemName.text = library.libraryName
-            licenseItemSummary.text = library.license?.licenseName
+            licenseItemSummary.text = library.license?.licenseName?.takeIf { it.isNotBlank() } ?: library.libraryVersion
         }
     }
 

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

@@ -27,10 +27,6 @@ class LicensePresenter @Inject constructor(
 
     private fun loadData() {
         disposable.add(Single.fromCallable { view?.appLibraries }
-            .map {
-                val exclude = listOf("Android-Iconics", "CircleImageView", "FastAdapter", "Jsoup", "okio", "Retrofit")
-                it.filter { library -> !exclude.contains(library.libraryName) }
-            }
             .map { it.map { library -> LicenseItem(library) } }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)

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

@@ -188,13 +188,16 @@ class AttendancePresenter @Inject constructor(
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .delay(200, MILLISECONDS)
+                .flatMap { student ->
-                .flatMap { semesterRepository.getCurrentSemester(it) }
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
-                .flatMap { attendanceRepository.getAttendance(it, date, date, forceRefresh) }
+                        attendanceRepository.getAttendance(student, semester, date, date, forceRefresh)
+                    }
+                }
                 .map { list ->
                     if (prefRepository.isShowPresent) list
                     else list.filter { !it.presence }
                 }
+                .delay(200, MILLISECONDS)
                 .map { items -> items.map { AttendanceItem(it) } }
                 .map { items -> items.sortedBy { it.attendance.number } }
                 .subscribeOn(schedulers.backgroundThread)
@@ -228,9 +231,12 @@ class AttendancePresenter @Inject constructor(
         Timber.i("Excusing absence started")
         disposable.apply {
             add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        attendanceRepository.excuseForAbsence(student, semester, toExcuseList, reason)
+                    }
+                }
                 .delay(200, MILLISECONDS)
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMap { attendanceRepository.excuseForAbsence(it, toExcuseList, reason) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doOnSubscribe {

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

@@ -83,10 +83,13 @@ class AttendanceSummaryPresenter @Inject constructor(
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .delay(200, MILLISECONDS)
+                .flatMap { student ->
-                .flatMap { semesterRepository.getCurrentSemester(it) }
+                    semesterRepository.getCurrentSemester(student).flatMap {
-                .flatMap { attendanceSummaryRepository.getAttendanceSummary(it, subjectId, forceRefresh) }
+                        attendanceSummaryRepository.getAttendanceSummary(student, it, subjectId, forceRefresh)
+                    }
+                }
                 .map { createAttendanceSummaryItems(it) to AttendanceSummaryScrollableHeader(formatPercentage(it.calculatePercentage())) }
+                .delay(200, MILLISECONDS)
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally {
@@ -126,8 +129,11 @@ class AttendanceSummaryPresenter @Inject constructor(
     private fun loadSubjects() {
         Timber.i("Loading attendance summary subjects started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .flatMap { student ->
-            .flatMap { subjectRepository.getSubjects(it) }
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    subjectRepository.getSubjects(student, semester)
+                }
+            }
             .doOnSuccess { subjects = it }
             .map { ArrayList(it.map { subject -> subject.name }) }
             .subscribeOn(schedulers.backgroundThread)

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

@@ -112,9 +112,12 @@ class ExamPresenter @Inject constructor(
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        examRepository.getExams(student, semester, currentDate.monday, currentDate.friday, forceRefresh)
+                    }
+                }
                 .delay(200, MILLISECONDS)
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMap { examRepository.getExams(it, currentDate.monday, currentDate.friday, forceRefresh) }
                 .map { it.groupBy { exam -> exam.date }.toSortedMap() }
                 .map { createExamItems(it) }
                 .subscribeOn(schedulers.backgroundThread)

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

@@ -34,7 +34,7 @@ class GradeAverageProvider @Inject constructor(
         val selectedSemester = semesters.single { it.semesterId == semesterId }
         val firstSemester = semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
 
-        return getAverageFromGradeSummary(selectedSemester, forceRefresh)
+        return getAverageFromGradeSummary(student, selectedSemester, forceRefresh)
             .switchIfEmpty(gradeRepository.getGrades(student, selectedSemester, forceRefresh)
                 .flatMap { firstGrades ->
                     if (selectedSemester == firstSemester) Single.just(firstGrades)
@@ -52,7 +52,7 @@ class GradeAverageProvider @Inject constructor(
     private fun getOnlyOneSemesterAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<List<Triple<String, Double, String>>> {
         val selectedSemester = semesters.single { it.semesterId == semesterId }
 
-        return getAverageFromGradeSummary(selectedSemester, forceRefresh)
+        return getAverageFromGradeSummary(student, selectedSemester, forceRefresh)
             .switchIfEmpty(gradeRepository.getGrades(student, selectedSemester, forceRefresh)
                 .map { grades ->
                     grades.map { if (student.loginMode == Sdk.Mode.SCRAPPER.name) it.changeModifier(plusModifier, minusModifier) else it }
@@ -61,8 +61,8 @@ class GradeAverageProvider @Inject constructor(
                 })
     }
 
-    private fun getAverageFromGradeSummary(selectedSemester: Semester, forceRefresh: Boolean): Maybe<List<Triple<String, Double, String>>> {
+    private fun getAverageFromGradeSummary(student: Student, selectedSemester: Semester, forceRefresh: Boolean): Maybe<List<Triple<String, Double, String>>> {
-        return gradeSummaryRepository.getGradesSummary(selectedSemester, forceRefresh)
+        return gradeSummaryRepository.getGradesSummary(student, selectedSemester, forceRefresh)
             .toMaybe()
             .flatMap {
                 if (it.any { summary -> summary.average != .0 }) {

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

@@ -48,7 +48,6 @@ class GradeStatisticsPresenter @Inject constructor(
         loadDataByType(semesterId, currentSubjectName, currentType, forceRefresh)
     }
 
-
     fun onParentViewReselected() {
         view?.run {
             if (!isViewEmpty) resetView()
@@ -118,8 +117,11 @@ class GradeStatisticsPresenter @Inject constructor(
     private fun loadSubjects() {
         Timber.i("Loading grade stats subjects started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .flatMap { student ->
-            .flatMap { subjectRepository.getSubjects(it) }
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    subjectRepository.getSubjects(student, semester)
+                }
+            }
             .doOnSuccess { subjects = it }
             .map { ArrayList(it.map { subject -> subject.name }) }
             .subscribeOn(schedulers.backgroundThread)
@@ -131,7 +133,7 @@ class GradeStatisticsPresenter @Inject constructor(
                     showSubjects(true)
                 }
             }, {
-                Timber.e("Loading grade stats subjects result: An exception occurred")
+                Timber.i("Loading grade stats subjects result: An exception occurred")
                 errorHandler.dispatch(it)
             })
         )
@@ -146,14 +148,15 @@ class GradeStatisticsPresenter @Inject constructor(
     private fun loadData(semesterId: Int, subjectName: String, type: ViewType, forceRefresh: Boolean) {
         Timber.i("Loading grade stats data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it) }
+            .flatMap { student ->
-            .flatMap {
+                semesterRepository.getSemesters(student).flatMap { semesters ->
-                val semester = it.first { item -> item.semesterId == semesterId }
+                    val semester = semesters.first { item -> item.semesterId == semesterId }
 
-                when (type) {
+                    when (type) {
-                    ViewType.SEMESTER -> gradeStatisticsRepository.getGradesStatistics(semester, subjectName, true, forceRefresh)
+                        ViewType.SEMESTER -> gradeStatisticsRepository.getGradesStatistics(student, semester, subjectName, true, forceRefresh)
-                    ViewType.PARTIAL -> gradeStatisticsRepository.getGradesStatistics(semester, subjectName, false, forceRefresh)
+                        ViewType.PARTIAL -> gradeStatisticsRepository.getGradesStatistics(student, semester, subjectName, false, forceRefresh)
-                    ViewType.POINTS -> gradeStatisticsRepository.getGradesPointsStatistics(semester, subjectName, forceRefresh)
+                        ViewType.POINTS -> gradeStatisticsRepository.getGradesPointsStatistics(student, semester, subjectName, forceRefresh)
+                    }
                 }
             }
             .subscribeOn(schedulers.backgroundThread)
@@ -176,7 +179,7 @@ class GradeStatisticsPresenter @Inject constructor(
                 }
                 analytics.logEvent("load_grade_statistics", "items" to it.size, "force_refresh" to forceRefresh)
             }) {
-                Timber.e("Loading grade stats result: An exception occurred")
+                Timber.i("Loading grade stats result: An exception occurred")
                 errorHandler.dispatch(it)
             })
     }

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

@@ -38,7 +38,7 @@ class GradeSummaryPresenter @Inject constructor(
         disposable.add(studentRepository.getCurrentStudent()
             .flatMap { semesterRepository.getSemesters(it).map { semesters -> it to semesters } }
             .flatMap { (student, semesters) ->
-                gradeSummaryRepository.getGradesSummary(semesters.first { it.semesterId == semesterId }, forceRefresh)
+                gradeSummaryRepository.getGradesSummary(student, semesters.first { it.semesterId == semesterId }, forceRefresh)
                     .map { it.sortedBy { subject -> subject.subject } }
                     .flatMap { gradesSummary ->
                         averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh)

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

@@ -1,49 +0,0 @@
-package io.github.wulkanowy.ui.modules.homework
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.DialogFragment
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.synthetic.main.dialog_homework.*
-
-class HomeworkDialog : DialogFragment() {
-
-    private lateinit var homework: Homework
-
-    companion object {
-        private const val ARGUMENT_KEY = "Item"
-
-        fun newInstance(homework: Homework): HomeworkDialog {
-            return HomeworkDialog().apply {
-                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, homework) }
-            }
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
-        arguments?.run {
-            homework = getSerializable(HomeworkDialog.ARGUMENT_KEY) as Homework
-        }
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_homework, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-
-        homeworkDialogDate.text = homework.date.toFormattedString()
-        homeworkDialogEntryDate.text = homework.entryDate.toFormattedString()
-        homeworkDialogSubject.text = homework.subject
-        homeworkDialogTeacher.text = homework.teacher
-        homeworkDialogContent.text = homework.content
-        homeworkDialogClose.setOnClickListener { dismiss() }
-    }
-}

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

@@ -13,6 +13,7 @@ import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.homework.details.HomeworkDetailsDialog
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.dpToPx
@@ -73,6 +74,10 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
         homeworkAdapter.updateDataSet(data, true)
     }
 
+    fun onReloadList() {
+        presenter.reloadData()
+    }
+
     override fun clearData() {
         homeworkAdapter.clear()
     }
@@ -118,7 +123,7 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
     }
 
     override fun showTimetableDialog(homework: Homework) {
-        (activity as? MainActivity)?.showDialogFragment(HomeworkDialog.newInstance(homework))
+        (activity as? MainActivity)?.showDialogFragment(HomeworkDetailsDialog.newInstance(homework))
     }
 
     override fun onSaveInstanceState(outState: Bundle) {

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

@@ -24,6 +24,8 @@ class HomeworkItem(header: HomeworkHeader, val homework: Homework) :
             homeworkItemSubject.text = homework.subject
             homeworkItemTeacher.text = homework.teacher
             homeworkItemContent.text = homework.content
+            homeworkItemCheckImage.visibility = if (homework.isDone) View.VISIBLE else View.GONE
+            homeworkItemAttachmentImage.visibility = if (!homework.isDone && homework.attachments.isNotEmpty()) View.VISIBLE else View.GONE
         }
     }
 
@@ -43,7 +45,8 @@ class HomeworkItem(header: HomeworkHeader, val homework: Homework) :
         return result
     }
 
-    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/homework/HomeworkPresenter.kt

@@ -95,15 +95,22 @@ class HomeworkPresenter @Inject constructor(
             })
     }
 
+    fun reloadData() {
+        loadData(currentDate, false)
+    }
+
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading homework data started")
         currentDate = date
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        homeworkRepository.getHomework(student, semester, currentDate, currentDate, forceRefresh)
+                    }
+                }
                 .delay(200, TimeUnit.MILLISECONDS)
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMap { homeworkRepository.getHomework(it, currentDate, currentDate, forceRefresh) }
                 .map { it.groupBy { homework -> homework.date }.toSortedMap() }
                 .map { createHomeworkItem(it) }
                 .subscribeOn(schedulers.backgroundThread)

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

@@ -0,0 +1,84 @@
+package io.github.wulkanowy.ui.modules.homework.details
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.synthetic.main.item_homework_dialog_attachment.view.*
+import kotlinx.android.synthetic.main.item_homework_dialog_details.view.*
+import javax.inject.Inject
+
+class HomeworkDetailsAdapter @Inject constructor() :
+    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    private enum class ViewType(val id: Int) {
+        DETAILS(1),
+        ATTACHMENTS_HEADER(2),
+        ATTACHMENT(3)
+    }
+
+    private var attachments = emptyList<Pair<String, String>>()
+
+    var homework: Homework? = null
+        set(value) {
+            field = value
+            attachments = value?.attachments.orEmpty()
+        }
+
+    var onAttachmentClickListener: (url: String) -> Unit = {}
+
+    override fun getItemCount() = 1 + if (attachments.isNotEmpty()) attachments.size + 1 else 0
+
+    override fun getItemViewType(position: Int) = when (position) {
+        0 -> ViewType.DETAILS.id
+        1 -> ViewType.ATTACHMENTS_HEADER.id
+        else -> ViewType.ATTACHMENT.id
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ViewType.ATTACHMENTS_HEADER.id -> AttachmentsHeaderViewHolder(inflater.inflate(R.layout.item_homework_dialog_attachments_header, parent, false))
+            ViewType.ATTACHMENT.id -> AttachmentViewHolder(inflater.inflate(R.layout.item_homework_dialog_attachment, parent, false))
+            else -> DetailsViewHolder(inflater.inflate(R.layout.item_homework_dialog_details, parent, false))
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is DetailsViewHolder -> bindDetailsViewHolder(holder)
+            is AttachmentViewHolder -> bindAttachmentViewHolder(holder, position - 2)
+        }
+    }
+
+    private fun bindDetailsViewHolder(holder: DetailsViewHolder) {
+        with(holder.view) {
+            homeworkDialogDate.text = homework?.date?.toFormattedString()
+            homeworkDialogEntryDate.text = homework?.entryDate?.toFormattedString()
+            homeworkDialogSubject.text = homework?.subject
+            homeworkDialogTeacher.text = homework?.teacher
+            homeworkDialogContent.text = homework?.content
+        }
+    }
+
+    private fun bindAttachmentViewHolder(holder: AttachmentViewHolder, position: Int) {
+        val item = attachments[position]
+
+        with(holder.view) {
+            homeworkDialogAttachment.text = item.second
+            setOnClickListener {
+                onAttachmentClickListener(item.first)
+            }
+        }
+    }
+
+    class DetailsViewHolder(val view: View) : RecyclerView.ViewHolder(view)
+
+    class AttachmentsHeaderViewHolder(val view: View) : RecyclerView.ViewHolder(view)
+
+    class AttachmentViewHolder(val view: View) : RecyclerView.ViewHolder(view)
+}

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

@@ -0,0 +1,78 @@
+package io.github.wulkanowy.ui.modules.homework.details
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.LinearLayoutManager
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.ui.base.BaseDialogFragment
+import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
+import io.github.wulkanowy.utils.openInternetBrowser
+import kotlinx.android.synthetic.main.dialog_homework.*
+import javax.inject.Inject
+
+class HomeworkDetailsDialog : BaseDialogFragment(), HomeworkDetailsView {
+
+    @Inject
+    lateinit var presenter: HomeworkDetailsPresenter
+
+    @Inject
+    lateinit var detailsAdapter: HomeworkDetailsAdapter
+
+    private lateinit var homework: Homework
+
+    companion object {
+        private const val ARGUMENT_KEY = "Item"
+
+        fun newInstance(homework: Homework): HomeworkDetailsDialog {
+            return HomeworkDetailsDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, homework) }
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, 0)
+        arguments?.run {
+            homework = getSerializable(ARGUMENT_KEY) as Homework
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.dialog_homework, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        presenter.onAttachView(this)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun initView() {
+        homeworkDialogRead.text = view?.context?.getString(if (homework.isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
+        homeworkDialogRead.setOnClickListener { presenter.toggleDone(homework) }
+        homeworkDialogClose.setOnClickListener { dismiss() }
+
+        with(homeworkDialogRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = detailsAdapter.apply {
+                onAttachmentClickListener = { context.openInternetBrowser(it, ::showMessage) }
+                homework = this@HomeworkDetailsDialog.homework
+            }
+        }
+    }
+
+    override fun updateMarkAsDoneLabel(isDone: Boolean) {
+        (parentFragment as? HomeworkFragment)?.onReloadList()
+        homeworkDialogRead.text = view?.context?.getString(if (isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}

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

@@ -0,0 +1,44 @@
+package io.github.wulkanowy.ui.modules.homework.details
+
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import timber.log.Timber
+import javax.inject.Inject
+
+class HomeworkDetailsPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
+    private val homeworkRepository: HomeworkRepository,
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<HomeworkDetailsView>(errorHandler, studentRepository, schedulers) {
+
+    override fun onAttachView(view: HomeworkDetailsView) {
+        super.onAttachView(view)
+        view.initView()
+        Timber.i("Homework details view was initialized")
+    }
+
+    fun toggleDone(homework: Homework) {
+        Timber.i("Homework details update start")
+        disposable.add(homeworkRepository.toggleDone(homework)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Homework details update: Success")
+                view?.run {
+                    updateMarkAsDoneLabel(homework.isDone)
+                }
+                analytics.logEvent("homework_mark_as_done")
+            }) {
+                Timber.i("Homework details update result: An exception occurred")
+                errorHandler.dispatch(it)
+            }
+        )
+    }
+}

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

@@ -0,0 +1,10 @@
+package io.github.wulkanowy.ui.modules.homework.details
+
+import io.github.wulkanowy.ui.base.BaseView
+
+interface HomeworkDetailsView : BaseView {
+
+    fun initView()
+
+    fun updateMarkAsDoneLabel(isDone: Boolean)
+}