[4.0-beta.1] It's here. Finally.

.idea/jarRepositories.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://kotlin.bintray.com/kotlinx/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://dl.bintray.com/wulkanowy/wulkanowy" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+  </component>
+</project>

app/sampledata/format-bold/ic_format_bold.xml

@@ -0,0 +1,13 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-12-28.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M13.5,15.5H10V12.5H13.5A1.5,1.5 0,0 1,15 14A1.5,1.5 0,0 1,13.5 15.5M10,6.5H13A1.5,1.5 0,0 1,14.5 8A1.5,1.5 0,0 1,13 9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z"/>
+</vector>

app/sampledata/format/ic_format_italic.xml

@@ -0,0 +1,13 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-12-28.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M10,4V7H12.21L8.79,15H6V18H14V15H11.79L15.21,7H18V4H10Z"/>
+</vector>

app/sampledata/format/ic_format_underline.xml

@@ -0,0 +1,13 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-12-28.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M5,21H19V19H5V21M12,17A6,6 0,0 0,18 11V3H15.5V11A3.5,3.5 0,0 1,12 14.5A3.5,3.5 0,0 1,8.5 11V3H6V11A6,6 0,0 0,12 17Z"/>
+</vector>

app/src/main/AndroidManifest.xml

@@ -32,11 +32,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.modules.messages.MessagesComposeActivity"
-            android:configChanges="orientation|screenSize"
-            android:label="@string/messages_compose_title"
-            android:theme="@style/AppTheme.Black" />
         <activity
             android:name=".ui.modules.feedback.FeedbackActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"

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

@@ -1,53 +1,38 @@
-<html>
-<head>
-	<style type="text/css">
-		* {
-			word-wrap: break-word;
-		}
-
-		body {
-			background-color: #{bg-color}; color: #{text-color};
-		}
-
-		a {
-			color: #{link-color};
-		}
-
-		a:active {
-			color: #{link-color-active};
-		}
-
-		ol {
-			list-style-position: inside;
-			padding-left: 0;
-			padding-right: 0;
-		}
-
-		li:not(:first-child) {
-			padding-top: 8px;
-		}
-	</style>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body>
-
-<h3>Wersja 4.0, 2019-jeszcze-nie-wiem-kiedy</h3>
+<h3>Wersja 4.0-beta.1, 2020-01-02</h3>
 <ul>
-    <li>UWAGA. To jest wersja in-development. Wiele funkcji może nie działać prawidłowo (lub wcale), co oznacza tylko że nie zostały jeszcze przeniesione
-    z wersji 3.x. Proszę o cierpliwość oraz <b>nie udostępnianie</b> tej wersji <u>nikomu</u>.</li>
-    <li>Bardzo dużo zmian</li>
+    <li><b>Przebudowaliśmy cały moduł synchronizacji</b>, co oznacza większą stabilność aplikacji, szybkosć oraz poprawność pobieranych danych.</li>
+    <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>Udoskonalony wygląd Szkolnego - sprawi, że korzystanie z aplikacji będzie jeszcze przyjemniejsze</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 okienka informacji o wydarzeniach oraz lekcjach</li>
+    <li>Łatwiejsze dodawanie własnych wydarzeń</li>
+    <li>Dużo poprawek w widoku <b>Wiadomości</b> oraz <b>Ogłoszeń</b></li>
+    <li>Częściowa <b>Obsługa dziennika EduDziennik</b></li>
+    <li>Librus: opcja logowania w dziennikach <b>Jednostek Samorządu Terytorialnego</b> oraz <b>Oświata w Radomiu</b></li>
+    <li>Librus: obsługa Zadań domowych bez posiadania Mobilnych dodatków (przez system Synergia)</li>
+    <li>Lepsze <b>przekazywanie powiadomień na komputer</b> oraz łatwiejsze parowanie</li>
+    <li>Poprawiliśmy synchronizację w tle na niektórych telefonach</li>
+    <li>Znaczna ilość błędów z poprzednich wersji już nie występuje</li>
 </ul>
-
-<!--<i>
-    <h3>Plany na następne wersje:</h3>
-    <ul>
-        <li>Widget kalendarza ze sprawdzianami, ulepszenie widoku kalendarza w aplikacji</li>
-        <li>Wsparcie dla systemu Synergia w jednostkach samorządu terytorialnego - aplikacja Nasze Szkoły</li>
-        <li>Wsparcie dla Librusa w systemie Oświata w Radomiu</li>
-        <li>EduDziennik</li>
-        <li>Mobireg</li>
-        <li>Możliwość edycji planu lekcji</li>
-    </ul>
-</i>-->
-
-</body>
+<br>
+<br>
+<br>
+<b>Uwaga.</b> Ponieważ to wersja <i>beta</i>, niektóre funkcje mogą nie działać prawidłowo.<br>
+Staramy się usuwać takie przypadki, jednak na chwilę obecną mogą występować błędy w:
+<ul>
+    <li>Wysyłanie wiadomości może czasami nie działać - proszę o zgłaszanie wszystkich błędów na naszym serwerze Discord</li>
+    <li>Widget powiadomień</li>
+    <li>Terminarz - brak informacji o odwołanych lekcjach w dialogu</li>
+    <li>Brak generowania blokowego planu lekcji</li>
+</ul>
+<br>
+<br>
+<br>
+<br>
+<i>Okazja ograniczona czasowo:</i> Poczuj prawdziwą zimę, włączając w Ustawieniach widok padającego śniegu!
+<br>
+<br>
+<br>
+Dzięki za korzystanie ze Szkolnego!<br>
+<i>&copy; Kuba Szczodrzyński, Kacper Ziubryniewicz 2020</i>

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

@@ -9,7 +9,7 @@
 
 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0xc4, 0x14, 0x3c, 0x14, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0x6c, 0x53, 0xa9, 0x71, 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.java

@@ -67,8 +67,9 @@ import me.leolin.shortcutbadger.ShortcutBadger;
 import okhttp3.ConnectionSpec;
 import okhttp3.OkHttpClient;
 import okhttp3.TlsVersion;
-import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing;
 import pl.szczodrzynski.edziennik.config.Config;
+import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing;
+import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask;
 import pl.szczodrzynski.edziennik.data.db.AppDb;
 import pl.szczodrzynski.edziennik.data.db.modules.debuglog.DebugLog;
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
@@ -438,6 +439,11 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
                     "Vulcan"
             );
 
+            if (config.getRunSync()) {
+                config.setRunSync(false);
+                EdziennikTask.Companion.sync().enqueue(this);
+            }
+
             try {
                 final long startTime = System.currentTimeMillis();
                 FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(instanceIdResult -> {

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

@@ -4,6 +4,7 @@ import android.Manifest
 import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
+import android.content.res.ColorStateList
 import android.content.res.Resources
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
@@ -15,6 +16,7 @@ import android.text.*
 import android.text.style.ForegroundColorSpan
 import android.text.style.StrikethroughSpan
 import android.text.style.StyleSpan
+import android.util.Base64
 import android.util.Base64.NO_WRAP
 import android.util.Base64.encodeToString
 import android.util.LongSparseArray
@@ -42,8 +44,10 @@ import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
 import pl.szczodrzynski.edziennik.utils.models.Time
-import pl.szczodrzynski.navlib.getColorFromRes
+import java.io.PrintWriter
+import java.io.StringWriter
 import java.math.BigInteger
+import java.nio.charset.Charset
 import java.security.MessageDigest
 import java.text.SimpleDateFormat
 import java.util.*
@@ -97,12 +101,31 @@ fun Bundle?.getString(key: String, defaultValue: String): String {
     return this?.getString(key, defaultValue) ?: defaultValue
 }
 
-fun String.fixName(): String {
-    return this.fixWhiteSpaces().toProperCase()
+/**
+ * `   The quick BROWN_fox Jumps OveR THE       LAZy-DOG.   `
+ *
+ * converts to
+ *
+ * `The Quick Brown_fox Jumps Over The Lazy-Dog.`
+ */
+fun String?.fixName(): String {
+    return this?.fixWhiteSpaces()?.toProperCase() ?: ""
 }
 
+/**
+ * `The quick BROWN_fox Jumps OveR THE       LAZy-DOG.`
+ *
+ * converts to
+ *
+ * `The Quick Brown_fox Jumps Over The       Lazy-Dog.`
+ */
 fun String.toProperCase(): String = changeStringCase(this)
 
+/**
+ * `John Smith` -> `Smith John`
+ *
+ * `JOHN SMith` -> `SMith JOHN`
+ */
 fun String.swapFirstLastName(): String {
     return this.split(" ").let {
         if (it.size > 1)
@@ -148,33 +171,52 @@ fun String.getShortName(): String {
     }
 }
 
-fun List<String>.join(delimiter: String): String {
-    return this.joinToString(delimiter)
+/**
+ * "John Smith"             -> "JS"
+ *
+ * "JOHN SMith"             -> "JS"
+ *
+ * "John"                   -> "J"
+ *
+ * "John "                  -> "J"
+ *
+ * "John     Smith      "   -> "JS"
+ *
+ * " "                      -> ""
+ *
+ * "  "                     -> ""
+ */
+fun String?.getNameInitials(): String {
+    if (this.isNullOrBlank()) return ""
+    return this.toUpperCase().fixWhiteSpaces().split(" ").take(2).map { it[0] }.joinToString("")
 }
 
-fun colorFromName(context: Context, name: String?): Int {
+fun List<String>.join(delimiter: String): String {
+    return concat(delimiter).toString()
+}
+
+fun colorFromName(name: String?): Int {
     var crc = (name ?: "").crc16()
     crc = (crc and 0xff) or (crc shr 8)
     crc %= 16
-    val color = when (crc) {
-        13 -> R.color.md_red_500
-        4  -> R.color.md_pink_A400
-        2  -> R.color.md_purple_A400
-        9  -> R.color.md_deep_purple_A700
-        5  -> R.color.md_indigo_500
-        1  -> R.color.md_indigo_A700
-        6  -> R.color.md_cyan_A200
-        14 -> R.color.md_teal_400
-        15 -> R.color.md_green_500
-        7  -> R.color.md_yellow_A700
-        3  -> R.color.md_deep_orange_A400
-        8  -> R.color.md_deep_orange_A700
-        10 -> R.color.md_brown_500
-        12 -> R.color.md_grey_400
-        11 -> R.color.md_blue_grey_400
-        else -> R.color.md_light_green_A700
-    }
-    return context.getColorFromRes(color)
+    return when (crc) {
+        13 -> 0xffF44336
+        4  -> 0xffF50057
+        2  -> 0xffD500F9
+        9  -> 0xff6200EA
+        5  -> 0xff3F51B5
+        1  -> 0xff304FFE
+        6  -> 0xff18FFFF
+        14 -> 0xff26A69A
+        15 -> 0xff4CAF50
+        7  -> 0xffFFD600
+        3  -> 0xffFF3D00
+        8  -> 0xffDD2C00
+        10 -> 0xff795548
+        12 -> 0xffBDBDBD
+        11 -> 0xff78909C
+        else -> 0xff64DD17
+    }.toInt()
 }
 
 fun colorFromCssName(name: String): Int {
@@ -240,6 +282,21 @@ fun <T> SparseArray<T>.values(): List<T> {
     return result
 }
 
+fun <K, V> List<Pair<K, V>>.keys(): List<K> {
+    val result = mutableListOf<K>()
+    forEach { pair ->
+        result += pair.first
+    }
+    return result
+}
+fun <K, V> List<Pair<K, V>>.values(): List<V> {
+    val result = mutableListOf<V>()
+    forEach { pair ->
+        result += pair.second
+    }
+    return result
+}
+
 fun <T> List<T>.toSparseArray(destination: SparseArray<T>, key: (T) -> Int) {
     forEach {
         destination.put(key(it), it)
@@ -422,6 +479,29 @@ fun CharSequence?.asItalicSpannable(): Spannable {
     spannable.setSpan(StyleSpan(Typeface.ITALIC), 0, spannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
     return spannable
 }
+fun CharSequence?.asBoldSpannable(): Spannable {
+    val spannable = SpannableString(this)
+    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 {
+    val spannable = SpannableString(this)
+    if (substring == null) {
+        spans.forEach {
+            spannable.setSpan(it, 0, spannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        }
+    }
+    else if (substring.isNotEmpty()) {
+        var index = 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);
+        }
+    }
+    return spannable
+}
 
 /**
  * Returns a new read-only list only of those given elements, that are not empty.
@@ -429,7 +509,7 @@ fun CharSequence?.asItalicSpannable(): Spannable {
  */
 fun <T : CharSequence> listOfNotEmpty(vararg elements: T): List<T> = elements.filterNot { it.isEmpty() }
 
-fun List<CharSequence?>.concat(delimiter: String? = null): CharSequence {
+fun List<CharSequence?>.concat(delimiter: CharSequence? = null): CharSequence {
     if (this.isEmpty()) {
         return ""
     }
@@ -438,11 +518,13 @@ fun List<CharSequence?>.concat(delimiter: String? = null): CharSequence {
         return this[0] ?: ""
     }
 
-    var spanned = false
-    for (piece in this) {
-        if (piece is Spanned) {
-            spanned = true
-            break
+    var spanned = delimiter is Spanned
+    if (!spanned) {
+        for (piece in this) {
+            if (piece is Spanned) {
+                spanned = true
+                break
+            }
         }
     }
 
@@ -490,8 +572,44 @@ fun JsonObject(vararg properties: Pair<String, Any?>): JsonObject {
     }
 }
 
+fun JsonArray(vararg properties: Any?): JsonArray {
+    return JsonArray().apply {
+        for (property in properties) {
+            when (property) {
+                is JsonElement -> add(property as JsonElement?)
+                is String -> add(property as String?)
+                is Char -> add(property as Char?)
+                is Number -> add(property as Number?)
+                is Boolean -> add(property as Boolean?)
+            }
+        }
+    }
+}
+
+fun Bundle(vararg properties: Pair<String, Any?>): Bundle {
+    return Bundle().apply {
+        for (property in properties) {
+            when (property.second) {
+                is String -> putString(property.first, property.second as String?)
+                is Char -> putChar(property.first, property.second as Char)
+                is Int -> putInt(property.first, property.second as Int)
+                is Long -> putLong(property.first, property.second as Long)
+                is Float -> putFloat(property.first, property.second as Float)
+                is Short -> putShort(property.first, property.second as Short)
+                is Double -> putDouble(property.first, property.second as Double)
+                is Boolean -> putBoolean(property.first, property.second as Boolean)
+            }
+        }
+    }
+}
+
 fun JsonArray?.isNullOrEmpty(): Boolean = (this?.size() ?: 0) == 0
 fun JsonArray.isEmpty(): Boolean = this.size() == 0
+operator fun JsonArray.plusAssign(o: JsonElement) = this.add(o)
+operator fun JsonArray.plusAssign(o: String) = this.add(o)
+operator fun JsonArray.plusAssign(o: Char) = this.add(o)
+operator fun JsonArray.plusAssign(o: Number) = this.add(o)
+operator fun JsonArray.plusAssign(o: Boolean) = this.add(o)
 
 @Suppress("UNCHECKED_CAST")
 inline fun <T : View> T.onClick(crossinline onClickListener: (v: T) -> Unit) {
@@ -682,3 +800,82 @@ val String.firstLettersName: String
         }
         return nameShort
     }
+
+val Throwable.stackTraceString: String
+    get() {
+        val sw = StringWriter()
+        printStackTrace(PrintWriter(sw))
+        return sw.toString()
+    }
+
+inline fun <T> LongSparseArray<T>.filter(predicate: (T) -> Boolean): List<T> {
+    val destination = ArrayList<T>()
+    this.forEach { _, element -> if (predicate(element)) destination.add(element) }
+    return destination
+}
+
+fun CharSequence.replace(oldValue: String, newValue: CharSequence, ignoreCase: Boolean = false): CharSequence =
+        splitToSequence(oldValue, ignoreCase = ignoreCase).toList().concat(newValue)
+
+fun Int.toColorStateList(): ColorStateList {
+    val states = arrayOf(
+        intArrayOf( android.R.attr.state_enabled ),
+        intArrayOf(-android.R.attr.state_enabled ),
+        intArrayOf(-android.R.attr.state_checked ),
+        intArrayOf( android.R.attr.state_pressed )
+    )
+
+    val colors = intArrayOf(
+            this,
+            this,
+            this,
+            this
+    )
+
+    return ColorStateList(states, colors);
+}
+
+fun SpannableStringBuilder.appendText(text: CharSequence): SpannableStringBuilder {
+    append(text)
+    return this
+}
+fun SpannableStringBuilder.appendSpan(text: CharSequence, what: Any, flags: Int): SpannableStringBuilder {
+    val start: Int = length
+    append(text)
+    setSpan(what, start, length, flags)
+    return this
+}
+
+fun joinNotNullStrings(delimiter: String = "", vararg parts: String?): String {
+    var first = true
+    val sb = StringBuilder()
+    for (part in parts) {
+        if (part == null)
+            continue
+        if (!first)
+            sb += delimiter
+        first = false
+        sb += part
+    }
+    return sb.toString()
+}
+
+fun String.notEmptyOrNull(): String? {
+    return if (isEmpty())
+        null
+    else
+        this
+}
+
+fun String.base64Encode(): String {
+    return encodeToString(toByteArray(), NO_WRAP)
+}
+fun ByteArray.base64Encode(): String {
+    return encodeToString(this, NO_WRAP)
+}
+fun String.base64Decode(): ByteArray {
+    return Base64.decode(this, Base64.DEFAULT)
+}
+fun String.base64DecodeToString(): String {
+    return Base64.decode(this, Base64.DEFAULT).toString(Charset.defaultCharset())
+}

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

@@ -9,7 +9,10 @@ import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
 import android.graphics.drawable.BitmapDrawable
-import android.os.*
+import android.os.AsyncTask
+import android.os.Build
+import android.os.Bundle
+import android.os.Environment
 import android.provider.Settings
 import android.util.Log
 import android.view.Gravity
@@ -20,6 +23,7 @@ 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
@@ -36,13 +40,11 @@ import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import pl.droidsonroids.gif.GifDrawable
-import pl.szczodrzynski.edziennik.App.APP_URL
 import pl.szczodrzynski.edziennik.data.api.events.*
 import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing
 import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.*
 import pl.szczodrzynski.edziennik.databinding.ActivitySzkolnyBinding
-import pl.szczodrzynski.edziennik.network.ServerRequest
 import pl.szczodrzynski.edziennik.sync.AppManagerDetectedEvent
 import pl.szczodrzynski.edziennik.sync.SyncWorker
 import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog
@@ -52,6 +54,7 @@ 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.error.ErrorSnackbar
 import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackFragment
@@ -62,7 +65,9 @@ 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.notifications.NotificationsFragment
 import pl.szczodrzynski.edziennik.ui.modules.settings.ProfileManagerFragment
 import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsNewFragment
@@ -119,6 +124,7 @@ class MainActivity : AppCompatActivity() {
         const val TARGET_HELP = 502
         const val TARGET_FEEDBACK = 120
         const val TARGET_MESSAGES_DETAILS = 503
+        const val TARGET_MESSAGES_COMPOSE = 504
         const val TARGET_WEB_PUSH = 140
 
         const val HOME_ID = DRAWER_ITEM_HOME
@@ -210,7 +216,8 @@ class MainActivity : AppCompatActivity() {
             list += NavTarget(TARGET_GRADES_EDITOR, R.string.menu_grades_editor, GradesEditorFragment::class)
             list += NavTarget(TARGET_HELP, R.string.menu_help, HelpFragment::class)
             list += NavTarget(TARGET_FEEDBACK, R.string.menu_feedback, FeedbackFragment::class)
-            list += NavTarget(TARGET_MESSAGES_DETAILS, R.string.menu_message, MessageFragment::class)
+            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)
 
@@ -222,6 +229,7 @@ class MainActivity : AppCompatActivity() {
     val navView: NavView by lazy { b.navView }
     val drawer: NavDrawer by lazy { navView.drawer }
     val bottomSheet: NavBottomSheet by lazy { navView.bottomSheet }
+    val mainSnackbar: MainSnackbar by lazy { MainSnackbar(this) }
     val errorSnackbar: ErrorSnackbar by lazy { ErrorSnackbar(this) }
 
     val swipeRefreshLayout: SwipeRefreshLayoutNoTouch by lazy { b.swipeRefreshLayout }
@@ -232,10 +240,11 @@ class MainActivity : AppCompatActivity() {
 
     private val fragmentManager by lazy { supportFragmentManager }
     private lateinit var navTarget: NavTarget
+    private var navArguments: Bundle? = null
     val navTargetId
         get() = navTarget.id
 
-    private val navBackStack = mutableListOf<NavTarget>()
+    private val navBackStack = mutableListOf<Pair<NavTarget, Bundle?>>()
     private var navLoading = true
 
     /*     ____           _____                _
@@ -257,6 +266,7 @@ class MainActivity : AppCompatActivity() {
 
         Log.d(TAG, Signing.appPassword)
 
+        mainSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
         errorSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
 
         navLoading = true
@@ -426,16 +436,7 @@ class MainActivity : AppCompatActivity() {
 
         // WHAT'S NEW DIALOG
         if (app.config.appVersion < BuildConfig.VERSION_CODE) {
-            ServerRequest(app, app.requestScheme + APP_URL + "main.php?just_updated", "MainActivity/JU")
-                    .run { e, result ->
-                        Handler(Looper.getMainLooper()).post {
-                            try {
-                                ChangelogDialog().show(supportFragmentManager, "whats_new")
-                            } catch (e2: Exception) {
-                                e2.printStackTrace()
-                            }
-                        }
-                    }
+            ChangelogDialog(this)
             if (app.config.appVersion < 170) {
                 //Intent intent = new Intent(this, ChangelogIntroActivity.class);
                 //startActivity(intent);
@@ -560,7 +561,7 @@ class MainActivity : AppCompatActivity() {
         ).enqueue(this)
     }
     @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onSyncStartedEvent(event: ApiTaskStartedEvent) {
+    fun onApiTaskStartedEvent(event: ApiTaskStartedEvent) {
         swipeRefreshLayout.isRefreshing = true
         if (event.profileId == App.profileId) {
             navView.toolbar.apply {
@@ -571,7 +572,7 @@ class MainActivity : AppCompatActivity() {
         }
     }
     @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onSyncProgressEvent(event: ApiTaskProgressEvent) {
+    fun onApiTaskProgressEvent(event: ApiTaskProgressEvent) {
         if (event.profileId == App.profileId) {
             navView.toolbar.apply {
                 subtitleFormat = null
@@ -584,8 +585,8 @@ class MainActivity : AppCompatActivity() {
             }
         }
     }
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onSyncProfileFinishedEvent(event: ApiTaskFinishedEvent) {
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onApiTaskFinishedEvent(event: ApiTaskFinishedEvent) {
         if (event.profileId == App.profileId) {
             navView.toolbar.apply {
                 subtitleFormat = R.string.toolbar_subtitle
@@ -594,17 +595,18 @@ class MainActivity : AppCompatActivity() {
             }
         }
     }
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onSyncFinishedEvent(event: ApiTaskAllFinishedEvent) {
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onApiTaskAllFinishedEvent(event: ApiTaskAllFinishedEvent) {
         swipeRefreshLayout.isRefreshing = false
     }
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onSyncErrorEvent(event: ApiTaskErrorEvent) {
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onApiTaskErrorEvent(event: ApiTaskErrorEvent) {
         navView.toolbar.apply {
             subtitleFormat = R.string.toolbar_subtitle
             subtitleFormatWithUnread = R.plurals.toolbar_subtitle_with_unread
             subtitle = "Gotowe"
         }
+        mainSnackbar.dismiss()
         errorSnackbar.addError(event.error).show()
     }
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
@@ -808,6 +810,10 @@ class MainActivity : AppCompatActivity() {
         }
         AsyncTask.execute {
             app.profileLoadById(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)
 
             this.runOnUiThread {
                 if (app.profile == null) {
@@ -833,7 +839,7 @@ class MainActivity : AppCompatActivity() {
             loadId = DRAWER_ITEM_HOME
         }
         val target = navTargetList
-                .singleOrNull { it.id == loadId }
+                .firstOrNull { it.id == loadId }
         if (target == null) {
             Toast.makeText(this, getString(R.string.error_invalid_fragment, id), Toast.LENGTH_LONG).show()
             loadTarget(navTargetList.first(), arguments)
@@ -843,7 +849,7 @@ class MainActivity : AppCompatActivity() {
         }
     }
     private fun loadTarget(target: NavTarget, arguments: Bundle? = null) {
-        d("NavDebug", "loadItem(id = ${target.id})")
+        d("NavDebug", "loadTarget(target = $target, arguments = $arguments)")
 
         bottomSheet.close()
         bottomSheet.removeAllContextual()
@@ -870,7 +876,7 @@ class MainActivity : AppCompatActivity() {
             )
         }
         else {
-            navBackStack.lastIndexOf(target).let {
+            navBackStack.keys().lastIndexOf(target).let {
                 if (it == -1)
                     return@let target
                 // pop the back stack up until that target
@@ -901,8 +907,9 @@ class MainActivity : AppCompatActivity() {
                         R.anim.task_open_enter,
                         R.anim.task_open_exit
                 )
-                navBackStack.add(navTarget)
+                navBackStack.add(navTarget to arguments)
                 navTarget = target
+                navArguments = arguments
             }
         }
 
@@ -917,7 +924,7 @@ class MainActivity : AppCompatActivity() {
 
         d("NavDebug", "Current fragment ${navTarget.fragmentClass?.java?.simpleName}, pop to home ${navTarget.popToHome}, back stack:")
         navBackStack.forEachIndexed { index, target2 ->
-            d("NavDebug", " - $index: ${target2.fragmentClass?.java?.simpleName}")
+            d("NavDebug", " - $index: ${target2.first.fragmentClass?.java?.simpleName}")
         }
 
         transaction.replace(R.id.fragment, fragment)
@@ -942,11 +949,18 @@ class MainActivity : AppCompatActivity() {
             return false
         }
         // TODO back stack argument support
-        if (navTarget.popToHome) {
-            loadTarget(HOME_ID)
-        }
-        else {
-            loadTarget(navBackStack.last())
+        when {
+            navTarget.popToHome -> {
+                loadTarget(HOME_ID)
+            }
+            navTarget.popTo != null -> {
+                loadTarget(navTarget.popTo ?: HOME_ID)
+            }
+            else -> {
+                navBackStack.last().let {
+                    loadTarget(it.first, it.second)
+                }
+            }
         }
         return true
     }
@@ -961,6 +975,8 @@ class MainActivity : AppCompatActivity() {
      * that something has changed in the bottom sheet.
      */
     fun gainAttention() {
+        if (app.config.ui.bottomSheetOpened || true)
+            return
         b.navView.postDelayed({
             navView.gainAttentionOnBottomBar()
         }, 2000)
@@ -1084,4 +1100,7 @@ class MainActivity : AppCompatActivity() {
             }
         }
     }
+
+    fun snackbar(text: String, actionText: String? = null, onClick: (() -> Unit)? = null) = mainSnackbar.snackbar(text, actionText, onClick)
+    fun snackbarDismiss() = mainSnackbar.dismiss()
 }

app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt

@@ -64,6 +64,11 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
         get() { mAppRateSnackbarTime = mAppRateSnackbarTime ?: values.get("appRateSnackbarTime", 0L); return mAppRateSnackbarTime ?: 0L }
         set(value) { set("appRateSnackbarTime", value); mAppRateSnackbarTime = value }
 
+    private var mRunSync: Boolean? = null
+    var runSync: Boolean
+        get() { mRunSync = mRunSync ?: values.get("runSync", false); return mRunSync ?: false }
+        set(value) { set("runSync", value); mRunSync = value }
+
     private var rawEntries: List<ConfigEntry> = db.configDao().getAllNow()
     private val profileConfigs: HashMap<Int, ProfileConfig> = hashMapOf()
     init {
@@ -76,6 +81,9 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
     fun getFor(profileId: Int): ProfileConfig {
         return profileConfigs[profileId] ?: ProfileConfig(db, profileId, rawEntries)
     }
+    fun forProfile(): ProfileConfig {
+        return profileConfigs[App.profileId] ?: ProfileConfig(db, App.profileId, rawEntries)
+    }
 
     fun setProfile(profileId: Int) {
     }

app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigUI.kt

@@ -59,4 +59,9 @@ class ConfigUI(private val config: Config) {
     var snowfall: Boolean
         get() { mSnowfall = mSnowfall ?: config.values.get("snowfall", false); return mSnowfall ?: false }
         set(value) { config.set("snowfall", value); mSnowfall = value }
+
+    private var mBottomSheetOpened: Boolean? = null
+    var bottomSheetOpened: Boolean
+        get() { mBottomSheetOpened = mBottomSheetOpened ?: config.values.get("bottomSheetOpened", false); return mBottomSheetOpened ?: false }
+        set(value) { config.set("bottomSheetOpened", value); mBottomSheetOpened = value }
 }

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

@@ -44,6 +44,7 @@ class ApiService : Service() {
             SzkolnyTask.sync(syncingProfiles),
             NotifyTask()
     )
+    private val allTaskList = mutableListOf<IApiTask>()
     private val taskQueue = mutableListOf<IApiTask>()
     private val errorList = mutableListOf<ApiError>()
 
@@ -73,7 +74,7 @@ class ApiService : Service() {
         override fun onCompleted() {
             lastEventTime = System.currentTimeMillis()
             d(TAG, "Task $taskRunningId (profile $taskProfileId) - $taskProgressText - finished")
-            EventBus.getDefault().post(ApiTaskFinishedEvent(taskProfileId))
+            EventBus.getDefault().postSticky(ApiTaskFinishedEvent(taskProfileId))
             clearTask()
 
             notification.setIdle().post()
@@ -84,7 +85,7 @@ class ApiService : Service() {
             lastEventTime = System.currentTimeMillis()
             d(TAG, "Task $taskRunningId threw an error - $apiError")
             apiError.profileId = taskProfileId
-            EventBus.getDefault().post(ApiTaskErrorEvent(apiError))
+            EventBus.getDefault().postSticky(ApiTaskErrorEvent(apiError))
             errorList.add(apiError)
             apiError.throwable?.printStackTrace()
             if (apiError.isCritical) {
@@ -194,7 +195,7 @@ class ApiService : Service() {
      */
     private fun stopIfTaskFrozen() {
         if (checkIfTaskFrozen()) {
-            stopSelf()
+            allCompleted()
         }
     }
 
@@ -213,7 +214,7 @@ class ApiService : Service() {
     }
 
     private fun allCompleted() {
-        EventBus.getDefault().post(ApiTaskAllFinishedEvent())
+        EventBus.getDefault().postSticky(ApiTaskAllFinishedEvent())
         stopSelf()
     }
 
@@ -228,6 +229,11 @@ class ApiService : Service() {
         EventBus.getDefault().removeStickyEvent(task)
         d(TAG, task.toString())
 
+        // fix for duplicated tasks, thank you EventBus
+        if (task in allTaskList)
+            return
+        allTaskList += task
+
         if (task is EdziennikTask) {
             when (task.request) {
                 is EdziennikTask.SyncRequest -> app.db.profileDao().idsForSyncNow.forEach {
@@ -270,7 +276,7 @@ class ApiService : Service() {
         serviceClosed = true
         taskCancelled = true
         taskRunning?.cancel()
-        stopSelf()
+        allCompleted()
     }
 
     /*     _____                 _                                     _     _

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

@@ -69,6 +69,10 @@ const val IDZIENNIK_WEB_NOTICES = "mod_panelRodzica/uwagi/WS_uwagiUcznia.asmx/po
 const val IDZIENNIK_WEB_ATTENDANCE = "mod_panelRodzica/obecnosci/WS_obecnosciUcznia.asmx/pobierzObecnosciUcznia"
 const val IDZIENNIK_WEB_ANNOUNCEMENTS = "mod_panelRodzica/tabOgl/WS_tablicaOgloszen.asmx/GetOgloszenia"
 const val IDZIENNIK_WEB_MESSAGES_LIST = "mod_komunikator/WS_wiadomosci.asmx/PobierzListeWiadomosci"
+const val IDZIENNIK_WEB_GET_MESSAGE = "mod_komunikator/WS_wiadomosci.asmx/PobierzWiadomosc"
+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"
 
 val IDZIENNIK_API_USER_AGENT = SYSTEM_USER_AGENT
 const val IDZIENNIK_API_URL = "https://iuczniowie.progman.pl/idziennik/api"
@@ -100,6 +104,7 @@ const val VULCAN_API_ENDPOINT_ATTENDANCE = "mobile-api/Uczen.v3.Uczen/Frekwencje
 const val VULCAN_API_ENDPOINT_MESSAGES_RECEIVED = "mobile-api/Uczen.v3.Uczen/WiadomosciOdebrane"
 const val VULCAN_API_ENDPOINT_MESSAGES_SENT = "mobile-api/Uczen.v3.Uczen/WiadomosciWyslane"
 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 EDUDZIENNIK_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME}"

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

@@ -45,6 +45,10 @@ class DataNotifications(val data: Data) {
             return@run
         }
 
+        val today = Date.getToday()
+        val todayValue = today.value
+        profile.currentSemester = profile.dateToSemester(today)
+
         for (lesson in app.db.timetableDao().getNotNotifiedNow(profileId)) {
             val text = app.getString(R.string.notification_lesson_change_format, lesson.getDisplayChangeType(app), if (lesson.displayDate == null) "" else lesson.displayDate!!.formattedString, lesson.changeSubjectName)
             data.notifications += Notification(
@@ -90,10 +94,6 @@ class DataNotifications(val data: Data) {
             ).addExtra("eventId", event.id).addExtra("eventDate", event.eventDate.value.toLong())
         }
 
-        val today = Date.getToday()
-        val todayValue = today.value
-        profile.currentSemester = profile.dateToSemester(today)
-
         for (grade in app.db.gradeDao().getNotNotifiedNow(profileId)) {
             val gradeName = when (grade.type) {
                 TYPE_SEMESTER1_PROPOSED, TYPE_SEMESTER2_PROPOSED -> app.getString(R.string.grade_semester_proposed_format_2, grade.name)

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

@@ -81,3 +81,32 @@ fun Data.prepare(loginMethods: List<LoginMethod>, features: List<Feature>, featu
     progressCount = targetLoginMethodIds.size + targetEndpointIds.size
     progressStep = if (progressCount <= 0) 0f else 100f / progressCount.toFloat()
 }
+
+fun Data.prepareFor(loginMethods: List<LoginMethod>, loginMethodId: Int) {
+    val possibleLoginMethods = this.loginMethods.toMutableList()
+
+    loginMethods.forEach {
+        if (it.isPossible(profile, loginStore))
+            possibleLoginMethods += it.loginMethodId
+    }
+
+    targetEndpointIds.clear()
+    targetLoginMethodIds.clear()
+
+    // check the login method for any dependencies
+    var requiredLoginMethod: Int? = loginMethodId
+    while (requiredLoginMethod != LOGIN_METHOD_NOT_NEEDED) {
+        loginMethods.singleOrNull { it.loginMethodId == requiredLoginMethod }?.let {
+            if (requiredLoginMethod != null)
+                targetLoginMethodIds.add(requiredLoginMethod!!)
+            requiredLoginMethod = it.requiredLoginMethod(profile, loginStore)
+        }
+    }
+
+    // sort and distinct every login method
+    targetLoginMethodIds = targetLoginMethodIds.toHashSet().toMutableList()
+    targetLoginMethodIds.sort()
+
+    progressCount = 0
+    progressStep = 0f
+}

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

@@ -31,6 +31,9 @@ const val CODE_SYNERGIA_NOT_ACTIVATED                       = 32
 const val CODE_LIBRUS_DISCONNECTED                          = 31
 const val CODE_PROFILE_ARCHIVED                             = 30*/
 
+const val ERROR_APP_CRASH                                   = 1
+const val ERROR_MESSAGE_NOT_SENT                            = 10
+
 const val ERROR_REQUEST_FAILURE                             = 50
 const val ERROR_REQUEST_HTTP_400                            = 51
 const val ERROR_REQUEST_HTTP_401                            = 52
@@ -38,10 +41,13 @@ const val ERROR_REQUEST_HTTP_403                            = 53
 const val ERROR_REQUEST_HTTP_404                            = 54
 const val ERROR_REQUEST_HTTP_405                            = 55
 const val ERROR_REQUEST_HTTP_410                            = 56
-const val ERROR_REQUEST_HTTP_500                            = 57
+const val ERROR_REQUEST_HTTP_424                            = 57
+const val ERROR_REQUEST_HTTP_500                            = 58
+const val ERROR_REQUEST_HTTP_503                            = 59
 const val ERROR_REQUEST_FAILURE_HOSTNAME_NOT_FOUND          = 60
 const val ERROR_REQUEST_FAILURE_TIMEOUT                     = 61
 const val ERROR_REQUEST_FAILURE_NO_INTERNET                 = 62
+const val ERROR_REQUEST_FAILURE_SSL_ERROR                   = 63
 const val ERROR_RESPONSE_EMPTY                              = 100
 const val ERROR_LOGIN_DATA_MISSING                          = 101
 const val ERROR_PROFILE_MISSING                             = 105
@@ -157,11 +163,14 @@ const val ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR        = 440
 const val ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA               = 441
 const val ERROR_IDZIENNIK_API_ACCESS_DENIED                 = 450
 const val ERROR_IDZIENNIK_API_OTHER                         = 451
+const val ERROR_IDZIENNIK_API_NO_REGISTER                   = 452
 
 const val ERROR_LOGIN_EDUDZIENNIK_WEB_INVALID_LOGIN         = 501
 const val ERROR_LOGIN_EDUDZIENNIK_WEB_OTHER                 = 510
 const val ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID         = 511
 const val ERROR_EDUDZIENNIK_WEB_TIMETABLE_NOT_PUBLIC        = 520
+const val ERROR_EDUDZIENNIK_WEB_LIMITED_ACCESS              = 521
+const val ERROR_EDUDZIENNIK_WEB_SESSION_EXPIRED             = 522
 const val ERROR_EDUDZIENNIK_WEB_TEAM_MISSING                = 530
 
 const val ERROR_TEMPLATE_WEB_OTHER                          = 801
@@ -182,5 +191,6 @@ const val EXCEPTION_IDZIENNIK_WEB_REQUEST                   = 912
 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 LOGIN_NO_ARGUMENTS                                = 1201

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

@@ -55,6 +55,10 @@ object Regexes {
         """href="https://.+?\.mobidziennik.pl/.+?&(?:amp;)?zalacznik=([0-9]+)"(?:.+?<small.+?\(([0-9.]+)\s(M|K|G|)B\))*""".toRegex(DOT_MATCHES_ALL)
     }
 
+    val MOBIDZIENNIK_MESSAGE_RECIPIENTS_JSON by lazy {
+        """odbiorcy: (\[.+?\]),${'$'}""".toRegex(RegexOption.MULTILINE)
+    }
+
 
 
     val IDZIENNIK_LOGIN_HIDDEN_FIELDS by lazy {
@@ -78,6 +82,9 @@ object Regexes {
     val IDZIENNIK_LOGIN_FIRST_STUDENT by lazy {
         """<option.*?value="([0-9]+)"\sdata-id-ucznia="([A-z0-9]+?)".*?>(.+?)\s(.+?)\s*\((.+?),\s*(.+?)\)</option>""".toRegex(DOT_MATCHES_ALL)
     }
+    val IDZIENNIK_MESSAGES_RECIPIENT_PARENT by lazy {
+        """(.+?)\s\((.+)\)""".toRegex()
+    }
 
 
 
@@ -99,6 +106,9 @@ object Regexes {
     val EDUDZIENNIK_ACCOUNT_NAME_START by lazy {
         """<span id='user_dn'>(.*?)</span>""".toRegex()
     }
+    val EDUDZIENNIK_SUBJECTS_START by lazy {
+        """<a class="menu-course" href="/Students/[\w-_]+?/Courses/([\w-_]+)/">(.+?)</a>""".toRegex()
+    }
 
     val EDUDZIENNIK_ATTENDANCE_ENTRIES by lazy {
         """<td id="([\d-]+?):(\d+?)".*?>(.+?)</td>""".toRegex()
@@ -110,6 +120,10 @@ object Regexes {
         """\((.+?)\) (.+)""".toRegex()
     }
 
+    val EDUDZIENNIK_ANNOUNCEMENT_DESCRIPTION by lazy {
+        """<div class="desc">.*?<p>(.*?)</p>""".toRegex(DOT_MATCHES_ALL)
+    }
+
     val EDUDZIENNIK_SUBJECT_ID by lazy {
         """/Courses/([\w-_]+?)/""".toRegex()
     }
@@ -122,6 +136,21 @@ object Regexes {
     val EDUDZIENNIK_EVENT_TYPE_ID by lazy {
         """/GradeLabels/([\w-_]+?)/""".toRegex()
     }
+    val EDUDZIENNIK_ANNOUNCEMENT_ID by lazy {
+        """/Announcement/([\w-_]+?)/""".toRegex()
+    }
+    val EDUDZIENNIK_HOMEWORK_ID by lazy {
+        """/Homework/([\w-_]+?)/""".toRegex()
+    }
+    val EDUDZIENNIK_TEACHER_ID by lazy {
+        """/Teachers/([\w-_]+?)/""".toRegex()
+    }
+    val EDUDZIENNIK_EVENT_ID by lazy {
+        """/KlassEvent/([\w-_]+?)/""".toRegex()
+    }
+    val EDUDZIENNIK_NOTE_ID by lazy {
+        """/RegistryNotes/([\w-_]+?)/""".toRegex()
+    }
 
     val EDUDZIENNIK_SCHOOL_DETAIL_ID by lazy {
         """<a id="School_detail".*?/School/([\w-_]+?)/""".toRegex(DOT_MATCHES_ALL)
@@ -135,4 +164,8 @@ object Regexes {
     val EDUDZIENNIK_CLASS_DETAIL_NAME by lazy {
         """<a id="Klass_detail".*?>(.*?)</a>""".toRegex(DOT_MATCHES_ALL)
     }
+
+    val EDUDZIENNIK_TEACHERS by lazy {
+        """<div class="teacher">.*?<p>(.+?) (.+?)</p>""".toRegex(DOT_MATCHES_ALL)
+    }
 }

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

@@ -92,18 +92,27 @@ class DataEdudziennik(app: App, profile: Profile?, loginStore: LoginStore) : Dat
     val schoolEndpoint: String
         get() = "Schools/$schoolId/"
 
+    val classStudentEndpoint: String
+        get() = "Class/$studentId/"
+
     val schoolClassEndpoint: String
         get() = "Schools/$classId/"
 
     val studentAndClassEndpoint: String
         get() = "Students/$studentId/Klass/$classId/"
 
-    val courseEndpoint: String
-        get() = "Course/$studentId/"
+    val studentAndClassesEndpoint: String
+        get() = "Students/$studentId/Classes/$classId/"
 
     val timetableEndpoint: String
         get() = "Plan/$studentId/"
 
+    val studentAndTeacherClassEndpoint: String
+        get() = "Students/$studentId/Teachers/$classId/"
+
+    val courseStudentEndpoint: String
+        get() = "Course/$studentId/"
+
     fun getSubject(longId: String, name: String): Subject {
         val id = longId.crc32()
         return subjectList.singleOrNull { it.id == id } ?: run {
@@ -113,20 +122,32 @@ class DataEdudziennik(app: App, profile: Profile?, loginStore: LoginStore) : Dat
         }
     }
 
-    fun getTeacher(firstName: String, lastName: String): Teacher {
+    fun getTeacher(firstName: String, lastName: String, longId: String? = null): Teacher {
         val name = "$firstName $lastName".fixName()
         val id = name.crc32()
-        return teacherList.singleOrNull { it.id == id } ?: run {
-            val teacher = Teacher(profileId, id, firstName, lastName)
+        return teacherList.singleOrNull { it.id == id }?.also {
+            if (longId != null && it.loginId == null) it.loginId = longId
+        } ?: run {
+            val teacher = Teacher(profileId, id, firstName, lastName, longId)
             teacherList.put(id, teacher)
             teacher
         }
     }
 
+    fun getTeacherByFirstLast(nameFirstLast: String, longId: String? = null): Teacher {
+        val nameParts = nameFirstLast.split(" ")
+        return getTeacher(nameParts[0], nameParts[1], longId)
+    }
+
+    fun getTeacherByLastFirst(nameLastFirst: String, longId: String? = null): Teacher {
+        val nameParts = nameLastFirst.split(" ")
+        return getTeacher(nameParts[1], nameParts[0], longId)
+    }
+
     fun getEventType(longId: String, name: String): EventType {
         val id = longId.crc16().toLong()
         return eventTypes.singleOrNull { it.id == id } ?: run {
-            val eventType = EventType(profileId, id, name, colorFromName(app, name))
+            val eventType = EventType(profileId, id, name, colorFromName(name))
             eventTypes.put(id, eventType)
             eventType
         }

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

@@ -6,20 +6,21 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik
 
 import com.google.gson.JsonObject
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.ERROR_EDUDZIENNIK_WEB_TIMETABLE_NOT_PUBLIC
-import pl.szczodrzynski.edziennik.data.api.ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID
-import pl.szczodrzynski.edziennik.data.api.edudziennikLoginMethods
+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.firstlogin.EdudziennikFirstLogin
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLogin
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLoginWeb
 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.db.modules.announcements.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
 class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
@@ -29,6 +30,7 @@ class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStor
 
     val internalErrorList = mutableListOf<Int>()
     val data: DataEdudziennik
+    private var afterLogin: (() -> Unit)? = null
 
     init {
         data = DataEdudziennik(app, profile, loginStore).apply {
@@ -55,21 +57,17 @@ class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStor
     override fun sync(featureIds: List<Int>, viewId: Int?, arguments: JsonObject?) {
         data.arguments = arguments
         data.prepare(edudziennikLoginMethods, EdudziennikFeatures, featureIds, viewId)
-        d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}")
-        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
-        EdudziennikLogin(data) {
-            EdudziennikData(data) {
-                completed()
-            }
-        }
+        login()
     }
 
-    private fun login() {
+    private fun login(loginMethodId: Int? = null, afterLogin: (() -> Unit)? = null) {
         d(TAG, "Trying to login with ${data.targetLoginMethodIds}")
         if (internalErrorList.isNotEmpty()) {
             d(TAG, "  - Internal errors:")
             internalErrorList.forEach { d(TAG, "      - code $it") }
         }
+        loginMethodId?.let { data.prepareFor(edudziennikLoginMethods, it) }
+        afterLogin?.let { this.afterLogin = it }
         EdudziennikLogin(data) {
             data()
         }
@@ -81,29 +79,27 @@ class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStor
             d(TAG, "  - Internal errors:")
             internalErrorList.forEach { d(TAG, "      - code $it") }
         }
-        EdudziennikData(data) {
+        afterLogin?.invoke() ?: EdudziennikData(data) {
             completed()
         }
     }
 
-    override fun getMessage(message: MessageFull) {
+    override fun getMessage(message: MessageFull) {}
+    override fun sendMessage(recipients: List<Teacher>, subject: String, text: String) {}
+    override fun markAllAnnouncementsAsRead() {}
 
-    }
-
-    override fun markAllAnnouncementsAsRead() {
-
-    }
-
-    override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {
-
-    }
-
-    override fun firstLogin() {
-        EdudziennikFirstLogin(data) {
-            completed()
+    override fun getAnnouncement(announcement: AnnouncementFull) {
+        EdudziennikLoginWeb(data) {
+            EdudziennikWebGetAnnouncement(data, announcement) {
+                completed()
+            }
         }
     }
 
+    override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {}
+    override fun getRecipientList() {}
+
+    override fun firstLogin() { EdudziennikFirstLogin(data) { completed() } }
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
@@ -111,18 +107,9 @@ class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStor
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
         return object : EdziennikCallback {
-            override fun onCompleted() {
-                callback.onCompleted()
-            }
-
-            override fun onProgress(step: Float) {
-                callback.onProgress(step)
-            }
-
-            override fun onStartProgress(stringRes: Int) {
-                callback.onStartProgress(stringRes)
-            }
-
+            override fun onCompleted() { callback.onCompleted() }
+            override fun onProgress(step: Float) { callback.onProgress(step) }
+            override fun onStartProgress(stringRes: Int) { callback.onStartProgress(stringRes) }
             override fun onError(apiError: ApiError) {
                 if (apiError.errorCode in internalErrorList) {
                     // finish immediately if the same error occurs twice during the same sync
@@ -131,6 +118,9 @@ class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStor
                 }
                 internalErrorList.add(apiError.errorCode)
                 when (apiError.errorCode) {
+                    ERROR_EDUDZIENNIK_WEB_SESSION_EXPIRED -> {
+                        login()
+                    }
                     ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID -> {
                         login()
                     }

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

@@ -8,32 +8,66 @@ import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.models.Feature
 
 const val ENDPOINT_EDUDZIENNIK_WEB_START                = 1000
-const val ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE            = 1001
-const val ENDPOINT_EDUDZIENNIK_WEB_EXAMS                = 1002
-const val ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE           = 1003
-const val ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER         = 1010
+const val ENDPOINT_EDUDZIENNIK_WEB_TEACHERS             = 1001
+const val ENDPOINT_EDUDZIENNIK_WEB_GRADES               = 1011
+const val ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE            = 1012
+const val ENDPOINT_EDUDZIENNIK_WEB_EXAMS                = 1013
+const val ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE           = 1014
+const val ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS        = 1015
+const val ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK             = 1016
+const val ENDPOINT_EDUDZIENNIK_WEB_EVENTS               = 1017
+const val ENDPOINT_EDUDZIENNIK_WEB_NOTES                = 1018
+const val ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER         = 1030
 
 val EdudziennikFeatures = listOf(
+        /* School and team info and subjects */
         Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_STUDENT_INFO, listOf(
                 ENDPOINT_EDUDZIENNIK_WEB_START to LOGIN_METHOD_EDUDZIENNIK_WEB
         ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
 
+        /* Teachers */
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_TEACHERS, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_TEACHERS to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        /* Timetable */
         Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_TIMETABLE, listOf(
                 ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE to LOGIN_METHOD_EDUDZIENNIK_WEB
         ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
 
+        /* Grades */
         Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_GRADES, listOf(
-                ENDPOINT_EDUDZIENNIK_WEB_START to LOGIN_METHOD_EDUDZIENNIK_WEB
+                ENDPOINT_EDUDZIENNIK_WEB_GRADES to LOGIN_METHOD_EDUDZIENNIK_WEB
         ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
 
+        /* Agenda */
         Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_AGENDA, listOf(
-                ENDPOINT_EDUDZIENNIK_WEB_EXAMS to LOGIN_METHOD_EDUDZIENNIK_WEB
+                ENDPOINT_EDUDZIENNIK_WEB_EXAMS to LOGIN_METHOD_EDUDZIENNIK_WEB,
+                ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK to LOGIN_METHOD_EDUDZIENNIK_WEB,
+                ENDPOINT_EDUDZIENNIK_WEB_EVENTS to LOGIN_METHOD_EDUDZIENNIK_WEB
         ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
 
+        /* Homework */
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_HOMEWORK, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        /* Behaviour */
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_BEHAVIOUR, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_NOTES to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        /* Attendance */
         Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_ATTENDANCE, listOf(
                 ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE to LOGIN_METHOD_EDUDZIENNIK_WEB
         ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
 
+        /* Announcements */
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_ANNOUNCEMENTS, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        /* Lucky number */
         Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_LUCKY_NUMBER, listOf(
                 ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER to LOGIN_METHOD_EDUDZIENNIK_WEB
         ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB))

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

@@ -11,7 +11,7 @@ import pl.szczodrzynski.edziennik.utils.Utils
 
 class EdudziennikData(val data: DataEdudziennik, val onSuccess: () -> Unit) {
     companion object {
-        private const val TAG = "TemplateData"
+        private const val TAG = "EdudziennikData"
     }
 
     init {
@@ -40,6 +40,14 @@ class EdudziennikData(val data: DataEdudziennik, val onSuccess: () -> Unit) {
                 data.startProgress(R.string.edziennik_progress_endpoint_data)
                 EdudziennikWebStart(data, onSuccess)
             }
+            ENDPOINT_EDUDZIENNIK_WEB_TEACHERS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_teachers)
+                EdudziennikWebTeachers(data, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_GRADES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_grades)
+                EdudziennikWebGrades(data, onSuccess)
+            }
             ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_timetable)
                 EdudziennikWebTimetable(data, onSuccess)
@@ -52,6 +60,22 @@ class EdudziennikData(val data: DataEdudziennik, val onSuccess: () -> Unit) {
                 data.startProgress(R.string.edziennik_progress_endpoint_attendance)
                 EdudziennikWebAttendance(data, onSuccess)
             }
+            ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_announcements)
+                EdudziennikWebAnnouncements(data, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_homework)
+                EdudziennikWebHomework(data, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_EVENTS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_events)
+                EdudziennikWebEvents(data, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_NOTES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_notices)
+                EdudziennikWebNotes(data, onSuccess)
+            }
             ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
                 EdudziennikWebLuckyNumber(data, onSuccess)

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

@@ -8,10 +8,7 @@ import im.wangchao.mhttp.Request
 import im.wangchao.mhttp.Response
 import im.wangchao.mhttp.callback.TextCallbackHandler
 import okhttp3.Cookie
-import pl.szczodrzynski.edziennik.data.api.EDUDZIENNIK_USER_AGENT
-import pl.szczodrzynski.edziennik.data.api.ERROR_REQUEST_FAILURE
-import pl.szczodrzynski.edziennik.data.api.ERROR_RESPONSE_EMPTY
-import pl.szczodrzynski.edziennik.data.api.EXCEPTION_EDUDZIENNIK_WEB_REQUEST
+import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.utils.Utils.d
@@ -54,7 +51,12 @@ open class EdudziennikWeb(open val data: DataEdudziennik) {
             }
 
             override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                val error = when (response?.code()) {
+                    402 -> ERROR_EDUDZIENNIK_WEB_LIMITED_ACCESS
+                    403 -> ERROR_EDUDZIENNIK_WEB_SESSION_EXPIRED
+                    else -> ERROR_REQUEST_FAILURE
+                }
+                data.error(ApiError(tag, error)
                         .withResponse(response)
                         .withThrowable(throwable))
             }

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

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-26
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ANNOUNCEMENT_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.splitName
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebAnnouncements(override val data: DataEdudziennik,
+                                  val onSuccess: () -> Unit) : EdudziennikWeb(data) {
+    companion object {
+        const val TAG = "EdudziennikWebAnnouncements"
+    }
+
+    init { data.profile?.also { profile ->
+        webGet(TAG, data.schoolClassEndpoint + "Announcements") { text ->
+            val doc = Jsoup.parse(text)
+
+            if (doc.getElementsByClass("message").text().trim() != "Brak ogłoszeń.") {
+                doc.select("table.list tbody tr").forEach { announcementElement ->
+                    val titleElement = announcementElement.child(0).child(0)
+
+                    val longId = EDUDZIENNIK_ANNOUNCEMENT_ID.find(titleElement.attr("href"))?.get(1)
+                            ?: return@forEach
+                    val id = longId.crc32()
+                    val subject = titleElement.text()
+
+                    val teacherName = announcementElement.child(1).text()
+                    val teacher = teacherName.splitName()?.let { (teacherFirstName, teacherLastName) ->
+                        data.getTeacher(teacherFirstName, teacherLastName)
+                    } ?: return@forEach
+
+                    val dateString = announcementElement.getElementsByClass("datetime").first().text()
+                    val startDate = Date.fromY_m_d(dateString)
+                    val addedDate = Date.fromIsoHm(dateString)
+
+                    val announcementObject = Announcement(
+                            profileId,
+                            id,
+                            subject,
+                            null,
+                            startDate,
+                            null,
+                            teacher.id,
+                            longId
+                    )
+
+                    data.announcementIgnoreList.add(announcementObject)
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_ANNOUNCEMENT,
+                            id,
+                            profile.empty,
+                            profile.empty,
+                            addedDate
+                    ))
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS, SYNC_ALWAYS)
+            onSuccess()
+        }
+    } ?: onSuccess() }
+}

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

@@ -40,8 +40,8 @@ class EdudziennikWebAttendance(override val data: DataEdudziennik,
                             "nieobecność" -> Attendance.TYPE_ABSENT
                             "spóźnienie" -> Attendance.TYPE_BELATED
                             "nieobecność usprawiedliwiona" -> Attendance.TYPE_ABSENT_EXCUSED
-                            "dzień wolny" -> Attendance.TYPE_RELEASED
-                            "brak zajęć" -> Attendance.TYPE_RELEASED
+                            "dzień wolny" -> Attendance.TYPE_DAY_FREE
+                            "brak zajęć" -> Attendance.TYPE_DAY_FREE
                             "oddelegowany" -> Attendance.TYPE_RELEASED
                             else -> Attendance.TYPE_CUSTOM
                         }

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

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-1-1
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_EVENT_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_EVENTS
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebEvents(override val data: DataEdudziennik,
+                           val onSuccess: () -> Unit) : EdudziennikWeb(data) {
+    companion object {
+        const val TAG = "EdudziennikWebEvents"
+    }
+
+    init { data.profile?.also { profile ->
+        webGet(TAG, data.studentAndClassesEndpoint + "KlassEvent", xhr = true) { text ->
+            val doc = Jsoup.parseBodyFragment("<table>" + text.trim() + "</table>")
+
+            doc.getElementsByTag("tr").forEach { eventElement ->
+                val date = Date.fromY_m_d(eventElement.child(1).text())
+
+                val titleElement = eventElement.child(2).child(0)
+                val title = titleElement.text().trim()
+
+                val id = EDUDZIENNIK_EVENT_ID.find(titleElement.attr("href"))?.get(1)?.crc32()
+                        ?: return@forEach
+
+                val eventObject = Event(
+                        profileId,
+                        id,
+                        date,
+                        null,
+                        title,
+                        -1,
+                        Event.TYPE_CLASS_EVENT,
+                        false,
+                        -1,
+                        -1,
+                        data.teamClass?.id ?: -1
+                )
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_EVENT,
+                        id,
+                        profile.empty,
+                        profile.empty,
+                        System.currentTimeMillis()
+                ))
+            }
+
+            data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_CLASS_EVENT))
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_EVENTS, SYNC_ALWAYS)
+            onSuccess()
+        }
+    } ?: onSuccess() }
+}

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

@@ -45,7 +45,7 @@ class EdudziennikWebExams(override val data: DataEdudziennik,
                 val date = Date.fromY_m_d(dateString)
 
                 val lessons = data.app.db.timetableDao().getForDateNow(profileId, date)
-                val startTime = lessons.firstOrNull { it.subjectId == subject.id }?.startTime
+                val startTime = lessons.firstOrNull { it.displaySubjectId == subject.id }?.displayStartTime
 
                 val eventTypeElement = examElement.child(3).child(0)
                 val eventTypeId = EDUDZIENNIK_EVENT_TYPE_ID.find(eventTypeElement.attr("href"))?.get(1)
@@ -78,7 +78,10 @@ class EdudziennikWebExams(override val data: DataEdudziennik,
                 ))
             }
 
-            data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_DEFAULT))
+            data.toRemove.add(DataRemoveModel.Events.futureExceptTypes(listOf(
+                    Event.TYPE_HOMEWORK,
+                    Event.TYPE_CLASS_EVENT
+            )))
 
             data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_EXAMS, SYNC_ALWAYS)
             onSuccess()

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

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-26
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+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.AnnouncementGetEvent
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementFull
+import pl.szczodrzynski.edziennik.get
+
+class EdudziennikWebGetAnnouncement(
+        override val data: DataEdudziennik,
+        private val announcement: AnnouncementFull,
+        val onSuccess: () -> Unit
+) : EdudziennikWeb(data) {
+    companion object {
+        const val TAG = "EdudziennikWebGetAnnouncement"
+    }
+
+    init {
+        webGet(TAG, "Announcement/${announcement.idString}") { text ->
+            val description = Regexes.EDUDZIENNIK_ANNOUNCEMENT_DESCRIPTION.find(text)?.get(1)?.trim() ?: ""
+
+            announcement.text = description
+
+            EventBus.getDefault().postSticky(AnnouncementGetEvent(announcement))
+
+            data.announcementList.add(announcement)
+            onSuccess()
+        }
+    }
+}

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

@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-25
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import android.graphics.Color
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.colorFromCssName
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.*
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebGrades(override val data: DataEdudziennik,
+                           val onSuccess: () -> Unit) : EdudziennikWeb(data) {
+    companion object {
+        private const val TAG = "EdudziennikWebGrades"
+    }
+
+    init { data.profile?.also { profile ->
+        webGet(TAG, data.studentEndpoint + "start") { text ->
+            val doc = Jsoup.parse(text)
+
+            val subjects = doc.select("#student_grades tbody").firstOrNull()?.children()
+
+            subjects?.forEach { subjectElement ->
+                if (subjectElement.id().isBlank()) return@forEach
+
+                val subjectId = subjectElement.id().trim()
+                val subjectName = subjectElement.child(0).text().trim()
+                val subject = data.getSubject(subjectId, subjectName)
+
+                val gradeType = when {
+                    subjectElement.select("#sum").text().isNotBlank() -> TYPE_POINT_SUM
+                    else -> TYPE_NORMAL
+                }
+
+                val gradeCountToAverage = subjectElement.select("#avg").text().isNotBlank()
+
+                val grades = subjectElement.select(".grade[data-edited]")
+                val gradesInfo = subjectElement.select(".grade-tip")
+
+                val gradeValues = if (grades.isNotEmpty()) {
+                    subjects.select(".avg-$subjectId .grade-tip > p").first()
+                            .text().split('+').map {
+                                val split = it.split('*')
+                                val weight = split[0].trim().toFloat()
+                                val value = split[1].trim().toFloat()
+
+                                Pair(value, weight)
+                            }
+                } else emptyList()
+
+                grades.forEachIndexed { index, gradeElement ->
+                    val id = Regexes.EDUDZIENNIK_GRADE_ID.find(gradeElement.attr("href"))?.get(1)?.crc32()
+                            ?: return@forEachIndexed
+                    val (value, weight) = gradeValues[index]
+                    val name = gradeElement.text().trim().let {
+                        if (it.contains(',') || it.contains('.')) {
+                            val replaced = it.replace(',', '.')
+                            val float = replaced.toFloatOrNull()
+
+                            if (float != null && float % 1 == 0f) float.toInt().toString()
+                            else it
+                        } else it
+                    }
+
+                    val info = gradesInfo[index]
+                    val fullName = info.child(0).text().trim()
+                    val columnName = info.child(4).text().trim()
+                    val comment = info.ownText()
+
+                    val description = columnName + if (comment.isNotBlank()) " - $comment" else ""
+
+                    val (teacherLastName, teacherFirstName) = info.child(1).text().split(' ')
+                    val teacher = data.getTeacher(teacherFirstName, teacherLastName)
+
+                    val addedDate = info.child(2).text().split(' ').let {
+                        val day = it[0].toInt()
+                        val month = Utils.monthFromName(it[1])
+                        val year = it[2].toInt()
+
+                        Date(year, month, day).inMillis
+                    }
+
+                    val color = Regexes.STYLE_CSS_COLOR.find(gradeElement.attr("style"))?.get(1)?.let {
+                        if (it.startsWith('#')) Color.parseColor(it)
+                        else colorFromCssName(it)
+                    } ?: -1
+
+                    val gradeObject = Grade(
+                            profileId,
+                            id,
+                            fullName,
+                            color,
+                            description,
+                            name,
+                            value,
+                            if (gradeCountToAverage) weight else 0f,
+                            profile.currentSemester,
+                            teacher.id,
+                            subject.id
+                    ).apply {
+                        type = gradeType
+                    }
+
+                    data.gradeList.add(gradeObject)
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_GRADE,
+                            id,
+                            profile.empty,
+                            profile.empty,
+                            addedDate
+                    ))
+                }
+
+                val proposed = subjectElement.select(".proposal").firstOrNull()?.text()?.trim()
+
+                if (proposed != null && proposed.isNotBlank()) {
+                    val proposedGradeObject = Grade(
+                            profileId,
+                            (-1 * subject.id) - 1,
+                            "",
+                            -1,
+                            "",
+                            proposed,
+                            proposed.toFloatOrNull() ?: 0f,
+                            0f,
+                            profile.currentSemester,
+                            -1,
+                            subject.id
+                    ).apply {
+                        type = when (semester) {
+                            1 -> TYPE_SEMESTER1_PROPOSED
+                            else -> TYPE_SEMESTER2_PROPOSED
+                        }
+                    }
+
+                    data.gradeList.add(proposedGradeObject)
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_GRADE,
+                            proposedGradeObject.id,
+                            profile.empty,
+                            profile.empty,
+                            System.currentTimeMillis()
+                    ))
+                }
+
+                val final = subjectElement.select(".final").firstOrNull()?.text()?.trim()
+
+                if (final != null && final.isNotBlank()) {
+                    val finalGradeObject = Grade(
+                            profileId,
+                            (-1 * subject.id) - 2,
+                            "",
+                            -1,
+                            "",
+                            final,
+                            final.toFloatOrNull() ?: 0f,
+                            0f,
+                            profile.currentSemester,
+                            -1,
+                            subject.id
+                    ).apply {
+                        type = when (semester) {
+                            1 -> TYPE_SEMESTER1_FINAL
+                            else -> TYPE_SEMESTER2_FINAL
+                        }
+                    }
+
+                    data.gradeList.add(finalGradeObject)
+                    data.metadataList.add(Metadata(
+                            data.profileId,
+                            Metadata.TYPE_GRADE,
+                            finalGradeObject.id,
+                            profile.empty,
+                            profile.empty,
+                            System.currentTimeMillis()
+                    ))
+                }
+            }
+
+            if (!subjects.isNullOrEmpty()) {
+                data.toRemove.addAll(listOf(
+                        TYPE_NORMAL,
+                        TYPE_POINT_SUM,
+                        TYPE_SEMESTER1_PROPOSED,
+                        TYPE_SEMESTER2_PROPOSED,
+                        TYPE_SEMESTER1_FINAL,
+                        TYPE_SEMESTER2_FINAL
+                ).map {
+                    DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it)
+                })
+            }
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_GRADES, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }}
+}

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

@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-29
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_HOMEWORK_ID
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.splitName
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebHomework(override val data: DataEdudziennik,
+                             val onSuccess: () -> Unit) : EdudziennikWeb(data) {
+    companion object {
+        const val TAG = "EdudziennikWebHomework"
+    }
+
+    init { data.profile?.also { profile ->
+        webGet(TAG, data.courseStudentEndpoint + "Homework", xhr = true) { text ->
+            val doc = Jsoup.parseBodyFragment("<table>" + text.trim() + "</table>")
+
+            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 date = Date.fromY_m_d(dateElement.text())
+
+                    val subjectElement = homeworkElement.child(1).child(0)
+                    val subjectId = EDUDZIENNIK_SUBJECT_ID.find(subjectElement.attr("href"))?.get(1)
+                            ?: return@forEach
+                    val subjectName = subjectElement.text()
+                    val subject = data.getSubject(subjectId, subjectName)
+
+                    val lessons = data.app.db.timetableDao().getForDateNow(profileId, date)
+                    val startTime = lessons.firstOrNull { it.subjectId == subject.id }?.displayStartTime
+
+                    val teacherName = homeworkElement.child(2).text()
+                    val teacher = teacherName.splitName()?.let { (teacherFirstName, teacherLastName) ->
+                        data.getTeacher(teacherFirstName, teacherLastName)
+                    } ?: return@forEach
+
+                    val topic = homeworkElement.child(4).text()
+
+                    val eventObject = Event(
+                            profileId,
+                            id,
+                            date,
+                            startTime,
+                            topic,
+                            -1,
+                            Event.TYPE_HOMEWORK,
+                            false,
+                            teacher.id,
+                            subject.id,
+                            data.teamClass?.id ?: -1
+                    )
+
+                    data.eventList.add(eventObject)
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_HOMEWORK,
+                            id,
+                            profile.empty,
+                            profile.empty,
+                            System.currentTimeMillis()
+                    ))
+                }
+            }
+
+            data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK))
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK, SYNC_ALWAYS)
+            onSuccess()
+        }
+    } ?: onSuccess() }
+}

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

@@ -20,7 +20,7 @@ class EdudziennikWebLuckyNumber(override val data: DataEdudziennik,
 
     init { data.profile?.also { profile ->
         webGet(TAG, data.schoolEndpoint + "Lucky", xhr = true) { text ->
-            text.toIntOrNull()?.let { luckyNumber ->
+            text.toIntOrNull()?.also { luckyNumber ->
                 val luckyNumberObject = LuckyNumber(
                         profileId,
                         Date.getToday(),

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

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-1-1
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_NOTE_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_NOTES
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebNotes(override val data: DataEdudziennik,
+                          val onSuccess: () -> Unit) : EdudziennikWeb(data) {
+    companion object {
+        const val TAG = "EdudziennikWebNotes"
+    }
+
+    init { data.profile?.also { profile ->
+        webGet(TAG, data.classStudentEndpoint + "RegistryNotesStudent", xhr = true) { text ->
+            val doc = Jsoup.parseBodyFragment("<table>" + text.trim() + "</table>")
+
+            doc.getElementsByTag("tr").forEach { noteElement ->
+                val dateElement = noteElement.getElementsByClass("date").first().child(0)
+                val addedDate = Date.fromY_m_d(dateElement.text()).inMillis
+
+                val id = EDUDZIENNIK_NOTE_ID.find(dateElement.attr("href"))?.get(0)?.crc32()
+                        ?: return@forEach
+
+                val teacherName = noteElement.child(1).text()
+                val teacher = data.getTeacherByFirstLast(teacherName)
+
+                val description = noteElement.child(3).text()
+
+                val noticeObject = Notice(
+                        profileId,
+                        id,
+                        description,
+                        profile.currentSemester,
+                        Notice.TYPE_NEUTRAL,
+                        teacher.id
+                )
+
+                data.noticeList.add(noticeObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_NOTICE,
+                        id,
+                        profile.empty,
+                        profile.empty,
+                        addedDate
+                ))
+            }
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_NOTES, SYNC_ALWAYS)
+            onSuccess()
+        }
+    } ?: onSuccess() }
+}

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

@@ -4,11 +4,18 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
 
-import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.MONTH
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.ERROR_EDUDZIENNIK_WEB_TEAM_MISSING
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECTS_START
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_START
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
+import pl.szczodrzynski.edziennik.firstLettersName
+import pl.szczodrzynski.edziennik.get
 
 class EdudziennikWebStart(override val data: DataEdudziennik,
                           val onSuccess: () -> Unit) : EdudziennikWeb(data) {
@@ -18,13 +25,53 @@ class EdudziennikWebStart(override val data: DataEdudziennik,
 
     init {
         webGet(TAG, data.studentEndpoint + "start") { text ->
-            val doc = Jsoup.parse(text)
+            getSchoolAndTeam(text)
+            getSubjects(text)
 
-            EdudziennikWebStartInfo(data, text)
-            EdudziennikWebStartGrades(data, doc)
-
-            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_START, SYNC_ALWAYS)
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_START, MONTH)
             onSuccess()
         }
     }
+
+    private fun getSchoolAndTeam(text: String) {
+        val schoolId = Regexes.EDUDZIENNIK_SCHOOL_DETAIL_ID.find(text)?.get(1)?.trim()
+        val schoolLongName = Regexes.EDUDZIENNIK_SCHOOL_DETAIL_NAME.find(text)?.get(1)?.trim()
+        data.schoolId = schoolId
+
+        val classId = Regexes.EDUDZIENNIK_CLASS_DETAIL_ID.find(text)?.get(1)?.trim()
+        val className = Regexes.EDUDZIENNIK_CLASS_DETAIL_NAME.find(text)?.get(1)?.trim()
+        data.classId = classId
+
+        if (classId == null || className == null || schoolId == null || schoolLongName == null) {
+            data.error(ApiError(TAG, ERROR_EDUDZIENNIK_WEB_TEAM_MISSING)
+                    .withApiResponse(text))
+            return
+        }
+
+        val schoolName = schoolId.crc32().toString() + schoolLongName.firstLettersName + "_edu"
+        data.schoolName = schoolName
+
+        val teamId = classId.crc32()
+        val teamCode = "$schoolName:$className"
+
+        val teamObject = Team(
+                data.profileId,
+                teamId,
+                className,
+                Team.TYPE_CLASS,
+                teamCode,
+                -1
+        )
+
+        data.teamClass = teamObject
+        data.teamList.put(teamObject.id, teamObject)
+    }
+
+    private fun getSubjects(text: String) {
+        EDUDZIENNIK_SUBJECTS_START.findAll(text).forEach {
+            val id = it[1].trim()
+            val name = it[2].trim()
+            data.getSubject(id, name)
+        }
+    }
 }

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

@@ -1,185 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-12-24
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
-
-import android.graphics.Color
-import org.jsoup.nodes.Document
-import pl.szczodrzynski.edziennik.colorFromCssName
-import pl.szczodrzynski.edziennik.crc32
-import pl.szczodrzynski.edziennik.data.api.Regexes
-import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
-import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
-import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.*
-import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.utils.Utils
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class EdudziennikWebStartGrades(val data: DataEdudziennik, val doc: Document) {
-    companion object {
-        const val TAG = "EdudziennikWebStartGrades"
-    }
-
-    init {data.profile?.also { profile ->
-        val subjects = doc.select("#student_grades tbody").firstOrNull()?.children()
-
-        if (subjects.isNullOrEmpty()) return@also
-
-        subjects.forEach { subjectElement ->
-            if (subjectElement.id().isBlank()) return@forEach
-
-            val subjectId = subjectElement.id().trim()
-            val subjectName = subjectElement.child(0).text().trim()
-            val subject = data.getSubject(subjectId, subjectName)
-
-            val grades = subjectElement.select(".grade")
-            val gradesInfo = subjectElement.select(".grade-tip")
-
-            val gradeValues = subjects.select(".avg-$subjectId .grade-tip > p").first()
-                    .text().split('+').map {
-                        val split = it.split('*')
-                        val weight = split[0].trim().toFloat()
-                        val value = split[1].trim().toFloat()
-
-                        Pair(value, weight)
-                    }
-
-            grades.forEachIndexed { index, gradeElement ->
-                val id = Regexes.EDUDZIENNIK_GRADE_ID.find(gradeElement.attr("href"))?.get(1)?.crc32()
-                        ?: return@forEachIndexed
-                val (value, weight) = gradeValues[index]
-                val name = gradeElement.text().trim().let {
-                    if (it.contains(',') || it.contains('.')) {
-                        val replaced = it.replace(',', '.')
-                        val float = replaced.toFloatOrNull()
-
-                        if (float != null && float % 1 == 0f) float.toInt().toString()
-                        else it
-                    } else it
-                }
-
-                val info = gradesInfo[index]
-                val category = info.child(4).text().trim()
-
-                val (teacherLastName, teacherFirstName) = info.child(1).text().split(' ')
-                val teacher = data.getTeacher(teacherFirstName, teacherLastName)
-
-                val addedDate = info.child(2).text().split(' ').let {
-                    val day = it[0].toInt()
-                    val month = Utils.monthFromName(it[1])
-                    val year = it[2].toInt()
-
-                    Date(year, month, day).inMillis
-                }
-
-                val color = Regexes.STYLE_CSS_COLOR.find(gradeElement.attr("style"))?.get(1)?.let {
-                    if (it.startsWith('#')) Color.parseColor(it)
-                    else colorFromCssName(it)
-                } ?: -1
-
-                val gradeObject = Grade(
-                        data.profileId,
-                        id,
-                        category,
-                        color,
-                        "",
-                        name,
-                        value,
-                        weight,
-                        profile.currentSemester,
-                        teacher.id,
-                        subject.id
-                )
-
-                data.gradeList.add(gradeObject)
-                data.metadataList.add(Metadata(
-                        data.profileId,
-                        Metadata.TYPE_GRADE,
-                        id,
-                        profile.empty,
-                        profile.empty,
-                        addedDate
-                ))
-            }
-
-            val proposed = subjectElement.select(".proposal").firstOrNull()?.text()?.trim()
-
-            if (proposed != null && proposed.isNotBlank()) {
-                val proposedGradeObject = Grade(
-                        data.profileId,
-                        (-1 * subject.id) - 1,
-                        "",
-                        -1,
-                        "",
-                        proposed,
-                        proposed.toFloatOrNull() ?: 0f,
-                        0f,
-                        profile.currentSemester,
-                        -1,
-                        subject.id
-                ).apply {
-                    type = when (semester) {
-                        1 -> TYPE_SEMESTER1_PROPOSED
-                        else -> TYPE_SEMESTER2_PROPOSED
-                    }
-                }
-
-                data.gradeList.add(proposedGradeObject)
-                data.metadataList.add(Metadata(
-                        data.profileId,
-                        Metadata.TYPE_GRADE,
-                        proposedGradeObject.id,
-                        profile.empty,
-                        profile.empty,
-                        System.currentTimeMillis()
-                ))
-            }
-
-            val final = subjectElement.select(".final").firstOrNull()?.text()?.trim()
-
-            if (final != null && final.isNotBlank()) {
-                val finalGradeObject = Grade(
-                        data.profileId,
-                        (-1 * subject.id) - 2,
-                        "",
-                        -1,
-                        "",
-                        final,
-                        final.toFloatOrNull() ?: 0f,
-                        0f,
-                        profile.currentSemester,
-                        -1,
-                        subject.id
-                ).apply {
-                    type = when (semester) {
-                        1 -> TYPE_SEMESTER1_FINAL
-                        else -> TYPE_SEMESTER2_FINAL
-                    }
-                }
-
-                data.gradeList.add(finalGradeObject)
-                data.metadataList.add(Metadata(
-                        data.profileId,
-                        Metadata.TYPE_GRADE,
-                        finalGradeObject.id,
-                        profile.empty,
-                        profile.empty,
-                        System.currentTimeMillis()
-                ))
-            }
-        }
-
-        data.toRemove.addAll(listOf(
-                TYPE_NORMAL,
-                TYPE_SEMESTER1_PROPOSED,
-                TYPE_SEMESTER2_PROPOSED,
-                TYPE_SEMESTER1_FINAL,
-                TYPE_SEMESTER2_FINAL
-        ).map {
-            DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it)
-        })
-    }}
-}

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

@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-12-24
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
-
-import pl.szczodrzynski.edziennik.crc32
-import pl.szczodrzynski.edziennik.data.api.ERROR_EDUDZIENNIK_WEB_TEAM_MISSING
-import pl.szczodrzynski.edziennik.data.api.Regexes
-import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
-import pl.szczodrzynski.edziennik.firstLettersName
-import pl.szczodrzynski.edziennik.get
-
-class EdudziennikWebStartInfo(val data: DataEdudziennik, val text: String) {
-    companion object {
-        const val TAG = "EdudziennikWebStartInfo"
-    }
-
-    init { run {
-        val schoolId = Regexes.EDUDZIENNIK_SCHOOL_DETAIL_ID.find(text)?.get(1)?.trim()
-        val schoolLongName = Regexes.EDUDZIENNIK_SCHOOL_DETAIL_NAME.find(text)?.get(1)?.trim()
-        data.schoolId = schoolId
-
-        val classId = Regexes.EDUDZIENNIK_CLASS_DETAIL_ID.find(text)?.get(1)?.trim()
-        val className = Regexes.EDUDZIENNIK_CLASS_DETAIL_NAME.find(text)?.get(1)?.trim()
-        data.classId = classId
-
-        if (classId == null || className == null || schoolId == null || schoolLongName == null) {
-            data.error(ApiError(TAG, ERROR_EDUDZIENNIK_WEB_TEAM_MISSING)
-                    .withApiResponse(text))
-            return@run
-        }
-
-        val schoolName = schoolId.crc32().toString() + schoolLongName.firstLettersName + "_edu"
-        data.schoolName = schoolName
-
-        val teamId = classId.crc32()
-        val teamCode = "$schoolName:$className"
-
-        val teamObject = Team(
-                data.profileId,
-                teamId,
-                className,
-                Team.TYPE_CLASS,
-                teamCode,
-                -1
-        )
-
-        data.teamClass = teamObject
-        data.teamList.put(teamObject.id, teamObject)
-    }}
-}

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

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-25
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import pl.szczodrzynski.edziennik.MONTH
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_TEACHERS
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_TEACHERS
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.get
+
+class EdudziennikWebTeachers(override val data: DataEdudziennik,
+                             val onSuccess: () -> Unit) : EdudziennikWeb(data) {
+    companion object {
+        private const val TAG = "EdudziennikWebTeachers"
+    }
+
+    init {
+        webGet(TAG, data.studentAndTeacherClassEndpoint + "grid") { text ->
+            EDUDZIENNIK_TEACHERS.findAll(text).forEach {
+                val lastName = it[1].trim()
+                val firstName = it[2].trim()
+                data.getTeacher(firstName, lastName)
+            }
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_TEACHERS, MONTH)
+            onSuccess()
+        }
+    }
+}

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

@@ -7,6 +7,7 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
 import org.jsoup.Jsoup
 import pl.szczodrzynski.edziennik.data.api.ERROR_EDUDZIENNIK_WEB_TIMETABLE_NOT_PUBLIC
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_TEACHER_ID
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
@@ -57,82 +58,88 @@ class EdudziennikWebTimetable(override val data: DataEdudziennik,
             val table = doc.select("#Schedule tbody").first()
 
             if (table.text().trim() == "Brak planu lekcji.") {
-                data.error(ApiError(TAG, ERROR_EDUDZIENNIK_WEB_TIMETABLE_NOT_PUBLIC)
-                        .withApiResponse(text))
-                onSuccess()
-                return@webGet
-            }
+                val today = Date.getToday()
+                val schoolYearStart = if (today.month >= 9) today.year else today.year - 1
 
-            table.children().forEach { row ->
-                val rowElements = row.children()
-
-                val lessonNumber = rowElements[0].text().toInt()
-
-                val times = rowElements[1].text().split('-')
-                val startTime = Time.fromH_m(times[0].trim())
-                val endTime = Time.fromH_m(times[1].trim())
-
-                data.lessonRanges.singleOrNull {
-                    it.lessonNumber == lessonNumber && it.startTime == startTime && it.endTime == endTime
-                } ?: run {
-                    data.lessonRanges.put(lessonNumber, LessonRange(profileId, lessonNumber, startTime, endTime))
+                if (weekStart >= Date(schoolYearStart, 9, 1)) {
+                    data.error(ApiError(TAG, ERROR_EDUDZIENNIK_WEB_TIMETABLE_NOT_PUBLIC)
+                            .withApiResponse(text))
+                    onSuccess()
+                    return@webGet
                 }
+            } else {
+                table.children().forEach { row ->
+                    val rowElements = row.children()
 
-                rowElements.subList(2, rowElements.size).forEachIndexed { index, lesson ->
-                    val course = lesson.select(".course").firstOrNull() ?: return@forEachIndexed
-                    val info = course.select("span > span")
+                    val lessonNumber = rowElements[0].text().toInt()
 
-                    if (info.isEmpty()) return@forEachIndexed
+                    val times = rowElements[1].text().split('-')
+                    val startTime = Time.fromH_m(times[0].trim())
+                    val endTime = Time.fromH_m(times[1].trim())
 
-                    val type = when (course.hasClass("substitute")) {
-                        true -> Lesson.TYPE_CHANGE
-                        else -> Lesson.TYPE_NORMAL
+                    data.lessonRanges.singleOrNull {
+                        it.lessonNumber == lessonNumber && it.startTime == startTime && it.endTime == endTime
+                    } ?: run {
+                        data.lessonRanges.put(lessonNumber, LessonRange(profileId, lessonNumber, startTime, endTime))
                     }
 
-                    /* Getting subject */
+                    rowElements.subList(2, rowElements.size).forEachIndexed { index, lesson ->
+                        val course = lesson.select(".course").firstOrNull() ?: return@forEachIndexed
+                        val info = course.select("span > span")
 
-                    val subjectElement = info[0].child(0)
-                    val subjectId = EDUDZIENNIK_SUBJECT_ID.find(subjectElement.attr("href"))?.get(1)
-                            ?: return@forEachIndexed
-                    val subjectName = subjectElement.text().trim()
-                    val subject = data.getSubject(subjectId, subjectName)
+                        if (info.isEmpty()) return@forEachIndexed
 
-                    /* Getting teacher */
+                        val type = when (course.hasClass("substitute")) {
+                            true -> Lesson.TYPE_CHANGE
+                            else -> Lesson.TYPE_NORMAL
+                        }
 
-                    val teacherId = if (info.size >= 2) {
-                        val teacherElement = info[1].child(0)
-                        val teacherName = teacherElement.text().trim()
-                        teacherName.splitName()?.let { (teacherLastName, teacherFirstName) ->
-                            data.getTeacher(teacherFirstName, teacherLastName)
-                        }?.id ?: -1
-                    } else -1
+                        /* Getting subject */
 
-                    val lessonObject = Lesson(profileId, -1).also {
-                        it.type = type
-                        it.date = weekStart.clone().stepForward(0, 0, index)
-                        it.lessonNumber = lessonNumber
-                        it.startTime = startTime
-                        it.endTime = endTime
-                        it.subjectId = subject.id
-                        it.teacherId = teacherId
+                        val subjectElement = info[0].child(0)
+                        val subjectId = EDUDZIENNIK_SUBJECT_ID.find(subjectElement.attr("href"))?.get(1)
+                                ?: return@forEachIndexed
+                        val subjectName = subjectElement.text().trim()
+                        val subject = data.getSubject(subjectId, subjectName)
 
-                        it.id = it.buildId()
-                    }
+                        /* Getting teacher */
 
-                    data.lessonNewList.add(lessonObject)
-                    dataDays.remove(lessonObject.date!!.value)
+                        val teacherId = if (info.size >= 2) {
+                            val teacherElement = info[1].child(0)
+                            val teacherLongId = EDUDZIENNIK_TEACHER_ID.find(teacherElement.attr("href"))?.get(1)
+                            val teacherName = teacherElement.text().trim()
+                            teacherName.splitName()?.let { (teacherLastName, teacherFirstName) ->
+                                data.getTeacher(teacherFirstName, teacherLastName, teacherLongId)
+                            }?.id ?: -1
+                        } else -1
 
-                    if (type != Lesson.TYPE_NORMAL) {
-                        val seen = profile.empty || lessonObject.date!! < Date.getToday()
+                        val lessonObject = Lesson(profileId, -1).also {
+                            it.type = type
+                            it.date = weekStart.clone().stepForward(0, 0, index)
+                            it.lessonNumber = lessonNumber
+                            it.startTime = startTime
+                            it.endTime = endTime
+                            it.subjectId = subject.id
+                            it.teacherId = teacherId
 
-                        data.metadataList.add(Metadata(
-                                profileId,
-                                Metadata.TYPE_LESSON_CHANGE,
-                                lessonObject.id,
-                                seen,
-                                seen,
-                                System.currentTimeMillis()
-                        ))
+                            it.id = it.buildId()
+                        }
+
+                        data.lessonNewList.add(lessonObject)
+                        dataDays.remove(lessonObject.date!!.value)
+
+                        if (type != Lesson.TYPE_NORMAL) {
+                            val seen = profile.empty || lessonObject.date!! < Date.getToday()
+
+                            data.metadataList.add(Metadata(
+                                    profileId,
+                                    Metadata.TYPE_LESSON_CHANGE,
+                                    lessonObject.id,
+                                    seen,
+                                    seen,
+                                    System.currentTimeMillis()
+                            ))
+                        }
                     }
                 }
             }

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

@@ -6,19 +6,23 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik
 
 import com.google.gson.JsonObject
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.CODE_INTERNAL_LIBRUS_ACCOUNT_410
+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.firstlogin.IdziennikFirstLogin
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLogin
-import pl.szczodrzynski.edziennik.data.api.idziennikLoginMethods
 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.db.modules.announcements.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
 class Idziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
@@ -28,6 +32,7 @@ class Idziennik(val app: App, val profile: Profile?, val loginStore: LoginStore,
 
     val internalErrorList = mutableListOf<Int>()
     val data: DataIdziennik
+    private var afterLogin: (() -> Unit)? = null
 
     init {
         data = DataIdziennik(app, profile, loginStore).apply {
@@ -54,33 +59,69 @@ class Idziennik(val app: App, val profile: Profile?, val loginStore: LoginStore,
     override fun sync(featureIds: List<Int>, viewId: Int?, arguments: JsonObject?) {
         data.arguments = arguments
         data.prepare(idziennikLoginMethods, IdziennikFeatures, featureIds, viewId)
-        d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}")
-        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        login()
+    }
+
+    private fun login(loginMethodId: Int? = null, afterLogin: (() -> Unit)? = null) {
+        d(TAG, "Trying to login with ${data.targetLoginMethodIds}")
+        if (internalErrorList.isNotEmpty()) {
+            d(TAG, "  - Internal errors:")
+            internalErrorList.forEach { d(TAG, "      - code $it") }
+        }
+        loginMethodId?.let { data.prepareFor(idziennikLoginMethods, it) }
+        afterLogin?.let { this.afterLogin = it }
         IdziennikLogin(data) {
-            IdziennikData(data) {
+            data()
+        }
+    }
+
+    private fun data() {
+        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        if (internalErrorList.isNotEmpty()) {
+            d(TAG, "  - Internal errors:")
+            internalErrorList.forEach { d(TAG, "      - code $it") }
+        }
+        afterLogin?.invoke() ?: IdziennikData(data) {
+            completed()
+        }
+    }
+
+    override fun getMessage(message: MessageFull) {
+        login(LOGIN_METHOD_IDZIENNIK_WEB) {
+            IdziennikWebGetMessage(data, message) {
                 completed()
             }
         }
     }
 
-    override fun getMessage(message: MessageFull) {
-
-    }
-
-    override fun markAllAnnouncementsAsRead() {
-
-    }
-
-    override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {
-
-    }
-
-    override fun firstLogin() {
-        IdziennikFirstLogin(data) {
-            completed()
+    override fun sendMessage(recipients: List<Teacher>, subject: String, text: String) {
+        login(LOGIN_METHOD_IDZIENNIK_API) {
+            IdziennikWebSendMessage(data, recipients, subject, text) {
+                completed()
+            }
         }
     }
 
+    override fun markAllAnnouncementsAsRead() {}
+    override fun getAnnouncement(announcement: AnnouncementFull) {}
+
+    override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {
+        login(LOGIN_METHOD_IDZIENNIK_WEB) {
+            IdziennikWebGetAttachment(data, message, attachmentId, attachmentName) {
+                completed()
+            }
+        }
+    }
+
+    override fun getRecipientList() {
+        login(LOGIN_METHOD_IDZIENNIK_WEB) {
+            IdziennikWebGetRecipientList(data) {
+                completed()
+            }
+        }
+    }
+
+    override fun firstLogin() { IdziennikFirstLogin(data) { completed() } }
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
@@ -88,28 +129,29 @@ class Idziennik(val app: App, val profile: Profile?, val loginStore: LoginStore,
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
         return object : EdziennikCallback {
-            override fun onCompleted() {
-                callback.onCompleted()
-            }
-
-            override fun onProgress(step: Float) {
-                callback.onProgress(step)
-            }
-
-            override fun onStartProgress(stringRes: Int) {
-                callback.onStartProgress(stringRes)
-            }
-
+            override fun onCompleted() { callback.onCompleted() }
+            override fun onProgress(step: Float) { callback.onProgress(step) }
+            override fun onStartProgress(stringRes: Int) { callback.onStartProgress(stringRes) }
             override fun onError(apiError: ApiError) {
+                if (apiError.errorCode in internalErrorList) {
+                    // finish immediately if the same error occurs twice during the same sync
+                    callback.onError(apiError)
+                    return
+                }
+                internalErrorList.add(apiError.errorCode)
                 when (apiError.errorCode) {
-                    in internalErrorList -> {
-                        // finish immediately if the same error occurs twice during the same sync
-                        callback.onError(apiError)
+                    ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION,
+                    ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH,
+                    ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER,
+                    ERROR_IDZIENNIK_WEB_ACCESS_DENIED,
+                    ERROR_IDZIENNIK_API_ACCESS_DENIED -> {
+                        data.loginMethods.remove(LOGIN_METHOD_IDZIENNIK_WEB)
+                        data.prepareFor(idziennikLoginMethods, LOGIN_METHOD_IDZIENNIK_WEB)
+                        data.loginExpiryTime = 0
+                        login()
                     }
-                    CODE_INTERNAL_LIBRUS_ACCOUNT_410 -> {
-                        internalErrorList.add(apiError.errorCode)
-                        loginStore.removeLoginData("refreshToken") // force a clean login
-                        //loginLibrus()
+                    ERROR_IDZIENNIK_API_NO_REGISTER -> {
+                        data()
                     }
                     else -> callback.onError(apiError)
                 }

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

@@ -55,6 +55,7 @@ open class IdziennikApi(open val data: DataIdziennik) {
                 }
                 error?.let { code ->
                     when (code) {
+                        "Uczeń nie posiada aktywnej pozycji w dzienniku" -> ERROR_IDZIENNIK_API_NO_REGISTER
                         "Authorization has been denied for this request." -> ERROR_IDZIENNIK_API_ACCESS_DENIED
                         else -> ERROR_IDZIENNIK_API_OTHER
                     }.let { errorCode ->
@@ -107,6 +108,7 @@ open class IdziennikApi(open val data: DataIdziennik) {
                         }
                     }
                 }
+                .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST)
                 .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED)
                 .allowErrorCode(HttpURLConnection.HTTP_INTERNAL_ERROR)
                 .callback(callback)

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

@@ -8,12 +8,14 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import im.wangchao.mhttp.Request
 import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.FileCallbackHandler
 import im.wangchao.mhttp.callback.JsonCallbackHandler
 import im.wangchao.mhttp.callback.TextCallbackHandler
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.utils.Utils.d
+import java.io.File
 import java.net.HttpURLConnection.HTTP_INTERNAL_ERROR
 import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
 
@@ -156,4 +158,54 @@ open class IdziennikWeb(open val data: DataIdziennik) {
                 .build()
                 .enqueue()
     }
+
+    fun webGetFile(tag: String, endpoint: String, targetFile: File, parameters: Map<String, Any>,
+                   onSuccess: (file: File) -> Unit, onProgress: (written: Long, total: Long) -> Unit) {
+
+        d(tag, "Request: Idziennik/Web - $IDZIENNIK_WEB_URL/$endpoint")
+
+        val callback = object : FileCallbackHandler(targetFile) {
+            override fun onSuccess(file: File?, response: Response?) {
+                if (file == null) {
+                    data.error(ApiError(TAG, ERROR_FILE_DOWNLOAD)
+                            .withResponse(response))
+                    return
+                }
+
+                try {
+                    onSuccess(file)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_EDUDZIENNIK_FILE_REQUEST)
+                            .withResponse(response)
+                            .withThrowable(e))
+                }
+            }
+
+            override fun onProgress(bytesWritten: Long, bytesTotal: Long) {
+                try {
+                    onProgress(bytesWritten, bytesTotal)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_EDUDZIENNIK_FILE_REQUEST)
+                            .withThrowable(e))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url("$IDZIENNIK_WEB_URL/$endpoint")
+                .userAgent(IDZIENNIK_USER_AGENT)
+                .apply {
+                    parameters.forEach { (k, v) -> addParameter(k, v) }
+                }
+                .post()
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
 }

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

@@ -5,17 +5,18 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api
 
 import com.google.gson.JsonArray
+import pl.szczodrzynski.edziennik.asJsonObjectList
 import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_MESSAGES_INBOX
 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.asJsonObjectList
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_DELETED
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.getBoolean
 import pl.szczodrzynski.edziennik.getString
 import pl.szczodrzynski.edziennik.utils.Utils.crc32
@@ -51,11 +52,18 @@ class IdziennikApiMessagesInbox(override val data: DataIdziennik,
                 val sentDate = Date.fromIso(jMessage.getString("dataWyslania"))
 
                 val sender = jMessage.getAsJsonObject("nadawca")
+                var firstName = sender.getString("imie")
+                var lastName = sender.getString("nazwisko")
+                if (firstName.isNullOrEmpty() || lastName.isNullOrEmpty()) {
+                    firstName = "usunięty"
+                    lastName = "użytkownik"
+                }
                 val rTeacher = data.getTeacher(
-                        sender.getString("imie") ?: "",
-                        sender.getString("nazwisko") ?: ""
+                        firstName,
+                        lastName
                 )
-                rTeacher.loginId = sender.getString("id") + ":" + sender.getString("usr")
+                rTeacher.loginId = /*sender.getString("id") + ":" + */sender.getString("usr")
+                rTeacher.setTeacherType(Teacher.TYPE_OTHER)
 
                 val message = Message(
                         profileId,
@@ -77,7 +85,7 @@ class IdziennikApiMessagesInbox(override val data: DataIdziennik,
 
                 data.messageIgnoreList.add(message)
                 data.messageRecipientList.add(messageRecipient)
-                data.messageMetadataList.add(Metadata(
+                data.setSeenMetadataList.add(Metadata(
                         profileId,
                         Metadata.TYPE_MESSAGE,
                         message.id,

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

@@ -7,11 +7,11 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api
 import com.google.gson.JsonArray
 import pl.szczodrzynski.edziennik.DAY
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
+import pl.szczodrzynski.edziennik.asJsonObjectList
 import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_MESSAGES_SENT
 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.asJsonObjectList
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
@@ -62,7 +62,7 @@ class IdziennikApiMessagesSent(override val data: DataIdziennik,
                         lastName = "użytkownik"
                     }
                     val rTeacher = data.getTeacher(firstName, lastName)
-                    rTeacher.loginId = recipient.get("id").asString + ":" + recipient.get("usr").asString
+                    rTeacher.loginId = /*recipient.get("id").asString + ":" + */recipient.get("usr").asString
 
                     val messageRecipient = MessageRecipient(
                             profileId,

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

@@ -54,7 +54,8 @@ class IdziennikWebAnnouncements(override val data: DataIdziennik,
                         jAnnouncement.get("Tresc").asString,
                         startDate,
                         null,
-                        rTeacher.id
+                        rTeacher.id,
+                        null
                 )
                 data.announcementList.add(announcementObject)
                 data.metadataList.add(Metadata(

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

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-28
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_ATTACHMENT
+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.modules.messages.Message
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.Utils
+import java.io.File
+
+class IdziennikWebGetAttachment(
+        override val data: DataIdziennik, val message: Message, val attachmentId: Long,
+        val attachmentName: String, val onSuccess: () -> Unit
+) : IdziennikWeb(data) {
+    companion object {
+        const val TAG = "IdziennikWebGetAttachment"
+    }
+
+    init {
+        val messageId = "\\[META:([A-z0-9]+);([0-9-]+)]".toRegex().find(message.body ?: "")?.get(2) ?: -1
+        val targetFile = File(Utils.getStorageDir(), attachmentName)
+
+        webGetFile(TAG, IDZIENNIK_WEB_GET_ATTACHMENT, targetFile, mapOf(
+                "id" to messageId,
+                "fileName" to attachmentName
+        ), { file ->
+            val event = AttachmentGetEvent(
+                    profileId,
+                    message.id,
+                    attachmentId,
+                    AttachmentGetEvent.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,
+                    AttachmentGetEvent.TYPE_PROGRESS,
+                    bytesWritten = written
+            )
+
+            EventBus.getDefault().post(event)
+        }
+    }
+}

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

@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-28
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
+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.modules.messages.Message.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipientFull
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class IdziennikWebGetMessage(
+        override val data: DataIdziennik,
+        private val message: MessageFull,
+        val onSuccess: () -> Unit
+) : IdziennikWeb(data) {
+    companion object {
+        const val TAG = "IdziennikWebGetMessage"
+    }
+
+    init { data.profile?.also { profile ->
+        val metaPattern = "\\[META:([A-z0-9]+);([0-9-]+)]".toRegex()
+        val meta = metaPattern.find(message.body!!)
+        val messageIdString = meta?.get(1) ?: ""
+
+        webApiGet(TAG, IDZIENNIK_WEB_GET_MESSAGE, parameters = mapOf(
+                "idWiadomosci" to messageIdString,
+                "typWiadomosci" to if (message.type == TYPE_SENT) 1 else 0
+        )) { json ->
+            json.getJsonObject("d")?.getJsonObject("Wiadomosc")?.also {
+                val id = it.getLong("_recordId")
+                message.body = message.body?.replace(metaPattern, "[META:$messageIdString;$id]")
+
+                message.clearAttachments()
+                it.getJsonArray("ListaZal")?.asJsonObjectList()?.forEach { attachment ->
+                    message.addAttachment(
+                            attachment.getLong("Id") ?: return@forEach,
+                            attachment.getString("Nazwa") ?: return@forEach,
+                            -1
+                    )
+                }
+
+                message.recipients?.clear()
+                when (message.type) {
+                    TYPE_RECEIVED -> {
+                        val recipientObject = MessageRecipientFull(profileId, -1, message.id)
+
+                        val readDateString = it.getString("DataOdczytania")
+                        recipientObject.readDate = if (readDateString.isNullOrBlank()) System.currentTimeMillis()
+                        else Date.fromIso(readDateString)
+
+                        recipientObject.fullName = profile.accountNameLong ?: profile.studentNameLong
+
+                        data.messageRecipientList.add(recipientObject)
+                        message.addRecipient(recipientObject)
+                    }
+
+                    TYPE_SENT -> {
+                        it.getJsonArray("ListaOdbiorcow")?.asJsonObjectList()?.forEach { recipient ->
+                            val recipientName = recipient.getString("NazwaOdbiorcy") ?: return@forEach
+                            val teacher = data.getTeacherByLastFirst(recipientName)
+
+                            val recipientObject = MessageRecipientFull(profileId, teacher.id, message.id)
+
+                            recipientObject.readDate = recipient.getLong("Status") ?: return@forEach
+                            recipientObject.fullName = teacher.fullName
+
+                            data.messageRecipientList.add(recipientObject)
+                            message.addRecipient(recipientObject)
+                        }
+                    }
+                }
+
+                if (!message.seen) {
+                    message.seen = true
+
+                    data.setSeenMetadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_MESSAGE,
+                            message.id,
+                            message.seen,
+                            message.notified,
+                            message.addedDate
+                    ))
+                }
+
+                EventBus.getDefault().postSticky(MessageGetEvent(message))
+
+                data.messageList.add(message)
+                onSuccess()
+            }
+        }
+    } ?: onSuccess() }
+}

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

@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-12-30.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import androidx.room.OnConflictStrategy
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_RECIPIENT_LIST
+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.RecipientListGetEvent
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+
+class IdziennikWebGetRecipientList(
+        override val data: DataIdziennik, val onSuccess: () -> Unit) : IdziennikWeb(data) {
+    companion object {
+        private const val TAG = "IdziennikWebGetRecipientList"
+    }
+
+    init {
+        webApiGet(TAG, IDZIENNIK_WEB_GET_RECIPIENT_LIST, mapOf(
+                "idP" to data.registerId
+        )) { result ->
+            val json = result.getJsonObject("d") ?: run {
+                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+                        .withApiResponse(result))
+                return@webApiGet
+            }
+
+            json.getJsonArray("ListK_Pracownicy")?.asJsonObjectList()?.forEach { recipient ->
+                val name = recipient.getString("ImieNazwisko") ?: ": "
+                val (fullName, subject) = name.split(": ").let {
+                    Pair(it.getOrNull(0), it.getOrNull(1))
+                }
+                val guid = recipient.getString("Id") ?: ""
+                // get teacher by ID or create it
+                val teacher = data.getTeacherByFirstLast(fullName ?: " ")
+                teacher.loginId = guid
+                teacher.setTeacherType(Teacher.TYPE_TEACHER)
+                // unset OTHER that is automatically set in IdziennikApiMessages*
+                teacher.unsetTeacherType(Teacher.TYPE_OTHER)
+                teacher.typeDescription = subject
+            }
+
+            json.getJsonArray("ListK_Opiekunowie")?.asJsonObjectList()?.forEach { recipient ->
+                val name = recipient.getString("ImieNazwisko") ?: ": "
+                val (fullName, parentOf) = Regexes.IDZIENNIK_MESSAGES_RECIPIENT_PARENT.find(name)?.let {
+                    Pair(it.groupValues.getOrNull(1), it.groupValues.getOrNull(2))
+                } ?: Pair(null, null)
+                val guid = recipient.getString("Id") ?: ""
+                // get teacher by ID or create it
+                val teacher = data.getTeacherByFirstLast(fullName ?: " ")
+                teacher.loginId = guid
+                teacher.setTeacherType(Teacher.TYPE_PARENT)
+                // unset OTHER that is automatically set in IdziennikApiMessages*
+                teacher.unsetTeacherType(Teacher.TYPE_OTHER)
+                teacher.typeDescription = parentOf
+            }
+
+            val event = RecipientListGetEvent(
+                    data.profileId,
+                    data.teacherList.filter { it.loginId != null }
+            )
+
+            profile?.lastReceiversSync = System.currentTimeMillis()
+
+            data.teacherOnConflictStrategy = OnConflictStrategy.REPLACE
+            EventBus.getDefault().postSticky(event)
+            onSuccess()
+        }
+    }
+}

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

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-12-30.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_SEND_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.edziennik.idziennik.data.api.IdziennikApiMessagesSent
+import pl.szczodrzynski.edziennik.data.api.events.MessageSentEvent
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+import java.util.*
+
+class IdziennikWebSendMessage(
+        override val data: DataIdziennik,
+        val recipients: List<Teacher>,
+        val subject: String,
+        val text: String,
+        val onSuccess: () -> Unit
+) : IdziennikWeb(data) {
+    companion object {
+        private const val TAG = "IdziennikWebSendMessage"
+    }
+
+    init {
+        val recipientsArray = JsonArray()
+        for (teacher in recipients) {
+            teacher.loginId?.let {
+                recipientsArray += it
+            }
+        }
+
+        webApiGet(TAG, IDZIENNIK_WEB_SEND_MESSAGE, mapOf(
+                "Wiadomosc" to JsonObject(
+                        "Tytul" to subject,
+                        "Tresc" to text,
+                        "Confirmation" to false,
+                        "GuidMessage" to UUID.randomUUID().toString().toUpperCase(Locale.ROOT),
+                        "Odbiorcy" to recipientsArray
+                )
+        )) { result ->
+            val json = result.getJsonObject("d") ?: run {
+                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+                        .withApiResponse(result))
+                return@webApiGet
+            }
+
+            if (json.getBoolean("CzyJestBlad") != false) {
+                // TODO error
+                return@webApiGet
+            }
+
+            IdziennikApiMessagesSent(data) {
+                val message = data.messageIgnoreList.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)
+
+                EventBus.getDefault().postSticky(event)
+                onSuccess()
+            }
+        }
+    }
+}

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

@@ -8,18 +8,23 @@ import com.google.gson.JsonObject
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusData
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api.LibrusApiAnnouncementMarkAsRead
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesGetAttachment
 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.LibrusSynergiaMarkAllAnnouncementsAsRead
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.firstlogin.LibrusFirstLogin
-import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLogin
 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.modules.announcements.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
 class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
@@ -29,6 +34,7 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
 
     val internalErrorList = mutableListOf<Int>()
     val data: DataLibrus
+    private var afterLogin: (() -> Unit)? = null
 
     init {
         data = DataLibrus(app, profile, loginStore).apply {
@@ -58,12 +64,14 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
         login()
     }
 
-    private fun login() {
+    private fun login(loginMethodId: Int? = null, afterLogin: (() -> Unit)? = null) {
         d(TAG, "Trying to login with ${data.targetLoginMethodIds}")
         if (internalErrorList.isNotEmpty()) {
             d(TAG, "  - Internal errors:")
             internalErrorList.forEach { d(TAG, "      - code $it") }
         }
+        loginMethodId?.let { data.prepareFor(librusLoginMethods, it) }
+        afterLogin?.let { this.afterLogin = it }
         LibrusLogin(data) {
             data()
         }
@@ -75,57 +83,60 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
             d(TAG, "  - Internal errors:")
             internalErrorList.forEach { d(TAG, "      - code $it") }
         }
-        LibrusData(data) {
+        afterLogin?.invoke() ?: LibrusData(data) {
             completed()
         }
     }
 
     override fun getMessage(message: MessageFull) {
-        LibrusLoginPortal(data) {
-            LibrusLoginApi(data) {
-                LibrusLoginSynergia(data) {
-                    LibrusLoginMessages(data) {
-                        LibrusMessagesGetMessage(data, message) {
-                            completed()
-                        }
-                    }
-                }
+        login(LOGIN_METHOD_LIBRUS_MESSAGES) {
+            LibrusMessagesGetMessage(data, message) {
+                completed()
+            }
+        }
+    }
+
+    override fun sendMessage(recipients: List<Teacher>, subject: String, text: String) {
+        login(LOGIN_METHOD_LIBRUS_MESSAGES) {
+            LibrusMessagesSendMessage(data, recipients, subject, text) {
+                completed()
             }
         }
     }
 
     override fun markAllAnnouncementsAsRead() {
-        LibrusLoginPortal(data) {
-            LibrusLoginApi(data) {
-                LibrusLoginSynergia(data) {
-                    LibrusSynergiaMarkAllAnnouncementsAsRead(data) {
-                        completed()
-                    }
-                }
+        login(LOGIN_METHOD_LIBRUS_SYNERGIA) {
+            LibrusSynergiaMarkAllAnnouncementsAsRead(data) {
+                completed()
+            }
+        }
+    }
+
+    override fun getAnnouncement(announcement: AnnouncementFull) {
+        login(LOGIN_METHOD_LIBRUS_API) {
+            LibrusApiAnnouncementMarkAsRead(data, announcement) {
+                completed()
             }
         }
     }
 
     override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {
-        LibrusLoginPortal(data) {
-            LibrusLoginApi(data) {
-                LibrusLoginSynergia(data) {
-                    LibrusLoginMessages(data) {
-                        LibrusMessagesGetAttachment(data, message, attachmentId, attachmentName) {
-                            completed()
-                        }
-                    }
-                }
+        login(LOGIN_METHOD_LIBRUS_MESSAGES) {
+            LibrusMessagesGetAttachment(data, message, attachmentId, attachmentName) {
+                completed()
             }
         }
     }
 
-    override fun firstLogin() {
-        LibrusFirstLogin(data) {
-            completed()
+    override fun getRecipientList() {
+        login(LOGIN_METHOD_LIBRUS_MESSAGES) {
+            LibrusMessagesGetRecipientList(data) {
+                completed()
+            }
         }
     }
 
+    override fun firstLogin() { LibrusFirstLogin(data) { completed() } }
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
@@ -133,18 +144,9 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
         return object : EdziennikCallback {
-            override fun onCompleted() {
-                callback.onCompleted()
-            }
-
-            override fun onProgress(step: Float) {
-                callback.onProgress(step)
-            }
-
-            override fun onStartProgress(stringRes: Int) {
-                callback.onStartProgress(stringRes)
-            }
-
+            override fun onCompleted() { callback.onCompleted() }
+            override fun onProgress(step: Float) { callback.onProgress(step) }
+            override fun onStartProgress(stringRes: Int) { callback.onStartProgress(stringRes) }
             override fun onError(apiError: ApiError) {
                 if (apiError.errorCode in internalErrorList) {
                     // finish immediately if the same error occurs twice during the same sync
@@ -155,30 +157,26 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
                 when (apiError.errorCode) {
                     ERROR_LIBRUS_PORTAL_ACCESS_DENIED -> {
                         data.loginMethods.remove(LOGIN_METHOD_LIBRUS_PORTAL)
-                        data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_PORTAL)
-                        data.targetLoginMethodIds.sort()
+                        data.prepareFor(librusLoginMethods, LOGIN_METHOD_LIBRUS_PORTAL)
                         data.portalTokenExpiryTime = 0
                         login()
                     }
                     ERROR_LIBRUS_API_ACCESS_DENIED,
                     ERROR_LIBRUS_API_TOKEN_EXPIRED -> {
                         data.loginMethods.remove(LOGIN_METHOD_LIBRUS_API)
-                        data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_API)
-                        data.targetLoginMethodIds.sort()
+                        data.prepareFor(librusLoginMethods, LOGIN_METHOD_LIBRUS_API)
                         data.apiTokenExpiryTime = 0
                         login()
                     }
                     ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED -> {
                         data.loginMethods.remove(LOGIN_METHOD_LIBRUS_SYNERGIA)
-                        data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_SYNERGIA)
-                        data.targetLoginMethodIds.sort()
+                        data.prepareFor(librusLoginMethods, LOGIN_METHOD_LIBRUS_SYNERGIA)
                         data.synergiaSessionIdExpiryTime = 0
                         login()
                     }
                     ERROR_LIBRUS_MESSAGES_ACCESS_DENIED -> {
                         data.loginMethods.remove(LOGIN_METHOD_LIBRUS_MESSAGES)
-                        data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_MESSAGES)
-                        data.targetLoginMethodIds.sort()
+                        data.prepareFor(librusLoginMethods, LOGIN_METHOD_LIBRUS_MESSAGES)
                         data.messagesSessionIdExpiryTime = 0
                         login()
                     }

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

@@ -89,6 +89,19 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
                 data.startProgress(R.string.edziennik_progress_endpoint_grade_categories)
                 LibrusApiBehaviourGradeCategories(data, onSuccess)
             }
+            ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADE_CATEGORIES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_grade_categories)
+                LibrusApiDescriptiveGradeCategories(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_TEXT_GRADE_CATEGORIES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_grade_categories)
+                LibrusApiTextGradeCategories(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_POINT_GRADE_CATEGORIES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_grade_categories)
+                LibrusApiPointGradeCategories(data, onSuccess)
+            }
+
             ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_grade_comments)
                 LibrusApiGradeComments(data, onSuccess)
@@ -97,6 +110,7 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
                 data.startProgress(R.string.edziennik_progress_endpoint_grade_comments)
                 LibrusApiBehaviourGradeComments(data, onSuccess)
             }
+
             ENDPOINT_LIBRUS_API_NORMAL_GRADES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_grades)
                 LibrusApiGrades(data, onSuccess)
@@ -105,7 +119,18 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
                 data.startProgress(R.string.edziennik_progress_endpoint_behaviour_grades)
                 LibrusApiBehaviourGrades(data, onSuccess)
             }
-            // TODO grades
+            ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_descriptive_grades)
+                LibrusApiDescriptiveGrades(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_TEXT_GRADES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_descriptive_grades)
+                LibrusApiTextGrades(data, onSuccess)
+            }
+            ENDPOINT_LIBRUS_API_POINT_GRADES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_point_grades)
+                LibrusApiPointGrades(data, onSuccess)
+            }
 
             ENDPOINT_LIBRUS_API_EVENT_TYPES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_event_types)

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

@@ -5,6 +5,7 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data
 
 import com.google.gson.JsonObject
+import com.google.gson.JsonParser
 import im.wangchao.mhttp.Request
 import im.wangchao.mhttp.Response
 import im.wangchao.mhttp.body.MediaTypeUtils
@@ -12,6 +13,8 @@ import im.wangchao.mhttp.callback.FileCallbackHandler
 import im.wangchao.mhttp.callback.JsonCallbackHandler
 import im.wangchao.mhttp.callback.TextCallbackHandler
 import okhttp3.Cookie
+import org.json.JSONObject
+import org.json.XML
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.parser.Parser
@@ -38,10 +41,10 @@ open class LibrusMessages(open val data: DataLibrus) {
     val profile
         get() = data.profile
 
-    fun messagesGet(tag: String, endpoint: String, method: Int = POST,
+    fun messagesGet(tag: String, module: String, method: Int = POST,
                     parameters: Map<String, Any>? = null, onSuccess: (doc: Document) -> Unit) {
 
-        d(tag, "Request: Librus/Messages - $LIBRUS_MESSAGES_URL/$endpoint")
+        d(tag, "Request: Librus/Messages - $LIBRUS_MESSAGES_URL/$module")
 
         val callback = object : TextCallbackHandler() {
             override fun onSuccess(text: String?, response: Response?) {
@@ -107,22 +110,92 @@ open class LibrusMessages(open val data: DataLibrus) {
         transformer.transform(DOMSource(doc), StreamResult(stringWriter))
         val requestXml = stringWriter.toString()
 
-        /*val requestXml = xml("service") {
-            "header" { }
-            "data" {
-                for ((key, value) in parameters.orEmpty()) {
-                    key {
-                        -value.toString()
+        Request.builder()
+                .url("$LIBRUS_MESSAGES_URL/$module")
+                .userAgent(SYNERGIA_USER_AGENT)
+                .setTextBody(requestXml, MediaTypeUtils.APPLICATION_XML)
+                .apply {
+                    when (method) {
+                        GET -> get()
+                        POST -> post()
                     }
                 }
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+
+    fun messagesGetJson(tag: String, module: String, method: Int = POST,
+                        parameters: Map<String, Any>? = null, onSuccess: (json: JsonObject?) -> Unit) {
+
+        d(tag, "Request: Librus/Messages - $LIBRUS_MESSAGES_URL/$module")
+
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                if (text.isNullOrEmpty()) {
+                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                when {
+                    text.contains("<message>Niepoprawny login i/lub hasło.</message>") -> data.error(TAG, ERROR_LOGIN_LIBRUS_MESSAGES_INVALID_LOGIN, response, text)
+                    text.contains("stop.png") -> data.error(TAG, ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED, response, text)
+                    text.contains("eAccessDeny") -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED, response, text)
+                    text.contains("OffLine") -> data.error(TAG, ERROR_LIBRUS_MESSAGES_MAINTENANCE, response, text)
+                    text.contains("<status>error</status>") -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ERROR, response, text)
+                    text.contains("<type>eVarWhitThisNameNotExists</type>") -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED, response, text)
+                    text.contains("<error>") -> data.error(TAG, ERROR_LIBRUS_MESSAGES_OTHER, response, text)
+                }
+
+                try {
+                    val json: JSONObject? = XML.toJSONObject(text)
+                    onSuccess(JsonParser().parse(json?.toString() ?: "{}")?.asJsonObject)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_LIBRUS_MESSAGES_REQUEST)
+                            .withResponse(response)
+                            .withThrowable(e)
+                            .withApiResponse(text))
+                }
             }
-        }.toString(PrintOptions(
-                singleLineTextElements = true,
-                useSelfClosingTags = true
-        ))*/
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        data.app.cookieJar.saveFromResponse(null, listOf(
+                Cookie.Builder()
+                        .name("DZIENNIKSID")
+                        .value(data.messagesSessionId!!)
+                        .domain("wiadomosci.librus.pl")
+                        .secure().httpOnly().build()
+        ))
+
+
+        val docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder()
+        val doc = docBuilder.newDocument()
+        val serviceElement = doc.createElement("service")
+        val headerElement = doc.createElement("header")
+        val dataElement = doc.createElement("data")
+        for ((key, value) in parameters.orEmpty()) {
+            val element = doc.createElement(key)
+            element.appendChild(doc.createTextNode(value.toString()))
+            dataElement.appendChild(element)
+        }
+        serviceElement.appendChild(headerElement)
+        serviceElement.appendChild(dataElement)
+        doc.appendChild(serviceElement)
+        val transformer = TransformerFactory.newInstance().newTransformer()
+        transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes")
+        val stringWriter = StringWriter()
+        transformer.transform(DOMSource(doc), StreamResult(stringWriter))
+        val requestXml = stringWriter.toString()
 
         Request.builder()
-                .url("$LIBRUS_MESSAGES_URL/$endpoint")
+                .url("$LIBRUS_MESSAGES_URL/$module")
                 .userAgent(SYNERGIA_USER_AGENT)
                 .setTextBody(requestXml, MediaTypeUtils.APPLICATION_XML)
                 .apply {

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

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-27
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.POST
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.events.AnnouncementGetEvent
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+
+class LibrusApiAnnouncementMarkAsRead(
+        override val data: DataLibrus,
+        private val announcement: AnnouncementFull,
+        val onSuccess: () -> Unit
+) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiAnnouncementMarkAsRead"
+    }
+
+    init {
+        apiGet(TAG, "SchoolNotices/MarkAsRead/${announcement.idString}", method = POST) {
+            announcement.seen = true
+
+            EventBus.getDefault().postSticky(AnnouncementGetEvent(announcement))
+
+            data.setSeenMetadataList.add(Metadata(
+                    profileId,
+                    Metadata.TYPE_ANNOUNCEMENT,
+                    announcement.id,
+                    announcement.seen,
+                    announcement.notified,
+                    announcement.addedDate
+            ))
+            onSuccess()
+        }
+    }
+}

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

@@ -24,7 +24,8 @@ class LibrusApiAnnouncements(override val data: DataLibrus,
             val announcements = json.getJsonArray("SchoolNotices").asJsonObjectList()
 
             announcements?.forEach { announcement ->
-                val id = announcement.getString("Id")?.crc32() ?: return@forEach
+                val longId = announcement.getString("Id") ?: return@forEach
+                val id = longId.crc32()
                 val subject = announcement.getString("Subject") ?: ""
                 val text = announcement.getString("Content") ?: ""
                 val startDate = Date.fromY_m_d(announcement.getString("StartDate"))
@@ -41,11 +42,12 @@ class LibrusApiAnnouncements(override val data: DataLibrus,
                         text,
                         startDate,
                         endDate,
-                        teacherId
+                        teacherId,
+                        longId
                 )
 
                 data.announcementList.add(announcementObject)
-                data.metadataList.add(Metadata(
+                data.setSeenMetadataList.add(Metadata(
                         profileId,
                         Metadata.TYPE_ANNOUNCEMENT,
                         id,

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

@@ -40,7 +40,7 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
                         1,
                         -1,
                         1
-                ).apply { type = Grade.TYPE_BEHAVIOUR }
+                ).apply { type = Grade.TYPE_POINT_SUM }
 
                 data.gradeList.add(semester1StartGradeObject)
                 data.metadataList.add(Metadata(
@@ -66,7 +66,7 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
                         2,
                         -1,
                         1
-                ).apply { type = Grade.TYPE_BEHAVIOUR }
+                ).apply { type = Grade.TYPE_POINT_SUM }
 
                 data.gradeList.add(semester2StartGradeObject)
                 data.metadataList.add(Metadata(
@@ -133,7 +133,7 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
                         teacherId,
                         1
                 ).apply {
-                    type = Grade.TYPE_BEHAVIOUR
+                    type = Grade.TYPE_POINT_SUM
                     valueMax = valueTo
                 }
 
@@ -148,7 +148,7 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
                 ))
             }
 
-            data.toRemove.add(DataRemoveModel.Grades.semesterWithType(profile.currentSemester, Grade.TYPE_BEHAVIOUR))
+            data.toRemove.add(DataRemoveModel.Grades.semesterWithType(profile.currentSemester, Grade.TYPE_POINT_SUM))
             data.setSyncNext(ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADES, SYNC_ALWAYS)
             onSuccess()
         }

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

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-29
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api
+
+import android.graphics.Color
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADE_CATEGORIES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
+
+class LibrusApiDescriptiveGradeCategories(override val data: DataLibrus,
+                                          val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiDescriptiveGradeCategories"
+    }
+
+    init {
+        apiGet(TAG, "DescriptiveTextGrades/Skills") { json ->
+            json.getJsonArray("Skills")?.asJsonObjectList()?.forEach { category ->
+                val id = category.getLong("Id") ?: return@forEach
+                val name = category.getString("Name") ?: ""
+                val color = category.getJsonObject("Color")?.getInt("Id")
+                        ?.let { data.getColor(it) } ?: Color.BLUE
+
+                val gradeCategoryObject = GradeCategory(
+                        profileId,
+                        id,
+                        -1f,
+                        color,
+                        name
+                ).apply {
+                    type = GradeCategory.TYPE_DESCRIPTIVE
+                }
+
+                data.gradeCategories.put(id, gradeCategoryObject)
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADE_CATEGORIES, 1 * DAY)
+            onSuccess()
+        }
+    }
+}

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

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-29
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_DESCRIPTIVE_TEXT
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_TEXT
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class LibrusApiDescriptiveGrades(override val data: DataLibrus,
+                                 val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiDescriptiveGrades"
+    }
+
+    init { data.profile?.also { profile ->
+        apiGet(TAG, "BaseTextGrades") { json ->
+
+            json.getJsonArray("Grades")?.asJsonObjectList()?.forEach { grade ->
+                val id = grade.getLong("Id") ?: return@forEach
+                val teacherId = grade.getJsonObject("AddedBy")?.getLong("Id") ?: return@forEach
+                val semester = grade.getInt("Semester") ?: return@forEach
+                val subjectId = grade.getJsonObject("Subject")?.getLong("Id") ?: return@forEach
+                val description = grade.getString("Grade")
+
+                val categoryId = grade.getJsonObject("Skill")?.getLong("Id")
+                        ?: grade.getJsonObject("Category")?.getLong("Id")
+                        ?: return@forEach
+                val type = when (grade.getJsonObject("Category")) {
+                    null -> TYPE_DESCRIPTIVE_TEXT
+                    else -> TYPE_TEXT
+                }
+
+                val category = data.gradeCategories.singleOrNull {
+                    it.categoryId == categoryId && it.type == when (type) {
+                        TYPE_DESCRIPTIVE_TEXT -> GradeCategory.TYPE_DESCRIPTIVE
+                        else -> GradeCategory.TYPE_TEXT
+                    }
+                }
+
+                val addedDate = Date.fromIso(grade.getString("AddDate") ?: return@forEach)
+
+                val gradeObject = Grade(
+                        profileId,
+                        id,
+                        category?.text ?: "",
+                        category?.color ?: -1,
+                        description,
+                        " ",
+                        0f,
+                        0f,
+                        semester,
+                        teacherId,
+                        subjectId
+                ).apply {
+                    this.type = type
+                }
+
+                data.gradeList.add(gradeObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_GRADE,
+                        id,
+                        profile.empty,
+                        profile.empty,
+                        addedDate
+                ))
+            }
+
+            data.toRemove.addAll(listOf(
+                    TYPE_DESCRIPTIVE_TEXT,
+                    TYPE_TEXT
+            ).map {
+                DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it)
+            })
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADES, SYNC_ALWAYS)
+            onSuccess()
+        }
+    } ?: onSuccess() }
+}

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

@@ -70,7 +70,10 @@ class LibrusApiEvents(override val data: DataLibrus,
                         ))
             }
 
-            data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK))
+            data.toRemove.add(DataRemoveModel.Events.futureExceptTypes(listOf(
+                    Event.TYPE_HOMEWORK,
+                    Event.TYPE_PT_MEETING
+            )))
 
             data.setSyncNext(ENDPOINT_LIBRUS_API_EVENTS, SYNC_ALWAYS)
             onSuccess()

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

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-29
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api
+
+import android.graphics.Color
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_POINT_GRADE_CATEGORIES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
+
+class LibrusApiPointGradeCategories(override val data: DataLibrus,
+                                    val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiPointGradeCategories"
+    }
+
+    init {
+        apiGet(TAG, "PointGrades/Categories") { json ->
+            json.getJsonArray("Categories")?.asJsonObjectList()?.forEach { category ->
+                val id = category.getLong("Id") ?: return@forEach
+                val name = category.getString("Name") ?: ""
+                val color = category.getJsonObject("Color")?.getInt("Id")
+                        ?.let { data.getColor(it) } ?: Color.BLUE
+                val countToAverage = category.getBoolean("CountToTheAverage") ?: true
+                val weight = if (countToAverage) category.getFloat("Weight") ?: 0f else 0f
+                val valueFrom = category.getFloat("ValueFrom") ?: 0f
+                val valueTo = category.getFloat("ValueTo") ?: 0f
+
+                val gradeCategoryObject = GradeCategory(
+                        profileId,
+                        id,
+                        weight,
+                        color,
+                        name
+                ).apply {
+                    type = GradeCategory.TYPE_POINT
+                    setValueRange(valueFrom, valueTo)
+                }
+
+                data.gradeCategories.put(id, gradeCategoryObject)
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_POINT_GRADE_CATEGORIES, 1 * DAY)
+            onSuccess()
+        }
+    }
+}

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

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-29
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_POINT_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_POINT_AVG
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class LibrusApiPointGrades(override val data: DataLibrus,
+                           val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiPointGrades"
+    }
+
+    init { data.profile?.also { profile ->
+        apiGet(TAG, "PointGrades") { json ->
+
+            json.getJsonArray("Grades")?.asJsonObjectList()?.forEach { grade ->
+                val id = grade.getLong("Id") ?: return@forEach
+                val teacherId = grade.getJsonObject("AddedBy")?.getLong("Id") ?: return@forEach
+                val semester = grade.getInt("Semester") ?: return@forEach
+                val subjectId = grade.getJsonObject("Subject")?.getLong("Id") ?: return@forEach
+                val name = grade.getString("Grade") ?: return@forEach
+                val value = grade.getFloat("GradeValue") ?: 0f
+
+                val categoryId = grade.getJsonObject("Category")?.getLong("Id") ?: return@forEach
+
+                val category = data.gradeCategories.singleOrNull {
+                    it.categoryId == categoryId && it.type == GradeCategory.TYPE_POINT
+                }
+
+                val addedDate = Date.fromIso(grade.getString("AddDate") ?: return@forEach)
+
+                val gradeObject = Grade(
+                        profileId,
+                        id,
+                        category?.text ?: "",
+                        category?.color ?: -1,
+                        "",
+                        name,
+                        value,
+                        category?.weight ?: 0f,
+                        semester,
+                        teacherId,
+                        subjectId
+                ).apply {
+                    type = TYPE_POINT_AVG
+                    valueMax = category?.valueTo ?: 0f
+                }
+
+                data.gradeList.add(gradeObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_GRADE,
+                        id,
+                        profile.empty,
+                        profile.empty,
+                        addedDate
+                ))
+            }
+
+            data.toRemove.add(DataRemoveModel.Grades.semesterWithType(profile.currentSemester, TYPE_POINT_AVG))
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_POINT_GRADES, SYNC_ALWAYS)
+            onSuccess()
+        }
+    } ?: onSuccess() }
+}

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

@@ -8,6 +8,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_PT_MEETINGS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.modules.events.Event
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.utils.models.Date
@@ -61,6 +62,8 @@ class LibrusApiPtMeetings(override val data: DataLibrus,
                         ))
             }
 
+            data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_PT_MEETING))
+
             data.setSyncNext(ENDPOINT_LIBRUS_API_PT_MEETINGS, 12*HOUR)
             onSuccess()
         }

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

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-29
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api
+
+import android.graphics.Color
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_TEXT_GRADE_CATEGORIES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
+
+class LibrusApiTextGradeCategories(override val data: DataLibrus,
+                                   val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiTextGradeCategories"
+    }
+
+    init {
+        apiGet(TAG, "TextGrades/Categories") { json ->
+            json.getJsonArray("Categories")?.asJsonObjectList()?.forEach { category ->
+                val id = category.getLong("Id") ?: return@forEach
+                val name = category.getString("Name") ?: ""
+                val color = category.getJsonObject("Color")?.getInt("Id")
+                        ?.let { data.getColor(it) } ?: Color.BLUE
+
+                val gradeCategoryObject = GradeCategory(
+                        profileId,
+                        id,
+                        -1f,
+                        color,
+                        name
+                ).apply {
+                    type = GradeCategory.TYPE_TEXT
+                }
+
+                data.gradeCategories.put(id, gradeCategoryObject)
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_TEXT_GRADE_CATEGORIES, 1 * DAY)
+            onSuccess()
+        }
+    }
+}

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

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-29
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_TEXT_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_DESCRIPTIVE
+import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class LibrusApiTextGrades(override val data: DataLibrus,
+                          val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiTextGrades"
+    }
+
+    init { data.profile?.also { profile ->
+        apiGet(TAG, "DescriptiveGrades") { json ->
+
+            json.getJsonArray("Grades")?.asJsonObjectList()?.forEach { grade ->
+                val id = grade.getLong("Id") ?: return@forEach
+                val teacherId = grade.getJsonObject("AddedBy")?.getLong("Id") ?: return@forEach
+                val semester = grade.getInt("Semester") ?: return@forEach
+                val subjectId = grade.getJsonObject("Subject")?.getLong("Id") ?: return@forEach
+                val description = grade.getString("RealGradeValue") ?: grade.getString("Map") ?: ""
+
+                val categoryId = grade.getJsonObject("Skill")?.getLong("Id") ?: return@forEach
+
+                val category = data.gradeCategories.singleOrNull {
+                    it.categoryId == categoryId && it.type == GradeCategory.TYPE_DESCRIPTIVE
+                }
+
+                val addedDate = Date.fromIso(grade.getString("AddDate") ?: return@forEach)
+
+                val gradeObject = Grade(
+                        profileId,
+                        id,
+                        category?.text ?: "",
+                        category?.color ?: -1,
+                        "",
+                        description,
+                        0f,
+                        0f,
+                        semester,
+                        teacherId,
+                        subjectId
+                ).apply {
+                    type = TYPE_DESCRIPTIVE
+                }
+
+                data.gradeList.add(gradeObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_GRADE,
+                        id,
+                        profile.empty,
+                        profile.empty,
+                        addedDate
+                ))
+            }
+
+            data.toRemove.add(DataRemoveModel.Grades.semesterWithType(profile.currentSemester, TYPE_DESCRIPTIVE))
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_TEXT_GRADES, SYNC_ALWAYS)
+            onSuccess()
+        }
+    } ?: onSuccess() }
+}

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

@@ -25,7 +25,14 @@ class LibrusApiUsers(override val data: DataLibrus,
                 val firstName = user.getString("FirstName")?.fixName() ?: ""
                 val lastName = user.getString("LastName")?.fixName() ?: ""
 
-                data.teacherList.put(id, Teacher(profileId, id, firstName, lastName))
+                val teacher = Teacher(profileId, id, firstName, lastName)
+
+                if (user.getBoolean("IsSchoolAdministrator") == true)
+                    teacher.setTeacherType(Teacher.TYPE_SCHOOL_ADMIN)
+                if (user.getBoolean("IsPedagogue") == true)
+                    teacher.setTeacherType(Teacher.TYPE_PEDAGOGUE)
+
+                data.teacherList.put(id, teacher)
             }
 
             data.setSyncNext(ENDPOINT_LIBRUS_API_USERS, 4*DAY)

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

@@ -17,6 +17,7 @@ import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+import pl.szczodrzynski.edziennik.fixName
 import pl.szczodrzynski.edziennik.singleOrNull
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date
@@ -51,12 +52,12 @@ class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int
                     val recipientFirstName = element.select(when (type) {
                         TYPE_RECEIVED -> "senderFirstName"
                         else -> "receiverFirstName"
-                    }).text().trim()
+                    }).text().fixName()
 
                     val recipientLastName = element.select(when (type) {
                         TYPE_RECEIVED -> "senderLastName"
                         else -> "receiverLastName"
-                    }).text().trim()
+                    }).text().fixName()
 
                     val recipientId = data.teacherList.singleOrNull {
                         it.name == recipientFirstName && it.surname == recipientLastName

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

@@ -14,7 +14,10 @@ import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipientFull
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.fixName
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.notEmptyOrNull
 import pl.szczodrzynski.edziennik.singleOrNull
 import pl.szczodrzynski.edziennik.utils.models.Date
 import java.nio.charset.Charset
@@ -56,11 +59,45 @@ class LibrusMessagesGetMessage(
 
             when (messageObject.type) {
                 TYPE_RECEIVED -> {
-                    val senderLoginId = message.select("senderId").text()
-                    data.teacherList.singleOrNull { it.id == messageObject.senderId }?.loginId = senderLoginId
+                    val senderLoginId = message.select("senderId").text().notEmptyOrNull()
+                    val senderGroupId = message.select("senderGroupId").text().toIntOrNull()
+                    val userClass = message.select("userClass").text().notEmptyOrNull()
+                    data.teacherList.singleOrNull { it.id == messageObject.senderId }?.apply {
+                        loginId = senderLoginId
+                        setTeacherType(when (senderGroupId) {
+                            /* https://api.librus.pl/2.0/Messages/Role */
+                            0, 1, 99 -> Teacher.TYPE_SUPER_ADMIN
+                            2 -> Teacher.TYPE_SCHOOL_ADMIN
+                            3 -> Teacher.TYPE_PRINCIPAL
+                            4 -> Teacher.TYPE_TEACHER
+                            5, 9 -> {
+                                if (typeDescription == null)
+                                    typeDescription = userClass
+                                Teacher.TYPE_PARENT
+                            }
+                            7 -> Teacher.TYPE_SECRETARIAT
+                            8 -> {
+                                if (typeDescription == null)
+                                    typeDescription = userClass
+                                Teacher.TYPE_STUDENT
+                            }
+                            10 -> Teacher.TYPE_PEDAGOGUE
+                            11 -> Teacher.TYPE_LIBRARIAN
+                            12 -> Teacher.TYPE_SPECIALIST
+                            21 -> {
+                                typeDescription = "Jednostka Nadrzędna"
+                                Teacher.TYPE_OTHER
+                            }
+                            50 -> {
+                                typeDescription = "Jednostka Samorządu Terytorialnego"
+                                Teacher.TYPE_OTHER
+                            }
+                            else -> Teacher.TYPE_OTHER
+                        })
+                    }
 
                     val readDateText = message.select("readDate").text()
-                    val readDate = when (readDateText.isNotEmpty()) {
+                    val readDate = when (readDateText.isNotNullNorEmpty()) {
                         true -> Date.fromIso(readDateText)
                         else -> 0
                     }
@@ -73,7 +110,7 @@ class LibrusMessagesGetMessage(
                             messageObject.id
                     )
 
-                    messageRecipientObject.fullName = profile.accountNameLong ?: profile.studentNameLong
+                    messageRecipientObject.fullName = profile.accountNameLong ?: profile.studentNameLong ?: ""
 
                     messageRecipientList.add(messageRecipientObject)
                 }
@@ -90,7 +127,7 @@ class LibrusMessagesGetMessage(
                         teacher?.loginId = receiverLoginId
 
                         val readDateText = message.select("readed").text()
-                        val readDate = when (readDateText.isNotEmpty()) {
+                        val readDate = when (readDateText.isNotNullNorEmpty()) {
                             true -> Date.fromIso(readDateText)
                             else -> 0
                         }
@@ -111,7 +148,7 @@ class LibrusMessagesGetMessage(
             }
 
             if (!messageObject.seen) {
-                data.messageMetadataList.add(Metadata(
+                data.setSeenMetadataList.add(Metadata(
                         messageObject.profileId,
                         Metadata.TYPE_MESSAGE,
                         messageObject.id,

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

@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-12-31.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages
+
+import androidx.core.util.set
+import androidx.room.OnConflictStrategy
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
+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.RecipientListGetEvent
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+
+class LibrusMessagesGetRecipientList(
+        override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusMessages(data) {
+    companion object {
+        private const val TAG = "LibrusMessagesGetRecipientList"
+    }
+
+    private val listTypes = mutableListOf<Pair<String, String>>()
+
+    init {
+        messagesGet(TAG, "Receivers/action/GetTypes", parameters = mapOf(
+            "includeClass" to 1
+        )) { doc ->
+            doc.select("response GetTypes data list ArrayItem")?.forEach {
+                val id = it.getElementsByTag("id")?.firstOrNull()?.ownText() ?: return@forEach
+                val name = it.getElementsByTag("name")?.firstOrNull()?.ownText() ?: return@forEach
+                listTypes += id to name
+            }
+
+            getLists()
+        }
+    }
+
+    private fun getLists() {
+        if (listTypes.isEmpty()) {
+            finish()
+            return
+        }
+        val type = listTypes.removeAt(0)
+        if (type.first == "contactsGroups") {
+            getLists()
+            return
+        }
+        messagesGetJson(TAG, "Receivers/action/GetListForType", parameters = mapOf(
+                "receiverType" to type.first
+        )) { json ->
+            val dataEl = json?.getJsonObject("response")?.getJsonObject("GetListForType")?.get("data")
+            if (dataEl is JsonObject) {
+                val listEl = dataEl.get("ArrayItem")
+                if (listEl is JsonArray) {
+                    listEl.asJsonObjectList()?.forEach { item ->
+                        processElement(item, type.first, type.second)
+                    }
+                }
+                if (listEl is JsonObject) {
+                    processElement(listEl, type.first, type.second)
+                }
+            }
+
+            getLists()
+        }
+    }
+
+    private fun processElement(element: JsonObject, typeId: String, typeName: String, listName: String? = null) {
+        val listEl = element.getJsonObject("list")?.get("ArrayItem")
+        if (listEl is JsonArray) {
+            listEl.asJsonObjectList()?.let { list ->
+                val label = element.getString("label") ?: ""
+                list.forEach { item ->
+                    processElement(item, typeId, typeName, label)
+                }
+                return
+            }
+        }
+        if (listEl is JsonObject) {
+            val label = element.getString("label") ?: ""
+            processElement(listEl, typeId, typeName, label)
+            return
+        }
+        processRecipient(element, typeId, typeName, listName)
+    }
+
+    private fun processRecipient(recipient: JsonObject, typeId: String, typeName: String, listName: String? = null) {
+        val id = recipient.getLong("id") ?: return
+        val label = recipient.getString("label") ?: return
+
+        val fullNameLastFirst: String
+        val description: String?
+        if (typeId == "parentsCouncil" || typeId == "schoolParentsCouncil") {
+            val delimiterIndex = label.lastIndexOf(" - ")
+            if (delimiterIndex == -1) {
+                fullNameLastFirst = label.fixName()
+                description = null
+            }
+            else {
+                fullNameLastFirst = label.substring(0, delimiterIndex).fixName()
+                description = label.substring(delimiterIndex+3)
+            }
+        }
+        else {
+            fullNameLastFirst = label.fixName()
+            description = null
+        }
+
+        var typeDescription: String? = null
+        val type = when (typeId) {
+            "tutors" -> Teacher.TYPE_EDUCATOR
+            "teachers" -> Teacher.TYPE_TEACHER
+            "classParents" -> Teacher.TYPE_PARENT
+            "guardians" -> Teacher.TYPE_PARENT
+            "parentsCouncil" -> {
+                typeDescription = joinNotNullStrings(": ", listName, description)
+                Teacher.TYPE_PARENTS_COUNCIL
+            }
+            "schoolParentsCouncil" -> {
+                typeDescription = joinNotNullStrings(": ", listName, description)
+                Teacher.TYPE_SCHOOL_PARENTS_COUNCIL
+            }
+            "pedagogue" -> Teacher.TYPE_PEDAGOGUE
+            "librarian" -> Teacher.TYPE_LIBRARIAN
+            "admin" -> Teacher.TYPE_SCHOOL_ADMIN
+            "secretary" -> Teacher.TYPE_SECRETARIAT
+            "sadmin" -> Teacher.TYPE_SUPER_ADMIN
+            else -> {
+                typeDescription = typeName
+                Teacher.TYPE_OTHER
+            }
+        }
+
+        // get teacher by fullName AND type or create it
+        val teacher = data.teacherList.singleOrNull {
+            it.fullNameLastFirst == fullNameLastFirst && ((type != Teacher.TYPE_SCHOOL_ADMIN && type != Teacher.TYPE_PEDAGOGUE) || it.isType(type))
+        } ?: Teacher(data.profileId, id).apply {
+            if (typeId == "sadmin" && id == 2L) {
+                name = "Pomoc"
+                surname = "Techniczna LIBRUS"
+            }
+            else {
+                name = fullNameLastFirst
+                fullNameLastFirst.splitName()?.let {
+                    name = it.second
+                    surname = it.first
+                }
+            }
+            data.teacherList[id] = this
+        }
+
+        teacher.apply {
+            this.loginId = id.toString()
+            this.setTeacherType(type)
+            if (this.typeDescription.isNullOrBlank())
+                this.typeDescription = typeDescription
+        }
+    }
+
+    private fun finish() {
+        val event = RecipientListGetEvent(
+                data.profileId,
+                data.teacherList.filter { it.loginId != null }
+        )
+
+        profile?.lastReceiversSync = System.currentTimeMillis()
+
+        data.teacherOnConflictStrategy = OnConflictStrategy.REPLACE
+        EventBus.getDefault().postSticky(event)
+        onSuccess()
+    }
+}

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

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-2.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.base64Encode
+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.MessageSentEvent
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+import pl.szczodrzynski.edziennik.getJsonObject
+import pl.szczodrzynski.edziennik.getLong
+import pl.szczodrzynski.edziennik.getString
+
+class LibrusMessagesSendMessage(
+        override val data: DataLibrus,
+        val recipients: List<Teacher>,
+        val subject: String,
+        val text: String,
+        val onSuccess: () -> Unit
+) : LibrusMessages(data) {
+    companion object {
+        const val TAG = "LibrusMessages"
+    }
+
+    init {
+        val params = mapOf<String, Any>(
+                "topic" to subject.base64Encode(),
+                "message" to text.base64Encode(),
+                "receivers" to recipients
+                        .filter { it.loginId != null }
+                        .joinToString(",") { it.loginId ?: "" },
+                "actions" to "<Actions/>".base64Encode()
+        )
+
+        messagesGetJson(TAG, "SendMessage", parameters = params) { json ->
+
+            val response = json.getJsonObject("response").getJsonObject("SendMessage")
+            val id = response.getLong("data")
+
+            if (response.getString("status") != "ok" || id == null) {
+                val message = response.getString("message")
+                // TODO error
+                return@messagesGetJson
+            }
+
+            LibrusMessagesGetList(data, type = Message.TYPE_SENT) {
+                val message = data.messageIgnoreList.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)
+
+                EventBus.getDefault().postSticky(event)
+                onSuccess()
+            }
+        }
+    }
+}

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

@@ -23,14 +23,14 @@ class LibrusSynergiaHomework(override val data: DataLibrus, val onSuccess: () ->
         const val TAG = "LibrusSynergiaHomework"
     }
 
-    init {
+    init { data.profile?.also { profile ->
         synergiaGet(TAG, "moje_zadania", method = POST, parameters = mapOf(
                 "dataOd" to
-                        if (data.profile?.empty != false)
-                            profile!!.getSemesterStart(1).stringY_m_d
+                        if (!data.profile.empty)
+                            profile.getSemesterStart(1).stringY_m_d
                         else
                             Date.getToday().stringY_m_d,
-                "dataDo" to profile!!.getSemesterEnd(profile?.currentSemester ?: 2).stringY_m_d,
+                "dataDo" to Date.getToday().stepForward(0, 0, 7).stringY_m_d,
                 "przedmiot" to -1
 
         )) { text ->
@@ -65,7 +65,7 @@ class LibrusSynergiaHomework(override val data: DataLibrus, val onSuccess: () ->
                     val description = "Treść: (.*)".toRegex(RegexOption.DOT_MATCHES_ALL).find(moreInfo)
                             ?.get(1)?.replace("<br.*/>".toRegex(), "\n")?.trim()
 
-                    val seen = when (profile?.empty) {
+                    val seen = when (profile.empty) {
                         true -> true
                         else -> eventDate < Date.getToday()
                     }
@@ -102,5 +102,5 @@ class LibrusSynergiaHomework(override val data: DataLibrus, val onSuccess: () ->
             data.setSyncNext(ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK, 2 * HOUR, DRAWER_ITEM_HOMEWORK)
             onSuccess()
         }
-    }
+    } ?: onSuccess() }
 }

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

@@ -6,6 +6,7 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia
 
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 
 class LibrusSynergiaMarkAllAnnouncementsAsRead(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusSynergia(data) {
     companion object {
@@ -14,6 +15,7 @@ class LibrusSynergiaMarkAllAnnouncementsAsRead(override val data: DataLibrus, va
 
     init {
         synergiaGet(TAG, "ogloszenia") {
+            data.app.db.metadataDao().setAllSeen(profileId, Metadata.TYPE_ANNOUNCEMENT, true)
             onSuccess()
         }
     }

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

@@ -2,10 +2,7 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.librus.firstlogin
 
 import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.ERROR_NO_STUDENTS_IN_ACCOUNT
-import pl.szczodrzynski.edziennik.data.api.FAKE_LIBRUS_ACCOUNTS
-import pl.szczodrzynski.edziennik.data.api.LIBRUS_ACCOUNTS_URL
-import pl.szczodrzynski.edziennik.data.api.LOGIN_MODE_LIBRUS_EMAIL
+import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusPortal
@@ -13,8 +10,6 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginApi
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginPortal
 import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.models.AppError.CODE_LIBRUS_DISCONNECTED
-import pl.szczodrzynski.edziennik.data.api.models.AppError.CODE_SYNERGIA_NOT_ACTIVATED
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
 
 class LibrusFirstLogin(val data: DataLibrus, val onSuccess: () -> Unit) {
@@ -46,8 +41,8 @@ class LibrusFirstLogin(val data: DataLibrus, val onSuccess: () -> Unit) {
 
                         val state = account.getString("state")
                         when (state) {
-                            "requiring_an_action" -> CODE_LIBRUS_DISCONNECTED
-                            "need-activation" -> CODE_SYNERGIA_NOT_ACTIVATED
+                            "requiring_an_action" -> ERROR_LIBRUS_PORTAL_SYNERGIA_DISCONNECTED
+                            "need-activation" -> ERROR_LOGIN_LIBRUS_PORTAL_NOT_ACTIVATED
                             else -> null
                         }?.let { errorCode ->
                             data.error(ApiError(TAG, errorCode)

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

@@ -59,7 +59,7 @@ class SynergiaTokenExtractor(override val data: DataLibrus, val onSuccess: () ->
                 data.apiTokenExpiryTime = response.getUnixDate() + 6 * 60 * 60
 
                 // TODO remove this
-                data.profile?.studentNameLong = json.getString("studentName")
+                data.profile?.studentNameLong = json.getString("studentName") ?: ""
                 val nameParts = json.getString("studentName")?.split(" ")
                 data.profile?.studentNameShort = nameParts?.get(0) + " " + nameParts?.get(1)?.get(0)
 

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

@@ -6,22 +6,23 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik
 
 import com.google.gson.JsonObject
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.CODE_INTERNAL_LIBRUS_ACCOUNT_410
+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.firstlogin.MobidziennikFirstLogin
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login.MobidziennikLogin
-import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login.MobidziennikLoginWeb
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
-import pl.szczodrzynski.edziennik.data.api.mobidziennikLoginMethods
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.prepare
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
 class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
@@ -33,6 +34,7 @@ class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginSto
 
     val internalErrorList = mutableListOf<Int>()
     val data: DataMobidziennik
+    private var afterLogin: (() -> Unit)? = null
 
     init {
         data = DataMobidziennik(app, profile, loginStore).apply {
@@ -59,41 +61,69 @@ class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginSto
     override fun sync(featureIds: List<Int>, viewId: Int?, arguments: JsonObject?) {
         data.arguments = arguments
         data.prepare(mobidziennikLoginMethods, MobidziennikFeatures, featureIds, viewId)
-        d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}")
-        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        login()
+    }
+
+    private fun login(loginMethodId: Int? = null, afterLogin: (() -> Unit)? = null) {
+        d(TAG, "Trying to login with ${data.targetLoginMethodIds}")
+        if (internalErrorList.isNotEmpty()) {
+            d(TAG, "  - Internal errors:")
+            internalErrorList.forEach { d(TAG, "      - code $it") }
+        }
+        loginMethodId?.let { data.prepareFor(mobidziennikLoginMethods, it) }
+        afterLogin?.let { this.afterLogin = it }
         MobidziennikLogin(data) {
-            MobidziennikData(data) {
-                completed()
-            }
+            data()
+        }
+    }
+
+    private fun data() {
+        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        if (internalErrorList.isNotEmpty()) {
+            d(TAG, "  - Internal errors:")
+            internalErrorList.forEach { d(TAG, "      - code $it") }
+        }
+        afterLogin?.invoke() ?: MobidziennikData(data) {
+            completed()
         }
     }
 
     override fun getMessage(message: MessageFull) {
-        MobidziennikLoginWeb(data) {
+        login(LOGIN_METHOD_MOBIDZIENNIK_WEB) {
             MobidziennikWebGetMessage(data, message) {
                 completed()
             }
         }
     }
 
-    override fun markAllAnnouncementsAsRead() {
-
+    override fun sendMessage(recipients: List<Teacher>, subject: String, text: String) {
+        login(LOGIN_METHOD_MOBIDZIENNIK_WEB) {
+            MobidziennikWebSendMessage(data, recipients, subject, text) {
+                completed()
+            }
+        }
     }
 
+    override fun markAllAnnouncementsAsRead() {}
+    override fun getAnnouncement(announcement: AnnouncementFull) {}
+
     override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {
-        MobidziennikLoginWeb(data) {
+        login(LOGIN_METHOD_MOBIDZIENNIK_WEB) {
             MobidziennikWebGetAttachment(data, message, attachmentId, attachmentName) {
                 completed()
             }
         }
     }
 
-    override fun firstLogin() {
-        MobidziennikFirstLogin(data) {
-            completed()
+    override fun getRecipientList() {
+        login(LOGIN_METHOD_MOBIDZIENNIK_WEB) {
+            MobidziennikWebGetRecipientList(data) {
+                completed()
+            }
         }
     }
 
+    override fun firstLogin() { MobidziennikFirstLogin(data) { completed() } }
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
@@ -101,28 +131,25 @@ class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginSto
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
         return object : EdziennikCallback {
-            override fun onCompleted() {
-                callback.onCompleted()
-            }
-
-            override fun onProgress(step: Float) {
-                callback.onProgress(step)
-            }
-
-            override fun onStartProgress(stringRes: Int) {
-                callback.onStartProgress(stringRes)
-            }
-
+            override fun onCompleted() { callback.onCompleted() }
+            override fun onProgress(step: Float) { callback.onProgress(step) }
+            override fun onStartProgress(stringRes: Int) { callback.onStartProgress(stringRes) }
             override fun onError(apiError: ApiError) {
+                if (apiError.errorCode in internalErrorList) {
+                    // finish immediately if the same error occurs twice during the same sync
+                    callback.onError(apiError)
+                    return
+                }
+                internalErrorList.add(apiError.errorCode)
                 when (apiError.errorCode) {
-                    in internalErrorList -> {
-                        // finish immediately if the same error occurs twice during the same sync
-                        callback.onError(apiError)
-                    }
-                    CODE_INTERNAL_LIBRUS_ACCOUNT_410 -> {
-                        internalErrorList.add(apiError.errorCode)
-                        loginStore.removeLoginData("refreshToken") // force a clean login
-                        //loginLibrus()
+                    ERROR_MOBIDZIENNIK_WEB_ACCESS_DENIED,
+                    ERROR_MOBIDZIENNIK_WEB_NO_SESSION_KEY,
+                    ERROR_MOBIDZIENNIK_WEB_NO_SESSION_VALUE,
+                    ERROR_MOBIDZIENNIK_WEB_NO_SERVER_ID -> {
+                        data.loginMethods.remove(LOGIN_METHOD_MOBIDZIENNIK_WEB)
+                        data.prepareFor(mobidziennikLoginMethods, LOGIN_METHOD_MOBIDZIENNIK_WEB)
+                        data.webSessionIdExpiryTime = 0
+                        login()
                     }
                     else -> callback.onError(apiError)
                 }

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

@@ -26,8 +26,15 @@ open class MobidziennikWeb(open val data: DataMobidziennik) {
     val profile
         get() = data.profile
 
-    fun webGet(tag: String, endpoint: String, method: Int = GET, onSuccess: (text: String) -> Unit) {
-        val url = "https://${data.loginServerName}.mobidziennik.pl$endpoint"
+    fun webGet(
+            tag: String,
+            endpoint: String,
+            method: Int = GET,
+            parameters: List<Pair<String, Any>> = emptyList(),
+            fullUrl: String? = null,
+            onSuccess: (text: String) -> Unit
+    ) {
+        val url = fullUrl ?: "https://${data.loginServerName}.mobidziennik.pl$endpoint"
 
         d(tag, "Request: Mobidziennik/Web - $url")
 
@@ -91,6 +98,15 @@ open class MobidziennikWeb(open val data: DataMobidziennik) {
         Request.builder()
                 .url(url)
                 .userAgent(MOBIDZIENNIK_USER_AGENT)
+                .apply {
+                    when (method) {
+                        GET -> get()
+                        POST -> post()
+                    }
+                    parameters.map { (name, value) ->
+                        addParameter(name, value)
+                    }
+                }
                 .callback(callback)
                 .build()
                 .enqueue()

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

@@ -15,6 +15,7 @@ import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipientFull
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.fixName
 import pl.szczodrzynski.edziennik.get
 import pl.szczodrzynski.edziennik.singleOrNull
 import pl.szczodrzynski.edziennik.utils.Utils.monthFromName
@@ -67,7 +68,7 @@ class MobidziennikWebGetMessage(
                         message.id
                 )
 
-                recipient.fullName = profile?.accountNameLong ?: profile?.studentNameLong
+                recipient.fullName = profile?.accountNameLong ?: profile?.studentNameLong ?: ""
 
                 messageRecipientList.add(recipient)
             } else {
@@ -76,7 +77,7 @@ class MobidziennikWebGetMessage(
 
                 content.select("table.spis tr:has(td)")?.forEach { recipientEl ->
                     val senderEl = recipientEl.select("td:eq(0)").first()
-                    val senderName = senderEl.text()
+                    val senderName = senderEl.text().fixName()
 
                     val teacher = data.teacherList.singleOrNull { it.fullNameLastFirst == senderName }
                     val receiverId = teacher?.id ?: -1
@@ -117,7 +118,7 @@ class MobidziennikWebGetMessage(
 
             // this needs to be at the end
             message.apply {
-                this.body = body.html()
+                this.body = body.html().replace("\n", "<br>")
 
                 clearAttachments()
                 content.select("ul li").map { it.select("a").first() }.forEach {
@@ -136,7 +137,7 @@ class MobidziennikWebGetMessage(
             }
 
             if (!message.seen) { // TODO discover why this monstrosity instead of MetadataDao.setSeen
-                data.messageMetadataList.add(Metadata(
+                data.setSeenMetadataList.add(Metadata(
                         message.profileId,
                         Metadata.TYPE_MESSAGE,
                         message.id,

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

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-12-22.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web
+
+import androidx.core.util.set
+import androidx.room.OnConflictStrategy
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
+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.RecipientListGetEvent
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+
+class MobidziennikWebGetRecipientList(
+        override val data: DataMobidziennik, val onSuccess: () -> Unit) : MobidziennikWeb(data) {
+    companion object {
+        private const val TAG = "MobidziennikWebGetRecipientList"
+    }
+
+    init {
+        webGet(TAG, "/mobile/dodajwiadomosc") { text ->
+            Regexes.MOBIDZIENNIK_MESSAGE_RECIPIENTS_JSON.find(text)?.let { match ->
+                val recipientLists = JsonParser().parse(match[1]).asJsonArray
+                recipientLists?.asJsonObjectList()?.forEach { list ->
+                    val listType = list.getString("typ")?.toIntOrNull() ?: -1
+                    val listName = list.getString("nazwa") ?: ""
+                    list.getJsonArray("dane")?.asJsonObjectList()?.forEach { recipient ->
+                        if (recipient.getBoolean("lista") == true) {
+                            recipient.getJsonArray("dane")?.asJsonObjectList()?.forEach {
+                                processRecipient(listType, recipient.getString("nazwa") ?: "", it)
+                            }
+                        }
+                        else
+                            processRecipient(listType, listName, recipient)
+                    }
+                }
+            }
+
+            val event = RecipientListGetEvent(
+                    data.profileId,
+                    data.teacherList.filter { it.loginId != null }
+            )
+
+            profile?.lastReceiversSync = System.currentTimeMillis()
+
+            data.teacherOnConflictStrategy = OnConflictStrategy.REPLACE
+            EventBus.getDefault().postSticky(event)
+            onSuccess()
+        }
+    }
+
+    private fun processRecipient(listType: Int, listName: String, recipient: JsonObject) {
+        val id = recipient.getLong("id") ?: -1
+        // get teacher by ID or create it
+        val teacher = data.teacherList[id] ?: Teacher(data.profileId, id).apply {
+            val fullName = recipient.getString("nazwa")?.fixName()
+            name = fullName ?: ""
+            fullName?.splitName()?.let {
+                name = it.second
+                surname = it.first
+            }
+            data.teacherList[id] = this
+        }
+
+        teacher.apply {
+            loginId = id.toString()
+            when (listType) {
+                1 -> setTeacherType(Teacher.TYPE_PRINCIPAL)
+                2 -> setTeacherType(Teacher.TYPE_TEACHER)
+                3 -> setTeacherType(Teacher.TYPE_PARENT)
+                4 -> setTeacherType(Teacher.TYPE_STUDENT)
+                //5 -> Użytkownicy zewnętrzni
+                //6 -> Samorządy klasowe
+                7 -> setTeacherType(Teacher.TYPE_PARENTS_COUNCIL) // Rady oddziałowe rodziców
+                8 -> {
+                    setTeacherType(Teacher.TYPE_EDUCATOR)
+                    typeDescription = listName
+                }
+                9 -> setTeacherType(Teacher.TYPE_PEDAGOGUE)
+                10 -> setTeacherType(Teacher.TYPE_SPECIALIST)
+                else -> when (listName) {
+                    "Administratorzy" -> setTeacherType(Teacher.TYPE_SCHOOL_ADMIN)
+                    "Sekretarka" -> setTeacherType(Teacher.TYPE_SECRETARIAT)
+                    "Wsparcie techniczne mobiDziennik" -> setTeacherType(Teacher.TYPE_SUPER_ADMIN)
+                    else -> {
+                        setTeacherType(Teacher.TYPE_OTHER)
+                        typeDescription = listName
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -14,6 +14,7 @@ import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.fixName
 import pl.szczodrzynski.edziennik.singleOrNull
 import pl.szczodrzynski.edziennik.utils.models.Date
 
@@ -55,14 +56,15 @@ class MobidziennikWebMessagesAll(override val data: DataMobidziennik,
 
                 if (type == TYPE_RECEIVED) {
                     // search sender teacher
-                    val senderName = senderEl.text()
+                    val senderName = senderEl.text().fixName()
                     senderId = data.teacherList.singleOrNull { it.fullNameLastFirst == senderName }?.id ?: -1
                     data.messageRecipientList.add(MessageRecipient(profileId, -1, id))
                 } else {
                     // TYPE_SENT, so multiple recipients possible
                     val recipientNames = senderEl.text().split(", ")
                     for (recipientName in recipientNames) {
-                        val recipientId = data.teacherList.singleOrNull { it.fullNameLastFirst == recipientName }?.id ?: -1
+                        val name = recipientName.fixName()
+                        val recipientId = data.teacherList.singleOrNull { it.fullNameLastFirst == name }?.id ?: -1
                         data.messageRecipientIgnoreList.add(MessageRecipient(profileId, recipientId, id))
                     }
                 }

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

@@ -12,6 +12,7 @@ import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.fixName
 import pl.szczodrzynski.edziennik.singleOrNull
 import pl.szczodrzynski.edziennik.utils.models.Date
 
@@ -48,7 +49,7 @@ class MobidziennikWebMessagesInbox(override val data: DataMobidziennik,
                 val addedDate = Date.fromIsoHm(addedDateEl.text())
 
                 val senderEl = item.select("td:eq(2)").first()
-                val senderName = senderEl.ownText()
+                val senderName = senderEl.ownText().fixName()
                 val senderId = data.teacherList.singleOrNull { it.fullNameLastFirst == senderName }?.id ?: -1
                 data.messageRecipientIgnoreList.add(MessageRecipient(profileId, -1, id))
 
@@ -68,7 +69,7 @@ class MobidziennikWebMessagesInbox(override val data: DataMobidziennik,
                     message.setHasAttachments()
 
                 data.messageIgnoreList.add(message)
-                data.messageMetadataList.add(
+                data.setSeenMetadataList.add(
                         Metadata(
                                 profileId,
                                 Metadata.TYPE_MESSAGE,

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

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-12-26.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.POST
+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.MessageSentEvent
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+
+class MobidziennikWebSendMessage(
+        override val data: DataMobidziennik,
+        val recipients: List<Teacher>,
+        val subject: String,
+        val text: String,
+        val onSuccess: () -> Unit
+) : MobidziennikWeb(data) {
+    companion object {
+        private const val TAG = "MobidziennikWebSendMessage"
+    }
+
+    init {
+        val params = mutableListOf<Pair<String, Any>>(
+                "nazwa" to subject,
+                "tresc" to text
+        )
+        for (teacher in recipients) {
+            teacher.loginId?.let {
+                params += "odbiorcy[]" to it
+            }
+        }
+
+        webGet(TAG, endpoint = "/dziennik/dodajwiadomosc", method = POST, parameters = params) { text ->
+
+            if (!text.contains(">Wiadomość została wysłana.<")) {
+                // TODO error
+                return@webGet
+            }
+
+            // TODO create MobidziennikWebMessagesSent and replace this
+            MobidziennikWebMessagesAll(data) {
+                val message = data.messageIgnoreList.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)
+
+                EventBus.getDefault().postSticky(event)
+                onSuccess()
+            }
+        }
+    }
+}

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

@@ -15,10 +15,12 @@ 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.templateLoginMethods
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
 class Template(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
@@ -67,14 +69,26 @@ class Template(val app: App, val profile: Profile?, val loginStore: LoginStore,
 
     }
 
+    override fun sendMessage(recipients: List<Teacher>, subject: String, text: String) {
+
+    }
+
     override fun markAllAnnouncementsAsRead() {
 
     }
 
+    override fun getAnnouncement(announcement: AnnouncementFull) {
+
+    }
+
     override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {
 
     }
 
+    override fun getRecipientList() {
+
+    }
+
     override fun firstLogin() {
         TemplateFirstLogin(data) {
             completed()

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

@@ -171,7 +171,7 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
                 "P02" -> "http://efeb-komunikacja.pro-hudsonrc.win.vulcan.pl"
                 "P90" -> "http://efeb-komunikacja-pro-mwujakowska.neo.win.vulcan.pl"
                 "FK1", "FS1" -> "http://api.fakelog.cf"
-                "SZ9" -> "http://vulcan.szkolny.eu"
+                "SZ9" -> "http://hack.szkolny.eu"
                 else -> null
             }
             return if (url != null) "$url/$symbol" else loginStore.getLoginData("apiUrl", null)

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

@@ -6,21 +6,24 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan
 
 import com.google.gson.JsonObject
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.CODE_INTERNAL_LIBRUS_ACCOUNT_410
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_API
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanData
 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.edziennik.vulcan.login.VulcanLoginApi
 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.modules.announcements.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
 class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
@@ -30,6 +33,7 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
 
     val internalErrorList = mutableListOf<Int>()
     val data: DataVulcan
+    private var afterLogin: (() -> Unit)? = null
 
     init {
         data = DataVulcan(app, profile, loginStore).apply {
@@ -56,18 +60,44 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
     override fun sync(featureIds: List<Int>, viewId: Int?, arguments: JsonObject?) {
         data.arguments = arguments
         data.prepare(vulcanLoginMethods, VulcanFeatures, featureIds, viewId)
-        d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}")
-        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        login()
+    }
+
+    private fun login(loginMethodId: Int? = null, afterLogin: (() -> Unit)? = null) {
+        d(TAG, "Trying to login with ${data.targetLoginMethodIds}")
+        if (internalErrorList.isNotEmpty()) {
+            d(TAG, "  - Internal errors:")
+            internalErrorList.forEach { d(TAG, "      - code $it") }
+        }
+        loginMethodId?.let { data.prepareFor(vulcanLoginMethods, it) }
+        afterLogin?.let { this.afterLogin = it }
         VulcanLogin(data) {
-            VulcanData(data) {
+            data()
+        }
+    }
+
+    private fun data() {
+        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        if (internalErrorList.isNotEmpty()) {
+            d(TAG, "  - Internal errors:")
+            internalErrorList.forEach { d(TAG, "      - code $it") }
+        }
+        afterLogin?.invoke() ?: VulcanData(data) {
+            completed()
+        }
+    }
+
+    override fun getMessage(message: MessageFull) {
+        login(LOGIN_METHOD_VULCAN_API) {
+            VulcanApiMessagesChangeStatus(data, message) {
                 completed()
             }
         }
     }
 
-    override fun getMessage(message: MessageFull) {
-        VulcanLoginApi(data) {
-            VulcanApiMessagesChangeStatus(data, message) {
+    override fun sendMessage(recipients: List<Teacher>, subject: String, text: String) {
+        login(LOGIN_METHOD_VULCAN_API) {
+            VulcanApiSendMessage(data, recipients, subject, text) {
                 completed()
             }
         }
@@ -77,16 +107,19 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
 
     }
 
+    override fun getAnnouncement(announcement: AnnouncementFull) {
+
+    }
+
     override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {
         
     }
 
-    override fun firstLogin() {
-        VulcanFirstLogin(data) {
-            completed()
-        }
+    override fun getRecipientList() {
+
     }
 
+    override fun firstLogin() { VulcanFirstLogin(data) { completed() } }
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
@@ -94,29 +127,17 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
         return object : EdziennikCallback {
-            override fun onCompleted() {
-                callback.onCompleted()
-            }
-
-            override fun onProgress(step: Float) {
-                callback.onProgress(step)
-            }
-
-            override fun onStartProgress(stringRes: Int) {
-                callback.onStartProgress(stringRes)
-            }
-
+            override fun onCompleted() { callback.onCompleted() }
+            override fun onProgress(step: Float) { callback.onProgress(step) }
+            override fun onStartProgress(stringRes: Int) { callback.onStartProgress(stringRes) }
             override fun onError(apiError: ApiError) {
+                if (apiError.errorCode in internalErrorList) {
+                    // finish immediately if the same error occurs twice during the same sync
+                    callback.onError(apiError)
+                    return
+                }
+                internalErrorList.add(apiError.errorCode)
                 when (apiError.errorCode) {
-                    in internalErrorList -> {
-                        // finish immediately if the same error occurs twice during the same sync
-                        callback.onError(apiError)
-                    }
-                    CODE_INTERNAL_LIBRUS_ACCOUNT_410 -> {
-                        internalErrorList.add(apiError.errorCode)
-                        loginStore.removeLoginData("refreshToken") // force a clean login
-                        //loginLibrus()
-                    }
                     else -> callback.onError(apiError)
                 }
             }

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

@@ -27,6 +27,9 @@ open class VulcanApi(open val data: DataVulcan) {
     val profileId
         get() = data.profile?.id ?: -1
 
+    val profile
+        get() = data.profile
+
     fun apiGet(
             tag: String,
             endpoint: String,

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

@@ -32,7 +32,7 @@ class VulcanApiMessagesChangeStatus(
             )) { _, _ ->
 
                 if (!messageObject.seen) {
-                    data.messageMetadataList.add(Metadata(
+                    data.setSeenMetadataList.add(Metadata(
                             profileId,
                             Metadata.TYPE_MESSAGE,
                             messageObject.id,

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

@@ -17,6 +17,7 @@ import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date
+import kotlin.text.replace
 
 class VulcanApiMessagesInbox(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
     companion object {
@@ -26,11 +27,11 @@ class VulcanApiMessagesInbox(override val data: DataVulcan, val onSuccess: () ->
     init {
         data.profile?.also { profile ->
 
-            val startDate: String = when (profile.empty) {
-                true -> profile.getSemesterStart(profile.currentSemester).stringY_m_d
-                else -> Date.getToday().stepForward(0, -1, 0).stringY_m_d
+            val startDate = when (profile.empty) {
+                true -> profile.getSemesterStart(profile.currentSemester).inUnix
+                else -> Date.getToday().stepForward(0, -2, 0).inUnix
             }
-            val endDate: String = profile.getSemesterEnd(profile.currentSemester).stringY_m_d
+            val endDate = Date.getToday().stepForward(0, 1, 0).inUnix
 
             apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_RECEIVED, parameters = mapOf(
                     "DataPoczatkowa" to startDate,
@@ -71,7 +72,7 @@ class VulcanApiMessagesInbox(override val data: DataVulcan, val onSuccess: () ->
                             profileId,
                             id,
                             subject,
-                            body,
+                            body.replace("\n", "<br>"),
                             TYPE_RECEIVED,
                             senderId,
                             -1

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

@@ -17,6 +17,7 @@ import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date
+import kotlin.text.replace
 
 class VulcanApiMessagesSent(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
     companion object {
@@ -25,11 +26,12 @@ class VulcanApiMessagesSent(override val data: DataVulcan, val onSuccess: () ->
 
     init {
         data.profile?.also { profile ->
-            val startDate: Long = when (profile.empty) {
+
+            val startDate = when (profile.empty) {
                 true -> profile.getSemesterStart(profile.currentSemester).inUnix
-                else -> Date.getToday().stepForward(0, -1, 0).inUnix
+                else -> Date.getToday().stepForward(0, -2, 0).inUnix
             }
-            val endDate: Long = profile.getSemesterEnd(profile.currentSemester).inUnix
+            val endDate = Date.getToday().stepForward(0, 1, 0).inUnix
 
             apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_SENT, parameters = mapOf(
                     "DataPoczatkowa" to startDate,
@@ -90,7 +92,7 @@ class VulcanApiMessagesSent(override val data: DataVulcan, val onSuccess: () ->
                             profileId,
                             id,
                             subject,
-                            body,
+                            body.replace("\n", "<br>"),
                             TYPE_SENT,
                             -1,
                             -1

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

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-12-29.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_MESSAGES_ADD
+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.MessageSentEvent
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+
+class VulcanApiSendMessage(
+        override val data: DataVulcan,
+        val recipients: List<Teacher>,
+        val subject: String,
+        val text: String,
+        val onSuccess: () -> Unit
+) : VulcanApi(data) {
+    companion object {
+        private const val TAG = "VulcanApiSendMessage"
+    }
+
+    init {
+        val recipientsArray = JsonArray()
+        for (teacher in recipients) {
+            teacher.loginId?.let {
+                recipientsArray += JsonObject(
+                        "LoginId" to it,
+                        "Nazwa" to "${teacher.fullNameLastFirst} - pracownik"
+                )
+            }
+        }
+        val params = mapOf(
+                "NadawcaWiadomosci" to (profile?.accountNameLong ?: profile?.studentNameLong ?: ""),
+                "Tytul" to subject,
+                "Tresc" to text,
+                "Adresaci" to recipientsArray,
+                "LoginId" to data.studentLoginId,
+                "IdUczen" to data.studentId
+        )
+
+        apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_ADD, parameters = params) { json, _ ->
+            val messageId = json.getJsonObject("Data").getLong("WiadomoscId")
+
+            if (messageId == null) {
+                // TODO error
+                return@apiGet
+            }
+
+            VulcanApiMessagesSent(data) {
+                val message = data.messageIgnoreList.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)
+
+                EventBus.getDefault().postSticky(event)
+                onSuccess()
+            }
+        }
+    }
+}

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

@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-26
+ */
+
+package pl.szczodrzynski.edziennik.data.api.events
+
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementFull
+
+data class AnnouncementGetEvent(val announcement: AnnouncementFull)

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

@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-12-27.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.events
+
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+
+data class MessageSentEvent(val profileId: Int, val message: Message?, val sentDate: Long?)

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

@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-12-22.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.events
+
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+
+data class RecipientListGetEvent(val profileId: Int, val teacherList: List<Teacher>)

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

@@ -5,14 +5,19 @@
 package pl.szczodrzynski.edziennik.data.api.interfaces
 
 import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 
 interface EdziennikInterface {
     fun sync(featureIds: List<Int>, viewId: Int? = null, arguments: JsonObject? = null)
     fun getMessage(message: MessageFull)
+    fun sendMessage(recipients: List<Teacher>, subject: String, text: String)
     fun markAllAnnouncementsAsRead()
+    fun getAnnouncement(announcement: AnnouncementFull)
     fun getAttachment(message: Message, attachmentId: Long, attachmentName: String)
+    fun getRecipientList()
     fun firstLogin()
     fun cancel()
 }

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

@@ -8,8 +8,12 @@ import android.content.Context
 import com.google.gson.JsonObject
 import im.wangchao.mhttp.Request
 import im.wangchao.mhttp.Response
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.api.szkolny.request.ErrorReportRequest
+import pl.szczodrzynski.edziennik.stackTraceString
 
-class ApiError(val tag: String, val errorCode: Int) {
+class ApiError(val tag: String, var errorCode: Int) {
+    val id = System.currentTimeMillis()
     var profileId: Int? = null
     var throwable: Throwable? = null
     var apiResponse: String? = null
@@ -44,16 +48,8 @@ class ApiError(val tag: String, val errorCode: Int) {
         return this
     }
 
-    fun toAppError(): AppError {
-        return AppError(
-                tag,
-                -1,
-                errorCode, response, throwable, apiResponse
-        )
-    }
-
-    fun getStringReason(context: Context): String {
-        return context.resources.getIdentifier("error_${errorCode}_reason", "string", context.packageName).let {
+    fun getStringText(context: Context): String {
+        return context.resources.getIdentifier("error_${errorCode}", "string", context.packageName).let {
             if (it != 0)
                 context.getString(it)
             else
@@ -61,9 +57,45 @@ class ApiError(val tag: String, val errorCode: Int) {
         }
     }
 
+    fun getStringReason(context: Context): String {
+        return context.resources.getIdentifier("error_${errorCode}_reason", "string", context.packageName).let {
+            if (it != 0)
+                context.getString(it)
+            else
+                context.getString(R.string.error_unknown_format, errorCode, tag)
+        }
+    }
+
     override fun toString(): String {
         return "ApiError(tag='$tag', errorCode=$errorCode, profileId=$profileId, throwable=$throwable, apiResponse=$apiResponse, request=$request, response=$response, isCritical=$isCritical)"
     }
 
+    fun toReportableError(context: Context): ErrorReportRequest.Error {
+        val requestString = request?.let {
+            it.method() + " " + it.url() + "\n" + it.headers()
+        }
+        val responseString = response?.let {
+            if (it.parserErrorBody == null) {
+                try {
+                    it.parserErrorBody = it.raw().body()?.string()
+                } catch (e: Exception) {
+                    it.parserErrorBody = e.stackTraceString
+                }
+            }
+            "HTTP "+it.code()+" "+it.message()+"\n" + it.headers() + "\n\n" + it.parserErrorBody
+        }
+        return ErrorReportRequest.Error(
+                id = id,
+                tag = tag,
+                errorCode = errorCode,
+                errorText = getStringText(context),
+                errorReason = getStringReason(context),
+                stackTrace = throwable?.stackTraceString,
+                request = requestString,
+                response = responseString,
+                apiResponse = apiResponse,
+                isCritical = isCritical
+        )
+    }
 
 }

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

@@ -1,324 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-11-26
- */
-
-package pl.szczodrzynski.edziennik.data.api.models;
-
-import android.content.Context;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.util.Log;
-
-import com.google.gson.JsonObject;
-
-import java.io.InterruptedIOException;
-import java.net.SocketTimeoutException;
-import java.net.UnknownHostException;
-
-import javax.net.ssl.SSLException;
-
-import im.wangchao.mhttp.Request;
-import im.wangchao.mhttp.Response;
-import pl.szczodrzynski.edziennik.R;
-
-
-public class AppError {
-    public static final int CODE_OTHER = 0;
-    public static final int CODE_OK = 1;
-    public static final int CODE_NO_INTERNET = 10;
-    public static final int CODE_SSL_ERROR = 13;
-    public static final int CODE_ARCHIVED = 5;
-    public static final int CODE_MAINTENANCE = 6;
-    public static final int CODE_LOGIN_ERROR = 7;
-    public static final int CODE_ACCOUNT_MISMATCH = 8;
-    public static final int CODE_APP_SERVER_ERROR = 9;
-    public static final int CODE_MULTIACCOUNT_SETUP = 12;
-    public static final int CODE_TIMEOUT = 11;
-    public static final int CODE_PROFILE_NOT_FOUND = 14;
-    public static final int CODE_ATTACHMENT_NOT_AVAILABLE = 28;
-    // user's fault
-    public static final int CODE_INVALID_LOGIN = 2;
-    public static final int CODE_INVALID_SERVER_ADDRESS = 21;
-    public static final int CODE_INVALID_SCHOOL_NAME = 22;
-    public static final int CODE_INVALID_DEVICE = 23;
-    public static final int CODE_OLD_PASSWORD = 4;
-    public static final int CODE_INVALID_TOKEN = 24;
-    public static final int CODE_EXPIRED_TOKEN = 27;
-    public static final int CODE_INVALID_SYMBOL = 25;
-    public static final int CODE_INVALID_PIN = 26;
-    public static final int CODE_LIBRUS_NOT_ACTIVATED = 29;
-    public static final int CODE_SYNERGIA_NOT_ACTIVATED = 32;
-    public static final int CODE_LIBRUS_DISCONNECTED = 31;
-    public static final int CODE_PROFILE_ARCHIVED = 30;
-
-
-    public static final int CODE_INTERNAL_MISSING_DATA = 100;
-    // internal errors - not for user's information.
-    // these error codes are processed in API main classes
-
-    public String TAG;
-    public int line;
-    public int errorCode;
-    public String errorText;
-    public Response response;
-    public Request request;
-    public Throwable throwable;
-    public String apiResponse;
-
-    public AppError(String TAG, int line, int errorCode, String errorText, Response response, Request request, Throwable throwable, String apiResponse) {
-        this.TAG = TAG;
-        this.line = line;
-        this.errorCode = errorCode;
-        this.errorText = errorText;
-        this.response = response;
-        this.request = request;
-        this.throwable = throwable;
-        this.apiResponse = apiResponse;
-    }
-
-    public AppError(String TAG, int line, int errorCode) {
-        this(TAG, line, errorCode, null, null, null, null, null);
-    }
-    public AppError(String TAG, int line, int errorCode, Response response, Throwable throwable) {
-        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), throwable, null);
-    }
-    public AppError(String TAG, int line, int errorCode, Response response) {
-        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), null, null);
-    }
-    public AppError(String TAG, int line, int errorCode, Throwable throwable, String apiResponse) {
-        this(TAG, line, errorCode, null, null, null, throwable, apiResponse);
-    }
-    public AppError(String TAG, int line, int errorCode, Throwable throwable, JsonObject apiResponse) {
-        this(TAG, line, errorCode, null, null, null, throwable, apiResponse == null ? null : apiResponse.toString());
-    }
-    public AppError(String TAG, int line, int errorCode, String errorText, Response response, JsonObject apiResponse) {
-        this(TAG, line, errorCode, errorText, response, response == null ? null : response.request(), null, apiResponse == null ? null : apiResponse.toString());
-    }
-    public AppError(String TAG, int line, int errorCode, String errorText, Response response, String apiResponse) {
-        this(TAG, line, errorCode, errorText, response, response == null ? null : response.request(), null, apiResponse);
-    }
-    public AppError(String TAG, int line, int errorCode, String errorText, String apiResponse) {
-        this(TAG, line, errorCode, errorText, null, null, null, apiResponse);
-    }
-    public AppError(String TAG, int line, int errorCode, String errorText, JsonObject apiResponse) {
-        this(TAG, line, errorCode, errorText, null, null, null, apiResponse == null ? null : apiResponse.toString());
-    }
-    public AppError(String TAG, int line, int errorCode, String errorText) {
-        this(TAG, line, errorCode, errorText, null, null, null, null);
-    }
-    public AppError(String TAG, int line, int errorCode, JsonObject apiResponse) {
-        this(TAG, line, errorCode, null, null, null, null, apiResponse.toString());
-    }
-    public AppError(String TAG, int line, int errorCode, Response response, Throwable throwable, JsonObject apiResponse) {
-        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), throwable, apiResponse == null ? null : apiResponse.toString());
-    }
-    public AppError(String TAG, int line, int errorCode, Response response, Throwable throwable, String apiResponse) {
-        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), throwable, apiResponse);
-    }
-    public AppError(String TAG, int line, int errorCode, Response response, String apiResponse) {
-        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), null, apiResponse);
-    }
-    public AppError(String TAG, int line, int errorCode, Response response, JsonObject apiResponse) {
-        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), null, apiResponse == null ? null : apiResponse.toString());
-    }
-
-    public String getDetails(Context context) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(stringErrorCode(context, errorCode, errorText)).append("\n");
-        sb.append("(").append(stringErrorType(errorCode)).append("#").append(errorCode).append(")\n");
-        sb.append("at ").append(TAG).append(":").append(line).append("\n");
-        sb.append("\n");
-        if (throwable == null)
-            sb.append("Throwable is null");
-        else
-            sb.append(Log.getStackTraceString(throwable));
-        sb.append("\n");
-        sb.append(Build.MANUFACTURER).append(" ").append(Build.BRAND).append(" ").append(Build.MODEL).append(" ").append(Build.DEVICE).append("\n");
-
-        return sb.toString();
-    }
-
-    public interface GetApiResponseCallback {
-        void onSuccess(String apiResponse);
-    }
-    /**
-     *
-     * @param context a Context
-     * @param apiResponseCallback a callback executed on a worker thread
-     */
-    public void getApiResponse(Context context, GetApiResponseCallback apiResponseCallback) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Request:\n");
-        if (request != null) {
-            sb.append(request.method()).append(" ").append(request.url().toString()).append("\n");
-            sb.append(request.headers().toString()).append("\n");
-            sb.append("\n");
-            sb.append(request.bodyToString()).append("\n\n");
-        }
-        else
-            sb.append("null\n\n");
-
-        if (apiResponse == null && response != null)
-            apiResponse = response.parserErrorBody;
-
-        sb.append("Response:\n");
-        if (response != null) {
-            sb.append(response.code()).append(" ").append(response.message()).append("\n");
-            sb.append(response.headers().toString()).append("\n");
-            sb.append("\n");
-            if (apiResponse == null) {
-                if (Thread.currentThread().getName().equals("main")) {
-                    AsyncTask.execute(() -> {
-                        if (response.raw().body() != null) {
-                            try {
-                                sb.append(response.raw().body().string());
-                            } catch (Exception e) {
-                                sb.append("Exception while getting response body:\n").append(Log.getStackTraceString(e));
-                            }
-                        }
-                        else {
-                            sb.append("null");
-                        }
-                        apiResponseCallback.onSuccess(sb.toString());
-                    });
-                }
-                else {
-                    if (response.raw().body() != null) {
-                        try {
-                            sb.append(response.raw().body().string());
-                        } catch (Exception e) {
-                            sb.append("Exception while getting response body:\n").append(Log.getStackTraceString(e));
-                        }
-                    }
-                    else {
-                        sb.append("null");
-                    }
-                    apiResponseCallback.onSuccess(sb.toString());
-                }
-                return;
-            }
-        }
-        else
-            sb.append("null\n\n");
-
-        sb.append("API Response:\n");
-        if (apiResponse != null) {
-            sb.append(apiResponse).append("\n\n");
-        }
-        else {
-            sb.append("null\n\n");
-        }
-
-        apiResponseCallback.onSuccess(sb.toString());
-    }
-
-    public AppError changeIfCodeOther() {
-        if (errorCode != CODE_OTHER && errorCode != CODE_MAINTENANCE)
-            return this;
-        if (throwable instanceof UnknownHostException)
-            errorCode = CODE_NO_INTERNET;
-        else if (throwable instanceof SSLException)
-            errorCode = CODE_SSL_ERROR;
-        else if (throwable instanceof SocketTimeoutException)
-            errorCode = CODE_TIMEOUT;
-        else if (throwable instanceof InterruptedIOException)
-            errorCode = CODE_NO_INTERNET;
-        else if (response != null &&
-                (response.code() == 424
-                        || response.code() == 400
-                        || response.code() == 401
-                        || response.code() == 500
-                        || response.code() == 503
-                        || response.code() == 404))
-            errorCode = CODE_MAINTENANCE;
-        return this;
-    }
-
-    public String asReadableString(Context context) {
-        return stringErrorCode(context, errorCode, errorText) + (errorCode == CODE_MAINTENANCE && errorText != null && !errorText.isEmpty() ? " ("+errorText+")" : "");
-    }
-
-    public static String stringErrorCode(Context context, int errorCode, String errorText)
-    {
-        switch (errorCode) {
-            case CODE_OK:
-                return context.getString(R.string.sync_error_ok);
-            case CODE_INVALID_LOGIN:
-                return context.getString(R.string.sync_error_invalid_login);
-            case CODE_LOGIN_ERROR:
-                return context.getString(R.string.sync_error_login_error);
-            case CODE_INVALID_DEVICE:
-                return context.getString(R.string.sync_error_invalid_device);
-            case CODE_OLD_PASSWORD:
-                return context.getString(R.string.sync_error_old_password);
-            case CODE_ARCHIVED:
-                return context.getString(R.string.sync_error_archived);
-            case CODE_MAINTENANCE:
-                return context.getString(R.string.sync_error_maintenance);
-            case CODE_NO_INTERNET:
-                return context.getString(R.string.sync_error_no_internet);
-            case CODE_ACCOUNT_MISMATCH:
-                return context.getString(R.string.sync_error_account_mismatch);
-            case CODE_APP_SERVER_ERROR:
-                return context.getString(R.string.sync_error_app_server);
-            case CODE_TIMEOUT:
-                return context.getString(R.string.sync_error_timeout);
-            case CODE_SSL_ERROR:
-                return context.getString(R.string.sync_error_ssl);
-            case CODE_INVALID_SERVER_ADDRESS:
-                return context.getString(R.string.sync_error_invalid_server_address);
-            case CODE_INVALID_SCHOOL_NAME:
-                return context.getString(R.string.sync_error_invalid_school_name);
-            case CODE_PROFILE_NOT_FOUND:
-                return context.getString(R.string.sync_error_profile_not_found);
-            case CODE_INVALID_TOKEN:
-                return context.getString(R.string.sync_error_invalid_token);
-            case CODE_ATTACHMENT_NOT_AVAILABLE:
-                return context.getString(R.string.sync_error_attachment_not_available);
-            case CODE_LIBRUS_NOT_ACTIVATED:
-                return context.getString(R.string.sync_error_librus_not_activated);
-            case CODE_PROFILE_ARCHIVED:
-                return context.getString(R.string.sync_error_profile_archived);
-            case CODE_LIBRUS_DISCONNECTED:
-                return context.getString(R.string.sync_error_librus_disconnected);
-            case CODE_SYNERGIA_NOT_ACTIVATED:
-                return context.getString(R.string.sync_error_synergia_not_activated);
-            default:
-            case CODE_MULTIACCOUNT_SETUP:
-            case CODE_OTHER:
-                return errorText != null ? errorText : context.getString(R.string.sync_error_unknown);
-        }
-    }
-    public static String stringErrorType(int errorCode)
-    {
-        switch (errorCode) {
-            default:
-            case CODE_OTHER: return "CODE_OTHER";
-            case CODE_OK: return "CODE_OK";
-            case CODE_NO_INTERNET: return "CODE_NO_INTERNET";
-            case CODE_SSL_ERROR: return "CODE_SSL_ERROR";
-            case CODE_ARCHIVED: return "CODE_ARCHIVED";
-            case CODE_MAINTENANCE: return "CODE_MAINTENANCE";
-            case CODE_LOGIN_ERROR: return "CODE_LOGIN_ERROR";
-            case CODE_ACCOUNT_MISMATCH: return "CODE_ACCOUNT_MISMATCH";
-            case CODE_APP_SERVER_ERROR: return "CODE_APP_SERVER_ERROR";
-            case CODE_MULTIACCOUNT_SETUP: return "CODE_MULTIACCOUNT_SETUP";
-            case CODE_TIMEOUT: return "CODE_TIMEOUT";
-            case CODE_PROFILE_NOT_FOUND: return "CODE_PROFILE_NOT_FOUND";
-            case CODE_INVALID_LOGIN: return "CODE_INVALID_LOGIN";
-            case CODE_INVALID_SERVER_ADDRESS: return "CODE_INVALID_SERVER_ADDRESS";
-            case CODE_INVALID_SCHOOL_NAME: return "CODE_INVALID_SCHOOL_NAME";
-            case CODE_INVALID_DEVICE: return "CODE_INVALID_DEVICE";
-            case CODE_OLD_PASSWORD: return "CODE_OLD_PASSWORD";
-            case CODE_INVALID_TOKEN: return "CODE_INVALID_TOKEN";
-            case CODE_EXPIRED_TOKEN: return "CODE_EXPIRED_TOKEN";
-            case CODE_INVALID_SYMBOL: return "CODE_INVALID_SYMBOL";
-            case CODE_INVALID_PIN: return "CODE_INVALID_PIN";
-            case CODE_ATTACHMENT_NOT_AVAILABLE: return "CODE_ATTACHMENT_NOT_AVAILABLE";
-            case CODE_LIBRUS_NOT_ACTIVATED: return "CODE_LIBRUS_NOT_ACTIVATED";
-            case CODE_PROFILE_ARCHIVED: return "CODE_PROFILE_ARCHIVED";
-            case CODE_LIBRUS_DISCONNECTED: return "CODE_LIBRUS_DISCONNECTED";
-            case CODE_SYNERGIA_NOT_ACTIVATED: return "CODE_SYNERGIA_NOT_ACTIVATED";
-        }
-    }
-}

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

@@ -3,13 +3,12 @@ package pl.szczodrzynski.edziennik.data.api.models
 import android.util.LongSparseArray
 import android.util.SparseArray
 import androidx.core.util.size
+import androidx.room.OnConflictStrategy
 import com.google.gson.JsonObject
 import im.wangchao.mhttp.Response
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.DataNotifications
-import pl.szczodrzynski.edziennik.data.api.EXCEPTION_NOTIFY
+import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.interfaces.EndpointCallback
-import pl.szczodrzynski.edziennik.data.api.models.AppError.*
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement
 import pl.szczodrzynski.edziennik.data.db.modules.api.EndpointTimer
@@ -117,6 +116,8 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore)
     val lessonRanges = SparseArray<LessonRange>()
     val gradeCategories = LongSparseArray<GradeCategory>()
 
+    var teacherOnConflictStrategy = OnConflictStrategy.IGNORE
+
     val classrooms = LongSparseArray<Classroom>()
     val attendanceTypes = LongSparseArray<AttendanceType>()
     val noticeTypes = LongSparseArray<NoticeType>()
@@ -149,6 +150,7 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore)
     val attendanceList = mutableListOf<Attendance>()
 
     val announcementList = mutableListOf<Announcement>()
+    val announcementIgnoreList = mutableListOf<Announcement>()
 
     val luckyNumberList = mutableListOf<LuckyNumber>()
 
@@ -160,7 +162,7 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore)
     val messageRecipientIgnoreList = mutableListOf<MessageRecipient>()
 
     val metadataList = mutableListOf<Metadata>()
-    val messageMetadataList = mutableListOf<Metadata>()
+    val setSeenMetadataList = mutableListOf<Metadata>()
 
     val db: AppDb by lazy { app.db }
 
@@ -203,13 +205,15 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore)
         noticeList.clear()
         attendanceList.clear()
         announcementList.clear()
+        announcementIgnoreList.clear()
         luckyNumberList.clear()
         teacherAbsenceList.clear()
+        messageList.clear()
         messageIgnoreList.clear()
         messageRecipientList.clear()
         messageRecipientIgnoreList.clear()
         metadataList.clear()
-        messageMetadataList.clear()
+        setSeenMetadataList.clear()
     }
 
     open fun saveData() {
@@ -254,9 +258,10 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore)
 
         // always present and not empty, during every sync
         db.endpointTimerDao().addAll(endpointTimers)
-        db.teacherDao().clear(profileId)
-        db.teacherDao().addAll(teacherList.values())
-        db.subjectDao().clear(profileId)
+        if (teacherOnConflictStrategy == OnConflictStrategy.IGNORE)
+            db.teacherDao().addAllIgnore(teacherList.values())
+        else if (teacherOnConflictStrategy == OnConflictStrategy.REPLACE)
+            db.teacherDao().addAll(teacherList.values())
         db.subjectDao().addAll(subjectList.values())
         db.teamDao().clear(profileId)
         db.teamDao().addAll(teamList.values())
@@ -288,8 +293,8 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore)
 
         if (metadataList.isNotEmpty())
             db.metadataDao().addAllIgnore(metadataList)
-        if (messageMetadataList.isNotEmpty())
-            db.metadataDao().setSeen(messageMetadataList)
+        if (setSeenMetadataList.isNotEmpty())
+            db.metadataDao().setSeen(setSeenMetadataList)
 
         // not extracted from DB - always new data
         if (lessonList.isNotEmpty()) {
@@ -315,6 +320,8 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore)
             db.attendanceDao().addAll(attendanceList)
         if (announcementList.isNotEmpty())
             db.announcementDao().addAll(announcementList)
+        if (announcementIgnoreList.isNotEmpty())
+            db.announcementDao().addAllIgnore(announcementIgnoreList)
         if (luckyNumberList.isNotEmpty())
             db.luckyNumberDao().addAll(luckyNumberList)
         if (teacherAbsenceList.isNotEmpty())
@@ -375,7 +382,7 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore)
         return (db.luckyNumberDao().getNearestFutureNow(profileId, Date.getToday().value) ?: -1) == -1
     }
 
-    fun error(tag: String, errorCode: Int, response: Response? = null, throwable: Throwable? = null, apiResponse: JsonObject? = null) {
+    /*fun error(tag: String, errorCode: Int, response: Response? = null, throwable: Throwable? = null, apiResponse: JsonObject? = null) {
         val code = when (throwable) {
             is UnknownHostException, is SSLException, is InterruptedIOException -> CODE_NO_INTERNET
             is SocketTimeoutException -> CODE_TIMEOUT
@@ -387,23 +394,36 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore)
         error(ApiError(tag, code).apply {
             profileId = profile?.id ?: -1
         }.withResponse(response).withThrowable(throwable).withApiResponse(apiResponse))
-    }
+    }*/
 
     fun error(tag: String, errorCode: Int, response: Response? = null, apiResponse: String? = null) {
-        val code = when (null) {
-            is UnknownHostException, is SSLException, is InterruptedIOException -> CODE_NO_INTERNET
-            is SocketTimeoutException -> CODE_TIMEOUT
-            else -> when (response?.code()) {
-                400, 401, 424, 500, 503, 404 -> CODE_MAINTENANCE
-                else -> errorCode
-            }
-        }
-        error(ApiError(tag, code).apply {
+        error(ApiError(tag, errorCode).apply {
             profileId = profile?.id ?: -1
         }.withResponse(response).withApiResponse(apiResponse))
     }
 
     fun error(apiError: ApiError) {
+        apiError.errorCode = when (apiError.throwable) {
+            is UnknownHostException -> ERROR_REQUEST_FAILURE_HOSTNAME_NOT_FOUND
+            is SSLException -> ERROR_REQUEST_FAILURE_SSL_ERROR
+            is InterruptedIOException -> ERROR_REQUEST_FAILURE_NO_INTERNET
+            is SocketTimeoutException -> ERROR_REQUEST_FAILURE_TIMEOUT
+            else ->
+                if (apiError.errorCode == ERROR_REQUEST_FAILURE)
+                    when (apiError.response?.code()) {
+                        400 -> ERROR_REQUEST_HTTP_400
+                        401 -> ERROR_REQUEST_HTTP_401
+                        403 -> ERROR_REQUEST_HTTP_403
+                        404 -> ERROR_REQUEST_HTTP_404
+                        405 -> ERROR_REQUEST_HTTP_405
+                        410 -> ERROR_REQUEST_HTTP_410
+                        424 -> ERROR_REQUEST_HTTP_424
+                        500 -> ERROR_REQUEST_HTTP_500
+                        503 -> ERROR_REQUEST_HTTP_503
+                        else -> apiError.errorCode
+                    }
+                else apiError.errorCode
+        }
         callback.onError(apiError)
     }
 

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

@@ -47,15 +47,17 @@ open class DataRemoveModel {
         }
     }
 
-    class Events(private val type: Int?, private val exceptType: Int?) : DataRemoveModel() {
+    class Events(private val type: Int?, private val exceptType: Int?, private val exceptTypes: List<Int>?) : DataRemoveModel() {
         companion object {
-            fun futureExceptType(exceptType: Int) = Events(null, exceptType)
-            fun futureWithType(type: Int) = Events(type, null)
+            fun futureExceptType(exceptType: Int) = Events(null, exceptType, null)
+            fun futureExceptTypes(exceptTypes: List<Int>) = Events(null, null, exceptTypes)
+            fun futureWithType(type: Int) = Events(type, null, null)
         }
 
         fun commit(profileId: Int, dao: EventDao) {
             type?.let { dao.removeFutureWithType(profileId, Date.getToday(), it) }
             exceptType?.let { dao.removeFutureExceptType(profileId, Date.getToday(), it) }
+            exceptTypes?.let { dao.removeFutureExceptTypes(profileId, Date.getToday(), it) }
         }
     }
 }

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

@@ -6,15 +6,16 @@ package pl.szczodrzynski.edziennik.data.api.szkolny
 
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
-import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull
 
 class Szkolny(val app: App, val callback: EdziennikCallback) {
 
     private val api = SzkolnyApi(app)
 
-    fun sync(profiles: List<ProfileFull>) {
+    fun sync(profileList: List<ProfileFull>) {
+        val profiles = profileList.filter { it.registration == Profile.REGISTRATION_ENABLED }
         if (profiles.isNotEmpty()) {
             val events = api.getEvents(profiles)
 

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

@@ -12,6 +12,7 @@ import pl.szczodrzynski.edziennik.BuildConfig
 import pl.szczodrzynski.edziennik.data.api.szkolny.adapter.DateAdapter
 import pl.szczodrzynski.edziennik.data.api.szkolny.adapter.TimeAdapter
 import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.SignatureInterceptor
+import pl.szczodrzynski.edziennik.data.api.szkolny.request.ErrorReportRequest
 import pl.szczodrzynski.edziennik.data.api.szkolny.request.EventShareRequest
 import pl.szczodrzynski.edziennik.data.api.szkolny.request.ServerSyncRequest
 import pl.szczodrzynski.edziennik.data.api.szkolny.request.WebPushRequest
@@ -164,4 +165,11 @@ class SzkolnyApi(val app: App) {
 
         return response?.data?.browsers ?: emptyList()
     }
+
+    fun errorReport(errors: List<ErrorReportRequest.Error>): ApiResponse<Nothing>? {
+        return api.errorReport(ErrorReportRequest(
+                deviceId = app.deviceId,
+                errors = errors
+        )).execute().body()
+    }
 }

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

@@ -4,6 +4,7 @@
 
 package pl.szczodrzynski.edziennik.data.api.szkolny
 
+import pl.szczodrzynski.edziennik.data.api.szkolny.request.ErrorReportRequest
 import pl.szczodrzynski.edziennik.data.api.szkolny.request.EventShareRequest
 import pl.szczodrzynski.edziennik.data.api.szkolny.request.ServerSyncRequest
 import pl.szczodrzynski.edziennik.data.api.szkolny.request.WebPushRequest
@@ -24,4 +25,7 @@ interface SzkolnyService {
 
     @POST("webPush")
     fun webPush(@Body request: WebPushRequest): Call<ApiResponse<WebPushResponse>>
+
+    @POST("errorReport")
+    fun errorReport(@Body request: ErrorReportRequest): Call<ApiResponse<Nothing>>
 }

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.MTIzNDU2Nzg5MDpOm94zKC===.$param2".sha256()
+        return "$param1.MTIzNDU2Nzg5MDTvMgEcqP===.$param2".sha256()
     }
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/ErrorReportRequest.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-12-31.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.szkolny.request
+
+data class ErrorReportRequest(
+        val deviceId: String,
+        val errors: List<Error>
+) {
+    data class Error(
+            val id: Long,
+            val tag: String,
+            val errorCode: Int,
+            val errorText: String?,
+            val errorReason: String?,
+            val stackTrace: String?,
+            val request: String?,
+            val response: String?,
+            val apiResponse: String?,
+            val isCritical: Boolean
+    )
+}

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

@@ -12,9 +12,11 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.template.Template
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.Vulcan
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
+import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
 
 open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTask(profileId) {
     companion object {
@@ -25,8 +27,11 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
         fun syncProfile(profileId: Int, viewIds: List<Pair<Int, Int>>? = null, arguments: JsonObject? = null) = EdziennikTask(profileId, SyncProfileRequest(viewIds, arguments))
         fun syncProfileList(profileList: List<Int>) = EdziennikTask(-1, SyncProfileListRequest(profileList))
         fun messageGet(profileId: Int, message: MessageFull) = EdziennikTask(profileId, MessageGetRequest(message))
+        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 recipientListGet(profileId: Int) = EdziennikTask(profileId, RecipientListGetRequest())
     }
 
     private lateinit var loginStore: LoginStore
@@ -75,9 +80,12 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
                     viewId = request.viewIds?.get(0)?.first,
                     arguments = request.arguments)
             is MessageGetRequest -> edziennikInterface?.getMessage(request.message)
+            is MessageSendRequest -> edziennikInterface?.sendMessage(request.recipients, request.subject, request.text)
             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 RecipientListGetRequest -> edziennikInterface?.getRecipientList()
         }
     }
 
@@ -94,6 +102,9 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
     data class SyncProfileRequest(val viewIds: List<Pair<Int, Int>>? = null, val arguments: JsonObject? = null)
     data class SyncProfileListRequest(val profileList: List<Int>)
     data class MessageGetRequest(val message: MessageFull)
+    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)
+    class RecipientListGetRequest
 }