[4.0] Update build.gradle, signing and changelog.

.gitignore

@@ -86,4 +86,5 @@ app/schemas/
 
 signatures/
 
-app/.cxx
+app/.cxx
+/i18n/

.idea/jarRepositories.xml

@@ -41,5 +41,15 @@
       <option name="name" value="MavenRepo" />
       <option name="url" value="https://repo.maven.apache.org/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven4" />
+      <option name="name" value="maven4" />
+      <option name="url" value="https://dl.bintray.com/undervoid/Powerpermission" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven4" />
+      <option name="name" value="maven4" />
+      <option name="url" value="https://dl.bintray.com/undervoid/PowerPermission" />
+    </remote-repository>
   </component>
 </project>

app/build.gradle

@@ -196,6 +196,11 @@ dependencies {
 
     implementation project(":annotation")
     kapt project(":codegen")
+
+    implementation 'com.google.android:flexbox:2.0.1'
+
+    implementation 'com.qifan.powerpermission:powerpermission:1.0.0'
+    implementation 'com.qifan.powerpermission:powerpermission-coroutines:1.0.0'
 }
 repositories {
     mavenCentral()

app/src/main/AndroidManifest.xml

@@ -14,6 +14,9 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
+    <!-- PowerPermission uses minSdk 21, it's safe to override as it is used only in >= 23 -->
+    <uses-sdk tools:overrideLibrary="com.qifan.powerpermission.coroutines, com.qifan.powerpermission.core" />
+
     <application
         android:name=".App"
         android:allowBackup="true"

app/src/main/assets/pl-changelog.html

@@ -1,14 +1,10 @@
-<h3>Wersja 4.0-rc.4, 2020-03-30</h3>
-<ul>
-    <li>Poprawione pobieranie załączników w Librusie.</li>
-    <li>Nowy widok zadań domowych</li>
-    <li>Możliwość oznaczania zadań domowych i wydarzeń jako wykonane.</li>
-</ul>
-<!--<h3>Wersja 4.0-rc.3, 2020-03-29</h3>
+<h3>Wersja 4.0, 2020-04-19</h3>
 <ul>
     <li><b><u>Wysyłanie wiadomości</u></b> - funkcja, na którą czekał każdy. Od teraz w Szkolnym można wysyłać oraz odpowiadać na wiadomości do nauczycieli &#x1F44F;</li>
     <li><b>Przebudowaliśmy cały moduł synchronizacji</b>, co oznacza większą stabilność aplikacji, szybkość oraz poprawność pobieranych danych</li>
     <li>Udoskonalony wygląd Szkolnego - sprawi, że korzystanie z aplikacji będzie jeszcze przyjemniejsze</li>
+    <li>Wyszukiwarka wiadomości, pozwalająca na łatwe znalezienie potrzebnej konwersacji.</li>
+    <li>Możliwość pobierania załączników do zadań domowych oraz wiadomości w każdym dzienniku.</li>
     <li>Nowa <b>Strona główna</b> - ładniejszy wygląd oraz możliwość przestawiania kart na każdym profilu</li>
     <li>Nowy <b>Plan lekcji</b> - z doskonałą obsługą lekcji przesuniętych oraz dwóch lekcji o tej samej godzinie</li>
     <li>Nowe <b>Oceny</b> - z możliwością zmiany wartości plusów oraz minusów oraz wyłączenia niektórych ocen ze średniej</li>
@@ -16,6 +12,7 @@
     <li>Znaczki nieprzeczytanych informacji na obrazkach profili.</li>
     <br>
     <br>
+    <li>Udoskonalone tłumaczenie na j.angielski (dzięki @Predator)</li>
     <li>Nowe okienka informacji o wydarzeniach oraz lekcjach</li>
     <li>Nowe, przyjemniejsze powiadomienia</li>
     <li>Dużo poprawek w widoku <b>Wiadomości</b> oraz <b>Ogłoszeń</b></li>
@@ -28,7 +25,7 @@
     <li>Poprawiliśmy synchronizację w tle na niektórych telefonach</li>
     <li>Usunąłem denerwujący brak zaznaczenia w lewym menu</li>
     <li>Znaczna ilość błędów z poprzednich wersji już nie występuje</li>
-</ul>-->
+</ul>
 <br>
 <br>
 Dzięki za korzystanie ze Szkolnego!<br>

app/src/main/cpp/szkolny-signing.cpp

@@ -9,7 +9,7 @@
 
 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0x1c, 0x15, 0x0f, 0x1c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0x38, 0xd4, 0x73, 0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
 
 unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);
 

app/src/main/java/pl/szczodrzynski/edziennik/App.kt

@@ -43,10 +43,7 @@ import pl.szczodrzynski.edziennik.sync.SyncWorker
 import pl.szczodrzynski.edziennik.sync.UpdateWorker
 import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity
 import pl.szczodrzynski.edziennik.utils.*
-import pl.szczodrzynski.edziennik.utils.managers.GradesManager
-import pl.szczodrzynski.edziennik.utils.managers.NotificationChannelsManager
-import pl.szczodrzynski.edziennik.utils.managers.TimetableManager
-import pl.szczodrzynski.edziennik.utils.managers.UserActionManager
+import pl.szczodrzynski.edziennik.utils.managers.*
 import java.util.concurrent.TimeUnit
 import kotlin.coroutines.CoroutineContext
 
@@ -67,6 +64,8 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
     val userActionManager by lazy { UserActionManager(this) }
     val gradesManager by lazy { GradesManager(this) }
     val timetableManager by lazy { TimetableManager(this) }
+    val eventManager by lazy { EventManager(this) }
+    val permissionManager by lazy { PermissionManager(this) }
 
     val db
         get() = App.db
@@ -168,7 +167,11 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
             db.profileDao().firstId?.let { profileLoadById(it) }
         }
 
-        devMode = "f054761fbdb6a238" == deviceId || BuildConfig.DEBUG
+        config.ui.language?.let {
+            setLanguage(it)
+        }
+
+        devMode = BuildConfig.DEBUG
 
         Signing.getCert(this)
 

app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt

@@ -27,10 +27,7 @@ import android.util.Base64.NO_WRAP
 import android.util.Base64.encodeToString
 import android.view.View
 import android.view.WindowManager
-import android.widget.CheckBox
-import android.widget.CompoundButton
-import android.widget.RadioButton
-import android.widget.TextView
+import android.widget.*
 import androidx.annotation.*
 import androidx.core.app.ActivityCompat
 import androidx.core.database.getIntOrNull
@@ -44,6 +41,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import androidx.viewpager.widget.ViewPager
 import com.google.android.gms.security.ProviderInstaller
+import com.google.android.material.button.MaterialButton
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
@@ -167,6 +165,13 @@ fun Bundle?.getString(key: String, defaultValue: String): String {
     return this?.getString(key, defaultValue) ?: defaultValue
 }
 
+fun Bundle?.getIntOrNull(key: String): Int? {
+    return this?.get(key) as? Int
+}
+fun <T : Any> Bundle?.get(key: String): T? {
+    return this?.get(key) as? T?
+}
+
 /**
  * `   The quick BROWN_fox Jumps OveR THE       LAZy-DOG.   `
  *
@@ -449,7 +454,7 @@ operator fun MatchResult.get(group: Int): String {
     return groupValues[group]
 }
 
-fun Activity.setLanguage(language: String) {
+fun Context.setLanguage(language: String) {
     val locale = Locale(language.toLowerCase(Locale.ROOT))
     val configuration = resources.configuration
     Locale.setDefault(locale)
@@ -458,7 +463,6 @@ fun Activity.setLanguage(language: String) {
     }
     configuration.locale = locale
     resources.updateConfiguration(configuration, resources.displayMetrics)
-    baseContext.resources.updateConfiguration(configuration, baseContext.resources.displayMetrics)
 }
 
 /*
@@ -567,7 +571,7 @@ fun CharSequence?.asBoldSpannable(): Spannable {
     spannable.setSpan(StyleSpan(Typeface.BOLD), 0, spannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
     return spannable
 }
-fun CharSequence.asSpannable(vararg spans: Any, substring: String? = null, ignoreCase: Boolean = false): Spannable {
+fun CharSequence.asSpannable(vararg spans: Any, substring: String? = null, ignoreCase: Boolean = false, ignoreDiacritics: Boolean = false): Spannable {
     val spannable = SpannableString(this)
     if (substring == null) {
         spans.forEach {
@@ -575,17 +579,44 @@ fun CharSequence.asSpannable(vararg spans: Any, substring: String? = null, ignor
         }
     }
     else if (substring.isNotEmpty()) {
-        var index = indexOf(substring, ignoreCase = ignoreCase)
+        val string =
+                if (ignoreDiacritics)
+                    this.cleanDiacritics()
+                else this
+
+        var index = string.indexOf(substring, ignoreCase = ignoreCase)
+                .takeIf { it != -1 } ?: indexOf(substring, ignoreCase = ignoreCase)
         while (index >= 0) {
             spans.forEach {
                 spannable.setSpan(it, index, index + substring.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
             }
-            index = indexOf(substring, startIndex = index + 1, ignoreCase = ignoreCase)
+            index = string.indexOf(substring, startIndex = index + 1, ignoreCase = ignoreCase)
+                    .takeIf { it != -1 } ?: indexOf(substring, startIndex = index + 1, ignoreCase = ignoreCase)
         }
     }
     return spannable
 }
 
+fun CharSequence.cleanDiacritics(): String {
+    val nameClean = StringBuilder()
+    forEach {
+        val ch = when (it) {
+            'ż' -> 'z'
+            'ó' -> 'o'
+            'ł' -> 'l'
+            'ć' -> 'c'
+            'ę' -> 'e'
+            'ś' -> 's'
+            'ą' -> 'a'
+            'ź' -> 'z'
+            'ń' -> 'n'
+            else -> it
+        }
+        nameClean.append(ch)
+    }
+    return nameClean.toString()
+}
+
 /**
  * Returns a new read-only list only of those given elements, that are not empty.
  * Applies for CharSequence and descendants.
@@ -743,6 +774,19 @@ inline fun <T : CompoundButton> T.onChange(crossinline onChangeListener: (v: T,
     }
 }
 
+@Suppress("UNCHECKED_CAST")
+inline fun <T : MaterialButton> T.onChange(crossinline onChangeListener: (v: T, isChecked: Boolean) -> Unit) {
+    clearOnCheckedChangeListeners()
+    addOnCheckedChangeListener { buttonView, isChecked ->
+        onChangeListener(buttonView as T, isChecked)
+    }
+}
+
+fun View.attachToastHint(stringRes: Int) = onLongClick {
+    Toast.makeText(it.context, stringRes, Toast.LENGTH_SHORT).show()
+    true
+}
+
 fun <T> LiveData<T>.observeOnce(lifecycleOwner: LifecycleOwner, observer: Observer<T>) {
     observe(lifecycleOwner, object : Observer<T> {
         override fun onChanged(t: T?) {
@@ -798,7 +842,7 @@ fun View.findParentById(targetId: Int): View? {
     return null
 }
 
-fun CoroutineScope.startCoroutineTimer(delayMillis: Long = 0, repeatMillis: Long = 0, action: () -> Unit) = launch {
+fun CoroutineScope.startCoroutineTimer(delayMillis: Long = 0, repeatMillis: Long = 0, action: suspend CoroutineScope.() -> Unit) = launch {
     delay(delayMillis)
     if (repeatMillis > 0) {
         while (true) {
@@ -1197,3 +1241,7 @@ val SwipeRefreshLayout.onScrollListener: RecyclerView.OnScrollListener
                 this@onScrollListener.isEnabled = true
         }
     }
+
+operator fun <K, V> Iterable<Pair<K, V>>.get(key: K): V? {
+    return firstOrNull { it.first == key }?.second
+}

app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt

@@ -20,7 +20,6 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.core.graphics.ColorUtils
 import androidx.lifecycle.Observer
 import androidx.navigation.NavOptions
-import androidx.recyclerview.widget.RecyclerView
 import com.danimahardhika.cafebar.CafeBar
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.mikepenz.iconics.IconicsColor
@@ -55,9 +54,10 @@ import pl.szczodrzynski.edziennik.ui.dialogs.sync.SyncViewListDialog
 import pl.szczodrzynski.edziennik.ui.modules.agenda.AgendaFragment
 import pl.szczodrzynski.edziennik.ui.modules.announcements.AnnouncementsFragment
 import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceFragment
-import pl.szczodrzynski.edziennik.ui.modules.base.DebugFragment
 import pl.szczodrzynski.edziennik.ui.modules.base.MainSnackbar
 import pl.szczodrzynski.edziennik.ui.modules.behaviour.BehaviourFragment
+import pl.szczodrzynski.edziennik.ui.modules.debug.DebugFragment
+import pl.szczodrzynski.edziennik.ui.modules.debug.LabFragment
 import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar
 import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackFragment
 import pl.szczodrzynski.edziennik.ui.modules.feedback.HelpFragment
@@ -67,13 +67,11 @@ import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
 import pl.szczodrzynski.edziennik.ui.modules.homework.HomeworkFragment
 import pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity
 import pl.szczodrzynski.edziennik.ui.modules.messages.MessageFragment
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeFragment
 import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesListFragment
+import pl.szczodrzynski.edziennik.ui.modules.messages.compose.MessagesComposeFragment
 import pl.szczodrzynski.edziennik.ui.modules.notifications.NotificationsListFragment
 import pl.szczodrzynski.edziennik.ui.modules.settings.ProfileManagerFragment
 import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsNewFragment
-import pl.szczodrzynski.edziennik.ui.modules.template.TemplateFragment
 import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment
 import pl.szczodrzynski.edziennik.ui.modules.webpush.WebPushFragment
 import pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch
@@ -130,7 +128,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         const val TARGET_MESSAGES_DETAILS = 503
         const val TARGET_MESSAGES_COMPOSE = 504
         const val TARGET_WEB_PUSH = 140
-        const val TARGET_TEMPLATE = 1000
+        const val TARGET_LAB = 1000
 
         const val HOME_ID = DRAWER_ITEM_HOME
 
@@ -228,10 +226,10 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
             list += NavTarget(TARGET_MESSAGES_DETAILS, R.string.menu_message, MessageFragment::class).withPopTo(DRAWER_ITEM_MESSAGES)
             list += NavTarget(TARGET_MESSAGES_COMPOSE, R.string.menu_message_compose, MessagesComposeFragment::class)
             list += NavTarget(TARGET_WEB_PUSH, R.string.menu_web_push, WebPushFragment::class)
-            list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class)
-            if (App.devMode) {
-                list += NavTarget(TARGET_TEMPLATE, R.string.menu_template, TemplateFragment::class)
-                        .withIcon(CommunityMaterial.Icon2.cmd_test_tube_empty)
+            if (App.debugMode) {
+                list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class)
+                list += NavTarget(TARGET_LAB, R.string.menu_lab, LabFragment::class)
+                        .withIcon(CommunityMaterial.Icon.cmd_flask_outline)
                         .isInDrawer(true)
                         .isBelowSeparator(true)
                         .isStatic(true)
@@ -416,8 +414,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                 R.color.md_green_500
         )
 
-        isStoragePermissionGranted()
-
         SyncWorker.scheduleNext(app)
         UpdateWorker.scheduleNext(app)
 
@@ -518,7 +514,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                         .withIcon(CommunityMaterial.Icon2.cmd_help_circle_outline)
                         .withOnClickListener(View.OnClickListener { loadTarget(TARGET_FEEDBACK) })
         )
-        if (App.devMode) {
+        if (App.debugMode) {
             bottomSheet += BottomSheetPrimaryItem(false)
                     .withTitle(R.string.menu_debug)
                     .withIcon(CommunityMaterial.Icon.cmd_android_studio)
@@ -889,9 +885,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         }
         app.profileLoad(id) {
             MessagesFragment.pageSelection = -1
-            MessagesListFragment.tapPositions = intArrayOf(RecyclerView.NO_POSITION, RecyclerView.NO_POSITION)
-            MessagesListFragment.topPositions = intArrayOf(RecyclerView.NO_POSITION, RecyclerView.NO_POSITION)
-            MessagesListFragment.bottomPositions = intArrayOf(RecyclerView.NO_POSITION, RecyclerView.NO_POSITION)
 
             setDrawerItems()
             // the drawer profile is updated automatically when the drawer item is clicked
@@ -916,9 +909,10 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
             loadTarget(target, arguments)
         }
     }
-    private fun loadTarget(target: NavTarget, arguments: Bundle? = null) {
-        d("NavDebug", "loadTarget(target = $target, arguments = $arguments)")
+    private fun loadTarget(target: NavTarget, args: Bundle? = null) {
+        d("NavDebug", "loadTarget(target = $target, args = $args)")
 
+        val arguments = args ?: navBackStack.firstOrNull { it.first.id == target.id }?.second ?: Bundle()
         bottomSheet.close()
         bottomSheet.removeAllContextual()
         bottomSheet.toggleGroupEnabled = false
@@ -966,6 +960,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                     navBackStack.removeAt(navBackStack.lastIndex)
                 }
                 navTarget = target
+                navArguments = arguments
 
                 return@let null
             }?.let {
@@ -975,7 +970,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                         R.anim.task_open_enter,
                         R.anim.task_open_exit
                 )
-                navBackStack.add(navTarget to arguments)
+                navBackStack.add(navTarget to navArguments)
                 navTarget = target
                 navArguments = arguments
             }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/ApiService.kt

@@ -38,6 +38,9 @@ class ApiService : Service() {
             context.startService(Intent(context, ApiService::class.java))
             EventBus.getDefault().postSticky(request)
         }
+
+        var lastEventTime = System.currentTimeMillis()
+        var taskCancelTries = 0
     }
 
     private val app by lazy { applicationContext as App }
@@ -64,9 +67,6 @@ class ApiService : Service() {
 
     private val notification by lazy { EdziennikNotification(app) }
 
-    private var lastEventTime = System.currentTimeMillis()
-    private var taskCancelTries = 0
-
     /*    ______    _     _                  _ _       _____      _ _ _                _
          |  ____|  | |   (_)                (_) |     / ____|    | | | |              | |
          | |__   __| |_____  ___ _ __  _ __  _| | __ | |     __ _| | | |__   __ _  ___| | __

app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt

@@ -56,6 +56,8 @@ const val LIBRUS_SYNERGIA_TOKEN_LOGIN_URL = "https://synergia.librus.pl/loguj/to
 const val LIBRUS_MESSAGES_URL = "https://wiadomosci.librus.pl/module"
 const val LIBRUS_SANDBOX_URL = "https://sandbox.librus.pl/index.php?action="
 
+const val LIBRUS_SYNERGIA_HOMEWORK_ATTACHMENT_URL = "https://synergia.librus.pl/homework/downloadFile"
+
 const val IDZIENNIK_USER_AGENT = SYNERGIA_USER_AGENT
 const val IDZIENNIK_WEB_URL = "https://iuczniowie.progman.pl/idziennik"
 const val IDZIENNIK_WEB_LOGIN = "login.aspx"
@@ -74,6 +76,8 @@ const val IDZIENNIK_WEB_GET_MESSAGE = "mod_komunikator/WS_wiadomosci.asmx/Pobier
 const val IDZIENNIK_WEB_GET_RECIPIENT_LIST = "mod_komunikator/WS_wiadomosci.asmx/pobierzListeOdbiorcowPanelRodzic"
 const val IDZIENNIK_WEB_SEND_MESSAGE = "mod_komunikator/WS_wiadomosci.asmx/WyslijWiadomosc"
 const val IDZIENNIK_WEB_GET_ATTACHMENT = "mod_komunikator/Download.ashx"
+const val IDZIENNIK_WEB_GET_HOMEWORK = "mod_panelRodzica/pracaDomowa/WS_pracaDomowa.asmx/pobierzJednaPraceDomowa"
+const val IDZIENNIK_WEB_GET_HOMEWORK_ATTACHMENT = "mod_panelRodzica/pracaDomowa.aspx"
 
 val IDZIENNIK_API_USER_AGENT = SYSTEM_USER_AGENT
 const val IDZIENNIK_API_URL = "https://iuczniowie.progman.pl/idziennik/api"
@@ -107,5 +111,7 @@ const val VULCAN_API_ENDPOINT_MESSAGES_SENT = "mobile-api/Uczen.v3.Uczen/Wiadomo
 const val VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS = "mobile-api/Uczen.v3.Uczen/ZmienStatusWiadomosci"
 const val VULCAN_API_ENDPOINT_MESSAGES_ADD = "mobile-api/Uczen.v3.Uczen/DodajWiadomosc"
 const val VULCAN_API_ENDPOINT_PUSH = "mobile-api/Uczen.v3.Uczen/UstawPushToken"
+const val VULCAN_API_ENDPOINT_MESSAGES_ATTACHMENTS = "mobile-api/Uczen.v3.Uczen/WiadomosciZalacznik"
+const val VULCAN_API_ENDPOINT_HOMEWORK_ATTACHMENTS = "mobile-api/Uczen.v3.Uczen/ZadaniaDomoweZalacznik"
 
 const val EDUDZIENNIK_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME}"

app/src/main/java/pl/szczodrzynski/edziennik/data/api/EdziennikNotification.kt

@@ -8,11 +8,12 @@ import android.app.Notification
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
-import android.content.Intent
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.PRIORITY_MIN
 import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.Bundle
 import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.receivers.SzkolnyReceiver
 import kotlin.math.roundToInt
 
 
@@ -35,16 +36,18 @@ class EdziennikNotification(val app: App) {
     var serviceClosed = false
 
     private fun cancelPendingIntent(taskId: Int): PendingIntent {
-        val intent = Intent("pl.szczodrzynski.edziennik.SZKOLNY_MAIN")
-        intent.putExtra("task", "TaskCancelRequest")
-        intent.putExtra("taskId", taskId)
-        return PendingIntent.getBroadcast(app, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT) as PendingIntent
+        val intent = SzkolnyReceiver.getIntent(app, Bundle(
+                "task" to "TaskCancelRequest",
+                "taskId" to taskId
+        ))
+        return PendingIntent.getBroadcast(app, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT) as PendingIntent
     }
     private val closePendingIntent: PendingIntent
         get() {
-            val intent = Intent("pl.szczodrzynski.edziennik.SZKOLNY_MAIN")
-            intent.putExtra("task", "ServiceCloseRequest")
-            return PendingIntent.getBroadcast(app, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT) as PendingIntent
+            val intent = SzkolnyReceiver.getIntent(app, Bundle(
+                    "task" to "ServiceCloseRequest"
+            ))
+            return PendingIntent.getBroadcast(app, 0, intent, 0) as PendingIntent
         }
 
     private fun errorCountText(): String? {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt

@@ -126,6 +126,7 @@ const val ERROR_LOGIN_LIBRUS_PORTAL_CSRF_EXPIRED            = 184
 const val ERROR_LIBRUS_API_DEVICE_REGISTERED                = 185
 const val ERROR_LIBRUS_MESSAGES_NOT_FOUND                   = 186
 const val ERROR_LOGIN_LIBRUS_API_INVALID_REQUEST            = 187
+const val ERROR_LIBRUS_MESSAGES_ATTACHMENT_NOT_FOUND        = 188
 
 const val ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_LOGIN        = 201
 const val ERROR_LOGIN_MOBIDZIENNIK_WEB_OLD_PASSWORD         = 202
@@ -157,6 +158,7 @@ const val ERROR_LOGIN_VULCAN_NO_PUPILS                      = 331
 const val ERROR_VULCAN_API_MAINTENANCE                      = 340
 const val ERROR_VULCAN_API_BAD_REQUEST                      = 341
 const val ERROR_VULCAN_API_OTHER                            = 342
+const val ERROR_VULCAN_ATTACHMENT_DOWNLOAD                  = 343
 
 const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN           = 401
 const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME     = 402
@@ -206,5 +208,6 @@ const val EXCEPTION_IDZIENNIK_WEB_API_REQUEST               = 913
 const val EXCEPTION_IDZIENNIK_API_REQUEST                   = 914
 const val EXCEPTION_EDUDZIENNIK_WEB_REQUEST                 = 920
 const val EXCEPTION_EDUDZIENNIK_FILE_REQUEST                = 921
+const val ERROR_ONEDRIVE_DOWNLOAD                           = 930
 
 const val LOGIN_NO_ARGUMENTS                                = 1201

app/src/main/java/pl/szczodrzynski/edziennik/data/api/Features.kt

@@ -13,8 +13,8 @@ import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOME
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOMEWORK
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_TIMETABLE
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
 
 internal const val FEATURE_TIMETABLE = 1
 internal const val FEATURE_AGENDA = 2

app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt

@@ -84,6 +84,22 @@ object Regexes {
         """<strong>(.+?) - (.*?)</strong>.+?<small>.+?\((.+?), .+?(.+?)\)""".toRegex(DOT_MATCHES_ALL)
     }
 
+    val MOBIDZIENNIK_HOMEWORK_ROW by lazy {
+        """class="rowRolling">(.+?</div>\s*</td>)""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_HOMEWORK_ITEM by lazy {
+        """<p><b>(.+?):</b>\s*(.+?)\s*</p>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_HOMEWORK_BODY by lazy {
+        """Treść:</b>(.+?)<p><b>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_HOMEWORK_ID by lazy {
+        """zadanieFormularz\(([0-9]+),""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_HOMEWORK_ATTACHMENT by lazy {
+        """zalacznik(_zadania)?=([0-9]+)'.+?word-break">(.+?)</td>""".toRegex(DOT_MATCHES_ALL)
+    }
+
 
 
     val IDZIENNIK_LOGIN_HIDDEN_FIELDS by lazy {
@@ -155,6 +171,9 @@ object Regexes {
     val EDUDZIENNIK_ANNOUNCEMENT_DESCRIPTION by lazy {
         """<div class="desc">.*?<p>(.*?)</p>""".toRegex(DOT_MATCHES_ALL)
     }
+    val EDUDZIENNIK_HOMEWORK_DESCRIPTION by lazy {
+        """<div class="desc">(.*?)</div>""".toRegex(DOT_MATCHES_ALL)
+    }
 
     val EDUDZIENNIK_SUBJECT_ID by lazy {
         """/Courses/([\w-_]+?)/""".toRegex()

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/EdziennikTask.kt

@@ -19,9 +19,9 @@ import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.task.IApiTask
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 
 open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTask(profileId) {
@@ -36,8 +36,9 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
         fun messageSend(profileId: Int, recipients: List<Teacher>, subject: String, text: String) = EdziennikTask(profileId, MessageSendRequest(recipients, subject, text))
         fun announcementsRead(profileId: Int) = EdziennikTask(profileId, AnnouncementsReadRequest())
         fun announcementGet(profileId: Int, announcement: AnnouncementFull) = EdziennikTask(profileId, AnnouncementGetRequest(announcement))
-        fun attachmentGet(profileId: Int, message: Message, attachmentId: Long, attachmentName: String) = EdziennikTask(profileId, AttachmentGetRequest(message, attachmentId, attachmentName))
+        fun attachmentGet(profileId: Int, owner: Any, attachmentId: Long, attachmentName: String) = EdziennikTask(profileId, AttachmentGetRequest(owner, attachmentId, attachmentName))
         fun recipientListGet(profileId: Int) = EdziennikTask(profileId, RecipientListGetRequest())
+        fun eventGet(profileId: Int, event: EventFull) = EdziennikTask(profileId, EventGetRequest(event))
     }
 
     private lateinit var loginStore: LoginStore
@@ -92,8 +93,9 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
             is FirstLoginRequest -> edziennikInterface?.firstLogin()
             is AnnouncementsReadRequest -> edziennikInterface?.markAllAnnouncementsAsRead()
             is AnnouncementGetRequest -> edziennikInterface?.getAnnouncement(request.announcement)
-            is AttachmentGetRequest -> edziennikInterface?.getAttachment(request.message, request.attachmentId, request.attachmentName)
+            is AttachmentGetRequest -> edziennikInterface?.getAttachment(request.owner, request.attachmentId, request.attachmentName)
             is RecipientListGetRequest -> edziennikInterface?.getRecipientList()
+            is EventGetRequest -> edziennikInterface?.getEvent(request.event)
         }
     }
 
@@ -113,6 +115,7 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
     data class MessageSendRequest(val recipients: List<Teacher>, val subject: String, val text: String)
     class AnnouncementsReadRequest
     data class AnnouncementGetRequest(val announcement: AnnouncementFull)
-    data class AttachmentGetRequest(val message: Message, val attachmentId: Long, val attachmentName: String)
+    data class AttachmentGetRequest(val owner: Any, val attachmentId: Long, val attachmentName: String)
     class RecipientListGetRequest
+    data class EventGetRequest(val event: EventFull)
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/Edudziennik.kt

@@ -9,6 +9,7 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikData
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web.EdudziennikWebGetAnnouncement
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web.EdudziennikWebGetHomework
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.firstlogin.EdudziennikFirstLogin
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLogin
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLoginWeb
@@ -16,10 +17,10 @@ import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
@@ -94,13 +95,22 @@ class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStor
         }
     }
 
-    override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {}
+    override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) {}
     override fun getRecipientList() {}
 
+    override fun getEvent(eventFull: EventFull) {
+        EdudziennikLoginWeb(data) {
+            EdudziennikWebGetHomework(data, eventFull) {
+                completed()
+            }
+        }
+    }
+
     override fun firstLogin() { EdudziennikFirstLogin(data) { completed() } }
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
+        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetHomework.kt

@@ -0,0 +1,45 @@
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import android.text.Html
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+
+class EdudziennikWebGetHomework(
+        override val data: DataEdudziennik,
+        val event: EventFull,
+        val onSuccess: () -> Unit
+) : EdudziennikWeb(data, null) {
+    companion object {
+        const val TAG = "EdudziennikWebGetHomework"
+    }
+
+    init {
+        if (event.attachmentNames.isNotNullNorEmpty()) {
+            val id = event.attachmentNames!![0]
+
+            webGet(TAG, "Homework/$id") { text ->
+                val description = Regexes.EDUDZIENNIK_HOMEWORK_DESCRIPTION.find(text)?.get(1)?.trim()
+
+                if (description != null) event.topic = Html.fromHtml(description).toString()
+
+                event.homeworkBody = ""
+                event.attachmentNames = null
+
+                data.eventList += event
+                data.eventListReplace = true
+
+                EventBus.getDefault().postSticky(EventGetEvent(event))
+                onSuccess()
+            }
+        } else {
+            EventBus.getDefault().postSticky(EventGetEvent(event))
+            onSuccess()
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebHomework.kt

@@ -33,8 +33,8 @@ class EdudziennikWebHomework(override val data: DataEdudziennik,
             if (doc.getElementsByClass("message").text().trim() != "Brak prac domowych") {
                 doc.getElementsByTag("tr").forEach { homeworkElement ->
                     val dateElement = homeworkElement.getElementsByClass("date").first().child(0)
-                    val id = EDUDZIENNIK_HOMEWORK_ID.find(dateElement.attr("href"))?.get(1)?.crc32()
-                            ?: return@forEach
+                    val idStr = EDUDZIENNIK_HOMEWORK_ID.find(dateElement.attr("href"))?.get(1) ?: return@forEach
+                    val id = idStr.crc32()
                     val date = Date.fromY_m_d(dateElement.text())
 
                     val subjectElement = homeworkElement.child(1).child(0)
@@ -49,14 +49,14 @@ class EdudziennikWebHomework(override val data: DataEdudziennik,
                     val teacherName = homeworkElement.child(2).text()
                     val teacher = data.getTeacherByFirstLast(teacherName)
 
-                    val topic = homeworkElement.child(4).text()
+                    val topic = homeworkElement.child(4).text()?.trim()
 
                     val eventObject = Event(
                             profileId = profileId,
                             id = id,
                             date = date,
                             time = startTime,
-                            topic = topic,
+                            topic = topic ?: "",
                             color = null,
                             type = Event.TYPE_HOMEWORK,
                             teacherId = teacher.id,
@@ -64,6 +64,8 @@ class EdudziennikWebHomework(override val data: DataEdudziennik,
                             teamId = data.teamClass?.id ?: -1
                     )
 
+                    eventObject.attachmentNames = mutableListOf(idStr)
+
                     data.eventList.add(eventObject)
                     data.metadataList.add(Metadata(
                             profileId,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/helper/OneDriveDownloadAttachment.kt

@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-4-7.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.helper
+
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.FileCallbackHandler
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.data.api.ERROR_ONEDRIVE_DOWNLOAD
+import pl.szczodrzynski.edziennik.data.api.ERROR_REQUEST_FAILURE
+import pl.szczodrzynski.edziennik.data.api.SYSTEM_USER_AGENT
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.utils.Utils
+import java.io.File
+
+class OneDriveDownloadAttachment(
+        app: App,
+        fileUrl: String,
+        val onSuccess: (file: File) -> Unit,
+        val onProgress: (written: Long, total: Long) -> Unit,
+        val onError: (apiError: ApiError) -> Unit
+) {
+    companion object {
+        private const val TAG = "OneDriveDownloadAttachment"
+    }
+
+    init {
+        Request.builder()
+                .url(fileUrl)
+                .userAgent(SYSTEM_USER_AGENT)
+                .withClient(app.httpLazy)
+                .callback(object : TextCallbackHandler() {
+                    override fun onSuccess(text: String, response: Response) {
+                        val location = response.headers().get("Location")
+                        // https://onedrive.live.com/redir?resid=D75496A2EB87531C!706&authkey=!ABjZeh3pHMqj11Q
+                        if (location?.contains("onedrive.live.com/redir?resid=") != true) {
+                            onError(ApiError(TAG, ERROR_ONEDRIVE_DOWNLOAD)
+                                    .withApiResponse(text)
+                                    .withResponse(response))
+                            return
+                        }
+                        val url = location
+                                .replace("onedrive.live.com/redir?resid=", "storage.live.com/items/")
+                                .replace("?", "&")
+                                .replaceFirst("&", "?")
+                        downloadFile(url)
+                    }
+
+                    override fun onFailure(response: Response, throwable: Throwable) {
+                        onError(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                                .withResponse(response)
+                                .withThrowable(throwable))
+                    }
+                })
+                .build()
+                .enqueue()
+    }
+
+    private fun downloadFile(url: String) {
+        val targetFile = Utils.getStorageDir()
+
+        val callback = object : FileCallbackHandler(targetFile) {
+            override fun onSuccess(file: File?, response: Response?) {
+                if (file == null) {
+                    onError(ApiError(TAG, ERROR_ONEDRIVE_DOWNLOAD)
+                            .withResponse(response))
+                    return
+                }
+
+                try {
+                    onSuccess(file)
+                } catch (e: Exception) {
+                    onError(ApiError(TAG, ERROR_ONEDRIVE_DOWNLOAD)
+                            .withResponse(response)
+                            .withThrowable(e))
+                }
+            }
+
+            override fun onProgress(bytesWritten: Long, bytesTotal: Long) {
+                try {
+                    this@OneDriveDownloadAttachment.onProgress(bytesWritten, bytesTotal)
+                } catch (e: Exception) {
+                    onError(ApiError(TAG, ERROR_ONEDRIVE_DOWNLOAD)
+                            .withThrowable(e))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                onError(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url(url)
+                .userAgent(SYSTEM_USER_AGENT)
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/Idziennik.kt

@@ -8,20 +8,15 @@ import com.google.gson.JsonObject
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikData
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web.IdziennikWebGetAttachment
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web.IdziennikWebGetMessage
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web.IdziennikWebGetRecipientList
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web.IdziennikWebSendMessage
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.firstlogin.IdziennikFirstLogin
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLogin
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.entity.*
 import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
@@ -103,10 +98,17 @@ class Idziennik(val app: App, val profile: Profile?, val loginStore: LoginStore,
     override fun markAllAnnouncementsAsRead() {}
     override fun getAnnouncement(announcement: AnnouncementFull) {}
 
-    override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {
+    override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) {
         login(LOGIN_METHOD_IDZIENNIK_WEB) {
-            IdziennikWebGetAttachment(data, message, attachmentId, attachmentName) {
-                completed()
+            if (owner is Message) {
+                IdziennikWebGetAttachment(data, owner, attachmentId, attachmentName) {
+                    completed()
+                }
+            }
+            else if (owner is Event) {
+                IdziennikWebGetHomeworkAttachment(data, owner, attachmentId, attachmentName) {
+                    completed()
+                }
             }
         }
     }
@@ -119,10 +121,19 @@ class Idziennik(val app: App, val profile: Profile?, val loginStore: LoginStore,
         }
     }
 
+    override fun getEvent(eventFull: EventFull) {
+        login(LOGIN_METHOD_IDZIENNIK_WEB) {
+            IdziennikWebGetHomework(data, eventFull) {
+                completed()
+            }
+        }
+    }
+
     override fun firstLogin() { IdziennikFirstLogin(data) { completed() } }
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
+        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikWeb.kt

@@ -229,6 +229,7 @@ open class IdziennikWeb(open val data: DataIdziennik, open val lastSync: Long?)
                 .apply {
                     parameters.forEach { (k, v) -> addParameter(k, v) }
                 }
+                .contentType("application/x-www-form-urlencoded")
                 .post()
                 .callback(callback)
                 .build()

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesInbox.kt

@@ -11,8 +11,8 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi
 import pl.szczodrzynski.edziennik.data.db.entity.*
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_DELETED
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_DELETED
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
 import pl.szczodrzynski.edziennik.getBoolean
 import pl.szczodrzynski.edziennik.getString
 import pl.szczodrzynski.edziennik.utils.Utils.crc32
@@ -33,11 +33,11 @@ class IdziennikApiMessagesInbox(override val data: DataIdziennik,
                 return@apiGet
             }
 
-            json.asJsonObjectList()?.forEach { jMessage ->
-                val subject = jMessage.getString("tytul")
-                if (subject?.contains("(") == true && subject.startsWith("iDziennik - "))
+            json.asJsonObjectList().forEach { jMessage ->
+                val subject = jMessage.getString("tytul") ?: ""
+                if (subject.contains("(") && subject.startsWith("iDziennik - "))
                     return@forEach
-                if (subject?.startsWith("Uwaga dla ucznia (klasa:") == true)
+                if (subject.startsWith("Uwaga dla ucznia (klasa:"))
                     return@forEach
 
                 val messageIdStr = jMessage.getString("id")
@@ -64,13 +64,12 @@ class IdziennikApiMessagesInbox(override val data: DataIdziennik,
                 rTeacher.setTeacherType(Teacher.TYPE_OTHER)
 
                 val message = Message(
-                        profileId,
-                        messageId,
-                        subject,
-                        body,
-                        if (jMessage.getBoolean("rekordUsuniety") == true) TYPE_DELETED else TYPE_RECEIVED,
-                        rTeacher.id,
-                        -1
+                        profileId = profileId,
+                        id = messageId,
+                        type = if (jMessage.getBoolean("rekordUsuniety") == true) TYPE_DELETED else TYPE_RECEIVED,
+                        subject = subject,
+                        body = body,
+                        senderId = rTeacher.id
                 )
 
                 val messageRecipient = MessageRecipient(
@@ -81,7 +80,7 @@ class IdziennikApiMessagesInbox(override val data: DataIdziennik,
                         /*messageId*/ messageId
                 )
 
-                data.messageIgnoreList.add(message)
+                data.messageList.add(message)
                 data.messageRecipientList.add(messageRecipient)
                 data.setSeenMetadataList.add(Metadata(
                         profileId,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesSent.kt

@@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_SENT
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi
 import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
 import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.utils.Utils.crc32
@@ -46,13 +46,12 @@ class IdziennikApiMessagesSent(override val data: DataIdziennik,
                 val sentDate = Date.fromIso(jMessage.get("dataWyslania").asString)
 
                 val message = Message(
-                        profileId,
-                        messageId,
-                        subject,
-                        body,
-                        TYPE_SENT,
-                        -1,
-                        -1
+                        profileId = profileId,
+                        id = messageId,
+                        type = TYPE_SENT,
+                        subject = subject,
+                        body = body,
+                        senderId = null
                 )
 
                 for (recipientEl in jMessage.getAsJsonArray("odbiorcy")) {
@@ -76,7 +75,7 @@ class IdziennikApiMessagesSent(override val data: DataIdziennik,
                     data.messageRecipientIgnoreList.add(messageRecipient)
                 }
 
-                data.messageIgnoreList.add(message)
+                data.messageList.add(message)
                 data.metadataList.add(Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, true, true, sentDate))
             }
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebExams.kt

@@ -66,7 +66,7 @@ class IdziennikWebExams(override val data: DataIdziennik,
                 val subjectId = data.getSubject(subjectName, null, subjectName).id
                 val teacherName = exam.getString("wpisal") ?: return@forEach
                 val teacherId = data.getTeacherByLastFirst(teacherName).id
-                val topic = exam.getString("zakres") ?: ""
+                val topic = exam.getString("zakres")?.trim() ?: ""
 
                 val lessonList = data.db.timetableDao().getForDateNow(profileId, examDate)
                 val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetAttachment.kt

@@ -15,7 +15,7 @@ import pl.szczodrzynski.edziennik.utils.Utils
 import java.io.File
 
 class IdziennikWebGetAttachment(override val data: DataIdziennik,
-                                val message: Message,
+                                val owner: Any,
                                 val attachmentId: Long,
                                 val attachmentName: String,
                                 val onSuccess: () -> Unit
@@ -25,6 +25,8 @@ class IdziennikWebGetAttachment(override val data: DataIdziennik,
     }
 
     init {
+        val message = owner as Message
+
         val messageId = "\\[META:([A-z0-9]+);([0-9-]+)]".toRegex().find(message.body ?: "")?.get(2) ?: -1
         val targetFile = File(Utils.getStorageDir(), attachmentName)
 
@@ -34,29 +36,29 @@ class IdziennikWebGetAttachment(override val data: DataIdziennik,
         ), { file ->
             val event = AttachmentGetEvent(
                     profileId,
-                    message.id,
+                    owner,
                     attachmentId,
                     AttachmentGetEvent.TYPE_FINISHED,
                     file.absolutePath
             )
 
-            val attachmentDataFile = File(Utils.getStorageDir(), ".${profileId}_${event.messageId}_${event.attachmentId}")
+            val attachmentDataFile = File(Utils.getStorageDir(), ".${profileId}_${event.ownerId}_${event.attachmentId}")
             Utils.writeStringToFile(attachmentDataFile, event.fileName)
 
-            EventBus.getDefault().post(event)
+            EventBus.getDefault().postSticky(event)
 
             onSuccess()
 
         }) { written, _ ->
             val event = AttachmentGetEvent(
                     profileId,
-                    message.id,
+                    owner,
                     attachmentId,
                     AttachmentGetEvent.TYPE_PROGRESS,
                     bytesWritten = written
             )
 
-            EventBus.getDefault().post(event)
+            EventBus.getDefault().postSticky(event)
         }
     }
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetHomework.kt

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-4-1.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
+import pl.szczodrzynski.edziennik.getBoolean
+import pl.szczodrzynski.edziennik.getJsonObject
+import pl.szczodrzynski.edziennik.getString
+
+class IdziennikWebGetHomework(override val data: DataIdziennik,
+                              val event: EventFull,
+                              val onSuccess: () -> Unit
+) : IdziennikWeb(data, null) {
+    companion object {
+        private const val TAG = "IdziennikWebGetHomework"
+    }
+
+    init {
+        webApiGet(TAG, IDZIENNIK_WEB_GET_HOMEWORK, mapOf(
+                "idP" to data.registerId,
+                "idPD" to event.id
+        )) { result ->
+            val json = result.getJsonObject("d") ?: run {
+                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+                        .withApiResponse(result))
+                return@webApiGet
+            }
+
+            val homework = json.getJsonObject("praca") ?: return@webApiGet
+
+            if (homework.getBoolean("zalacznik", false)) {
+                event.attachmentIds = mutableListOf(event.id)
+                event.attachmentNames = mutableListOf("Załącznik do zadania")
+            }
+            else {
+                event.attachmentIds = mutableListOf()
+                event.attachmentNames = mutableListOf()
+            }
+            event.homeworkBody = homework.getString("tresc")
+
+            data.eventList.add(event)
+            data.eventListReplace = true
+
+            EventBus.getDefault().postSticky(EventGetEvent(event))
+            onSuccess()
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetHomeworkAttachment.kt

@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-4-1.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import com.google.gson.JsonObject
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_HOMEWORK_ATTACHMENT
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.set
+import pl.szczodrzynski.edziennik.utils.Utils
+import java.io.File
+
+class IdziennikWebGetHomeworkAttachment(override val data: DataIdziennik,
+                                        val owner: Any,
+                                        val attachmentId: Long,
+                                        val attachmentName: String,
+                                        val onSuccess: () -> Unit
+) : IdziennikWeb(data, null) {
+    companion object {
+        const val TAG = "IdziennikWebGetHomeworkAttachment"
+    }
+
+    init {
+        val homework = owner as Event
+
+        /*val request = Request.Builder()
+                .url("")
+                .build()
+        data.app.http.newCall(request).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                        .withThrowable(e))
+            }
+
+            override fun onResponse(call: Call, response: Response) {
+                val filename = response.header("content-disposition")?.substringAfter("\"")?.substringBeforeLast("\"")
+
+                val file: File = File(Utils.getStorageDir(), filename)
+                val sink = file.sink().buffer()
+                response.body()?.source()?.let {
+                    sink.writeAll(it)
+                }
+                sink.close()
+            }
+        })*/
+
+        webGet(TAG, IDZIENNIK_WEB_GET_HOMEWORK_ATTACHMENT) { text ->
+            val hiddenFields = JsonObject()
+            Regexes.IDZIENNIK_LOGIN_HIDDEN_FIELDS.findAll(text).forEach {
+                hiddenFields[it[1]] = it[2]
+            }
+
+            webGetFile(TAG, IDZIENNIK_WEB_GET_HOMEWORK_ATTACHMENT, Utils.getStorageDir(), mapOf(
+                    "__VIEWSTATE" to hiddenFields.getString("__VIEWSTATE", ""),
+                    "__VIEWSTATEGENERATOR" to hiddenFields.getString("__VIEWSTATEGENERATOR", ""),
+                    "__EVENTVALIDATION" to hiddenFields.getString("__EVENTVALIDATION", ""),
+                    "__EVENTTARGET" to "ctl00\$cphContent\$bt_pobraniePliku",
+                    "ctl00\$dxComboUczniowie" to data.registerId,
+                    "ctl00\$cphContent\$idPracyDomowej" to attachmentId
+            ), { file ->
+                val event = AttachmentGetEvent(
+                        profileId,
+                        owner,
+                        attachmentId,
+                        AttachmentGetEvent.TYPE_FINISHED,
+                        file.absolutePath
+                )
+
+                val attachmentDataFile = File(Utils.getStorageDir(), ".${profileId}_${event.ownerId}_${event.attachmentId}")
+                Utils.writeStringToFile(attachmentDataFile, event.fileName)
+
+                homework.attachmentNames = mutableListOf(file.name)
+                data.eventList.add(homework)
+                data.eventListReplace = true
+
+                EventBus.getDefault().postSticky(event)
+                onSuccess()
+
+            }) { written, _ ->
+                val event = AttachmentGetEvent(
+                        profileId,
+                        owner,
+                        attachmentId,
+                        AttachmentGetEvent.TYPE_PROGRESS,
+                        bytesWritten = written
+                )
+
+                EventBus.getDefault().postSticky(event)
+            }
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetMessage.kt

@@ -10,8 +10,8 @@ import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_MESSAGE
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageRecipientFull
@@ -50,7 +50,11 @@ class IdziennikWebGetMessage(override val data: DataIdziennik,
                 message.recipients?.clear()
                 when (message.type) {
                     TYPE_RECEIVED -> {
-                        val recipientObject = MessageRecipientFull(profileId, -1, message.id)
+                        val recipientObject = MessageRecipientFull(
+                                profileId = profileId,
+                                id = -1,
+                                messageId = message.id
+                        )
 
                         val readDateString = it.getString("DataOdczytania")
                         recipientObject.readDate = if (readDateString.isNullOrBlank()) System.currentTimeMillis()
@@ -67,7 +71,11 @@ class IdziennikWebGetMessage(override val data: DataIdziennik,
                             val recipientName = recipient.getString("NazwaOdbiorcy") ?: return@forEach
                             val teacher = data.getTeacherByLastFirst(recipientName)
 
-                            val recipientObject = MessageRecipientFull(profileId, teacher.id, message.id)
+                            val recipientObject = MessageRecipientFull(
+                                    profileId = profileId,
+                                    id = teacher.id,
+                                    messageId = message.id
+                            )
 
                             recipientObject.readDate = recipient.getLong("Status") ?: return@forEach
                             recipientObject.fullName = teacher.fullName
@@ -91,9 +99,10 @@ class IdziennikWebGetMessage(override val data: DataIdziennik,
                     ))
                 }
 
-                EventBus.getDefault().postSticky(MessageGetEvent(message))
-
                 data.messageList.add(message)
+                data.messageListReplace = true
+
+                EventBus.getDefault().postSticky(MessageGetEvent(message))
                 onSuccess()
             }
         }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebHomework.kt

@@ -52,13 +52,14 @@ class IdziennikWebHomework(override val data: DataIdziennik,
             json.getJsonArray("ListK")?.asJsonObjectList()?.forEach { homework ->
                 val id = homework.getLong("_recordId") ?: return@forEach
                 val eventDate = Date.fromY_m_d(homework.getString("dataO") ?: return@forEach)
+                val addedDate = Date.fromY_m_d(homework.getString("dataZ") ?: return@forEach)
                 val subjectName = homework.getString("przed") ?: return@forEach
                 val subjectId = data.getSubject(subjectName, null, subjectName).id
                 val teacherName = homework.getString("usr") ?: return@forEach
                 val teacherId = data.getTeacherByLastFirst(teacherName).id
                 val lessonList = data.db.timetableDao().getForDateNow(profileId, eventDate)
                 val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.displayStartTime
-                val topic = homework.getString("tytul") ?: ""
+                val topic = homework.getString("tytul")?.trim() ?: ""
 
                 val seen = when (profile?.empty) {
                     true -> true
@@ -86,7 +87,7 @@ class IdziennikWebHomework(override val data: DataIdziennik,
                         eventObject.id,
                         seen,
                         seen,
-                        System.currentTimeMillis()
+                        addedDate.inMillis
                 ))
             }
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebProposedGrades.kt

@@ -13,6 +13,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.entity.Grade
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_DESCRIPTIVE
 import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_PROPOSED
 import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_PROPOSED
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
@@ -20,7 +21,6 @@ import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.getJsonArray
 import pl.szczodrzynski.edziennik.getJsonObject
 import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.Utils.getWordGradeValue
 
 class IdziennikWebProposedGrades(override val data: DataIdziennik,
                                  override val lastSync: Long?,
@@ -39,36 +39,64 @@ class IdziennikWebProposedGrades(override val data: DataIdziennik,
                         .withApiResponse(result))
                 return@webApiGet
             }
+            val manager = data.app.gradesManager
 
             json.getJsonArray("Przedmioty")?.asJsonObjectList()?.forEach { subject ->
                 val subjectName = subject.getString("Przedmiot") ?: return@forEach
                 val subjectObject = data.getSubject(subjectName, null, subjectName)
 
                 val semester1Proposed = subject.getString("OcenaSem1") ?: ""
-                val semester1Value = getWordGradeValue(semester1Proposed)
+                val semester1Value = manager.getGradeValue(semester1Proposed)
                 val semester1Id = subjectObject.id * (-100) - 1
+                val semester1Type =
+                        if (semester1Value == 0f) TYPE_DESCRIPTIVE
+                        else TYPE_SEMESTER1_PROPOSED
+                val semester1Name = when {
+                    semester1Value == 0f -> " "
+                    semester1Value % 1.0f == 0f -> semester1Value.toInt().toString()
+                    else -> semester1Value.toString()
+                }
+                val semester1Color =
+                        if (semester1Value == 0f) 0xff536dfe.toInt()
+                        else -1
 
                 val semester2Proposed = subject.getString("OcenaSem2") ?: ""
-                val semester2Value = getWordGradeValue(semester2Proposed)
+                val semester2Value = manager.getGradeValue(semester2Proposed)
                 val semester2Id = subjectObject.id * (-100) - 2
+                val semester2Type =
+                        if (semester2Value == 0f) TYPE_DESCRIPTIVE
+                        else TYPE_YEAR_PROPOSED
+                val semester2Name = when {
+                    semester2Value == 0f -> " "
+                    semester2Value % 1.0f == 0f -> semester2Value.toInt().toString()
+                    else -> semester2Value.toString()
+                }
+                val semester2Color =
+                        if (semester2Value == 0f) 0xffff4081.toInt()
+                        else -1
 
                 if (semester1Proposed != "") {
                     val gradeObject = Grade(
                             profileId = profileId,
                             id = semester1Id,
-                            name = semester1Value.toString(),
-                            type = TYPE_SEMESTER1_PROPOSED,
-                            value = semester1Value.toFloat(),
+                            name = semester1Name,
+                            type = semester1Type,
+                            value = semester1Value,
                             weight = 0f,
-                            color = -1,
-                            category = null,
-                            description = null,
+                            color = semester1Color,
+                            category = if (semester1Value == 0f) "Ocena opisowa semestralna" else null,
+                            description = if (semester1Value == 0f) semester1Proposed else null,
                             comment = null,
                             semester = 1,
                             teacherId = -1,
                             subjectId = subjectObject.id
                     )
 
+                    val addedDate = if (data.profile.empty)
+                        data.profile.dateSemester1Start.inMillis
+                    else
+                        System.currentTimeMillis()
+
                     data.gradeList.add(gradeObject)
                     data.metadataList.add(Metadata(
                             profileId,
@@ -76,7 +104,7 @@ class IdziennikWebProposedGrades(override val data: DataIdziennik,
                             gradeObject.id,
                             profile.empty,
                             profile.empty,
-                            System.currentTimeMillis()
+                            addedDate
                     ))
                 }
 
@@ -84,13 +112,13 @@ class IdziennikWebProposedGrades(override val data: DataIdziennik,
                     val gradeObject = Grade(
                             profileId = profileId,
                             id = semester2Id,
-                            name = semester2Value.toString(),
-                            type = TYPE_YEAR_PROPOSED,
-                            value = semester2Value.toFloat(),
+                            name = semester2Name,
+                            type = semester2Type,
+                            value = semester2Value,
                             weight = 0f,
-                            color = -1,
-                            category = null,
-                            description = null,
+                            color = semester2Color,
+                            category = if (semester2Value == 0f) "Ocena opisowa końcoworoczna" else null,
+                            description = if (semester2Value == 0f) semester2Proposed else null,
                             comment = null,
                             semester = 2,
                             teacherId = -1,
@@ -98,7 +126,7 @@ class IdziennikWebProposedGrades(override val data: DataIdziennik,
                     )
 
                     val addedDate = if (data.profile.empty)
-                        data.profile.dateSemester1Start.inMillis
+                        data.profile.dateSemester2Start.inMillis
                     else
                         System.currentTimeMillis()
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebSendMessage.kt

@@ -57,7 +57,7 @@ class IdziennikWebSendMessage(override val data: DataIdziennik,
             }
 
             IdziennikApiMessagesSent(data, null) {
-                val message = data.messageIgnoreList.firstOrNull { it.type == Message.TYPE_SENT && it.subject == subject }
+                val message = data.messageList.firstOrNull { it.type == Message.TYPE_SENT && it.subject == subject }
                 val metadata = data.metadataList.firstOrNull { it.thingType == Metadata.TYPE_MESSAGE && it.thingId == message?.id }
                 val event = MessageSentEvent(data.profileId, message, metadata?.addedDate)
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/Librus.kt

@@ -13,6 +13,8 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.Librus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesGetMessage
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesGetRecipientList
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesSendMessage
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaGetHomework
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaHomeworkGetAttachment
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaMarkAllAnnouncementsAsRead
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.firstlogin.LibrusFirstLogin
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLogin
@@ -24,6 +26,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
@@ -118,11 +121,23 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
         }
     }
 
-    override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {
-        login(LOGIN_METHOD_LIBRUS_MESSAGES) {
-            LibrusMessagesGetAttachment(data, message, attachmentId, attachmentName) {
-                completed()
+    override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) {
+        when (owner) {
+            is Message -> {
+                login(LOGIN_METHOD_LIBRUS_MESSAGES) {
+                    LibrusMessagesGetAttachment(data, owner, attachmentId, attachmentName) {
+                        completed()
+                    }
+                }
             }
+            is EventFull -> {
+                login(LOGIN_METHOD_LIBRUS_SYNERGIA) {
+                    LibrusSynergiaHomeworkGetAttachment(data, owner, attachmentId, attachmentName) {
+                        completed()
+                    }
+                }
+            }
+            else -> completed()
         }
     }
 
@@ -134,10 +149,19 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
         }
     }
 
+    override fun getEvent(eventFull: EventFull) {
+        login(LOGIN_METHOD_LIBRUS_SYNERGIA) {
+            LibrusSynergiaGetHomework(data, eventFull) {
+                completed()
+            }
+        }
+    }
+
     override fun firstLogin() { LibrusFirstLogin(data) { completed() } }
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
+        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusSynergia.kt

@@ -35,7 +35,7 @@ open class LibrusSynergia(open val data: DataLibrus, open val lastSync: Long?) {
                     return
                 }
 
-                if (!text.contains("jesteś zalogowany")) {
+                if (!text.contains("jesteś zalogowany") && !text.contains("Podgląd zadania")) {
                     when {
                         text.contains("stop.png") -> ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED
                         text.contains("Przerwa techniczna") -> ERROR_LIBRUS_SYNERGIA_MAINTENANCE
@@ -48,7 +48,6 @@ open class LibrusSynergia(open val data: DataLibrus, open val lastSync: Long?) {
                     }
                 }
 
-
                 try {
                     onSuccess(text)
                 } catch (e: Exception) {
@@ -90,4 +89,42 @@ open class LibrusSynergia(open val data: DataLibrus, open val lastSync: Long?) {
                 .build()
                 .enqueue()
     }
+
+    fun redirectUrlGet(tag: String, url: String, onSuccess: (url: String) -> Unit) {
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response) {
+                val redirectUrl = response.headers().get("Location")
+
+                if (redirectUrl != null) {
+                    try {
+                        onSuccess(redirectUrl)
+                    } catch (e: Exception) {
+                        data.error(ApiError(tag, EXCEPTION_LIBRUS_SYNERGIA_REQUEST)
+                                .withResponse(response)
+                                .withThrowable(e)
+                                .withApiResponse(text))
+                    }
+                } else {
+                    data.error(ApiError(tag, ERROR_LIBRUS_SYNERGIA_OTHER)
+                            .withResponse(response)
+                            .withApiResponse(text))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url(url)
+                .userAgent(LIBRUS_USER_AGENT)
+                .withClient(data.app.httpLazy)
+                .get()
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEvents.kt

@@ -35,7 +35,7 @@ class LibrusApiEvents(override val data: DataLibrus,
             events?.forEach { event ->
                 val id = event.getLong("Id") ?: return@forEach
                 val eventDate = Date.fromY_m_d(event.getString("Date"))
-                val topic = event.getString("Content") ?: ""
+                val topic = event.getString("Content")?.trim() ?: ""
                 val type = event.getJsonObject("Category")?.getLong("Id") ?: -1
                 val teacherId = event.getJsonObject("CreatedBy")?.getLong("Id") ?: -1
                 val subjectId = event.getJsonObject("Subject")?.getLong("Id") ?: -1

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetAttachment.kt

@@ -4,20 +4,12 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages
 
-import kotlinx.coroutines.*
-import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.data.api.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
-import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
-import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent.Companion.TYPE_FINISHED
-import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent.Companion.TYPE_PROGRESS
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.Utils
-import java.io.File
 import kotlin.coroutines.CoroutineContext
 
 class LibrusMessagesGetAttachment(override val data: DataLibrus,
@@ -35,8 +27,6 @@ class LibrusMessagesGetAttachment(override val data: DataLibrus,
     override val coroutineContext: CoroutineContext
         get() = job + Dispatchers.Default
 
-    private var getAttachmentCheckKeyTries = 0
-
     init {
         messagesGet(TAG, "GetFileDownloadLink", parameters = mapOf(
                 "fileId" to attachmentId,
@@ -44,80 +34,8 @@ class LibrusMessagesGetAttachment(override val data: DataLibrus,
                 "archive" to 0
         )) { doc ->
             val downloadLink = doc.select("response GetFileDownloadLink downloadLink").text()
-            val keyMatcher = Regexes.LIBRUS_ATTACHMENT_KEY.find(downloadLink)
 
-            if (keyMatcher != null) {
-                getAttachmentCheckKeyTries = 0
-
-                val attachmentKey = keyMatcher[1]
-                getAttachmentCheckKey(attachmentKey) {
-                    downloadAttachment("${LIBRUS_SANDBOX_URL}CSDownload&singleUseKey=$attachmentKey", method = POST)
-                }
-            } else {
-                downloadAttachment("$downloadLink/get", method = GET)
-            }
-        }
-    }
-
-    private fun getAttachmentCheckKey(attachmentKey: String, callback: () -> Unit) {
-        sandboxGet(TAG, "CSCheckKey",
-                parameters = mapOf("singleUseKey" to attachmentKey)) { json ->
-
-            when (json.getString("status")) {
-                "not_downloaded_yet" -> {
-                    if (getAttachmentCheckKeyTries++ > 5) {
-                        data.error(ApiError(TAG, ERROR_FILE_DOWNLOAD)
-                                .withApiResponse(json))
-                        return@sandboxGet
-                    }
-                    launch {
-                        delay(2000)
-                        getAttachmentCheckKey(attachmentKey, callback)
-                    }
-                }
-
-                "ready" -> {
-                    launch { callback() }
-                }
-
-                else -> {
-                    data.error(ApiError(TAG, EXCEPTION_LIBRUS_MESSAGES_REQUEST)
-                            .withApiResponse(json))
-                }
-            }
-        }
-    }
-
-    private fun downloadAttachment(url: String, method: Int = GET) {
-        val targetFile = File(Utils.getStorageDir(), attachmentName)
-
-        sandboxGetFile(TAG, url, targetFile, { file ->
-
-            val event = AttachmentGetEvent(
-                    profileId,
-                    message.id,
-                    attachmentId,
-                    TYPE_FINISHED,
-                    file.absolutePath
-            )
-
-            val attachmentDataFile = File(Utils.getStorageDir(), ".${profileId}_${event.messageId}_${event.attachmentId}")
-            Utils.writeStringToFile(attachmentDataFile, event.fileName)
-
-            EventBus.getDefault().post(event)
-
-            onSuccess()
-
-        }) { written, _ ->
-            val event = AttachmentGetEvent(
-                    profileId,
-                    message.id,
-                    attachmentId,
-                    TYPE_PROGRESS,
-                    bytesWritten = written
-            )
-
-            EventBus.getDefault().post(event)
+            LibrusSandboxDownloadAttachment(data, downloadLink, message, attachmentId, attachmentName, onSuccess)
         }
     }
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetList.kt

@@ -12,7 +12,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_MESS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_MESSAGES_SENT
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
 import pl.szczodrzynski.edziennik.data.db.entity.*
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
 import pl.szczodrzynski.edziennik.fixName
 import pl.szczodrzynski.edziennik.singleOrNull
 import pl.szczodrzynski.edziennik.utils.Utils
@@ -78,7 +78,7 @@ class LibrusMessagesGetList(override val data: DataLibrus,
 
                     val senderId = when (type) {
                         TYPE_RECEIVED -> recipientId
-                        else -> -1
+                        else -> null
                     }
 
                     val receiverId = when (type) {
@@ -92,13 +92,12 @@ class LibrusMessagesGetList(override val data: DataLibrus,
                     }
 
                     val messageObject = Message(
-                            profileId,
-                            id,
-                            subject,
-                            null,
-                            type,
-                            senderId,
-                            -1
+                            profileId = profileId,
+                            id = id,
+                            type = type,
+                            subject = subject,
+                            body = null,
+                            senderId = senderId
                     )
 
                     val messageRecipientObject = MessageRecipient(
@@ -111,10 +110,10 @@ class LibrusMessagesGetList(override val data: DataLibrus,
 
                     element.select("isAnyFileAttached")?.text()?.let {
                         if (it == "1")
-                            messageObject.overrideHasAttachments = true
+                            messageObject.hasAttachments = true
                     }
 
-                    data.messageIgnoreList.add(messageObject)
+                    data.messageList.add(messageObject)
                     data.messageRecipientList.add(messageRecipientObject)
                     data.setSeenMetadataList.add(Metadata(
                             profileId,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetMessage.kt

@@ -9,8 +9,8 @@ import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
 import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
@@ -102,11 +102,10 @@ class LibrusMessagesGetMessage(override val data: DataLibrus,
                     }
 
                     val messageRecipientObject = MessageRecipientFull(
-                            profileId,
-                            -1,
-                            -1,
-                            readDate,
-                            messageObject.id
+                            profileId = profileId,
+                            id = -1,
+                            messageId = messageObject.id,
+                            readDate = readDate
                     )
 
                     messageRecipientObject.fullName = profile.accountName ?: profile.studentNameLong ?: ""
@@ -132,11 +131,10 @@ class LibrusMessagesGetMessage(override val data: DataLibrus,
                         }
 
                         val messageRecipientObject = MessageRecipientFull(
-                                profileId,
-                                receiverId,
-                                -1,
-                                readDate,
-                                messageObject.id
+                                profileId = profileId,
+                                id = receiverId,
+                                messageId = messageObject.id,
+                                readDate = readDate
                         )
 
                         messageRecipientObject.fullName = "$receiverFirstName $receiverLastName"
@@ -159,7 +157,9 @@ class LibrusMessagesGetMessage(override val data: DataLibrus,
 
             messageObject.recipients = messageRecipientList
             data.messageRecipientList.addAll(messageRecipientList)
+
             data.messageList.add(messageObject)
+            data.messageListReplace = true
 
             EventBus.getDefault().postSticky(MessageGetEvent(messageObject))
             onSuccess()

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesSendMessage.kt

@@ -48,7 +48,7 @@ class LibrusMessagesSendMessage(override val data: DataLibrus,
             }
 
             LibrusMessagesGetList(data, type = Message.TYPE_SENT, lastSync = null) {
-                val message = data.messageIgnoreList.firstOrNull { it.type == Message.TYPE_SENT && it.id == id }
+                val message = data.messageList.firstOrNull { it.type == Message.TYPE_SENT && it.id == id }
                 val metadata = data.metadataList.firstOrNull { it.thingType == Metadata.TYPE_MESSAGE && it.thingId == message?.id }
                 val event = MessageSentEvent(data.profileId, message, metadata?.addedDate)
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusSandboxDownloadAttachment.kt

@@ -0,0 +1,117 @@
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages
+
+import kotlinx.coroutines.*
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
+import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.Utils
+import java.io.File
+import kotlin.coroutines.CoroutineContext
+
+class LibrusSandboxDownloadAttachment(override val data: DataLibrus,
+                                      downloadLink: String,
+                                      val owner: Any,
+                                      val attachmentId: Long,
+                                      val attachmentName: String,
+                                      val onSuccess: () -> Unit
+) : LibrusMessages(data, null), CoroutineScope {
+    companion object {
+        const val TAG = "LibrusSandboxDownloadAttachment"
+    }
+
+    private var job = Job()
+
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Default
+
+    private var getAttachmentCheckKeyTries = 0
+
+    init {
+        val keyMatcher = Regexes.LIBRUS_ATTACHMENT_KEY.find(downloadLink)
+
+        when {
+            downloadLink.contains("CSDownloadFailed") -> {
+                data.error(ApiError(TAG, ERROR_LIBRUS_MESSAGES_ATTACHMENT_NOT_FOUND))
+                onSuccess()
+            }
+            keyMatcher != null -> {
+                getAttachmentCheckKeyTries = 0
+
+                val attachmentKey = keyMatcher[1]
+                getAttachmentCheckKey(attachmentKey) {
+                    downloadAttachment("${LIBRUS_SANDBOX_URL}CSDownload&singleUseKey=$attachmentKey", method = POST)
+                }
+            }
+            else -> {
+                downloadAttachment("$downloadLink/get", method = GET)
+            }
+        }
+    }
+
+    private fun getAttachmentCheckKey(attachmentKey: String, callback: () -> Unit) {
+        sandboxGet(TAG, "CSCheckKey",
+                parameters = mapOf("singleUseKey" to attachmentKey)) { json ->
+
+            when (json.getString("status")) {
+                "not_downloaded_yet" -> {
+                    if (getAttachmentCheckKeyTries++ > 5) {
+                        data.error(ApiError(TAG, ERROR_FILE_DOWNLOAD)
+                                .withApiResponse(json))
+                        return@sandboxGet
+                    }
+                    launch {
+                        delay(2000)
+                        getAttachmentCheckKey(attachmentKey, callback)
+                    }
+                }
+
+                "ready" -> {
+                    launch { callback() }
+                }
+
+                else -> {
+                    data.error(ApiError(TAG, EXCEPTION_LIBRUS_MESSAGES_REQUEST)
+                            .withApiResponse(json))
+                }
+            }
+        }
+    }
+
+    private fun downloadAttachment(url: String, method: Int = GET) {
+        val targetFile = File(Utils.getStorageDir(), attachmentName)
+
+        sandboxGetFile(TAG, url, targetFile, { file ->
+
+            val event = AttachmentGetEvent(
+                    profileId,
+                    owner,
+                    attachmentId,
+                    AttachmentGetEvent.TYPE_FINISHED,
+                    file.absolutePath
+            )
+
+            val attachmentDataFile = File(Utils.getStorageDir(), ".${profileId}_${event.ownerId}_${event.attachmentId}")
+            Utils.writeStringToFile(attachmentDataFile, event.fileName)
+
+            EventBus.getDefault().postSticky(event)
+
+            onSuccess()
+
+        }) { written, _ ->
+            val event = AttachmentGetEvent(
+                    profileId,
+                    owner,
+                    attachmentId,
+                    AttachmentGetEvent.TYPE_PROGRESS,
+                    bytesWritten = written
+            )
+
+            EventBus.getDefault().postSticky(event)
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetHomework.kt

@@ -0,0 +1,48 @@
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia
+
+import android.text.Html
+import org.greenrobot.eventbus.EventBus
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia
+import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
+
+class LibrusSynergiaGetHomework(override val data: DataLibrus,
+                                val event: EventFull,
+                                val onSuccess: () -> Unit
+) : LibrusSynergia(data, null) {
+    companion object {
+        const val TAG = "LibrusSynergiaGetHomework"
+    }
+
+    init {
+        synergiaGet(TAG, "moje_zadania/podglad/${event.id}") { text ->
+            val doc = Jsoup.parse(text)
+
+            val table = doc.select("table.decorated tbody > tr")
+
+            event.topic = table[1].select("td")[1].text()
+            event.homeworkBody = Html.fromHtml(table[5].select("td")[1].html()).toString()
+
+            event.attachmentIds = mutableListOf()
+            event.attachmentNames = mutableListOf()
+
+            if (table.size > 6) {
+                table[6].select("a").forEach { a ->
+                    val attachmentId = a.attr("href").split('/')
+                            .last().toLongOrNull() ?: return@forEach
+                    val filename = a.text()
+                    event.attachmentIds?.add(attachmentId)
+                    event.attachmentNames?.add(filename)
+                }
+            }
+
+            data.eventList.add(event)
+            data.eventListReplace = true
+
+            EventBus.getDefault().postSticky(EventGetEvent(event))
+            onSuccess()
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomework.kt

@@ -42,8 +42,6 @@ class LibrusSynergiaHomework(override val data: DataLibrus,
             doc.select("table.myHomeworkTable > tbody").firstOrNull()?.also { homeworkTable ->
                 val homeworkElements = homeworkTable.children()
 
-                val graphElements = doc.select("table[border].center td[align=left] tbody").first().children()
-
                 homeworkElements.forEachIndexed { i, el ->
                     val elements = el.children()
 
@@ -63,26 +61,6 @@ class LibrusSynergiaHomework(override val data: DataLibrus,
                     val lessons = data.db.timetableDao().getForDateNow(profileId, eventDate)
                     val startTime = lessons.firstOrNull { it.subjectId == subjectId }?.startTime
 
-                    /*val moreInfo = graphElements[2 * i + 1].select("td[title]")
-                            .attr("title").trim()*/
-
-                    var description = ""
-
-                    graphElements.forEach { graphEl ->
-                        graphEl.select("td[title]")?.also {
-                            val title = it.attr("title")
-                            val r = "Temat: (.*?)<br.?/>Data udostępnienia: (.*?)<br.?/>Termin wykonania: (.*?)<br.?/>Treść: (.*)"
-                                    .toRegex(RegexOption.DOT_MATCHES_ALL).find(title) ?: return@forEach
-                            val gTopic = r[1].trim()
-                            val gAddedDate = Date.fromY_m_d(r[2].trim())
-                            val gEventDate = Date.fromY_m_d(r[3].trim())
-                            if (gTopic == topic && gAddedDate == addedDate && gEventDate == eventDate) {
-                                description = r[4].replace("<br.?/>".toRegex(), "\n").trim()
-                                return@forEach
-                            }
-                        }
-                    }
-
                     val seen = when (profile.empty) {
                         true -> true
                         else -> eventDate < Date.getToday()
@@ -93,7 +71,7 @@ class LibrusSynergiaHomework(override val data: DataLibrus,
                             id = id,
                             date = eventDate,
                             time = startTime,
-                            topic = "$topic\n$description",
+                            topic = topic,
                             color = null,
                             type = Event.TYPE_HOMEWORK,
                             teacherId = teacherId,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomeworkGetAttachment.kt

@@ -0,0 +1,25 @@
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia
+
+import pl.szczodrzynski.edziennik.data.api.LIBRUS_SYNERGIA_HOMEWORK_ATTACHMENT_URL
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusSandboxDownloadAttachment
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
+
+class LibrusSynergiaHomeworkGetAttachment(
+        override val data: DataLibrus,
+        val event: EventFull,
+        val attachmentId: Long,
+        val attachmentName: String,
+        val onSuccess: () -> Unit
+) : LibrusSynergia(data, null) {
+    companion object {
+        const val TAG = "LibrusSynergiaHomeworkGetAttachment"
+    }
+
+    init {
+        redirectUrlGet(TAG, "$LIBRUS_SYNERGIA_HOMEWORK_ATTACHMENT_URL/$attachmentId") { url ->
+            LibrusSandboxDownloadAttachment(data, url, event, attachmentId, attachmentName, onSuccess)
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/Mobidziennik.kt

@@ -8,20 +8,17 @@ import com.google.gson.JsonObject
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.MobidziennikData
-import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web.MobidziennikWebGetAttachment
-import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web.MobidziennikWebGetMessage
-import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web.MobidziennikWebGetRecipientList
-import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web.MobidziennikWebSendMessage
+import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.firstlogin.MobidziennikFirstLogin
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login.MobidziennikLogin
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
@@ -105,9 +102,9 @@ class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginSto
     override fun markAllAnnouncementsAsRead() {}
     override fun getAnnouncement(announcement: AnnouncementFull) {}
 
-    override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {
+    override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) {
         login(LOGIN_METHOD_MOBIDZIENNIK_WEB) {
-            MobidziennikWebGetAttachment(data, message, attachmentId, attachmentName) {
+            MobidziennikWebGetAttachment(data, owner, attachmentId, attachmentName) {
                 completed()
             }
         }
@@ -121,10 +118,19 @@ class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginSto
         }
     }
 
+    override fun getEvent(eventFull: EventFull) {
+        login(LOGIN_METHOD_MOBIDZIENNIK_WEB) {
+            MobidziennikWebGetHomework(data, eventFull) {
+                completed()
+            }
+        }
+    }
+
     override fun firstLogin() { MobidziennikFirstLogin(data) { completed() } }
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
+        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/MobidziennikFeatures.kt

@@ -17,6 +17,7 @@ const val ENDPOINT_MOBIDZIENNIK_WEB_NOTICES             = 2040
 const val ENDPOINT_MOBIDZIENNIK_WEB_ATTENDANCE          = 2050
 const val ENDPOINT_MOBIDZIENNIK_WEB_MANUALS             = 2100
 const val ENDPOINT_MOBIDZIENNIK_WEB_ACCOUNT_EMAIL       = 2200
+const val ENDPOINT_MOBIDZIENNIK_WEB_HOMEWORK            = 2300 // not used as an endpoint
 const val ENDPOINT_MOBIDZIENNIK_API2_MAIN               = 3000
 
 val MobidziennikFeatures = listOf(

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiEvents.kt

@@ -30,7 +30,7 @@ class MobidziennikApiEvents(val data: DataMobidziennik, rows: List<String>) {
                 val teacherId = cols[1].toLong()
                 val subjectId = cols[3].toLong()
                 var type = Event.TYPE_DEFAULT
-                var topic = cols[5]
+                var topic = cols[5].trim()
                 Regexes.MOBIDZIENNIK_EVENT_TYPE.find(topic)?.let {
                     val typeText = it.groupValues[1]
                     when (typeText) {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiHomework.kt

@@ -26,7 +26,7 @@ class MobidziennikApiHomework(val data: DataMobidziennik, rows: List<String>) {
                 val id = cols[0].toLong()
                 val teacherId = cols[7].toLong()
                 val subjectId = cols[6].toLong()
-                val topic = Html.fromHtml(cols[1])?.toString() ?: ""
+                val topic = Html.fromHtml(cols[1])?.toString()?.trim() ?: ""
                 val eventDate = Date.fromYmd(cols[2])
                 val startTime = Time.fromYmdHm(cols[3])
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGetAttachment.kt

@@ -8,12 +8,14 @@ import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.MobidziennikWeb
 import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
+import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.models.Date
 import java.io.File
 
 class MobidziennikWebGetAttachment(override val data: DataMobidziennik,
-                                   val message: Message,
+                                   val owner: Any,
                                    val attachmentId: Long,
                                    val attachmentName: String,
                                    val onSuccess: () -> Unit
@@ -25,25 +27,40 @@ class MobidziennikWebGetAttachment(override val data: DataMobidziennik,
     init {
         val targetFile = File(Utils.getStorageDir(), attachmentName)
 
-        val typeUrl = if (message.type == Message.TYPE_SENT)
-            "wiadwyslana"
-        else
-            "wiadodebrana"
+        val typeUrl = when (owner) {
+            is Message -> if (owner.type == Message.TYPE_SENT)
+                "dziennik/wiadwyslana/?id="
+            else
+                "dziennik/wiadodebrana/?id="
 
-        webGetFile(TAG, "/dziennik/$typeUrl/?id=${message.id}&zalacznik=$attachmentId", targetFile, { file ->
+            is Event -> if (owner.date >= Date.getToday())
+                "dziennik/wyslijzadanie/?id_zadania="
+            else
+                "dziennik/wyslijzadanie/?id_zadania="
+
+            else -> ""
+        }
+
+        val ownerId = when (owner) {
+            is Message -> owner.id
+            is Event -> owner.id
+            else -> -1
+        }
+
+        webGetFile(TAG, "/$typeUrl${ownerId}&uczen=${data.studentId}&zalacznik=$attachmentId", targetFile, { file ->
 
             val event = AttachmentGetEvent(
                     profileId,
-                    message.id,
+                    owner,
                     attachmentId,
                     AttachmentGetEvent.TYPE_FINISHED,
                     file.absolutePath
             )
 
-            val attachmentDataFile = File(Utils.getStorageDir(), ".${profileId}_${event.messageId}_${event.attachmentId}")
+            val attachmentDataFile = File(Utils.getStorageDir(), ".${profileId}_${event.ownerId}_${event.attachmentId}")
             Utils.writeStringToFile(attachmentDataFile, event.fileName)
 
-            EventBus.getDefault().post(event)
+            EventBus.getDefault().postSticky(event)
 
             onSuccess()
 
@@ -51,13 +68,13 @@ class MobidziennikWebGetAttachment(override val data: DataMobidziennik,
             // TODO make use of bytesTotal
             val event = AttachmentGetEvent(
                     profileId,
-                    message.id,
+                    owner,
                     attachmentId,
                     AttachmentGetEvent.TYPE_PROGRESS,
                     bytesWritten = written
             )
 
-            EventBus.getDefault().post(event)
+            EventBus.getDefault().postSticky(event)
         }
     }
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGetHomework.kt

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-31.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.MobidziennikWeb
+import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class MobidziennikWebGetHomework(override val data: DataMobidziennik,
+                                 val event: EventFull,
+                                 val onSuccess: () -> Unit
+) : MobidziennikWeb(data, null) {
+    companion object {
+        private const val TAG = "MobidziennikWebHomework"
+    }
+
+    init {
+        val endpoint = if (event.date >= Date.getToday())
+            "zadaniadomowe"
+        else
+            "zadaniadomowearchiwalne"
+
+        webGet(TAG, "/mobile/$endpoint") { text ->
+            MobidziennikLuckyNumberExtractor(data, text)
+
+            Regexes.MOBIDZIENNIK_HOMEWORK_ROW.findAll(text).forEach { homeworkMatch ->
+                val tableRow = homeworkMatch[1].ifBlank { return@forEach }
+
+                val id = Regexes.MOBIDZIENNIK_HOMEWORK_ID.find(tableRow)?.get(1)?.toLongOrNull() ?: return@forEach
+                if (event.id != id)
+                    return@forEach
+
+                event.attachmentIds = mutableListOf()
+                event.attachmentNames = mutableListOf()
+                Regexes.MOBIDZIENNIK_HOMEWORK_ATTACHMENT.findAll(tableRow).forEach {
+                    event.attachmentIds?.add(it[2].toLongOrNull() ?: return@forEach)
+                    event.attachmentNames?.add(it[3])
+                }
+
+                event.homeworkBody = ""
+            }
+
+            data.eventList.add(event)
+            data.eventListReplace = true
+
+            EventBus.getDefault().postSticky(EventGetEvent(event))
+            onSuccess()
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGetMessage.kt

@@ -11,7 +11,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidzienn
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.MobidziennikWeb
 import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
 import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageRecipientFull
@@ -61,19 +61,17 @@ class MobidziennikWebGetMessage(override val data: DataMobidziennik,
                 }
 
                 val recipient = MessageRecipientFull(
-                        profileId,
-                        -1,
-                        -1,
-                        readDate,
-                        message.id
+                        profileId = profileId,
+                        id = -1,
+                        messageId = message.id,
+                        readDate = readDate
                 )
 
                 recipient.fullName = profile?.accountName ?: profile?.studentNameLong ?: ""
 
                 messageRecipientList.add(recipient)
             } else {
-                message.senderId = -1
-                message.senderReplyId = -1
+                message.senderId = null
 
                 content.select("table.spis tr:has(td)")?.forEach { recipientEl ->
                     val senderEl = recipientEl.select("td:eq(0)").first()
@@ -100,11 +98,10 @@ class MobidziennikWebGetMessage(override val data: DataMobidziennik,
                     }
 
                     val recipient = MessageRecipientFull(
-                            profileId,
-                            receiverId,
-                            -1,
-                            readDate,
-                            message.id
+                            profileId = profileId,
+                            id = receiverId,
+                            messageId = message.id,
+                            readDate = readDate
                     )
 
                     recipient.fullName = teacher?.fullName ?: "?"
@@ -149,7 +146,9 @@ class MobidziennikWebGetMessage(override val data: DataMobidziennik,
 
             message.recipients = messageRecipientList
             data.messageRecipientList.addAll(messageRecipientList)
+
             data.messageList.add(message)
+            data.messageListReplace = true
 
             EventBus.getDefault().postSticky(MessageGetEvent(message))
             onSuccess()

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebHomework.kt

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-31.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.ENDPOINT_MOBIDZIENNIK_WEB_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.MobidziennikWeb
+import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
+import pl.szczodrzynski.edziennik.get
+
+class MobidziennikWebHomework(override val data: DataMobidziennik,
+                              override val lastSync: Long?,
+                              val type: Int = TYPE_CURRENT,
+                              val event: EventFull,
+                              val onSuccess: (endpointId: Int) -> Unit
+) : MobidziennikWeb(data, lastSync) {
+    companion object {
+        private const val TAG = "MobidziennikWebHomework"
+        const val TYPE_CURRENT = 0
+        const val TYPE_PAST = 1
+    }
+
+    init {
+        val endpoint = when (type) {
+            TYPE_PAST -> "zadaniadomowearchiwalne"
+            else -> "zadaniadomowe"
+        }
+        webGet(TAG, "/mobile/$endpoint") { text ->
+            MobidziennikLuckyNumberExtractor(data, text)
+
+            Regexes.MOBIDZIENNIK_HOMEWORK_ROW.findAll(text).forEach { homeworkMatch ->
+                val tableRow = homeworkMatch[1].ifBlank { return@forEach }
+
+                /*val items = Regexes.MOBIDZIENNIK_HOMEWORK_ITEM.findAll(tableRow).map { match ->
+                    match[1] to match[2].fixWhiteSpaces()
+                }.toList()*/
+
+                val id = Regexes.MOBIDZIENNIK_HOMEWORK_ID.find(tableRow)?.get(1)?.toLongOrNull() ?: return@forEach
+                if (event.id != id)
+                    return@forEach
+
+                //val homeworkBody = Regexes.MOBIDZIENNIK_HOMEWORK_BODY.find(tableRow)?.get(1) ?: ""
+
+                event.attachmentIds = mutableListOf()
+                event.attachmentNames = mutableListOf()
+                Regexes.MOBIDZIENNIK_HOMEWORK_ATTACHMENT.findAll(tableRow).forEach {
+                    event.attachmentIds?.add(it[1].toLongOrNull() ?: return@forEach)
+                    event.attachmentNames?.add(it[2])
+                }
+
+                event.homeworkBody = ""
+            }
+
+            //data.eventList.add(eventObject)
+            //data.metadataList.add(
+            //        Metadata(
+            //                profileId,
+            //                Metadata.TYPE_EVENT,
+            //                eventObject.id,
+            //                profile?.empty ?: false,
+            //                profile?.empty ?: false,
+            //                System.currentTimeMillis() /* no addedDate here though */
+            //        ))
+
+            // not used as an endpoint
+            //data.setSyncNext(ENDPOINT_MOBIDZIENNIK_WEB_HOMEWORK, SYNC_ALWAYS)
+            data.eventList.add(event)
+            data.eventListReplace = true
+
+            EventBus.getDefault().postSticky(EventGetEvent(event))
+            onSuccess(ENDPOINT_MOBIDZIENNIK_WEB_HOMEWORK)
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebMessagesAll.kt

@@ -10,8 +10,8 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidzienn
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_ALL
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.MobidziennikWeb
 import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
 import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.fixName
@@ -54,12 +54,12 @@ class MobidziennikWebMessagesAll(override val data: DataMobidziennik,
                     type = TYPE_SENT
 
                 val senderEl = item.select("td:eq(3) div").first()
-                var senderId: Long = -1
+                var senderId: Long? = null
 
                 if (type == TYPE_RECEIVED) {
                     // search sender teacher
                     val senderName = senderEl.text().fixName()
-                    senderId = data.teacherList.singleOrNull { it.fullNameLastFirst == senderName }?.id ?: -1
+                    senderId = data.teacherList.singleOrNull { it.fullNameLastFirst == senderName }?.id
                     data.messageRecipientList.add(MessageRecipient(profileId, -1, id))
                 } else {
                     // TYPE_SENT, so multiple recipients possible
@@ -72,16 +72,15 @@ class MobidziennikWebMessagesAll(override val data: DataMobidziennik,
                 }
 
                 val message = Message(
-                        profileId,
-                        id,
-                        subject,
-                        null,
-                        type,
-                        senderId,
-                        -1
+                        profileId = profileId,
+                        id = id,
+                        type = type,
+                        subject = subject,
+                        body = null,
+                        senderId = senderId
                 )
 
-                data.messageIgnoreList.add(message)
+                data.messageList.add(message)
                 data.metadataList.add(Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, true, true, addedDate))
             }
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebMessagesInbox.kt

@@ -52,25 +52,24 @@ class MobidziennikWebMessagesInbox(override val data: DataMobidziennik,
 
                 val senderEl = item.select("td:eq(2)").first()
                 val senderName = senderEl.ownText().fixName()
-                val senderId = data.teacherList.singleOrNull { it.fullNameLastFirst == senderName }?.id ?: -1
+                val senderId = data.teacherList.singleOrNull { it.fullNameLastFirst == senderName }?.id
                 data.messageRecipientIgnoreList.add(MessageRecipient(profileId, -1, id))
 
                 val isRead = item.select("td:eq(3) span").first().hasClass("wiadomosc_przeczytana")
 
                 val message = Message(
-                        profileId,
-                        id,
-                        subject,
-                        null,
-                        Message.TYPE_RECEIVED,
-                        senderId,
-                        -1
+                        profileId = profileId,
+                        id = id,
+                        type = Message.TYPE_RECEIVED,
+                        subject = subject,
+                        body = null,
+                        senderId = senderId
                 )
 
                 if (hasAttachments)
-                    message.setHasAttachments()
+                    message.hasAttachments = true
 
-                data.messageIgnoreList.add(message)
+                data.messageList.add(message)
                 data.setSeenMetadataList.add(
                         Metadata(
                                 profileId,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebMessagesSent.kt

@@ -73,19 +73,18 @@ class MobidziennikWebMessagesSent(override val data: DataMobidziennik,
                 val addedDate = Date.fromIsoHm(addedDateEl.text())
 
                 val message = Message(
-                        profileId,
-                        id,
-                        subject,
-                        null,
-                        Message.TYPE_SENT,
-                        -1,
-                        -1
+                        profileId = profileId,
+                        id = id,
+                        type = Message.TYPE_SENT,
+                        subject = subject,
+                        body = null,
+                        senderId = null
                 )
 
                 if (hasAttachments)
-                    message.setHasAttachments()
+                    message.hasAttachments = true
 
-                data.messageIgnoreList.add(message)
+                data.messageList.add(message)
                 data.setSeenMetadataList.add(
                         Metadata(
                                 profileId,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebSendMessage.kt

@@ -43,7 +43,7 @@ class MobidziennikWebSendMessage(override val data: DataMobidziennik,
 
             // TODO create MobidziennikWebMessagesSent and replace this
             MobidziennikWebMessagesAll(data, null) {
-                val message = data.messageIgnoreList.firstOrNull { it.type == Message.TYPE_SENT && it.subject == subject }
+                val message = data.messageList.firstOrNull { it.type == Message.TYPE_SENT && it.subject == subject }
                 val metadata = data.metadataList.firstOrNull { it.thingType == Metadata.TYPE_MESSAGE && it.thingId == message?.id }
                 val event = MessageSentEvent(data.profileId, message, metadata?.addedDate)
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/Template.kt

@@ -16,10 +16,10 @@ import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.prepare
 import pl.szczodrzynski.edziennik.data.api.templateLoginMethods
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
@@ -79,7 +79,7 @@ class Template(val app: App, val profile: Profile?, val loginStore: LoginStore,
 
     }
 
-    override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {
+    override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) {
 
     }
 
@@ -87,6 +87,10 @@ class Template(val app: App, val profile: Profile?, val loginStore: LoginStore,
 
     }
 
+    override fun getEvent(eventFull: EventFull) {
+
+    }
+
     override fun firstLogin() {
         TemplateFirstLogin(data) {
             completed()
@@ -96,6 +100,7 @@ class Template(val app: App, val profile: Profile?, val loginStore: LoginStore,
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
+        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/Vulcan.kt

@@ -5,26 +5,31 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan
 
 import com.google.gson.JsonObject
+import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_API
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.helper.OneDriveDownloadAttachment
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanData
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiAttachments
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiMessagesChangeStatus
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiSendMessage
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.firstlogin.VulcanFirstLogin
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLogin
+import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
+import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent
+import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.prepare
-import pl.szczodrzynski.edziennik.data.api.prepareFor
-import pl.szczodrzynski.edziennik.data.api.vulcanLoginMethods
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
+import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.Utils.d
+import java.io.File
 
 class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
     companion object {
@@ -87,8 +92,29 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
 
     override fun getMessage(message: MessageFull) {
         login(LOGIN_METHOD_VULCAN_API) {
-            VulcanApiMessagesChangeStatus(data, message) {
-                completed()
+            if (message.attachmentIds != null) {
+                VulcanApiMessagesChangeStatus(data, message) {
+                    completed()
+                }
+                return@login
+            }
+            val list = data.app.db.messageDao().getAllNow(data.profileId)
+            VulcanApiAttachments(data, list, message, MessageFull::class) { _ ->
+                list.forEach {
+                    if (it.attachmentIds == null)
+                        it.attachmentIds = mutableListOf()
+                    data.messageList.add(it)
+                }
+                data.messageListReplace = true
+
+                if (message.seen) {
+                    EventBus.getDefault().postSticky(MessageGetEvent(message))
+                    completed()
+                    return@VulcanApiAttachments
+                }
+                VulcanApiMessagesChangeStatus(data, message) {
+                    completed()
+                }
             }
         }
     }
@@ -101,26 +127,74 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
         }
     }
 
-    override fun markAllAnnouncementsAsRead() {
+    override fun markAllAnnouncementsAsRead() {}
+    override fun getAnnouncement(announcement: AnnouncementFull) {}
+    override fun getRecipientList() {}
 
+    override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) {
+        val fileUrl = attachmentName.substringAfter(":")
+        if (attachmentName == fileUrl) {
+            data.error(ApiError(TAG, ERROR_ONEDRIVE_DOWNLOAD))
+            return
+        }
+
+        OneDriveDownloadAttachment(
+                app,
+                fileUrl,
+                onSuccess = { file ->
+                    val event = AttachmentGetEvent(
+                            data.profileId,
+                            owner,
+                            attachmentId,
+                            AttachmentGetEvent.TYPE_FINISHED,
+                            file.absolutePath
+                    )
+
+                    val attachmentDataFile = File(Utils.getStorageDir(), ".${data.profileId}_${event.ownerId}_${event.attachmentId}")
+                    Utils.writeStringToFile(attachmentDataFile, event.fileName)
+
+                    EventBus.getDefault().postSticky(event)
+
+                    completed()
+                },
+                onProgress = { written, total ->
+                    val event = AttachmentGetEvent(
+                            data.profileId,
+                            owner,
+                            attachmentId,
+                            AttachmentGetEvent.TYPE_PROGRESS,
+                            bytesWritten = written
+                    )
+
+                    EventBus.getDefault().postSticky(event)
+                },
+                onError = { apiError ->
+                    data.error(apiError)
+                }
+        )
     }
 
-    override fun getAnnouncement(announcement: AnnouncementFull) {
-
-    }
-
-    override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {
-        
-    }
-
-    override fun getRecipientList() {
+    override fun getEvent(eventFull: EventFull) {
+        login(LOGIN_METHOD_VULCAN_API) {
+            val list = data.app.db.eventDao().getAllNow(data.profileId).filter { !it.addedManually }
+            VulcanApiAttachments(data, list, eventFull, EventFull::class) { _ ->
+                list.forEach {
+                    it.homeworkBody = ""
+                    data.eventList.add(it)
+                }
+                data.eventListReplace = true
 
+                EventBus.getDefault().postSticky(EventGetEvent(eventFull))
+                completed()
+            }
+        }
     }
 
     override fun firstLogin() { VulcanFirstLogin(data) { completed() } }
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
+        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiAttachments.kt

@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-4-6.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
+
+import pl.szczodrzynski.edziennik.asJsonObjectList
+import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_HOMEWORK_ATTACHMENTS
+import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_MESSAGES_ATTACHMENTS
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
+import pl.szczodrzynski.edziennik.data.db.full.MessageFull
+import pl.szczodrzynski.edziennik.getJsonArray
+import pl.szczodrzynski.edziennik.getLong
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.models.Date
+import kotlin.reflect.KClass
+
+class VulcanApiAttachments(override val data: DataVulcan,
+                           val list: List<*>,
+                           val owner: Any?,
+                           val ownerClass: KClass<*>,
+                           val onSuccess: (list: List<*>) -> Unit
+) : VulcanApi(data, null) {
+    companion object {
+        const val TAG = "VulcanApiAttachments"
+    }
+
+    init { run {
+        val endpoint = when (ownerClass) {
+            MessageFull::class -> VULCAN_API_ENDPOINT_MESSAGES_ATTACHMENTS
+            EventFull::class -> VULCAN_API_ENDPOINT_HOMEWORK_ATTACHMENTS
+            else -> null
+        } ?: return@run
+
+        val idName = when (ownerClass) {
+            MessageFull::class -> "IdWiadomosc"
+            EventFull::class -> "IdZadanieDomowe"
+            else -> null
+        } ?: return@run
+
+        val startDate = profile?.getSemesterStart(profile?.currentSemester ?: 1)?.inUnix ?: 0
+        val endDate = Date.getToday().stepForward(0, 1, 0).inUnix
+
+        apiGet(TAG, endpoint, parameters = mapOf(
+                "DataPoczatkowa" to startDate,
+                "DataKoncowa" to endDate,
+                "LoginId" to data.studentLoginId,
+                "IdUczen" to data.studentId
+        )) { json, _ ->
+
+            json.getJsonArray("Data")?.asJsonObjectList()?.forEach { attachment ->
+                val id = attachment.getLong("Id") ?: return@forEach
+                val itemId = attachment.getLong(idName) ?: return@forEach
+                val url = attachment.getString("Url") ?: return@forEach
+                val fileName = "${attachment.getString("NazwaPliku")}:$url"
+
+                list.forEach {
+                    if (it is MessageFull
+                            && it.profileId == profileId
+                            && it.id == itemId
+                            && it.attachmentIds?.contains(id) != true) {
+                        if (it.attachmentIds == null)
+                            it.attachmentIds = mutableListOf()
+                        if (it.attachmentNames == null)
+                            it.attachmentNames = mutableListOf()
+                        it.attachmentIds?.add(id)
+                        it.attachmentNames?.add(fileName)
+                    }
+
+                    if (it is EventFull
+                            && it.profileId == profileId
+                            && it.id == itemId
+                            && it.attachmentIds?.contains(id) != true) {
+                        if (it.attachmentIds == null)
+                            it.attachmentIds = mutableListOf()
+                        if (it.attachmentNames == null)
+                            it.attachmentNames = mutableListOf()
+                        it.attachmentIds?.add(id)
+                        it.attachmentNames?.add(fileName)
+                    }
+
+                    if (owner is MessageFull
+                            && it is MessageFull
+                            && owner.profileId == it.profileId
+                            && owner.id == it.id) {
+                        owner.attachmentIds = it.attachmentIds
+                        owner.attachmentNames = it.attachmentNames
+                    }
+
+                    if (owner is EventFull
+                            && it is EventFull
+                            && owner.profileId == it.profileId
+                            && owner.id == it.id) {
+                        owner.attachmentIds = it.attachmentIds
+                        owner.attachmentNames = it.attachmentNames
+                    }
+                }
+            }
+
+            /*if (owner is MessageFull) {
+                list.forEach {
+                    (it as? MessageFull)?.let { message ->
+                        data.messageList.add(message)
+                    }
+                }
+                data.messageListReplace = true
+            }
+
+            if (owner is EventFull) {
+                list.forEach {
+                    (it as? EventFull)?.let { it1 ->
+                        it1.homeworkBody = ""
+                        data.eventList.add(it1)
+                    }
+                }
+                data.eventListReplace = true
+            }*/
+
+            onSuccess(list)
+        }
+    }}
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiEvents.kt

@@ -57,7 +57,7 @@ class VulcanApiEvents(override val data: DataVulcan,
                 val eventDate = Date.fromY_m_d(event.getString("DataTekst") ?: return@forEach)
                 val subjectId = event.getLong("IdPrzedmiot") ?: -1
                 val teacherId = event.getLong("IdPracownik") ?: -1
-                val topic = event.getString("Opis") ?: ""
+                val topic = event.getString("Opis")?.trim() ?: ""
 
                 val lessonList = data.db.timetableDao().getForDateNow(profileId, eventDate)
                 val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesChangeStatus.kt

@@ -9,7 +9,7 @@ import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_MESSAGES_CHANGE_S
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
 import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
 import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesInbox.kt

@@ -10,7 +10,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_MESSAGES_INBOX
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
 import pl.szczodrzynski.edziennik.data.db.entity.*
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date
 import kotlin.text.replace
@@ -44,8 +44,7 @@ class VulcanApiMessagesInbox(override val data: DataVulcan,
                     val body = message.getString("Tresc") ?: ""
 
                     val senderLoginId = message.getString("NadawcaId") ?: return@forEach
-                    val senderId = data.teacherList
-                            .singleOrNull { it.loginId == senderLoginId }?.id ?: {
+                    val senderId = data.teacherList.singleOrNull { it.loginId == senderLoginId }?.id ?: {
 
                         val senderName = message.getString("Nadawca") ?: ""
 
@@ -60,7 +59,7 @@ class VulcanApiMessagesInbox(override val data: DataVulcan,
                             data.teacherList.put(teacherObject.id, teacherObject)
                             teacherObject.id
                         }
-                    }.invoke() ?: -1
+                    }.invoke()
 
                     val sentDate = message.getLong("DataWyslaniaUnixEpoch")?.let { it * 1000 }
                             ?: -1
@@ -68,13 +67,12 @@ class VulcanApiMessagesInbox(override val data: DataVulcan,
                             ?: -1
 
                     val messageObject = Message(
-                            profileId,
-                            id,
-                            subject,
-                            body.replace("\n", "<br>"),
-                            TYPE_RECEIVED,
-                            senderId,
-                            -1
+                            profileId = profileId,
+                            id = id,
+                            type = TYPE_RECEIVED,
+                            subject = subject,
+                            body = body.replace("\n", "<br>"),
+                            senderId = senderId
                     )
 
                     val messageRecipientObject = MessageRecipient(
@@ -85,7 +83,7 @@ class VulcanApiMessagesInbox(override val data: DataVulcan,
                             id
                     )
 
-                    data.messageIgnoreList.add(messageObject)
+                    data.messageList.add(messageObject)
                     data.messageRecipientList.add(messageRecipientObject)
                     data.setSeenMetadataList.add(Metadata(
                             profileId,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesSent.kt

@@ -11,7 +11,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_MESSAGES_SENT
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
 import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
 import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
@@ -92,16 +92,15 @@ class VulcanApiMessagesSent(override val data: DataVulcan,
                             }
 
                     val messageObject = Message(
-                            profileId,
-                            id,
-                            subject,
-                            body.replace("\n", "<br>"),
-                            TYPE_SENT,
-                            -1,
-                            -1
+                            profileId = profileId,
+                            id = id,
+                            type = TYPE_SENT,
+                            subject = subject,
+                            body = body.replace("\n", "<br>"),
+                            senderId = null
                     )
 
-                    data.messageIgnoreList.add(messageObject)
+                    data.messageList.add(messageObject)
                     data.setSeenMetadataList.add(Metadata(
                             profileId,
                             Metadata.TYPE_MESSAGE,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiSendMessage.kt

@@ -52,7 +52,7 @@ class VulcanApiSendMessage(override val data: DataVulcan,
             }
 
             VulcanApiMessagesSent(data, null) {
-                val message = data.messageIgnoreList.firstOrNull { it.type == Message.TYPE_SENT && it.subject == subject }
+                val message = data.messageList.firstOrNull { it.type == Message.TYPE_SENT && it.subject == subject }
                 val metadata = data.metadataList.firstOrNull { it.thingType == Metadata.TYPE_MESSAGE && it.thingId == messageId }
                 val event = MessageSentEvent(data.profileId, message, metadata?.addedDate)
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/AttachmentGetEvent.kt

@@ -4,11 +4,21 @@
 
 package pl.szczodrzynski.edziennik.data.api.events
 
-data class AttachmentGetEvent(val profileId: Int, val messageId: Long, val attachmentId: Long,
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Message
+
+data class AttachmentGetEvent(val profileId: Int, val owner: Any, val attachmentId: Long,
                               var eventType: Int = TYPE_PROGRESS, val fileName: String? = null,
                               val bytesWritten: Long = 0) {
     companion object {
         const val TYPE_PROGRESS = 0
         const val TYPE_FINISHED = 1
     }
+
+    val ownerId
+        get() = when (owner) {
+            is Message -> owner.id
+            is Event -> owner.id
+            else -> -1
+        }
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/EventGetEvent.kt

@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-31.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.events
+
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
+
+data class EventGetEvent(val event: EventFull)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/EdziennikInterface.kt

@@ -5,9 +5,9 @@
 package pl.szczodrzynski.edziennik.data.api.interfaces
 
 import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 
 interface EdziennikInterface {
@@ -16,8 +16,9 @@ interface EdziennikInterface {
     fun sendMessage(recipients: List<Teacher>, subject: String, text: String)
     fun markAllAnnouncementsAsRead()
     fun getAnnouncement(announcement: AnnouncementFull)
-    fun getAttachment(message: Message, attachmentId: Long, attachmentName: String)
+    fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String)
     fun getRecipientList()
+    fun getEvent(eventFull: EventFull)
     fun firstLogin()
     fun cancel()
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/Data.kt

@@ -86,6 +86,8 @@ abstract class Data(val app: App, val profile: Profile?, val loginStore: LoginSt
     val gradeCategories = LongSparseArray<GradeCategory>()
 
     var teacherOnConflictStrategy = OnConflictStrategy.IGNORE
+    var eventListReplace = false
+    var messageListReplace = false
 
     val classrooms = LongSparseArray<Classroom>()
     val attendanceTypes = LongSparseArray<AttendanceType>()
@@ -125,7 +127,6 @@ abstract class Data(val app: App, val profile: Profile?, val loginStore: LoginSt
     val teacherAbsenceList = mutableListOf<TeacherAbsence>()
 
     val messageList = mutableListOf<Message>()
-    val messageIgnoreList = mutableListOf<Message>()
     val messageRecipientList = mutableListOf<MessageRecipient>()
     val messageRecipientIgnoreList = mutableListOf<MessageRecipient>()
 
@@ -181,7 +182,6 @@ abstract class Data(val app: App, val profile: Profile?, val loginStore: LoginSt
         luckyNumberList.clear()
         teacherAbsenceList.clear()
         messageList.clear()
-        messageIgnoreList.clear()
         messageRecipientList.clear()
         messageRecipientIgnoreList.clear()
         metadataList.clear()
@@ -197,6 +197,13 @@ abstract class Data(val app: App, val profile: Profile?, val loginStore: LoginSt
 
         profile.userCode = generateUserCode()
 
+        // update profile subname with class name, school year and account type
+        profile.subname = joinNotNullStrings(
+                " - ",
+                profile.studentClassName,
+                "${profile.studentSchoolYearStart}/${profile.studentSchoolYearStart + 1}"
+        ) + " " + app.getString(if (profile.isParent) R.string.login_summary_account_parent else R.string.login_summary_account_child)
+
         db.profileDao().add(profile)
         db.loginStoreDao().add(loginStore)
 
@@ -284,7 +291,10 @@ abstract class Data(val app: App, val profile: Profile?, val loginStore: LoginSt
             db.gradeDao().addAll(gradeList)
         }
         if (eventList.isNotEmpty()) {
-            db.eventDao().upsertAll(eventList, removeNotKept = true)
+            if (eventListReplace)
+                db.eventDao().replaceAll(eventList)
+            else
+                db.eventDao().upsertAll(eventList, removeNotKept = true)
         }
         if (noticeList.isNotEmpty()) {
             db.noticeDao().clear(profile.id)
@@ -301,10 +311,12 @@ abstract class Data(val app: App, val profile: Profile?, val loginStore: LoginSt
         if (teacherAbsenceList.isNotEmpty())
             db.teacherAbsenceDao().addAll(teacherAbsenceList)
 
-        if (messageList.isNotEmpty())
-            db.messageDao().addAll(messageList)
-        if (messageIgnoreList.isNotEmpty())
-            db.messageDao().addAllIgnore(messageIgnoreList)
+        if (messageList.isNotEmpty()) {
+            if (messageListReplace)
+                db.messageDao().replaceAll(messageList)
+            else
+                db.messageDao().upsertAll(messageList, removeNotKept = false) // TODO dataRemoveModel for messages
+        }
         if (messageRecipientList.isNotEmpty())
             db.messageRecipientDao().addAll(messageRecipientList)
         if (messageRecipientIgnoreList.isNotEmpty())

app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt

@@ -46,6 +46,6 @@ object Signing {
 
     /*fun provideKey(param1: String, param2: Long): ByteArray {*/
     fun pleaseStopRightNow(param1: String, param2: Long): ByteArray {
-        return "$param1.MTIzNDU2Nzg5MDj3yyZoD8===.$param2".sha256()
+        return "$param1.MTIzNDU2Nzg5MDP/4SAI6B===.$param2".sha256()
     }
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/Notifications.kt

@@ -227,10 +227,10 @@ class Notifications(val app: App, val notifications: MutableList<Notification>,
     }
 
     private fun messageNotifications() {
-        for (message in app.db.messageDao().receivedNotNotifiedNow) {
+        for (message in app.db.messageDao().getNotNotifiedNow()) {
             val text = app.getString(
                     R.string.notification_message_format,
-                    message.senderFullName,
+                    message.senderName,
                     message.subject
             )
             notifications += Notification(

app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.kt

@@ -43,7 +43,7 @@ import pl.szczodrzynski.edziennik.data.db.migration.*
     LibrusLesson::class,
     TimetableManual::class,
     Metadata::class
-], version = 83)
+], version = 85)
 @TypeConverters(
         ConverterTime::class,
         ConverterDate::class,
@@ -168,7 +168,9 @@ abstract class AppDb : RoomDatabase() {
                 Migration80(),
                 Migration81(),
                 Migration82(),
-                Migration83()
+                Migration83(),
+                Migration84(),
+                Migration85()
         ).allowMainThreadQueries().build()
     }
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.kt

@@ -65,7 +65,7 @@ abstract class EventDao : BaseDao<Event, EventFull> {
     fun getAllByDate(profileId: Int, date: Date) =
             getRaw("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId AND eventDate = '${date.stringY_m_d}' $ORDER_BY")
     fun getAllByDateTime(profileId: Int, date: Date, time: Time) =
-            getRaw("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId AND eventDate = '${date.stringY_m_d}' AND eventTime = '${time.stringValue}'")
+            getRaw("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId AND eventDate = '${date.stringY_m_d}' AND eventTime = '${time.stringValue}' $ORDER_BY")
     fun getNearestNotDone(profileId: Int, today: Date, limit: Int) =
             getRaw("$QUERY WHERE $NOT_BLACKLISTED AND $NOT_DONE AND events.profileId = $profileId AND eventDate >= '${today.stringY_m_d}' $ORDER_BY LIMIT $limit")
 

app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageDao.java

@@ -1,114 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2020-1-6
- */
-
-package pl.szczodrzynski.edziennik.data.db.dao;
-
-import androidx.annotation.Nullable;
-import androidx.lifecycle.LiveData;
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-import androidx.room.RawQuery;
-import androidx.sqlite.db.SimpleSQLiteQuery;
-import androidx.sqlite.db.SupportSQLiteQuery;
-
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.data.db.entity.Message;
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata;
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull;
-
-import static pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_DELETED;
-import static pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED;
-import static pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_SENT;
-import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_MESSAGE;
-
-@Dao
-public abstract class MessageDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    public abstract long add(Message message);
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    public abstract void addAll(List<Message> messageList);
-
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
-    public abstract void addAllIgnore(List<Message> messageList);
-
-    @Query("DELETE FROM messages WHERE profileId = :profileId")
-    public abstract void clear(int profileId);
-
-    @RawQuery(observedEntities = {Message.class})
-    abstract LiveData<List<MessageFull>> getAll(SupportSQLiteQuery query);
-    @RawQuery(observedEntities = {Message.class, Metadata.class})
-    abstract List<MessageFull> getNow(SupportSQLiteQuery query);
-    @RawQuery(observedEntities = {Message.class, Metadata.class})
-    abstract MessageFull getOneNow(SupportSQLiteQuery query);
-
-    public LiveData<List<MessageFull>> getWithMetadataAndSenderName(int profileId, int messageType, String filter) {
-        return getAll(new SimpleSQLiteQuery("SELECT \n" +
-                "*, \n" +
-                "teachers.teacherName || ' ' || teachers.teacherSurname AS senderFullName\n" +
-                "FROM messages \n" +
-                "LEFT JOIN teachers ON teachers.profileId = "+profileId+" AND teacherId = senderId\n" +
-                "LEFT JOIN metadata ON messageId = thingId AND thingType = "+TYPE_MESSAGE+" AND metadata.profileId = "+profileId+"\n" +
-                "WHERE messages.profileId = "+profileId+" AND messageType = "+messageType+" AND "+filter+"\n" +
-                "ORDER BY addedDate DESC"));
-    }
-
-    public LiveData<List<MessageFull>> getWithMetadata(int profileId, int messageType, String filter) {
-        return getAll(new SimpleSQLiteQuery("SELECT \n" +
-                "* \n" +
-                "FROM messages \n" +
-                "LEFT JOIN metadata ON messageId = thingId AND thingType = "+TYPE_MESSAGE+" AND metadata.profileId = "+profileId+"\n" +
-                "WHERE messages.profileId = "+profileId+" AND messageType = "+messageType+" AND "+filter+"\n" +
-                "ORDER BY addedDate DESC"));
-    }
-
-    @Nullable
-    public MessageFull getById(int profileId, long messageId) {
-        return getOneNow(new SimpleSQLiteQuery("SELECT \n" +
-                "*, \n" +
-                "teachers.teacherName || ' ' || teachers.teacherSurname AS senderFullName\n" +
-                "FROM messages \n" +
-                "LEFT JOIN teachers ON teachers.profileId = "+profileId+" AND teacherId = senderId\n" +
-                "LEFT JOIN metadata ON messageId = thingId AND thingType = "+TYPE_MESSAGE+" AND metadata.profileId = "+profileId+"\n" +
-                "WHERE messages.profileId = "+profileId+" AND messageId = "+messageId+"\n" +
-                "ORDER BY addedDate DESC"));
-    }
-
-    public LiveData<List<MessageFull>> getReceived(int profileId) {
-        return getWithMetadataAndSenderName(profileId, TYPE_RECEIVED, "1");
-    }
-    public LiveData<List<MessageFull>> getDeleted(int profileId) {
-        return getWithMetadataAndSenderName(profileId, TYPE_DELETED, "1");
-    }
-    public LiveData<List<MessageFull>> getSent(int profileId) {
-        return getWithMetadata(profileId, TYPE_SENT, "1");
-    }
-
-    public List<MessageFull> getReceivedNow(int profileId, String filter) {
-        return getNow(new SimpleSQLiteQuery("SELECT \n" +
-                "*, \n" +
-                "teachers.teacherName || ' ' || teachers.teacherSurname AS senderFullName\n" +
-                "FROM messages \n" +
-                "LEFT JOIN teachers ON teachers.profileId = "+profileId+" AND teacherId = senderId\n" +
-                "LEFT JOIN metadata ON messageId = thingId AND thingType = "+TYPE_MESSAGE+" AND metadata.profileId = "+profileId+"\n" +
-                "WHERE messages.profileId = "+profileId+" AND messageType = 0 AND "+filter+"\n" +
-                "ORDER BY addedDate DESC"));
-    }
-    public List<MessageFull> getReceivedNotNotifiedNow(int profileId) {
-        return getReceivedNow(profileId, "notified = 0");
-    }
-
-    @Query("SELECT " +
-            "*, " +
-            "teachers.teacherName || ' ' || teachers.teacherSurname AS senderFullName " +
-            "FROM messages " +
-            "LEFT JOIN teachers ON teachers.profileId = messages.profileId AND teacherId = senderId " +
-            "LEFT JOIN metadata ON messageId = thingId AND thingType = "+TYPE_MESSAGE+" AND metadata.profileId = messages.profileId " +
-            "WHERE messageType = 0 AND notified = 0 " +
-            "ORDER BY addedDate DESC")
-    public abstract List<MessageFull> getReceivedNotNotifiedNow();
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageDao.kt

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-1-6
+ */
+package pl.szczodrzynski.edziennik.data.db.dao
+
+import androidx.lifecycle.LiveData
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.room.RawQuery
+import androidx.sqlite.db.SupportSQLiteQuery
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.annotation.SelectiveDao
+import pl.szczodrzynski.edziennik.annotation.UpdateSelective
+import pl.szczodrzynski.edziennik.data.db.AppDb
+import pl.szczodrzynski.edziennik.data.db.entity.Message
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.full.MessageFull
+
+@Dao
+@SelectiveDao(db = AppDb::class)
+abstract class MessageDao : BaseDao<Message, MessageFull> {
+    companion object {
+        private const val QUERY = """
+            SELECT 
+            *, 
+            teachers.teacherName ||" "|| teachers.teacherSurname AS senderName
+            FROM messages
+            LEFT JOIN teachers ON teachers.profileId = messages.profileId AND teacherId = senderId
+            LEFT JOIN metadata ON messageId = thingId AND thingType = ${Metadata.TYPE_MESSAGE} AND metadata.profileId = messages.profileId
+        """
+
+        private const val ORDER_BY = """ORDER BY messageIsPinned, addedDate DESC"""
+    }
+
+    private val selective by lazy { MessageDaoSelective(App.db) }
+
+    @RawQuery(observedEntities = [Message::class])
+    abstract override fun getRaw(query: SupportSQLiteQuery): LiveData<List<MessageFull>>
+
+    @UpdateSelective(primaryKeys = ["profileId", "messageId"], skippedColumns = ["messageType", "messageBody", "messageIsPinned", "attachmentIds", "attachmentNames", "attachmentSizes"])
+    override fun update(item: Message) = selective.update(item)
+    override fun updateAll(items: List<Message>) = selective.updateAll(items)
+
+    // CLEAR
+    @Query("DELETE FROM messages WHERE profileId = :profileId")
+    abstract override fun clear(profileId: Int)
+
+    // GET ALL - LIVE DATA
+    fun getAll(profileId: Int) =
+            getRaw("$QUERY WHERE messages.profileId = $profileId $ORDER_BY")
+    fun getAllByType(profileId: Int, type: Int) =
+            getRaw("$QUERY WHERE messages.profileId = $profileId AND messageType = $type $ORDER_BY")
+    fun getReceived(profileId: Int) = getAllByType(profileId, Message.TYPE_RECEIVED)
+    fun getSent(profileId: Int) = getAllByType(profileId, Message.TYPE_SENT)
+    fun getDeleted(profileId: Int) = getAllByType(profileId, Message.TYPE_DELETED)
+    fun getDraft(profileId: Int) = getAllByType(profileId, Message.TYPE_DRAFT)
+
+    // GET ALL - NOW
+    fun getAllNow(profileId: Int) =
+            getRawNow("$QUERY WHERE messages.profileId = $profileId $ORDER_BY")
+    fun getNotNotifiedNow() =
+            getRawNow("$QUERY WHERE notified = 0 AND messageType = ${Message.TYPE_RECEIVED} $ORDER_BY")
+
+    // GET ONE - NOW
+    fun getByIdNow(profileId: Int, id: Long) =
+            getOneNow("$QUERY WHERE messages.profileId = $profileId AND messageId = $id")
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MetadataDao.java

@@ -93,8 +93,8 @@ public abstract class MetadataDao {
             }
         }
         if (o instanceof Message) {
-            if (add(new Metadata(profileId, TYPE_MESSAGE, ((Message) o).id, seen, false, 0)) == -1) {
-                updateSeen(profileId, TYPE_MESSAGE, ((Message) o).id, seen);
+            if (add(new Metadata(profileId, TYPE_MESSAGE, ((Message) o).getId(), seen, false, 0)) == -1) {
+                updateSeen(profileId, TYPE_MESSAGE, ((Message) o).getId(), seen);
             }
         }
     }
@@ -132,8 +132,8 @@ public abstract class MetadataDao {
             }
         }
         if (o instanceof Message) {
-            if (add(new Metadata(profileId, TYPE_MESSAGE, ((Message) o).id, false, notified, 0)) == -1) {
-                updateNotified(profileId, TYPE_MESSAGE, ((Message) o).id, notified);
+            if (add(new Metadata(profileId, TYPE_MESSAGE, ((Message) o).getId(), false, notified, 0)) == -1) {
+                updateNotified(profileId, TYPE_MESSAGE, ((Message) o).getId(), notified);
             }
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherDao.kt

@@ -1,10 +1,8 @@
 package pl.szczodrzynski.edziennik.data.db.dao
 
 import androidx.lifecycle.LiveData
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
+import androidx.room.*
+import androidx.sqlite.db.SupportSQLiteQuery
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 
 @Dao
@@ -18,6 +16,9 @@ interface TeacherDao {
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     fun addAllIgnore(teacherList: List<Teacher>)
 
+    @RawQuery
+    fun query(query: SupportSQLiteQuery): Int
+
     @Query("DELETE FROM teachers WHERE profileId = :profileId")
     fun clear(profileId: Int)
 

app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Event.kt

@@ -82,12 +82,18 @@ open class Event(
     @ColumnInfo(name = "eventIsDone")
     var isDone: Boolean = false
 
+    /**
+     * Body/text of the event, if this is a [TYPE_HOMEWORK].
+     * May be null if the body is not downloaded yet, or the type is not [TYPE_HOMEWORK].
+     * May be empty or blank if the homework has no specific body attached,
+     * or the topic contains the body already.
+     */
     var homeworkBody: String? = null
-    var attachmentIds: List<Long>? = null
-    var attachmentNames: List<String>? = null
+    var attachmentIds: MutableList<Long>? = null
+    var attachmentNames: MutableList<String>? = null
 
     @Ignore
-    var showAsUnseen = false
+    var showAsUnseen: Boolean? = null
 
     val startTimeCalendar: Calendar
         get() = Calendar.getInstance().also { it.set(

app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Message.java

@@ -1,92 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2020-1-6
- */
-
-package pl.szczodrzynski.edziennik.data.db.entity;
-
-import androidx.annotation.Nullable;
-import androidx.room.ColumnInfo;
-import androidx.room.Entity;
-import androidx.room.Ignore;
-import androidx.room.Index;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Entity(tableName = "messages",
-        primaryKeys = {"profileId", "messageId"},
-        indices = {@Index(value = {"profileId"})})
-public class Message {
-    public int profileId;
-
-    @ColumnInfo(name = "messageId")
-    public long id;
-
-    @ColumnInfo(name = "messageSubject")
-    public String subject;
-    @Nullable
-    @ColumnInfo(name = "messageBody")
-    public String body = null;
-
-    public static final int TYPE_RECEIVED = 0;
-    public static final int TYPE_SENT = 1;
-    public static final int TYPE_DELETED = 2;
-    public static final int TYPE_DRAFT = 3;
-    @ColumnInfo(name = "messageType")
-    public int type = TYPE_RECEIVED;
-
-    public long senderId = -1; // -1 for sent messages
-    public long senderReplyId = -1;
-    public boolean overrideHasAttachments = false; // if the attachments are not yet downloaded but we already know there are some
-    public List<Long> attachmentIds = null;
-    public List<String> attachmentNames = null;
-    public List<Long> attachmentSizes = null;
-
-    @Ignore
-    public Message() {}
-
-    public Message(int profileId, long id, String subject, @Nullable String body, int type, long senderId, long senderReplyId) {
-        this.profileId = profileId;
-        this.id = id;
-        this.subject = subject;
-        this.body = body;
-        this.type = type;
-        this.senderId = senderId;
-        this.senderReplyId = senderReplyId;
-    }
-
-    /**
-     * Add an attachment
-     * @param id attachment ID
-     * @param name file name incl. extension
-     * @param size file size or -1 if unknown
-     * @return a Message to which the attachment has been added
-     */
-    public Message addAttachment(long id, String name, long size) {
-        if (attachmentIds == null)
-            attachmentIds = new ArrayList<>();
-        if (attachmentNames == null)
-            attachmentNames = new ArrayList<>();
-        if (attachmentSizes == null)
-            attachmentSizes = new ArrayList<>();
-        attachmentIds.add(id);
-        attachmentNames.add(name);
-        attachmentSizes.add(size);
-        return this;
-    }
-
-    public void clearAttachments() {
-        attachmentIds = null;
-        attachmentNames = null;
-        attachmentSizes = null;
-    }
-
-    public Message setHasAttachments() {
-        overrideHasAttachments = true;
-        return this;
-    }
-
-    public boolean hasAttachments() {
-        return overrideHasAttachments || (attachmentIds != null && attachmentIds.size() > 0);
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Message.kt

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-1-6
+ */
+package pl.szczodrzynski.edziennik.data.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Ignore
+import androidx.room.Index
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+
+@Entity(tableName = "messages",
+        primaryKeys = ["profileId", "messageId"],
+        indices = [
+            Index(value = ["profileId", "messageType"])
+        ])
+open class Message(
+        val profileId: Int,
+        @ColumnInfo(name = "messageId")
+        val id: Long,
+        @ColumnInfo(name = "messageType")
+        var type: Int,
+
+        @ColumnInfo(name = "messageSubject")
+        var subject: String,
+        @ColumnInfo(name = "messageBody")
+        var body: String?,
+
+        /**
+         * Keep in mind that this being null does NOT
+         * necessarily mean the message is sent.
+         */
+        var senderId: Long?
+) : Keepable() {
+    companion object {
+        const val TYPE_RECEIVED = 0
+        const val TYPE_SENT = 1
+        const val TYPE_DELETED = 2
+        const val TYPE_DRAFT = 3
+    }
+
+    @ColumnInfo(name = "messageIsPinned")
+    var isPinned: Boolean = false
+
+    var hasAttachments = false // if the attachments are not yet downloaded but we already know there are some
+        get() = field || attachmentIds.isNotNullNorEmpty()
+    var attachmentIds: MutableList<Long>? = null
+    var attachmentNames: MutableList<String>? = null
+    var attachmentSizes: MutableList<Long>? = null
+
+    @Ignore
+    var showAsUnseen: Boolean? = null
+
+    /**
+     * Add an attachment
+     * @param id attachment ID
+     * @param name file name incl. extension
+     * @param size file size or -1 if unknown
+     * @return a Message to which the attachment has been added
+     */
+    fun addAttachment(id: Long, name: String, size: Long): Message {
+        if (attachmentIds == null) attachmentIds = mutableListOf()
+        if (attachmentNames == null) attachmentNames = mutableListOf()
+        if (attachmentSizes == null) attachmentSizes = mutableListOf()
+        attachmentIds?.add(id)
+        attachmentNames?.add(name)
+        attachmentSizes?.add(size)
+        return this
+    }
+
+    fun clearAttachments() {
+        attachmentIds = null
+        attachmentNames = null
+        attachmentSizes = null
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt

@@ -17,6 +17,7 @@ import com.google.gson.JsonObject
 import pl.droidsonroids.gif.GifDrawable
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_EDUDZIENNIK
+import pl.szczodrzynski.edziennik.utils.ProfileImageHolder
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.navlib.ImageHolder
 import pl.szczodrzynski.navlib.R
@@ -128,7 +129,7 @@ open class Profile(
     override fun getImageHolder(context: Context): ImageHolder {
         return if (!image.isNullOrEmpty()) {
             try {
-                ImageHolder(image ?: "")
+                ProfileImageHolder(image ?: "")
             } catch (_: Exception) {
                 ImageHolder(R.drawable.profile, colorFromName(name))
             }

app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/MessageFull.java

@@ -1,32 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2020-1-6
- */
-
-package pl.szczodrzynski.edziennik.data.db.full;
-
-import androidx.annotation.Nullable;
-import androidx.room.Ignore;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.data.db.entity.Message;
-
-public class MessageFull extends Message {
-    public String senderFullName = null;
-    @Ignore
-    @Nullable
-    public List<MessageRecipientFull> recipients = null;
-
-    public MessageFull addRecipient(MessageRecipientFull recipient) {
-        if (recipients == null)
-            recipients = new ArrayList<>();
-        recipients.add(recipient);
-        return this;
-    }
-
-    // metadata
-    public boolean seen;
-    public boolean notified;
-    public long addedDate;
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/MessageFull.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-1-6
+ */
+package pl.szczodrzynski.edziennik.data.db.full
+
+import androidx.room.Ignore
+import androidx.room.Relation
+import pl.szczodrzynski.edziennik.data.db.entity.Message
+import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
+
+class MessageFull(
+        profileId: Int, id: Long, type: Int,
+        subject: String, body: String?, senderId: Long?
+) : Message(
+        profileId, id, type,
+        subject, body, senderId
+) {
+    var senderName: String? = null
+    @Relation(parentColumn = "messageId", entityColumn = "messageId", entity = MessageRecipient::class)
+    var recipients: MutableList<MessageRecipientFull>? = null
+
+    fun addRecipient(recipient: MessageRecipientFull): MessageFull {
+        if (recipients == null) recipients = mutableListOf()
+        recipients?.add(recipient)
+        return this
+    }
+
+    @Ignore
+    var filterWeight = 0
+    @Ignore
+    var searchHighlightText: String? = null
+
+    // metadata
+    var seen = false
+    var notified = false
+    var addedDate: Long = 0
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/MessageRecipientFull.kt

@@ -2,17 +2,13 @@ package pl.szczodrzynski.edziennik.data.db.full
 
 import androidx.room.Ignore
 import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
-import pl.szczodrzynski.edziennik.fixName
-
-class MessageRecipientFull : MessageRecipient {
-    var fullName: String? = ""
-        get() {
-            return field?.fixName() ?: ""
-        }
 
+class MessageRecipientFull(
+        profileId: Int,
+        id: Long,
+        messageId: Long,
+        readDate: Long = -1L
+) : MessageRecipient(profileId, id, -1, readDate, messageId) {
     @Ignore
-    constructor(profileId: Int, id: Long, replyId: Long, readDate: Long, messageId: Long) : super(profileId, id, replyId, readDate, messageId) {}
-    @Ignore
-    constructor(profileId: Int, id: Long, messageId: Long) : super(profileId, id, messageId) {}
-    constructor() : super() {}
+    var fullName: String? = null
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration84.kt

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-4-4.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.migration
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration84 : Migration(83, 84) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        // The Message Update
+        database.execSQL("ALTER TABLE messages RENAME TO _messages;")
+        database.execSQL("""CREATE TABLE messages (
+            profileId INTEGER NOT NULL,
+            messageId INTEGER NOT NULL,
+            messageType INTEGER NOT NULL,
+            messageSubject TEXT NOT NULL,
+            messageBody TEXT,
+            senderId INTEGER,
+            messageIsPinned INTEGER NOT NULL DEFAULT 0,
+            hasAttachments INTEGER NOT NULL DEFAULT 0,
+            attachmentIds TEXT DEFAULT NULL,
+            attachmentNames TEXT DEFAULT NULL,
+            attachmentSizes TEXT DEFAULT NULL,
+            keep INTEGER NOT NULL DEFAULT 1,
+            PRIMARY KEY(profileId, messageId)
+        )""")
+        database.execSQL("DROP INDEX IF EXISTS index_messages_profileId")
+        database.execSQL("CREATE INDEX index_messages_profileId_messageType ON messages (profileId, messageType)")
+        database.execSQL("""
+            INSERT INTO messages (profileId, messageId, messageType, messageSubject, messageBody, senderId, hasAttachments, attachmentIds, attachmentNames, attachmentSizes)
+            SELECT profileId, messageId, messageType, messageSubject, messageBody,
+            CASE senderId WHEN -1 THEN NULL ELSE senderId END,
+            overrideHasAttachments, attachmentIds, attachmentNames, attachmentSizes
+            FROM _messages
+        """)
+        database.execSQL("DROP TABLE _messages")
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration85.kt

@@ -0,0 +1,12 @@
+package pl.szczodrzynski.edziennik.data.db.migration
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_EDUDZIENNIK
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+
+class Migration85 : Migration(84, 85) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DELETE FROM events WHERE eventAddedManually = 0 AND eventType = ${Event.TYPE_HOMEWORK} AND profileId IN (SELECT profileId FROM (SELECT profileId FROM profiles WHERE loginStoreType = $LOGIN_TYPE_EDUDZIENNIK) x)")
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyMobidziennikFirebase.kt

@@ -12,7 +12,7 @@ import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
 import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_MOBIDZIENNIK
 import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.task.IApiTask
-import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.getLong
 import pl.szczodrzynski.edziennik.getString

app/src/main/java/pl/szczodrzynski/edziennik/receivers/SzkolnyReceiver.kt

@@ -7,6 +7,7 @@ package pl.szczodrzynski.edziennik.receivers
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.os.Bundle
 import pl.szczodrzynski.edziennik.data.api.ApiService
 import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.requests.ServiceCloseRequest
@@ -15,6 +16,11 @@ import pl.szczodrzynski.edziennik.data.api.events.requests.TaskCancelRequest
 class SzkolnyReceiver : BroadcastReceiver() {
     companion object {
         const val ACTION = "pl.szczodrzynski.edziennik.SZKOLNY_MAIN"
+        fun getIntent(context: Context, extras: Bundle): Intent {
+            val intent = Intent(context, SzkolnyReceiver::class.java)
+            intent.putExtras(extras)
+            return intent
+        }
     }
 
     override fun onReceive(context: Context?, intent: Intent?) {

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/day/DayDialog.kt

@@ -151,6 +151,7 @@ class DayDialog(
                 showType = true,
                 showTime = true,
                 showSubject = true,
+                markAsSeen = true,
                 onItemClick = {
                     EventDetailsDialog(
                             activity,

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventDetailsDialog.kt

@@ -12,10 +12,17 @@ import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.isVisible
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.*
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
+import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent
 import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
+import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.databinding.DialogEventDetailsBinding
 import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment
@@ -54,6 +61,7 @@ class EventDetailsDialog(
         if (activity.isFinishing)
             return@run
         onShowListener?.invoke(TAG)
+        EventBus.getDefault().register(this)
         app = activity.applicationContext as App
         b = DialogEventDetailsBinding.inflate(activity.layoutInflater)
         dialog = MaterialAlertDialogBuilder(activity)
@@ -67,6 +75,7 @@ class EventDetailsDialog(
                 }
                 .setOnDismissListener {
                     onDismissListener?.invoke(TAG)
+                    EventBus.getDefault().unregister(this@EventDetailsDialog)
                     progressDialog?.dismiss()
                 }
                 .show()
@@ -112,6 +121,35 @@ class EventDetailsDialog(
                 event.sharedByName ?: event.teacherName ?: ""
         )
 
+
+        // MARK AS DONE
+        b.checkDoneButton.isChecked = event.isDone
+        b.checkDoneButton.onChange { _, isChecked ->
+            if (isChecked && !event.isDone) {
+                b.checkDoneButton.isChecked = false
+                MaterialAlertDialogBuilder(activity)
+                        .setTitle(R.string.event_mark_as_done_title)
+                        .setMessage(R.string.event_mark_as_done_text)
+                        .setPositiveButton(R.string.ok) { _, _ ->
+                            event.isDone = isChecked
+                            launch(Dispatchers.Default) {
+                                app.db.eventDao().replace(event)
+                            }
+                            b.checkDoneButton.isChecked = true
+                        }
+                        .setNegativeButton(R.string.cancel, null)
+                        .show()
+            }
+            else if (!isChecked && event.isDone) {
+                event.isDone = isChecked
+                launch(Dispatchers.Default) {
+                    app.db.eventDao().replace(event)
+                }
+            }
+        }
+        b.checkDoneButton.attachToastHint(R.string.hint_mark_as_done)
+
+        // EDIT EVENT
         b.editButton.visibility = if (event.addedManually) View.VISIBLE else View.GONE
         b.editButton.setOnClickListener {
             EventManualDialog(
@@ -122,8 +160,16 @@ class EventDetailsDialog(
                     onDismissListener = onDismissListener
             )
         }
+        b.editButton.attachToastHint(R.string.hint_edit_event)
 
-        b.goToTimetableButton.setOnClickListener {
+        // SAVE IN CALENDAR
+        b.saveInCalendarButton.onClick {
+            openInCalendar()
+        }
+        b.saveInCalendarButton.attachToastHint(R.string.hint_save_in_calendar)
+
+        // GO TO TIMETABLE
+        b.goToTimetableButton.onClick {
             dialog.dismiss()
             val dateStr = event.date.stringY_m_d
 
@@ -144,39 +190,63 @@ class EventDetailsDialog(
             else
                 activity.startActivity(intent)
         }
-        b.saveInCalendarButton.setOnClickListener {
-            openInCalendar()
-        }
+        b.goToTimetableButton.attachToastHint(R.string.hint_go_to_timetable)
 
-        b.checkDoneButton.setOnLongClickListener {
-            Toast.makeText(activity, R.string.hint_mark_as_done, Toast.LENGTH_SHORT).show()
-            true
-        }
-        b.goToTimetableButton.setOnLongClickListener {
-            Toast.makeText(activity, R.string.hint_go_to_timetable, Toast.LENGTH_SHORT).show()
-            true
-        }
-        b.saveInCalendarButton.setOnLongClickListener {
-            Toast.makeText(activity, R.string.hint_save_in_calendar, Toast.LENGTH_SHORT).show()
-            true
-        }
-        b.editButton.setOnLongClickListener {
-            Toast.makeText(activity, R.string.hint_edit_event, Toast.LENGTH_SHORT).show()
-            true
+        // RE-DOWNLOAD
+        b.downloadButton.isVisible = App.debugMode
+        b.downloadButton.onClick {
+            EdziennikTask.eventGet(event.profileId, event).enqueue(activity)
         }
+        b.downloadButton.attachToastHint(R.string.hint_download_again)
 
-        b.checkDoneButton.isChecked = event.isDone
-        b.checkDoneButton.addOnCheckedChangeListener { _, isChecked ->
-            event.isDone = isChecked
-            launch(Dispatchers.Default) {
-                app.db.eventDao().replace(event)
-            }
-        }
 
         b.topic.text = event.topic
         BetterLink.attach(b.topic) {
             dialog.dismiss()
         }
+
+        if (event.homeworkBody == null && !event.addedManually && event.type == Event.TYPE_HOMEWORK) {
+            b.bodyTitle.isVisible = true
+            b.bodyProgressBar.isVisible = true
+            b.body.isVisible = false
+            EdziennikTask.eventGet(event.profileId, event).enqueue(activity)
+        }
+        else if (event.homeworkBody.isNullOrBlank()) {
+            b.bodyTitle.isVisible = false
+            b.bodyProgressBar.isVisible = false
+            b.body.isVisible = false
+        }
+        else {
+            b.bodyTitle.isVisible = true
+            b.bodyProgressBar.isVisible = false
+            b.body.isVisible = true
+            b.body.text = event.homeworkBody
+            BetterLink.attach(b.body) {
+                dialog.dismiss()
+            }
+        }
+
+        if (event.attachmentIds.isNullOrEmpty() || event.attachmentNames.isNullOrEmpty()) {
+            b.attachmentsTitle.isVisible = false
+            b.attachmentsFragment.isVisible = false
+        }
+        else {
+            b.attachmentsTitle.isVisible = true
+            b.attachmentsFragment.isVisible = true
+            b.attachmentsFragment.init(Bundle().also {
+                it.putInt("profileId", event.profileId)
+                it.putLongArray("attachmentIds", event.attachmentIds!!.toLongArray())
+                it.putStringArray("attachmentNames", event.attachmentNames!!.toTypedArray())
+            }, owner = event)
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onEventGetEvent(event: EventGetEvent) {
+        EventBus.getDefault().removeStickyEvent(event)
+        if (event.event.homeworkBody == null)
+            event.event.homeworkBody = ""
+        update()
     }
 
     private fun showRemovingProgressDialog() {

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListAdapter.kt

@@ -7,14 +7,17 @@ package pl.szczodrzynski.edziennik.ui.dialogs.event
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.databinding.EventListItemBinding
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Week
+import kotlin.coroutines.CoroutineContext
 
 class EventListAdapter(
         val context: Context,
@@ -24,11 +27,17 @@ class EventListAdapter(
         val showType: Boolean = true,
         val showTime: Boolean = true,
         val showSubject: Boolean = true,
+        val markAsSeen: Boolean = true,
         val onItemClick: ((event: EventFull) -> Unit)? = null,
         val onEventEditClick: ((event: EventFull) -> Unit)? = null
-) : RecyclerView.Adapter<EventListAdapter.ViewHolder>() {
+) : RecyclerView.Adapter<EventListAdapter.ViewHolder>(), CoroutineScope {
 
-    private val app by lazy { context.applicationContext as App }
+    private val app = context.applicationContext as App
+    private val manager = app.eventManager
+
+    private val job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
 
     var items = listOf<EventFull>()
 
@@ -41,9 +50,17 @@ class EventListAdapter(
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val event = items[position]
         val b = holder.b
+        val manager = app.eventManager
 
         b.root.onClick {
             onItemClick?.invoke(event)
+            if (!event.seen) {
+                manager.markAsSeen(event)
+            }
+            if (event.showAsUnseen == true) {
+                event.showAsUnseen = false
+                notifyItemChanged(event)
+            }
         }
 
         val bullet = " • "
@@ -83,43 +100,25 @@ class EventListAdapter(
         b.editButton.onClick {
             onEventEditClick?.invoke(event)
         }
+        b.editButton.attachToastHint(R.string.hint_edit_event)
 
         b.isDone.isVisible = event.isDone
 
-        b.editButton.setOnLongClickListener {
-            Toast.makeText(context, R.string.hint_edit_event, Toast.LENGTH_SHORT).show()
-            true
+        if (event.showAsUnseen == null)
+            event.showAsUnseen = !event.seen
+
+        b.unread.isVisible = event.showAsUnseen == true
+        if (markAsSeen && !event.seen) {
+            manager.markAsSeen(event)
         }
+    }
 
-        /*with(holder) {
-            b.eventListItemRoot.background.colorFilter = when (event.type) {
-                Event.TYPE_HOMEWORK -> PorterDuffColorFilter(0xffffffff.toInt(), PorterDuff.Mode.CLEAR)
-                else -> PorterDuffColorFilter(event.color, PorterDuff.Mode.MULTIPLY)
-            }
-
-            b.eventListItemStartTime.text = if (event.startTime == null) app.getString(R.string.event_all_day) else event.startTime?.stringHM
-            b.eventListItemTeamName.text = bs(event.teamName)
-            b.eventListItemTeacherName.text = app.getString(R.string.concat_2_strings, bs(null, event.teacherFullName, "\n"), bs(event.subjectLongName))
-            b.eventListItemAddedDate.text = Date.fromMillis(event.addedDate).formattedStringShort
-            b.eventListItemType.text = event.typeName
-            b.eventListItemTopic.text = event.topic
-            b.eventListItemHomework.visibility = if (event.type == Event.TYPE_HOMEWORK) View.VISIBLE else View.GONE
-            b.eventListItemSharedBy.text = app.getString(R.string.event_shared_by_format, if (event.sharedBy == "self") app.getString(R.string.event_shared_by_self) else event.sharedByName)
-            b.eventListItemSharedBy.visibility = if (event.sharedByName.isNullOrBlank()) View.GONE else View.VISIBLE
-
-            b.eventListItemEdit.visibility = if (event.addedManually) View.VISIBLE else View.GONE
-            b.eventListItemEdit.setOnClickListener {
-                parentDialog.dismiss()
-
-                EventManualDialog(
-                        context as MainActivity,
-                        event.profileId,
-                        editingEvent = event,
-                        onShowListener = parentDialog.onShowListener,
-                        onDismissListener = parentDialog.onDismissListener
-                )
-            }
-        }*/
+    private fun notifyItemChanged(model: Any) {
+        startCoroutineTimer(1000L, 0L) {
+            val index = items.indexOf(model)
+            if (index != -1)
+                notifyItemChanged(index)
+        }
     }
 
     override fun getItemCount() = items.size

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt

@@ -78,7 +78,7 @@ class LessonDetailsDialog(
             )
         }
 
-        if (App.devMode)
+        if (App.debugMode)
             b.lessonId.visibility = View.VISIBLE
 
         update()
@@ -175,6 +175,7 @@ class LessonDetailsDialog(
                 showType = true,
                 showTime = true,
                 showSubject = true,
+                markAsSeen = true,
                 onItemClick = {
                     EventDetailsDialog(
                             activity,

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/FragmentLazyPagerAdapter.kt

@@ -10,7 +10,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 class FragmentLazyPagerAdapter(
         fragmentManager: FragmentManager,
         swipeRefreshLayout: SwipeRefreshLayout,
-        private val fragments: List<Pair<LazyFragment, CharSequence>>
+        val fragments: List<Pair<LazyFragment, CharSequence>>
 ) : LazyPagerAdapter(fragmentManager, swipeRefreshLayout) {
     override fun getPage(position: Int) = fragments[position].first
     override fun getPageTitle(position: Int) = fragments[position].second

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/LazyFragment.kt

@@ -4,6 +4,7 @@
 
 package pl.szczodrzynski.edziennik.ui.modules.base.lazypager
 
+import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
 
@@ -11,6 +12,7 @@ abstract class LazyFragment : Fragment() {
     private var isPageCreated = false
     internal var position = -1
     internal var swipeRefreshLayoutCallback: ((position: Int, isEnabled: Boolean) -> Unit)? = null
+    internal var onPageDestroy: ((position: Int, outState: Bundle?) -> Unit?)? = null
 
     /**
      * Called when the page is first shown, or if previous

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/DebugFragment.java

@@ -1,4 +1,8 @@
-package pl.szczodrzynski.edziennik.ui.modules.base;
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-4-3.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.debug;
 
 import android.os.Bundle;
 import android.util.Log;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabFragment.kt

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-4-3.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.debug
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.sqlite.db.SimpleSQLiteQuery
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.databinding.LabFragmentBinding
+import pl.szczodrzynski.edziennik.onClick
+import kotlin.coroutines.CoroutineContext
+
+class LabFragment : Fragment(), CoroutineScope {
+    companion object {
+        private const val TAG = "LabFragment"
+    }
+
+    private lateinit var app: App
+    private lateinit var activity: MainActivity
+    private lateinit var b: LabFragmentBinding
+
+    private val job: Job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    // local/private variables go here
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        activity = (getActivity() as MainActivity?) ?: return null
+        context ?: return null
+        app = activity.application as App
+        b = LabFragmentBinding.inflate(inflater)
+        return b.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        if (!isAdded) return
+
+        b.last10unseen.onClick {
+            launch(Dispatchers.Default) {
+                val events = app.db.eventDao().getAllNow(App.profileId)
+                val ids = events.sortedBy { it.date }.filter { it.type == Event.TYPE_HOMEWORK }.takeLast(10)
+                ids.forEach {
+                    app.db.metadataDao().setSeen(App.profileId, it, false)
+                }
+            }
+        }
+
+        b.rodo.onClick {
+            app.db.teacherDao().query(SimpleSQLiteQuery("UPDATE teachers SET teacherSurname = \"\" WHERE profileId = ${App.profileId}"))
+        }
+
+        b.removeHomework.onClick {
+            app.db.eventDao().getRawNow("UPDATE events SET homeworkBody = NULL WHERE profileId = ${App.profileId}")
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorDetailsDialog.kt

@@ -45,7 +45,7 @@ class ErrorDetailsDialog(
                 listOf(
                         it.getStringReason(activity).asBoldSpannable().asColoredSpannable(R.attr.colorOnBackground.resolveAttr(activity)),
                         activity.getString(R.string.error_unknown_format, it.errorCode, it.tag),
-                        if (App.devMode)
+                        if (App.debugMode)
                             it.throwable?.stackTraceString ?: it.throwable?.localizedMessage
                         else
                             it.throwable?.localizedMessage

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradeView.kt

@@ -49,28 +49,29 @@ class GradeView : AppCompatTextView {
 
         val gradeColor = manager.getGradeColor(grade)
 
-        text = if (periodGradesTextual)
-            when (grade.type) {
+        text = when {
+            periodGradesTextual -> when (grade.type) {
                 TYPE_SEMESTER1_PROPOSED, TYPE_SEMESTER2_PROPOSED -> context.getString(
-                    R.string.grade_semester_proposed_format,
-                    gradeName
+                        R.string.grade_semester_proposed_format,
+                        gradeName
                 )
                 TYPE_SEMESTER1_FINAL, TYPE_SEMESTER2_FINAL -> context.getString(
-                    R.string.grade_semester_final_format,
-                    gradeName
+                        R.string.grade_semester_final_format,
+                        gradeName
                 )
                 TYPE_YEAR_PROPOSED -> context.getString(
-                    R.string.grade_year_proposed_format,
-                    gradeName
+                        R.string.grade_year_proposed_format,
+                        gradeName
                 )
                 TYPE_YEAR_FINAL -> context.getString(
-                    R.string.grade_year_final_format,
-                    gradeName
+                        R.string.grade_year_final_format,
+                        gradeName
                 )
                 else -> gradeName
             }
-        else
-            gradeName
+            gradeName.isBlank() -> "  "
+            else -> gradeName
+        }
 
         setTextColor(when (grade.type) {
             TYPE_SEMESTER1_PROPOSED,

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesAdapter.kt

@@ -99,10 +99,31 @@ class GradesAdapter(
             }
         }
         if (model is GradesSubject) {
+            // hide the preview, show summary
             val preview = view?.findViewById<View>(R.id.previewContainer)
             val summary = view?.findViewById<View>(R.id.yearSummary)
             preview?.visibility = if (model.state == STATE_CLOSED) View.INVISIBLE else View.VISIBLE
             summary?.visibility = if (model.state == STATE_CLOSED) View.VISIBLE else View.INVISIBLE
+
+            // expanding a subject - mark proposed & final grade as seen
+            var unseenChanged = false
+            if (model.proposedGrade?.seen == false) {
+                manager.markAsSeen(model.proposedGrade!!)
+                unseenChanged = true
+            }
+            if (model.finalGrade?.seen == false) {
+                manager.markAsSeen(model.finalGrade!!)
+                unseenChanged = true
+            }
+            // remove the override flag
+            model.hasUnseen = false
+
+            if (unseenChanged) {
+                // check if the unseen status has changed
+                if (!model.hasUnseen) {
+                    notifyItemChanged(model)
+                }
+            }
         }
 
         if (model.state == STATE_CLOSED) {
@@ -166,7 +187,7 @@ class GradesAdapter(
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         val item = items[position]
-        if (holder !is BindableViewHolder<*>)
+        if (holder !is BindableViewHolder<*, *>)
             return
 
         val viewType = when (holder) {

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListFragment.kt

@@ -71,7 +71,7 @@ class GradesListFragment : Fragment(), CoroutineScope {
         val adapter = GradesAdapter(activity)
         var firstRun = true
 
-        app.db.gradeDao().getAllOrderBy(App.profileId, app.gradesManager.getOrderByString()).observe(this, Observer { items -> launch {
+        app.db.gradeDao().getAllOrderBy(App.profileId, app.gradesManager.getOrderByString()).observe(this@GradesListFragment, Observer { items -> this@GradesListFragment.launch {
             if (!isAdded) return@launch
 
             // load & configure the adapter
@@ -204,7 +204,10 @@ class GradesListFragment : Fragment(), CoroutineScope {
 
             grade.showAsUnseen = !grade.seen
             if (!grade.seen) {
-                semester.hasUnseen = true
+                if (grade.type == Grade.TYPE_YEAR_PROPOSED || grade.type == Grade.TYPE_YEAR_FINAL)
+                    subject.hasUnseen = true // set an override flag
+                else
+                    semester.hasUnseen = true
             }
 
             when (grade.type) {

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesSubject.kt

@@ -16,8 +16,8 @@ data class GradesSubject(
     var lastAddedDate = 0L
     var semester: Int = 1
 
-    val hasUnseen
-        get() = semesters.any { it.hasUnseen }
+    var hasUnseen: Boolean = false
+        get() = field || semesters.any { it.hasUnseen }
 
     val averages = GradesAverages()
     var proposedGrade: GradeFull? = null

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/BindableViewHolder.kt

@@ -6,8 +6,7 @@ package pl.szczodrzynski.edziennik.ui.modules.grades.viewholder
 
 import androidx.appcompat.app.AppCompatActivity
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.ui.modules.grades.GradesAdapter
 
-interface BindableViewHolder<T> {
-    fun onBind(activity: AppCompatActivity, app: App, item: T, position: Int, adapter: GradesAdapter)
+interface BindableViewHolder<T, A> {
+    fun onBind(activity: AppCompatActivity, app: App, item: T, position: Int, adapter: A)
 }