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

# Conflicts:
#	app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginApi.kt
#	app/src/main/res/values/strings.xml

.gitignore

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

.idea/compiler.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.7">
+      <module name="annotation" target="1.7" />
+      <module name="codegen" target="1.7" />
+      <module name="Szkolny.eu.agendacalendarview" target="1.8" />
+      <module name="Szkolny.eu.app" target="1.8" />
+      <module name="Szkolny.eu.cafebar" target="1.8" />
+      <module name="Szkolny.eu.material-about-library" target="1.8" />
+      <module name="Szkolny.eu.mhttp" target="1.8" />
+      <module name="Szkolny.eu.nachos" target="1.8" />
+      <module name="Szkolny.eu.szkolny-font" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>

.idea/jarRepositories.xml

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

.idea/misc.xml

@@ -11,7 +11,6 @@
       <item index="1" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
     </list>
   </component>
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
     <option name="myDefaultNotNull" value="androidx.annotation.RecentlyNonNull" />
@@ -51,7 +50,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

annotation/.gitignore

@@ -0,0 +1 @@
+/build

annotation/build.gradle

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-28. 
+ */
+
+apply plugin: 'java-library'
+apply plugin: 'kotlin'
+apply plugin: 'kotlin-kapt'
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+
+sourceCompatibility = "7"
+targetCompatibility = "7"
+
+repositories {
+    mavenCentral()
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}

annotation/src/main/java/pl/szczodrzynski/edziennik/annotation/SelectiveDao.kt

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-28.
+ */
+
+package pl.szczodrzynski.edziennik.annotation
+
+import kotlin.reflect.KClass
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+@MustBeDocumented
+annotation class SelectiveDao(
+        val db: KClass<*>
+)

annotation/src/main/java/pl/szczodrzynski/edziennik/annotation/UpdateSelective.kt

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-28. 
+ */
+
+package pl.szczodrzynski.edziennik.annotation
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.SOURCE)
+@MustBeDocumented
+annotation class UpdateSelective(
+        val primaryKeys: Array<String>,
+        val skippedColumns: Array<String> = []
+)

app/build.gradle

@@ -128,6 +128,7 @@ dependencies {
     implementation "com.mikepenz:iconics-core:${versions.iconics}"
     implementation "com.mikepenz:iconics-views:${versions.iconics}"
     implementation "com.mikepenz:community-material-typeface:${versions.font_cmd}@aar"
+    implementation "com.mikepenz:materialize:1.2.1"
 
     implementation "com.github.kuba2k2:NavLib:${versions.navlib}"
 
@@ -144,7 +145,11 @@ dependencies {
     implementation("com.github.ozodrukh:CircularReveal:2.0.1@aar") {transitive = true}
     implementation "com.heinrichreimersoftware:material-intro:1.5.8" // do not update
     implementation "com.jaredrummler:colorpicker:1.0.2"
-    implementation "com.squareup.okhttp3:okhttp:3.12.2"
+    implementation("com.squareup.okhttp3:okhttp") {
+        version {
+            strictly "3.12.2"
+        }
+    }
     implementation "com.theartofdev.edmodo:android-image-cropper:2.8.0" // do not update
     implementation "com.wdullaer:materialdatetimepicker:4.1.2"
     implementation "com.yuyh.json:jsonviewer:1.0.6"
@@ -192,6 +197,19 @@ dependencies {
     implementation "io.coil-kt:coil:0.9.2"
 
     implementation 'com.github.kuba2k2:NumberSlidingPicker:2921225f76'
+
+    implementation project(":annotation")
+    kapt project(":codegen")
+
+    implementation 'com.google.android:flexbox:2.0.1'
+
+    implementation 'com.qifan.powerpermission:powerpermission:1.3.0'
+    implementation 'com.qifan.powerpermission:powerpermission-coroutines:1.3.0'
+
+    implementation 'com.github.kuba2k2.FSLogin:lib:master-SNAPSHOT'
+    implementation 'pl.droidsonroids:jspoon:1.3.2'
+    implementation "com.squareup.retrofit2:converter-scalars:2.8.1"
+    implementation "pl.droidsonroids.retrofit2:converter-jspoon:1.3.2"
 }
 repositories {
     mavenCentral()

app/proguard/app.pro

@@ -31,6 +31,12 @@
 -keepnames class pl.szczodrzynski.edziennik.ui.widgets.notifications.WidgetNotificationsProvider
 -keepnames class pl.szczodrzynski.edziennik.ui.widgets.luckynumber.WidgetLuckyNumberProvider
 
+-keepnames class androidx.appcompat.view.menu.MenuBuilder { setHeaderTitleInt(java.lang.CharSequence); }
+-keepclassmembernames class androidx.appcompat.view.menu.StandardMenuPopup { private *; }
+-keepnames class androidx.appcompat.view.menu.MenuPopupHelper { showPopup(int, int, boolean, boolean); }
+
+-keepclassmembernames class com.mikepenz.materialdrawer.widget.MiniDrawerSliderView { private *; }
+
 -keep class .R
 -keep class **.R$* {
     <fields>;
@@ -60,3 +66,4 @@
 
 -keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
 -keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; }
+-keepclassmembernames class pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo.Platform { *; }

app/src/main/AndroidManifest.xml

@@ -14,6 +14,9 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
+    <!-- PowerPermission uses minSdk 21, it's safe to override as it is used only in >= 23 -->
+    <uses-sdk tools:overrideLibrary="com.qifan.powerpermission.coroutines, com.qifan.powerpermission.core" />
+
     <application
         android:name=".App"
         android:allowBackup="true"
@@ -21,7 +24,6 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.Dark"
         android:usesCleartextTraffic="true"
@@ -62,7 +64,7 @@
             android:configChanges="orientation|keyboardHidden"
             android:excludeFromRecents="true"
             android:noHistory="true"
-            android:theme="@style/AppTheme.NoDisplay">
+            android:theme="@style/AppTheme.Dark.NoDisplay">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
@@ -84,7 +86,7 @@
             android:configChanges="orientation|keyboardHidden"
             android:excludeFromRecents="true"
             android:noHistory="true"
-            android:theme="@style/AppTheme.NoDisplay" />
+            android:theme="@style/AppTheme.Dark.NoDisplay" />
         <!-- NOTIFICATIONS -->
         <receiver android:name=".ui.widgets.notifications.WidgetNotificationsProvider"
             android:label="@string/widget_notifications_title">
@@ -132,9 +134,6 @@
             android:configChanges="orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.Light" />
-        <activity android:name=".ui.modules.login.LoginLibrusCaptchaActivity"
-            android:theme="@android:style/Theme.Dialog"
-            android:excludeFromRecents="true"/>
         <activity android:name=".ui.modules.home.CounterActivity"
             android:theme="@style/AppTheme.Black" />
         <activity android:name=".ui.modules.feedback.FeedbackActivity"

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

@@ -1,35 +1,10 @@
-<h3>Wersja 4.0-beta.11, 2020-03-06</h3>
+<h3>Wersja 4.4.1, 2020-09-03</h3>
 <ul>
-    <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>Nowe, przyjemniejsze powiadomienia</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: <b>poprawione obliczanie frekwencji</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>Usunąłem denerwujący brak zaznaczenia w lewym menu</li>
-    <li>Znaczna ilość błędów z poprzednich wersji już nie występuje</li>
-    <li><strike>Występują natomiast nowe błędy, dlatego proszę o ich zgłaszanie :)</strike></li>
+    <li>Poprawione komunikaty o aktualizacjach aplikacji.</li>
+    <li>Mobidziennik: poprawione wyświetlanie przedmiotu w planie lekcji.</li>
+    <li>Mobidziennik: naprawiony moduł frekwencji.</li>
 </ul>
 <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 nie działać w pełni prawidłowo - proszę o zgłaszanie wszystkich błędów na naszym serwerze Discord</li>
-    <li>Cisza nocna w powiadomieniach jeszcze nie działa.</li>
-</ul>
-<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] = {
-	0x00, 0x37, 0x6a, 0x20, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0x72, 0x4b, 0x61, 0x3a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
 
 unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);
 

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

@@ -28,9 +28,6 @@ import com.hypertrack.hyperlog.HyperLog
 import com.mikepenz.iconics.Iconics
 import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
 import im.wangchao.mhttp.MHttp
-import im.wangchao.mhttp.internal.cookie.PersistentCookieJar
-import im.wangchao.mhttp.internal.cookie.cache.SetCookieCache
-import im.wangchao.mhttp.internal.cookie.persistence.SharedPrefsCookiePersistor
 import kotlinx.coroutines.*
 import me.leolin.shortcutbadger.ShortcutBadger
 import okhttp3.OkHttpClient
@@ -41,13 +38,13 @@ import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.network.NetworkUtils
+import pl.szczodrzynski.edziennik.network.cookie.DumbCookieJar
 import pl.szczodrzynski.edziennik.sync.SyncWorker
 import pl.szczodrzynski.edziennik.sync.UpdateWorker
 import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity
 import pl.szczodrzynski.edziennik.utils.*
-import pl.szczodrzynski.edziennik.utils.managers.GradesManager
-import pl.szczodrzynski.edziennik.utils.managers.NotificationChannelsManager
-import pl.szczodrzynski.edziennik.utils.managers.UserActionManager
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.managers.*
 import java.util.concurrent.TimeUnit
 import kotlin.coroutines.CoroutineContext
 
@@ -67,6 +64,10 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
     val notificationChannelsManager by lazy { NotificationChannelsManager(this) }
     val userActionManager by lazy { UserActionManager(this) }
     val gradesManager by lazy { GradesManager(this) }
+    val timetableManager by lazy { TimetableManager(this) }
+    val eventManager by lazy { EventManager(this) }
+    val permissionManager by lazy { PermissionManager(this) }
+    val attendanceManager by lazy { AttendanceManager(this) }
 
     val db
         get() = App.db
@@ -101,9 +102,9 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 .followSslRedirects(true)
                 .retryOnConnectionFailure(true)
                 .cookieJar(cookieJar)
-                .connectTimeout(20, TimeUnit.SECONDS)
-                .writeTimeout(5, TimeUnit.SECONDS)
-                .readTimeout(10, TimeUnit.SECONDS)
+                .connectTimeout(15, TimeUnit.SECONDS)
+                .writeTimeout(10, TimeUnit.SECONDS)
+                .readTimeout(30, TimeUnit.SECONDS)
         builder.installHttpsSupport(this)
 
         if (debugMode || BuildConfig.DEBUG) {
@@ -123,7 +124,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 .followSslRedirects(false)
                 .build()
     }
-    val cookieJar by lazy { PersistentCookieJar(SetCookieCache(), SharedPrefsCookiePersistor(this)) }
+    val cookieJar by lazy { DumbCookieJar(this) }
 
     /*     _____ _                   _
           / ____(_)                 | |
@@ -168,7 +169,13 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
             db.profileDao().firstId?.let { profileLoadById(it) }
         }
 
-        devMode = "f054761fbdb6a238" == deviceId || BuildConfig.DEBUG
+        config.ui.language?.let {
+            setLanguage(it)
+        }
+
+        devMode = BuildConfig.DEBUG
+        if (BuildConfig.DEBUG)
+            debugMode = true
 
         Signing.getCert(this)
 
@@ -251,6 +258,10 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 val pushMobidziennikApp = FirebaseApp.initializeApp(
                         this@App,
                         FirebaseOptions.Builder()
+                                .setProjectId("mobidziennik")
+                                .setStorageBucket("mobidziennik.appspot.com")
+                                .setDatabaseUrl("https://mobidziennik.firebaseio.com")
+                                .setGcmSenderId("747285019373")
                                 .setApiKey("AIzaSyCi5LmsZ5BBCQnGtrdvWnp1bWLCNP8OWQE")
                                 .setApplicationId("1:747285019373:android:f6341bf7b158621d")
                                 .build(),
@@ -260,6 +271,10 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 val pushLibrusApp = FirebaseApp.initializeApp(
                         this@App,
                         FirebaseOptions.Builder()
+                                .setProjectId("synergiadru")
+                                .setStorageBucket("synergiadru.appspot.com")
+                                .setDatabaseUrl("https://synergiadru.firebaseio.com")
+                                .setGcmSenderId("513056078587")
                                 .setApiKey("AIzaSyDfTuEoYPKdv4aceEws1CO3n0-HvTndz-o")
                                 .setApplicationId("1:513056078587:android:1e29083b760af544")
                                 .build(),
@@ -269,6 +284,10 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 val pushVulcanApp = FirebaseApp.initializeApp(
                         this@App,
                         FirebaseOptions.Builder()
+                                .setProjectId("dzienniczekplus")
+                                .setStorageBucket("dzienniczekplus.appspot.com")
+                                .setDatabaseUrl("https://dzienniczekplus.firebaseio.com")
+                                .setGcmSenderId("987828170337")
                                 .setApiKey("AIzaSyDW8MUtanHy64_I0oCpY6cOxB3jrvJd_iA")
                                 .setApplicationId("1:987828170337:android:ac97431a0a4578c3")
                                 .build(),
@@ -278,10 +297,12 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 try {
                     FirebaseInstanceId.getInstance().instanceId.addOnSuccessListener { instanceIdResult ->
                         val token = instanceIdResult.token
+                        d("Firebase", "Got App token: $token")
                         config.sync.tokenApp = token
                     }
                     FirebaseInstanceId.getInstance(pushMobidziennikApp).instanceId.addOnSuccessListener { instanceIdResult ->
                         val token = instanceIdResult.token
+                        d("Firebase", "Got Mobidziennik2 token: $token")
                         if (token != config.sync.tokenMobidziennik) {
                             config.sync.tokenMobidziennik = token
                             config.sync.tokenMobidziennikList = listOf()
@@ -289,6 +310,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                     }
                     FirebaseInstanceId.getInstance(pushLibrusApp).instanceId.addOnSuccessListener { instanceIdResult ->
                         val token = instanceIdResult.token
+                        d("Firebase", "Got Librus token: $token")
                         if (token != config.sync.tokenLibrus) {
                             config.sync.tokenLibrus = token
                             config.sync.tokenLibrusList = listOf()
@@ -296,6 +318,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                     }
                     FirebaseInstanceId.getInstance(pushVulcanApp).instanceId.addOnSuccessListener { instanceIdResult ->
                         val token = instanceIdResult.token
+                        d("Firebase", "Got Vulcan token: $token")
                         if (token != config.sync.tokenVulcan) {
                             config.sync.tokenVulcan = token
                             config.sync.tokenVulcanList = listOf()
@@ -341,6 +364,9 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
             if (!success) {
                 EventBus.getDefault().post(ProfileListEmptyEvent())
             }
+            else {
+                onSuccess(profile)
+            }
         }
     }
     fun profileSave() = profileSave(profile)

app/src/main/java/pl/szczodrzynski/edziennik/Binding.java

@@ -1,21 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-11-11.
- */
-
-package pl.szczodrzynski.edziennik;
-
-import android.graphics.Paint;
-import android.widget.TextView;
-
-import androidx.databinding.BindingAdapter;
-
-public class Binding {
-    @BindingAdapter("strikeThrough")
-    public static void strikeThrough(TextView textView, Boolean strikeThrough) {
-        if (strikeThrough) {
-            textView.setPaintFlags(textView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
-        } else {
-            textView.setPaintFlags(textView.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
-        }
-    }
-}

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

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-11.
+ */
+package pl.szczodrzynski.edziennik
+
+import android.graphics.Paint
+import android.widget.TextView
+import androidx.databinding.BindingAdapter
+
+object Binding {
+    @JvmStatic
+    @BindingAdapter("strikeThrough")
+    fun strikeThrough(textView: TextView, strikeThrough: Boolean) {
+        if (strikeThrough) {
+            textView.paintFlags = textView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+        } else {
+            textView.paintFlags = textView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
+        }
+    }
+}

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

@@ -2,6 +2,8 @@ package pl.szczodrzynski.edziennik
 
 import android.Manifest
 import android.app.Activity
+import android.content.ClipData
+import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -10,6 +12,7 @@ import android.content.res.Resources
 import android.database.Cursor
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
+import android.graphics.Rect
 import android.graphics.Typeface
 import android.graphics.drawable.Drawable
 import android.os.Build
@@ -23,10 +26,8 @@ import android.util.Base64
 import android.util.Base64.NO_WRAP
 import android.util.Base64.encodeToString
 import android.view.View
-import android.widget.CheckBox
-import android.widget.CompoundButton
-import android.widget.RadioButton
-import android.widget.TextView
+import android.view.WindowManager
+import android.widget.*
 import androidx.annotation.*
 import androidx.core.app.ActivityCompat
 import androidx.core.database.getIntOrNull
@@ -36,7 +37,12 @@ import androidx.core.util.forEach
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import androidx.viewpager.widget.ViewPager
 import com.google.android.gms.security.ProviderInstaller
+import com.google.android.material.button.MaterialButton
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
@@ -51,6 +57,7 @@ import okhttp3.RequestBody
 import okhttp3.TlsVersion
 import okio.Buffer
 import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApiException
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.ApiResponse
 import pl.szczodrzynski.edziennik.data.db.entity.Notification
@@ -136,6 +143,10 @@ fun CharSequence?.isNotNullNorEmpty(): Boolean {
     return this != null && this.isNotEmpty()
 }
 
+fun <T> Collection<T>?.isNotNullNorEmpty(): Boolean {
+    return this != null && this.isNotEmpty()
+}
+
 fun CharSequence?.isNotNullNorBlank(): Boolean {
     return this != null && this.isNotBlank()
 }
@@ -155,6 +166,13 @@ fun Bundle?.getString(key: String, defaultValue: String): String {
     return this?.getString(key, defaultValue) ?: defaultValue
 }
 
+fun Bundle?.getIntOrNull(key: String): Int? {
+    return this?.get(key) as? Int
+}
+fun <T : Any> Bundle?.get(key: String): T? {
+    return this?.get(key) as? T?
+}
+
 /**
  * `   The quick BROWN_fox Jumps OveR THE       LAZy-DOG.   `
  *
@@ -437,7 +455,7 @@ operator fun MatchResult.get(group: Int): String {
     return groupValues[group]
 }
 
-fun Activity.setLanguage(language: String) {
+fun Context.setLanguage(language: String) {
     val locale = Locale(language.toLowerCase(Locale.ROOT))
     val configuration = resources.configuration
     Locale.setDefault(locale)
@@ -446,7 +464,6 @@ fun Activity.setLanguage(language: String) {
     }
     configuration.locale = locale
     resources.updateConfiguration(configuration, resources.displayMetrics)
-    baseContext.resources.updateConfiguration(configuration, baseContext.resources.displayMetrics)
 }
 
 /*
@@ -555,7 +572,7 @@ fun CharSequence?.asBoldSpannable(): Spannable {
     spannable.setSpan(StyleSpan(Typeface.BOLD), 0, spannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
     return spannable
 }
-fun CharSequence.asSpannable(vararg spans: Any, substring: String? = null, ignoreCase: Boolean = false): Spannable {
+fun CharSequence.asSpannable(vararg spans: Any, substring: String? = null, ignoreCase: Boolean = false, ignoreDiacritics: Boolean = false): Spannable {
     val spannable = SpannableString(this)
     if (substring == null) {
         spans.forEach {
@@ -563,17 +580,44 @@ fun CharSequence.asSpannable(vararg spans: Any, substring: String? = null, ignor
         }
     }
     else if (substring.isNotEmpty()) {
-        var index = indexOf(substring, ignoreCase = ignoreCase)
+        val string =
+                if (ignoreDiacritics)
+                    this.cleanDiacritics()
+                else this
+
+        var index = string.indexOf(substring, ignoreCase = ignoreCase)
+                .takeIf { it != -1 } ?: indexOf(substring, ignoreCase = ignoreCase)
         while (index >= 0) {
             spans.forEach {
                 spannable.setSpan(it, index, index + substring.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
             }
-            index = indexOf(substring, startIndex = index + 1, ignoreCase = ignoreCase)
+            index = string.indexOf(substring, startIndex = index + 1, ignoreCase = ignoreCase)
+                    .takeIf { it != -1 } ?: indexOf(substring, startIndex = index + 1, ignoreCase = ignoreCase)
         }
     }
     return spannable
 }
 
+fun CharSequence.cleanDiacritics(): String {
+    val nameClean = StringBuilder()
+    forEach {
+        val ch = when (it) {
+            'ż' -> 'z'
+            'ó' -> 'o'
+            'ł' -> 'l'
+            'ć' -> 'c'
+            'ę' -> 'e'
+            'ś' -> 's'
+            'ą' -> 'a'
+            'ź' -> 'z'
+            'ń' -> 'n'
+            else -> it
+        }
+        nameClean.append(ch)
+    }
+    return nameClean.toString()
+}
+
 /**
  * Returns a new read-only list only of those given elements, that are not empty.
  * Applies for CharSequence and descendants.
@@ -629,6 +673,16 @@ fun TextView.setText(@StringRes resid: Int, vararg formatArgs: Any) {
     text = context.getString(resid, *formatArgs)
 }
 
+fun MaterialAlertDialogBuilder.setTitle(@StringRes resid: Int, vararg formatArgs: Any): MaterialAlertDialogBuilder {
+    setTitle(context.getString(resid, *formatArgs))
+    return this
+}
+
+fun MaterialAlertDialogBuilder.setMessage(@StringRes resid: Int, vararg formatArgs: Any): MaterialAlertDialogBuilder {
+    setMessage(context.getString(resid, *formatArgs))
+    return this
+}
+
 fun JsonObject(vararg properties: Pair<String, Any?>): JsonObject {
     return JsonObject().apply {
         for (property in properties) {
@@ -717,6 +771,13 @@ inline fun <T : View> T.onClick(crossinline onClickListener: (v: T) -> Unit) {
     }
 }
 
+@Suppress("UNCHECKED_CAST")
+inline fun <T : View> T.onLongClick(crossinline onLongClickListener: (v: T) -> Boolean) {
+    setOnLongClickListener { v: View ->
+        onLongClickListener(v as T)
+    }
+}
+
 @Suppress("UNCHECKED_CAST")
 inline fun <T : CompoundButton> T.onChange(crossinline onChangeListener: (v: T, isChecked: Boolean) -> Unit) {
     setOnCheckedChangeListener { buttonView, isChecked ->
@@ -724,6 +785,19 @@ inline fun <T : CompoundButton> T.onChange(crossinline onChangeListener: (v: T,
     }
 }
 
+@Suppress("UNCHECKED_CAST")
+inline fun <T : MaterialButton> T.onChange(crossinline onChangeListener: (v: T, isChecked: Boolean) -> Unit) {
+    clearOnCheckedChangeListeners()
+    addOnCheckedChangeListener { buttonView, isChecked ->
+        onChangeListener(buttonView as T, isChecked)
+    }
+}
+
+fun View.attachToastHint(stringRes: Int) = onLongClick {
+    Toast.makeText(it.context, stringRes, Toast.LENGTH_SHORT).show()
+    true
+}
+
 fun <T> LiveData<T>.observeOnce(lifecycleOwner: LifecycleOwner, observer: Observer<T>) {
     observe(lifecycleOwner, object : Observer<T> {
         override fun onChanged(t: T?) {
@@ -779,7 +853,7 @@ fun View.findParentById(targetId: Int): View? {
     return null
 }
 
-fun CoroutineScope.startCoroutineTimer(delayMillis: Long = 0, repeatMillis: Long = 0, action: () -> Unit) = launch {
+fun CoroutineScope.startCoroutineTimer(delayMillis: Long = 0, repeatMillis: Long = 0, action: suspend CoroutineScope.() -> Unit) = launch {
     delay(delayMillis)
     if (repeatMillis > 0) {
         while (true) {
@@ -1003,6 +1077,7 @@ fun Context.getNotificationTitle(type: Int): String {
         Notification.TYPE_FEEDBACK_MESSAGE -> R.string.notification_type_feedback_message
         Notification.TYPE_NEW_ANNOUNCEMENT -> R.string.notification_type_new_announcement
         Notification.TYPE_AUTO_ARCHIVING -> R.string.notification_type_auto_archiving
+        Notification.TYPE_TEACHER_ABSENCE -> R.string.notification_type_new_teacher_absence
         Notification.TYPE_GENERAL -> R.string.notification_type_general
         else -> R.string.notification_type_general
     })
@@ -1080,6 +1155,7 @@ fun Throwable.toErrorCode() = when (this) {
 private fun ApiResponse.Error.toErrorCode() = when (this.code) {
     else -> ERROR_API_EXCEPTION
 }
+fun Throwable.toApiError(tag: String) = ApiError.fromThrowable(tag, this)
 
 inline fun <A, B, R> ifNotNull(a: A?, b: B?, code: (A, B) -> R): R? {
     if (a != null && b != null) {
@@ -1092,3 +1168,93 @@ inline fun <A, B, R> ifNotNull(a: A?, b: B?, code: (A, B) -> R): R? {
 fun Iterable<Int>.averageOrNull() = this.average().let { if (it.isNaN()) null else it }
 @kotlin.jvm.JvmName("averageOrNullOfFloat")
 fun Iterable<Float>.averageOrNull() = this.average().let { if (it.isNaN()) null else it }
+
+fun String.copyToClipboard(context: Context) {
+    val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+    val clipData = ClipData.newPlainText("Tekst", this)
+    clipboard.primaryClip = clipData
+}
+
+fun TextView.getTextPosition(range: IntRange): Rect {
+    val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+
+    // Initialize global value
+    var parentTextViewRect = Rect()
+
+    // Initialize values for the computing of clickedText position
+    //val completeText = parentTextView.text as SpannableString
+    val textViewLayout = this.layout
+
+    val startOffsetOfClickedText = range.first//completeText.getSpanStart(clickedText)
+    val endOffsetOfClickedText = range.last//completeText.getSpanEnd(clickedText)
+    var startXCoordinatesOfClickedText = textViewLayout.getPrimaryHorizontal(startOffsetOfClickedText)
+    var endXCoordinatesOfClickedText = textViewLayout.getPrimaryHorizontal(endOffsetOfClickedText)
+
+    // Get the rectangle of the clicked text
+    val currentLineStartOffset = textViewLayout.getLineForOffset(startOffsetOfClickedText)
+    val currentLineEndOffset = textViewLayout.getLineForOffset(endOffsetOfClickedText)
+    val keywordIsInMultiLine = currentLineStartOffset != currentLineEndOffset
+    textViewLayout.getLineBounds(currentLineStartOffset, parentTextViewRect)
+
+    // Update the rectangle position to his real position on screen
+    val parentTextViewLocation = intArrayOf(0, 0)
+    this.getLocationOnScreen(parentTextViewLocation)
+
+    val parentTextViewTopAndBottomOffset = (parentTextViewLocation[1] - this.scrollY + this.compoundPaddingTop)
+    parentTextViewRect.top += parentTextViewTopAndBottomOffset
+    parentTextViewRect.bottom += parentTextViewTopAndBottomOffset
+
+    // In the case of multi line text, we have to choose what rectangle take
+    if (keywordIsInMultiLine) {
+        val screenHeight = windowManager.defaultDisplay.height
+        val dyTop = parentTextViewRect.top
+        val dyBottom = screenHeight - parentTextViewRect.bottom
+        val onTop = dyTop > dyBottom
+
+        if (onTop) {
+            endXCoordinatesOfClickedText = textViewLayout.getLineRight(currentLineStartOffset);
+        } else {
+            parentTextViewRect = Rect()
+            textViewLayout.getLineBounds(currentLineEndOffset, parentTextViewRect);
+            parentTextViewRect.top += parentTextViewTopAndBottomOffset;
+            parentTextViewRect.bottom += parentTextViewTopAndBottomOffset;
+            startXCoordinatesOfClickedText = textViewLayout.getLineLeft(currentLineEndOffset);
+        }
+    }
+
+    parentTextViewRect.left += (
+            parentTextViewLocation[0] +
+                    startXCoordinatesOfClickedText +
+                    this.compoundPaddingLeft -
+                    this.scrollX
+            ).toInt()
+    parentTextViewRect.right = (
+            parentTextViewRect.left +
+                    endXCoordinatesOfClickedText -
+                    startXCoordinatesOfClickedText
+            ).toInt()
+
+    return parentTextViewRect
+}
+
+inline fun ViewPager.addOnPageSelectedListener(crossinline block: (position: Int) -> Unit) = addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+    override fun onPageScrollStateChanged(state: Int) {}
+    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
+    override fun onPageSelected(position: Int) { block(position) }
+})
+
+val SwipeRefreshLayout.onScrollListener: RecyclerView.OnScrollListener
+    get() = object : RecyclerView.OnScrollListener() {
+        override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+            if (recyclerView.canScrollVertically(-1))
+                this@onScrollListener.isEnabled = false
+            if (!recyclerView.canScrollVertically(-1) && newState == RecyclerView.SCROLL_STATE_IDLE)
+                this@onScrollListener.isEnabled = true
+        }
+    }
+
+operator fun <K, V> Iterable<Pair<K, V>>.get(key: K): V? {
+    return firstOrNull { it.first == key }?.second
+}
+
+fun ByteArray.toHexString() = joinToString("") { "%02x".format(it) }

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

@@ -12,16 +12,15 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Environment
 import android.provider.Settings
-import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.graphics.ColorUtils
+import androidx.core.view.isVisible
 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
@@ -32,8 +31,8 @@ import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
 import com.mikepenz.materialdrawer.model.DividerDrawerItem
 import com.mikepenz.materialdrawer.model.ProfileDrawerItem
 import com.mikepenz.materialdrawer.model.ProfileSettingDrawerItem
-import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem
-import com.mikepenz.materialdrawer.model.interfaces.IProfile
+import com.mikepenz.materialdrawer.model.interfaces.*
+import com.mikepenz.materialdrawer.model.utils.withIsHiddenInMiniDrawer
 import kotlinx.coroutines.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -42,36 +41,41 @@ import pl.droidsonroids.gif.GifDrawable
 import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.*
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing
+import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata.*
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.databinding.ActivitySzkolnyBinding
 import pl.szczodrzynski.edziennik.sync.AppManagerDetectedEvent
 import pl.szczodrzynski.edziennik.sync.SyncWorker
 import pl.szczodrzynski.edziennik.sync.UpdateWorker
+import pl.szczodrzynski.edziennik.ui.dialogs.RegisterUnavailableDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.ServerMessageDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.UpdateAvailableDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.ProfileRemoveDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.sync.SyncViewListDialog
 import pl.szczodrzynski.edziennik.ui.modules.agenda.AgendaFragment
 import pl.szczodrzynski.edziennik.ui.modules.announcements.AnnouncementsFragment
 import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceFragment
-import pl.szczodrzynski.edziennik.ui.modules.base.DebugFragment
 import pl.szczodrzynski.edziennik.ui.modules.base.MainSnackbar
 import pl.szczodrzynski.edziennik.ui.modules.behaviour.BehaviourFragment
+import pl.szczodrzynski.edziennik.ui.modules.debug.DebugFragment
+import pl.szczodrzynski.edziennik.ui.modules.debug.LabFragment
 import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar
 import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackFragment
 import pl.szczodrzynski.edziennik.ui.modules.feedback.HelpFragment
-import pl.szczodrzynski.edziennik.ui.modules.grades.GradesFragment
+import pl.szczodrzynski.edziennik.ui.modules.grades.GradesListFragment
 import pl.szczodrzynski.edziennik.ui.modules.grades.editor.GradesEditorFragment
 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.messages.compose.MessagesComposeFragment
+import pl.szczodrzynski.edziennik.ui.modules.notifications.NotificationsListFragment
 import pl.szczodrzynski.edziennik.ui.modules.settings.ProfileManagerFragment
 import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsNewFragment
 import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment
@@ -91,7 +95,6 @@ import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
 import pl.szczodrzynski.navlib.drawer.NavDrawer
 import pl.szczodrzynski.navlib.drawer.items.DrawerPrimaryItem
-import pl.szczodrzynski.navlib.drawer.items.withAppTitle
 import java.io.File
 import java.io.IOException
 import java.util.*
@@ -131,6 +134,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         const val TARGET_MESSAGES_DETAILS = 503
         const val TARGET_MESSAGES_COMPOSE = 504
         const val TARGET_WEB_PUSH = 140
+        const val TARGET_LAB = 1000
 
         const val HOME_ID = DRAWER_ITEM_HOME
 
@@ -155,7 +159,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                     .withBadgeTypeId(TYPE_EVENT)
                     .isInDrawer(true)
 
-            list += NavTarget(DRAWER_ITEM_GRADES, R.string.menu_grades, GradesFragment::class)
+            list += NavTarget(DRAWER_ITEM_GRADES, R.string.menu_grades, GradesListFragment::class)
                     .withIcon(CommunityMaterial.Icon2.cmd_numeric_5_box_outline)
                     .withBadgeTypeId(TYPE_GRADE)
                     .isInDrawer(true)
@@ -187,7 +191,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
 
 
             // static drawer items
-            list += NavTarget(DRAWER_ITEM_NOTIFICATIONS, R.string.menu_notifications, NotificationsFragment::class)
+            list += NavTarget(DRAWER_ITEM_NOTIFICATIONS, R.string.menu_notifications, NotificationsListFragment::class)
                     .withIcon(CommunityMaterial.Icon.cmd_bell_ring_outline)
                     .isInDrawer(true)
                     .isStatic(true)
@@ -228,7 +232,14 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
             list += NavTarget(TARGET_MESSAGES_DETAILS, R.string.menu_message, MessageFragment::class).withPopTo(DRAWER_ITEM_MESSAGES)
             list += NavTarget(TARGET_MESSAGES_COMPOSE, R.string.menu_message_compose, MessagesComposeFragment::class)
             list += NavTarget(TARGET_WEB_PUSH, R.string.menu_web_push, WebPushFragment::class)
-            list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class)
+            if (App.debugMode) {
+                list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class)
+                list += NavTarget(TARGET_LAB, R.string.menu_lab, LabFragment::class)
+                        .withIcon(CommunityMaterial.Icon.cmd_flask_outline)
+                        .isInDrawer(true)
+                        .isBelowSeparator(true)
+                        .isStatic(true)
+            }
 
             list
         }
@@ -286,11 +297,25 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
 
         setContentView(b.root)
 
-        Log.d(TAG, Signing.appPassword)
-
         mainSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
         errorSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
 
+        when {
+            BuildConfig.VERSION_NAME.contains("nightly") -> {
+                b.nightlyText.isVisible = true
+                b.nightlyText.text = "Nightly\n"+BuildConfig.VERSION_NAME.substringAfterLast(".")
+            }
+            BuildConfig.VERSION_NAME.contains("daily") -> {
+                b.nightlyText.isVisible = true
+                b.nightlyText.text = "Daily\n"+BuildConfig.VERSION_NAME.substringAfterLast(".")
+            }
+            BuildConfig.DEBUG -> {
+                b.nightlyText.isVisible = true
+                b.nightlyText.text = "Debug\n"+BuildConfig.VERSION_NAME
+            }
+            else -> b.nightlyText.isVisible = false
+        }
+
         navLoading = true
 
         b.navView.apply {
@@ -364,7 +389,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                     false
                 }
                 drawerProfileLongClickListener = { _, profile, _, view ->
-                    if (profile is ProfileDrawerItem) {
+                    if (view != null && profile is ProfileDrawerItem) {
                         showProfileContextMenu(profile, view)
                         true
                     }
@@ -388,7 +413,20 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         }
 
         app.db.profileDao().all.observe(this, Observer { profiles ->
-            drawer.setProfileList(profiles.filter { it.id >= 0 }.toMutableList())
+            val allArchived = profiles.all { it.archived }
+            drawer.setProfileList(profiles.filter { it.id >= 0 && (!it.archived || allArchived) }.toMutableList())
+            //prepend the archived profile if loaded
+            if (app.profile.archived && !allArchived) {
+                drawer.prependProfile(Profile(
+                        id = app.profile.id,
+                        loginStoreId = app.profile.loginStoreId,
+                        loginStoreType = app.profile.loginStoreType,
+                        name = app.profile.name,
+                        subname = "Archiwum - ${app.profile.subname}"
+                ).also {
+                    it.archived = true
+                })
+            }
             drawer.currentProfile = App.profileId
         })
 
@@ -404,18 +442,33 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         })
 
         b.swipeRefreshLayout.isEnabled = true
-        b.swipeRefreshLayout.setOnRefreshListener { this.syncCurrentFeature() }
+        b.swipeRefreshLayout.setOnRefreshListener { launch { syncCurrentFeature() } }
         b.swipeRefreshLayout.setColorSchemeResources(
                 R.color.md_blue_500,
                 R.color.md_amber_500,
                 R.color.md_green_500
         )
 
-        isStoragePermissionGranted()
-
         SyncWorker.scheduleNext(app)
         UpdateWorker.scheduleNext(app)
 
+        // if loaded profile is archived, switch to the up-to-date version of it
+        if (app.profile.archived) {
+            launch {
+                if (app.profile.archiveId != null) {
+                    val profile = withContext(Dispatchers.IO) {
+                        app.db.profileDao().getNotArchivedOf(app.profile.archiveId!!)
+                    }
+                    if (profile != null)
+                        loadProfile(profile)
+                    else
+                        loadProfile(0)
+                } else {
+                    loadProfile(0)
+                }
+            }
+        }
+
         // APP BACKGROUND
         if (app.config.ui.appBackground != null) {
             try {
@@ -448,6 +501,8 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
 
         // WHAT'S NEW DIALOG
         if (app.config.appVersion < BuildConfig.VERSION_CODE) {
+            // force an AppSync after update
+            app.config.sync.lastAppSync = 0L
             ChangelogDialog(this)
             if (app.config.appVersion < 170) {
                 //Intent intent = new Intent(this, ChangelogIntroActivity.class);
@@ -511,7 +566,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                         .withIcon(CommunityMaterial.Icon2.cmd_help_circle_outline)
                         .withOnClickListener(View.OnClickListener { loadTarget(TARGET_FEEDBACK) })
         )
-        if (App.devMode) {
+        if (App.debugMode) {
             bottomSheet += BottomSheetPrimaryItem(false)
                     .withTitle(R.string.menu_debug)
                     .withIcon(CommunityMaterial.Icon.cmd_android_studio)
@@ -553,7 +608,66 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
          |_____/ \__, |_| |_|\___|
                   __/ |
                  |__*/
-    fun syncCurrentFeature() {
+    suspend fun syncCurrentFeature() {
+        if (app.profile.archived) {
+            MaterialAlertDialogBuilder(this)
+                    .setTitle(R.string.profile_archived_title)
+                    .setMessage(
+                            R.string.profile_archived_text,
+                            app.profile.studentSchoolYearStart,
+                            app.profile.studentSchoolYearStart + 1
+                    )
+                    .setPositiveButton(R.string.ok, null)
+                    .show()
+            swipeRefreshLayout.isRefreshing = false
+            return
+        }
+        if (app.profile.shouldArchive()) {
+            MaterialAlertDialogBuilder(this)
+                    .setTitle(R.string.profile_archiving_title)
+                    .setMessage(
+                            R.string.profile_archiving_format,
+                            app.profile.dateYearEnd.formattedString
+                    )
+                    .setPositiveButton(R.string.ok, null)
+                    .show()
+        }
+        if (app.profile.isBeforeYear()) {
+            MaterialAlertDialogBuilder(this)
+                    .setTitle(R.string.profile_year_not_started_title)
+                    .setMessage(
+                            R.string.profile_year_not_started_format,
+                            app.profile.dateSemester1Start.formattedString
+                    )
+                    .setPositiveButton(R.string.ok, null)
+                    .show()
+            swipeRefreshLayout.isRefreshing = false
+            return
+        }
+
+        app.profile.registerName?.let { registerName ->
+            var status = app.config.sync.registerAvailability[registerName]
+            if (status == null || status.nextCheck < currentTimeUnix()) {
+                withContext(Dispatchers.IO) {
+                    val api = SzkolnyApi(app)
+                    api.runCatching(this@MainActivity) {
+                        val availability = getRegisterAvailability()
+                        app.config.sync.registerAvailability = availability
+                        status = availability[registerName]
+                    }
+                }
+            }
+
+            if (status?.available != true
+                    || status?.minVersionCode ?: BuildConfig.VERSION_CODE > BuildConfig.VERSION_CODE) {
+                swipeRefreshLayout.isRefreshing = false
+                loadTarget(DRAWER_ITEM_HOME)
+                if (status != null)
+                    RegisterUnavailableDialog(this, status!!)
+                return
+            }
+        }
+
         swipeRefreshLayout.isRefreshing = true
         Toast.makeText(this, fragmentToSyncName(navTargetId), Toast.LENGTH_SHORT).show()
         val fragmentParam = when (navTargetId) {
@@ -570,6 +684,20 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                 arguments = arguments
         ).enqueue(this)
     }
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onUpdateEvent(event: Update) {
+        EventBus.getDefault().removeStickyEvent(event)
+        UpdateAvailableDialog(this, event)
+    }
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onRegisterAvailabilityEvent(event: RegisterAvailabilityEvent) {
+        EventBus.getDefault().removeStickyEvent(event)
+        app.profile.registerName?.let { registerName ->
+            event.data[registerName]?.let {
+                RegisterUnavailableDialog(this, it)
+            }
+        }
+    }
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onApiTaskStartedEvent(event: ApiTaskStartedEvent) {
         swipeRefreshLayout.isRefreshing = true
@@ -725,6 +853,15 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                     )
                     true
                 }
+                "createManualEvent" -> {
+                    val date = extras.getString("eventDate")?.let { Date.fromY_m_d(it) } ?: Date.getToday()
+                    EventManualDialog(
+                            this,
+                            App.profileId,
+                            defaultDate = date
+                    )
+                    true
+                }
                 else -> false
             }
             if (handled && !navLoading) {
@@ -865,26 +1002,51 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
 
     fun loadProfile(id: Int) = loadProfile(id, navTargetId)
     fun loadProfile(id: Int, arguments: Bundle?) = loadProfile(id, navTargetId, arguments)
-    fun loadProfile(id: Int, drawerSelection: Int, arguments: Bundle? = null) {
+    fun loadProfile(profile: Profile) = loadProfile(
+            profile,
+            navTargetId,
+            null,
+            if (app.profile.archived) app.profile.id else null
+    )
+    private fun loadProfile(id: Int, drawerSelection: Int, arguments: Bundle? = null) {
         if (App.profileId == id) {
             drawer.currentProfile = app.profile.id
             loadTarget(drawerSelection, arguments)
             return
         }
+        val previousArchivedId = if (app.profile.archived) app.profile.id else null
         app.profileLoad(id) {
-            MessagesFragment.pageSelection = -1
-            MessagesListFragment.tapPositions = intArrayOf(RecyclerView.NO_POSITION, RecyclerView.NO_POSITION)
-            MessagesListFragment.topPositions = intArrayOf(RecyclerView.NO_POSITION, RecyclerView.NO_POSITION)
-            MessagesListFragment.bottomPositions = intArrayOf(RecyclerView.NO_POSITION, RecyclerView.NO_POSITION)
-
-            setDrawerItems()
-            // the drawer profile is updated automatically when the drawer item is clicked
-            // update it manually when switching profiles from other source
-            //if (drawer.currentProfile != app.profile.id)
-            drawer.currentProfile = app.profileId
-            loadTarget(drawerSelection, arguments)
+            loadProfile(it, drawerSelection, arguments, previousArchivedId)
         }
     }
+    private fun loadProfile(profile: Profile, drawerSelection: Int, arguments: Bundle?, previousArchivedId: Int?) {
+        App.profile = profile
+        MessagesFragment.pageSelection = -1
+
+        setDrawerItems()
+
+        if (previousArchivedId != null) {
+            // prevents accidentally removing the first item if the archived profile is not shown
+            drawer.removeProfileById(previousArchivedId)
+        }
+        if (profile.archived) {
+            drawer.prependProfile(Profile(
+                    id = profile.id,
+                    loginStoreId = profile.loginStoreId,
+                    loginStoreType = profile.loginStoreType,
+                    name = profile.name,
+                    subname = "Archiwum - ${profile.subname}"
+            ).also {
+                it.archived = true
+            })
+        }
+
+        // the drawer profile is updated automatically when the drawer item is clicked
+        // update it manually when switching profiles from other source
+        //if (drawer.currentProfile != app.profile.id)
+        drawer.currentProfile = app.profileId
+        loadTarget(drawerSelection, arguments)
+    }
     fun loadTarget(id: Int, arguments: Bundle? = null) {
         var loadId = id
         if (loadId == -1) {
@@ -900,15 +1062,16 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
             loadTarget(target, arguments)
         }
     }
-    private fun loadTarget(target: NavTarget, arguments: Bundle? = null) {
-        d("NavDebug", "loadTarget(target = $target, arguments = $arguments)")
+    private fun loadTarget(target: NavTarget, args: Bundle? = null) {
+        d("NavDebug", "loadTarget(target = $target, args = $args)")
 
+        val arguments = args ?: navBackStack.firstOrNull { it.first.id == target.id }?.second ?: Bundle()
         bottomSheet.close()
         bottomSheet.removeAllContextual()
         bottomSheet.toggleGroupEnabled = false
-        bottomSheet.onCloseListener = null
         drawer.close()
-        drawer.setSelection(target.id, fireOnClick = false)
+        if (drawer.getSelection() != target.id)
+            drawer.setSelection(target.id, fireOnClick = false)
         navView.toolbar.setTitle(target.title ?: target.name)
         navView.bottomBar.fabEnable = false
         navView.bottomBar.fabExtended = false
@@ -950,6 +1113,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                     navBackStack.removeAt(navBackStack.lastIndex)
                 }
                 navTarget = target
+                navArguments = arguments
 
                 return@let null
             }?.let {
@@ -959,7 +1123,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                         R.anim.task_open_enter,
                         R.anim.task_open_exit
                 )
-                navBackStack.add(navTarget to arguments)
+                navBackStack.add(navTarget to navArguments)
                 navTarget = target
                 navArguments = arguments
             }
@@ -1056,11 +1220,12 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         val item = DrawerPrimaryItem()
                 .withIdentifier(target.id.toLong())
                 .withName(target.name)
-                .withHiddenInMiniDrawer(!app.config.ui.miniMenuButtons.contains(target.id))
+                .withIsHiddenInMiniDrawer(!app.config.ui.miniMenuButtons.contains(target.id))
                 .also { if (target.description != null) it.withDescription(target.description!!) }
                 .also { if (target.icon != null) it.withIcon(target.icon!!) }
                 .also { if (target.title != null) it.withAppTitle(getString(target.title!!)) }
                 .also { if (target.badgeTypeId != null) it.withBadgeStyle(drawer.badgeStyle)}
+                .withSelectedBackgroundAnimated(false)
 
         if (target.badgeTypeId != null)
             drawer.addUnreadCounterType(target.badgeTypeId!!, target.id)
@@ -1120,7 +1285,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         drawer.addProfileSettings(*drawerProfiles.toTypedArray())
     }
 
-    private fun showProfileContextMenu(profile: IProfile<*>, view: View) {
+    private fun showProfileContextMenu(profile: IProfile, view: View) {
         val profileId = profile.identifier.toInt()
         val popupMenu = PopupMenu(this, view)
         popupMenu.menu.add(0, 1, 1, R.string.profile_menu_open_settings)
@@ -1133,7 +1298,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                 }
                 loadTarget(DRAWER_ITEM_SETTINGS, null)
             } else if (item.itemId == 2) {
-                ProfileRemoveDialog(this, profileId, profile.name?.getText(this)?.toString() ?: "?")
+                ProfileRemoveDialog(this, profileId, profile.name?.getText(this) ?: "?")
             }
             true
         }
@@ -1144,7 +1309,8 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
     private var targetHomeId: Int = -1
     override fun onBackPressed() {
         if (!b.navView.onBackPressed()) {
-            if (App.config.ui.openDrawerOnBackPressed) {
+            if (App.config.ui.openDrawerOnBackPressed && ((navTarget.popTo == null && navTarget.popToHome)
+                    || navTarget.id == DRAWER_ITEM_HOME)) {
                 b.navView.drawer.toggle()
             } else {
                 navigateUp()

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

@@ -22,7 +22,7 @@ import kotlin.coroutines.CoroutineContext
 
 class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
     companion object {
-        const val DATA_VERSION = 10
+        const val DATA_VERSION = 12
     }
 
     private val job = Job()
@@ -105,11 +105,6 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
         get() { mWidgetConfigs = mWidgetConfigs ?: values.get("widgetConfigs", JsonObject()); return mWidgetConfigs ?: JsonObject() }
         set(value) { set("widgetConfigs", value); mWidgetConfigs = value }
 
-    private var mLastAppSync: Long? = null
-    var lastAppSync: Long
-        get() { mLastAppSync = mLastAppSync ?: values.get("lastAppSync", 0L); return mLastAppSync ?: 0L }
-        set(value) { set("lastAppSync", value); mLastAppSync = value }
-
     private var rawEntries: List<ConfigEntry> = db.configDao().getAllNow()
     private val profileConfigs: HashMap<Int, ProfileConfig> = hashMapOf()
     init {

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

@@ -4,11 +4,18 @@
 
 package pl.szczodrzynski.edziennik.config
 
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 import pl.szczodrzynski.edziennik.config.utils.get
 import pl.szczodrzynski.edziennik.config.utils.getIntList
 import pl.szczodrzynski.edziennik.config.utils.set
+import pl.szczodrzynski.edziennik.config.utils.setMap
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus
+import pl.szczodrzynski.edziennik.utils.models.Time
 
 class ConfigSync(private val config: Config) {
+    private val gson = Gson()
+
     private var mDontShowAppManagerDialog: Boolean? = null
     var dontShowAppManagerDialog: Boolean
         get() { mDontShowAppManagerDialog = mDontShowAppManagerDialog ?: config.values.get("dontShowAppManagerDialog", false); return mDontShowAppManagerDialog ?: false }
@@ -19,6 +26,11 @@ class ConfigSync(private val config: Config) {
         get() { mSyncEnabled = mSyncEnabled ?: config.values.get("syncEnabled", true); return mSyncEnabled ?: true }
         set(value) { config.set("syncEnabled", value); mSyncEnabled = value }
 
+    private var mWebPushEnabled: Boolean? = null
+    var webPushEnabled: Boolean
+        get() { mWebPushEnabled = mWebPushEnabled ?: config.values.get("webPushEnabled", true); return mWebPushEnabled ?: true }
+        set(value) { config.set("webPushEnabled", value); mWebPushEnabled = value }
+
     private var mSyncOnlyWifi: Boolean? = null
     var onlyWifi: Boolean
         get() { mSyncOnlyWifi = mSyncOnlyWifi ?: config.values.get("syncOnlyWifi", false); return mSyncOnlyWifi ?: notifyAboutUpdates }
@@ -34,20 +46,30 @@ class ConfigSync(private val config: Config) {
         get() { mNotifyAboutUpdates = mNotifyAboutUpdates ?: config.values.get("notifyAboutUpdates", true); return mNotifyAboutUpdates ?: true }
         set(value) { config.set("notifyAboutUpdates", value); mNotifyAboutUpdates = value }
 
+    private var mLastAppSync: Long? = null
+    var lastAppSync: Long
+        get() { mLastAppSync = mLastAppSync ?: config.values.get("lastAppSync", 0L); return mLastAppSync ?: 0L }
+        set(value) { config.set("lastAppSync", value); mLastAppSync = value }
+
     /*     ____        _      _     _
           / __ \      (_)    | |   | |
          | |  | |_   _ _  ___| |_  | |__   ___  _   _ _ __ ___
          | |  | | | | | |/ _ \ __| | '_ \ / _ \| | | | '__/ __|
          | |__| | |_| | |  __/ |_  | | | | (_) | |_| | |  \__ \
           \___\_\\__,_|_|\___|\__| |_| |_|\___/ \__,_|_|  |__*/
-    private var mQuietHoursStart: Long? = null
-    var quietHoursStart: Long
-        get() { mQuietHoursStart = mQuietHoursStart ?: config.values.get("quietHoursStart", 0L); return mQuietHoursStart ?: 0L }
+    private var mQuietHoursEnabled: Boolean? = null
+    var quietHoursEnabled: Boolean
+        get() { mQuietHoursEnabled = mQuietHoursEnabled ?: config.values.get("quietHoursEnabled", false); return mQuietHoursEnabled ?: false }
+        set(value) { config.set("quietHoursEnabled", value); mQuietHoursEnabled = value }
+
+    private var mQuietHoursStart: Time? = null
+    var quietHoursStart: Time?
+        get() { mQuietHoursStart = mQuietHoursStart ?: config.values.get("quietHoursStart", null as Time?); return mQuietHoursStart }
         set(value) { config.set("quietHoursStart", value); mQuietHoursStart = value }
 
-    private var mQuietHoursEnd: Long? = null
-    var quietHoursEnd: Long
-        get() { mQuietHoursEnd = mQuietHoursEnd ?: config.values.get("quietHoursEnd", 0L); return mQuietHoursEnd ?: 0L }
+    private var mQuietHoursEnd: Time? = null
+    var quietHoursEnd: Time?
+        get() { mQuietHoursEnd = mQuietHoursEnd ?: config.values.get("quietHoursEnd", null as Time?); return mQuietHoursEnd }
         set(value) { config.set("quietHoursEnd", value); mQuietHoursEnd = value }
 
     private var mQuietDuringLessons: Boolean? = null
@@ -90,4 +112,9 @@ class ConfigSync(private val config: Config) {
     var tokenVulcanList: List<Int>
         get() { mTokenVulcanList = mTokenVulcanList ?: config.values.getIntList("tokenVulcanList", listOf()); return mTokenVulcanList ?: listOf() }
         set(value) { config.set("tokenVulcanList", value); mTokenVulcanList = value }
-}
+
+    private var mRegisterAvailability: Map<String, RegisterAvailabilityStatus>? = null
+    var registerAvailability: Map<String, RegisterAvailabilityStatus>
+        get() { mRegisterAvailability = mRegisterAvailability ?: config.values.get("registerAvailability", null as String?)?.let { it -> gson.fromJson<Map<String, RegisterAvailabilityStatus>>(it, object: TypeToken<Map<String, RegisterAvailabilityStatus>>(){}.type) }; return mRegisterAvailability ?: mapOf() }
+        set(value) { config.setMap("registerAvailability", value); mRegisterAvailability = value }
+}

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

@@ -18,7 +18,7 @@ import kotlin.coroutines.CoroutineContext
 
 class ProfileConfig(val db: AppDb, val profileId: Int, rawEntries: List<ConfigEntry>) : CoroutineScope, AbstractConfig {
     companion object {
-        const val DATA_VERSION = 1
+        const val DATA_VERSION = 2
     }
 
     private val job = Job()
@@ -30,6 +30,7 @@ class ProfileConfig(val db: AppDb, val profileId: Int, rawEntries: List<ConfigEn
     val grades by lazy { ProfileConfigGrades(this) }
     val ui by lazy { ProfileConfigUI(this) }
     val sync by lazy { ProfileConfigSync(this) }
+    val attendance by lazy { ProfileConfigAttendance(this) }
     /*
     val timetable by lazy { ConfigTimetable(this) }
     val grades by lazy { ConfigGrades(this) }*/

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-4-29. 
+ */
+
+package pl.szczodrzynski.edziennik.config
+
+import pl.szczodrzynski.edziennik.config.utils.get
+import pl.szczodrzynski.edziennik.config.utils.set
+
+class ProfileConfigAttendance(private val config: ProfileConfig) {
+    private var mAttendancePageSelection: Int? = null
+    var attendancePageSelection: Int
+        get() { mAttendancePageSelection = mAttendancePageSelection ?: config.values.get("attendancePageSelection", 1); return mAttendancePageSelection ?: 1 }
+        set(value) { config.set("attendancePageSelection", value); mAttendancePageSelection = value }
+
+    private var mUseSymbols: Boolean? = null
+    var useSymbols: Boolean
+        get() { mUseSymbols = mUseSymbols ?: config.values.get("useSymbols", false); return mUseSymbols ?: false }
+        set(value) { config.set("useSymbols", value); mUseSymbols = value }
+
+    private var mGroupConsecutiveDays: Boolean? = null
+    var groupConsecutiveDays: Boolean
+        get() { mGroupConsecutiveDays = mGroupConsecutiveDays ?: config.values.get("groupConsecutiveDays", true); return mGroupConsecutiveDays ?: true }
+        set(value) { config.set("groupConsecutiveDays", value); mGroupConsecutiveDays = value }
+
+    private var mShowPresenceInMonth: Boolean? = null
+    var showPresenceInMonth: Boolean
+        get() { mShowPresenceInMonth = mShowPresenceInMonth ?: config.values.get("showPresenceInMonth", false); return mShowPresenceInMonth ?: false }
+        set(value) { config.set("showPresenceInMonth", value); mShowPresenceInMonth = value }
+}

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

@@ -21,10 +21,15 @@ class ProfileConfigGrades(private val config: ProfileConfig) {
         get() { mYearAverageMode = mYearAverageMode ?: config.values.get("yearAverageMode", YEAR_ALL_GRADES); return mYearAverageMode ?: YEAR_ALL_GRADES }
         set(value) { config.set("yearAverageMode", value); mYearAverageMode = value }
 
-    private var mCountZeroToAvg: Boolean? = null
-    var countZeroToAvg: Boolean
-        get() { mCountZeroToAvg = mCountZeroToAvg ?: config.values.get("countZeroToAvg", true); return mCountZeroToAvg ?: true }
-        set(value) { config.set("countZeroToAvg", value); mCountZeroToAvg = value }
+    private var mHideImproved: Boolean? = null
+    var hideImproved: Boolean
+        get() { mHideImproved = mHideImproved ?: config.values.get("hideImproved", false); return mHideImproved ?: false }
+        set(value) { config.set("hideImproved", value); mHideImproved = value }
+
+    private var mAverageWithoutWeight: Boolean? = null
+    var averageWithoutWeight: Boolean
+        get() { mAverageWithoutWeight = mAverageWithoutWeight ?: config.values.get("averageWithoutWeight", true); return mAverageWithoutWeight ?: true }
+        set(value) { config.set("averageWithoutWeight", value); mAverageWithoutWeight = value }
 
     private var mPlusValue: Float? = null
     var plusValue: Float?
@@ -35,6 +40,11 @@ class ProfileConfigGrades(private val config: ProfileConfig) {
         get() { mMinusValue = mMinusValue ?: config.values.getFloat("minusValue"); return mMinusValue }
         set(value) { config.set("minusValue", value); mMinusValue = value }
 
+    private var mDontCountEnabled: Boolean? = null
+    var dontCountEnabled: Boolean
+        get() { mDontCountEnabled = mDontCountEnabled ?: config.values.get("dontCountEnabled", false); return mDontCountEnabled ?: false }
+        set(value) { config.set("dontCountEnabled", value); mDontCountEnabled = value }
+    
     private var mDontCountGrades: List<String>? = null
     var dontCountGrades: List<String>
         get() { mDontCountGrades = mDontCountGrades ?: config.values.get("dontCountGrades", listOf()); return mDontCountGrades ?: listOf() }

app/src/main/java/pl/szczodrzynski/edziennik/config/utils/AppConfigMigrationV3.kt

@@ -14,6 +14,7 @@ import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_LIBRUS
 import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_MOBIDZIENNIK
 import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_VULCAN
 import pl.szczodrzynski.edziennik.utils.models.Time
+import kotlin.math.abs
 
 class AppConfigMigrationV3(p: SharedPreferences, config: Config) {
     init { config.apply {
@@ -42,9 +43,7 @@ class AppConfigMigrationV3(p: SharedPreferences, config: Config) {
             devModePassword = p.getString("$s.devModePassword", null).fix()
             sync.tokenApp = p.getString("$s.fcmToken", null).fix()
             timetable.bellSyncMultiplier = p.getString("$s.bellSyncMultiplier", null)?.toIntOrNull() ?: 0
-            sync.quietHoursStart = p.getString("$s.quietHoursStart", null)?.toLongOrNull() ?: 0
             appRateSnackbarTime = p.getString("$s.appRateSnackbarTime", null)?.toLongOrNull() ?: 0
-            sync.quietHoursEnd = p.getString("$s.quietHoursEnd", null)?.toLongOrNull() ?: 0
             timetable.countInSeconds = p.getString("$s.countInSeconds", null)?.toBoolean() ?: false
             ui.headerBackground = p.getString("$s.headerBackground", null).fix()
             ui.appBackground = p.getString("$s.appBackground", null).fix()
@@ -59,6 +58,22 @@ class AppConfigMigrationV3(p: SharedPreferences, config: Config) {
             sync.notifyAboutUpdates = p.getString("$s.notifyAboutUpdates", null)?.toBoolean() ?: true
             timetable.bellSyncDiff = p.getString("$s.bellSyncDiff", null)?.let { Gson().fromJson(it, Time::class.java) }
 
+            val startMillis = p.getString("$s.quietHoursStart", null)?.toLongOrNull() ?: 0
+            val endMillis = p.getString("$s.quietHoursEnd", null)?.toLongOrNull() ?: 0
+            if (startMillis > 0) {
+                try {
+                    sync.quietHoursStart = Time.fromMillis(abs(startMillis))
+                    sync.quietHoursEnd = Time.fromMillis(abs(endMillis))
+                    sync.quietHoursEnabled = true
+                }
+                catch (_: Exception) {}
+            }
+            else {
+                sync.quietHoursEnabled = false
+                sync.quietHoursStart = null
+                sync.quietHoursEnd = null
+            }
+
             sync.tokenMobidziennikList = listOf()
             sync.tokenVulcanList = listOf()
             sync.tokenLibrusList = listOf()
@@ -78,4 +93,4 @@ class AppConfigMigrationV3(p: SharedPreferences, config: Config) {
     private fun String?.fix(): String? {
         return this?.replace("\"", "")?.let { if (it == "null") null else it }
     }
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigExtensions.kt

@@ -49,6 +49,9 @@ fun AbstractConfig.setIntList(key: String, value: List<Int>?) {
 fun AbstractConfig.setLongList(key: String, value: List<Long>?) {
     set(key, value?.let { gson.toJson(it) })
 }
+fun <K, V> AbstractConfig.setMap(key: String, value: Map<K, V>?) {
+    set(key, value?.let { gson.toJson(it) })
+}
 
 fun HashMap<String, String?>.get(key: String, default: String?): String? {
     return this[key] ?: default

app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigMigration.kt

@@ -11,6 +11,8 @@ import pl.szczodrzynski.edziennik.HOUR
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.config.Config
 import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.ORDER_BY_DATE_DESC
+import pl.szczodrzynski.edziennik.utils.models.Time
+import kotlin.math.abs
 
 class ConfigMigration(app: App, config: Config) {
     init { config.apply {
@@ -43,8 +45,9 @@ class ConfigMigration(app: App, config: Config) {
             sync.interval = 1*HOUR.toInt()
             sync.notifyAboutUpdates = true
             sync.onlyWifi = false
-            sync.quietHoursStart = 0
-            sync.quietHoursEnd = 0
+            sync.quietHoursEnabled = false
+            sync.quietHoursStart = null
+            sync.quietHoursEnd = null
             sync.quietDuringLessons = false
             sync.tokenApp = null
             sync.tokenMobidziennik = null
@@ -61,13 +64,47 @@ class ConfigMigration(app: App, config: Config) {
             dataVersion = 2
         }
 
+        if (dataVersion < 3) {
+            update = null
+            privacyPolicyAccepted = false
+            debugMode = false
+            devModePassword = null
+            appInstalledTime = 0L
+            appRateSnackbarTime = 0L
+
+            dataVersion = 3
+        }
+
         if (dataVersion < 10) {
             ui.openDrawerOnBackPressed = false
             ui.snowfall = false
             ui.bottomSheetOpened = false
             sync.dontShowAppManagerDialog = false
+            sync.webPushEnabled = true
+            sync.lastAppSync = 0L
+
 
             dataVersion = 10
         }
+
+        if (dataVersion < 11) {
+            val startMillis = config.values.get("quietHoursStart", 0L)
+            val endMillis = config.values.get("quietHoursEnd", 0L)
+            if (startMillis > 0) {
+                try {
+                    sync.quietHoursStart = Time.fromMillis(abs(startMillis))
+                    sync.quietHoursEnd = Time.fromMillis(abs(endMillis))
+                    sync.quietHoursEnabled = true
+                }
+                catch (_: Exception) {}
+            }
+            else {
+                sync.quietHoursEnabled = false
+                sync.quietHoursStart = null
+                sync.quietHoursEnd = null
+            }
+
+            dataVersion = 11
+        }
     }}
 }

app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ProfileConfigMigration.kt

@@ -5,6 +5,7 @@
 package pl.szczodrzynski.edziennik.config.utils
 
 import pl.szczodrzynski.edziennik.config.ProfileConfig
+import pl.szczodrzynski.edziennik.data.db.entity.Notification
 import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.AGENDA_DEFAULT
 import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.COLOR_MODE_WEIGHTED
 import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.YEAR_ALL_GRADES
@@ -14,11 +15,23 @@ class ProfileConfigMigration(config: ProfileConfig) {
 
         if (dataVersion < 1) {
             grades.colorMode = COLOR_MODE_WEIGHTED
-            grades.countZeroToAvg = true
             grades.yearAverageMode = YEAR_ALL_GRADES
+            grades.hideImproved = false
+            grades.averageWithoutWeight = true
+            grades.plusValue = null
+            grades.minusValue = null
+            grades.dontCountEnabled = false
+            grades.dontCountGrades = listOf()
             ui.agendaViewType = AGENDA_DEFAULT
+            // no migration for ui.homeCards
 
             dataVersion = 1
         }
+
+        if (dataVersion < 2) {
+            sync.notificationFilter = sync.notificationFilter + Notification.TYPE_TEACHER_ABSENCE
+
+            dataVersion = 2
+        }
     }}
 }

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

@@ -22,6 +22,7 @@ import pl.szczodrzynski.edziennik.data.api.task.ErrorReportTask
 import pl.szczodrzynski.edziennik.data.api.task.IApiTask
 import pl.szczodrzynski.edziennik.data.api.task.SzkolnyTask
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.toApiError
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import kotlin.math.min
 import kotlin.math.roundToInt
@@ -37,6 +38,9 @@ class ApiService : Service() {
             context.startService(Intent(context, ApiService::class.java))
             EventBus.getDefault().postSticky(request)
         }
+
+        var lastEventTime = System.currentTimeMillis()
+        var taskCancelTries = 0
     }
 
     private val app by lazy { applicationContext as App }
@@ -63,9 +67,6 @@ class ApiService : Service() {
 
     private val notification by lazy { EdziennikNotification(app) }
 
-    private var lastEventTime = System.currentTimeMillis()
-    private var taskCancelTries = 0
-
     /*    ______    _     _                  _ _       _____      _ _ _                _
          |  ____|  | |   (_)                (_) |     / ____|    | | | |              | |
          | |__   __| |_____  ___ _ __  _ __  _| | __ | |     __ _| | | |__   __ _  ___| | __
@@ -181,7 +182,7 @@ class ApiService : Service() {
                 is SzkolnyTask -> task.run(taskCallback)
             }
         } catch (e: Exception) {
-            taskCallback.onError(ApiError(TAG, EXCEPTION_API_TASK).withThrowable(e))
+            taskCallback.onError(e.toApiError(TAG))
         }
     }
 

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

@@ -24,14 +24,14 @@ const val FAKE_LIBRUS_ACCOUNTS = "/synergia_accounts.php"
 
 val LIBRUS_USER_AGENT = "${SYSTEM_USER_AGENT}LibrusMobileApp"
 const val SYNERGIA_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) Gecko/20100101 Firefox/62.0"
-const val LIBRUS_CLIENT_ID = "6XPsKf10LPz1nxgHQLcvZ1KM48DYzlBAhxipaXY8"
-const val LIBRUS_REDIRECT_URL = "http://localhost/bar"
+const val LIBRUS_CLIENT_ID = "0RbsDOkV9tyKEQYzlLv5hs3DM1ukrynFI4p6C1Yc"
+const val LIBRUS_REDIRECT_URL = "app://librus"
 const val LIBRUS_AUTHORIZE_URL = "https://portal.librus.pl/oauth2/authorize?client_id=$LIBRUS_CLIENT_ID&redirect_uri=$LIBRUS_REDIRECT_URL&response_type=code"
 const val LIBRUS_LOGIN_URL = "https://portal.librus.pl/rodzina/login/action"
 const val LIBRUS_TOKEN_URL = "https://portal.librus.pl/oauth2/access_token"
 
-const val LIBRUS_ACCOUNT_URL = "/v2/SynergiaAccounts/fresh/" // + login
-const val LIBRUS_ACCOUNTS_URL = "/v2/SynergiaAccounts"
+const val LIBRUS_ACCOUNT_URL = "/v3/SynergiaAccounts/fresh/" // + login
+const val LIBRUS_ACCOUNTS_URL = "/v3/SynergiaAccounts"
 
 /** https://api.librus.pl/2.0 */
 const val LIBRUS_API_URL = "https://api.librus.pl/2.0"
@@ -56,6 +56,9 @@ const val LIBRUS_SYNERGIA_TOKEN_LOGIN_URL = "https://synergia.librus.pl/loguj/to
 const val LIBRUS_MESSAGES_URL = "https://wiadomosci.librus.pl/module"
 const val LIBRUS_SANDBOX_URL = "https://sandbox.librus.pl/index.php?action="
 
+const val LIBRUS_SYNERGIA_HOMEWORK_ATTACHMENT_URL = "https://synergia.librus.pl/homework/downloadFile"
+const val LIBRUS_SYNERGIA_MESSAGES_ATTACHMENT_URL = "https://synergia.librus.pl/wiadomosci/pobierz_zalacznik"
+
 const val IDZIENNIK_USER_AGENT = SYNERGIA_USER_AGENT
 const val IDZIENNIK_WEB_URL = "https://iuczniowie.progman.pl/idziennik"
 const val IDZIENNIK_WEB_LOGIN = "login.aspx"
@@ -74,6 +77,8 @@ const val IDZIENNIK_WEB_GET_MESSAGE = "mod_komunikator/WS_wiadomosci.asmx/Pobier
 const val IDZIENNIK_WEB_GET_RECIPIENT_LIST = "mod_komunikator/WS_wiadomosci.asmx/pobierzListeOdbiorcowPanelRodzic"
 const val IDZIENNIK_WEB_SEND_MESSAGE = "mod_komunikator/WS_wiadomosci.asmx/WyslijWiadomosc"
 const val IDZIENNIK_WEB_GET_ATTACHMENT = "mod_komunikator/Download.ashx"
+const val IDZIENNIK_WEB_GET_HOMEWORK = "mod_panelRodzica/pracaDomowa/WS_pracaDomowa.asmx/pobierzJednaPraceDomowa"
+const val IDZIENNIK_WEB_GET_HOMEWORK_ATTACHMENT = "mod_panelRodzica/pracaDomowa.aspx"
 
 val IDZIENNIK_API_USER_AGENT = SYSTEM_USER_AGENT
 const val IDZIENNIK_API_URL = "https://iuczniowie.progman.pl/idziennik/api"
@@ -87,7 +92,7 @@ val MOBIDZIENNIK_USER_AGENT = SYSTEM_USER_AGENT
 
 const val VULCAN_API_USER_AGENT = "MobileUserAgent"
 const val VULCAN_API_APP_NAME = "VULCAN-Android-ModulUcznia"
-const val VULCAN_API_APP_VERSION = "19.4.1.436"
+const val VULCAN_API_APP_VERSION = "20.5.1.470"
 const val VULCAN_API_PASSWORD = "CE75EA598C7743AD9B0B7328DED85B06"
 const val VULCAN_API_PASSWORD_FAKELOG = "012345678901234567890123456789AB"
 val VULCAN_API_DEVICE_NAME = "Szkolny.eu ${Build.MODEL}"
@@ -107,5 +112,13 @@ const val VULCAN_API_ENDPOINT_MESSAGES_SENT = "mobile-api/Uczen.v3.Uczen/Wiadomo
 const val VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS = "mobile-api/Uczen.v3.Uczen/ZmienStatusWiadomosci"
 const val VULCAN_API_ENDPOINT_MESSAGES_ADD = "mobile-api/Uczen.v3.Uczen/DodajWiadomosc"
 const val VULCAN_API_ENDPOINT_PUSH = "mobile-api/Uczen.v3.Uczen/UstawPushToken"
+const val VULCAN_API_ENDPOINT_MESSAGES_ATTACHMENTS = "mobile-api/Uczen.v3.Uczen/WiadomosciZalacznik"
+const val VULCAN_API_ENDPOINT_HOMEWORK_ATTACHMENTS = "mobile-api/Uczen.v3.Uczen/ZadaniaDomoweZalacznik"
+const val VULCAN_WEB_ENDPOINT_LUCKY_NUMBER = "Start.mvc/GetKidsLuckyNumbers"
+const val VULCAN_WEB_ENDPOINT_REGISTER_DEVICE = "RejestracjaUrzadzeniaToken.mvc/Get"
 
 const val EDUDZIENNIK_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME}"
+
+const val PODLASIE_API_VERSION = "1.0.31"
+const val PODLASIE_API_URL = "https://cpdklaser.zeto.bialystok.pl/api"
+const val PODLASIE_API_USER_ENDPOINT = "/pobierzDaneUcznia"

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

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

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

@@ -124,6 +124,10 @@ const val ERROR_LIBRUS_PORTAL_MAINTENANCE                   = 182
 const val ERROR_LIBRUS_API_NOTICEBOARD_PROBLEM              = 183
 const val ERROR_LOGIN_LIBRUS_PORTAL_CSRF_EXPIRED            = 184
 const val ERROR_LIBRUS_API_DEVICE_REGISTERED                = 185
+const val ERROR_LIBRUS_MESSAGES_NOT_FOUND                   = 186
+const val ERROR_LOGIN_LIBRUS_API_INVALID_REQUEST            = 187
+const val ERROR_LIBRUS_MESSAGES_ATTACHMENT_NOT_FOUND        = 188
+const val ERROR_LOGIN_LIBRUS_MESSAGES_TIMEOUT               = 189
 
 const val ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_LOGIN        = 201
 const val ERROR_LOGIN_MOBIDZIENNIK_WEB_OLD_PASSWORD         = 202
@@ -140,6 +144,7 @@ const val ERROR_MOBIDZIENNIK_WEB_INVALID_RESPONSE           = 214
 const val ERROR_LOGIN_MOBIDZIENNIK_WEB_NO_SESSION_ID        = 215
 const val ERROR_LOGIN_MOBIDZIENNIK_API2_INVALID_LOGIN       = 216
 const val ERROR_LOGIN_MOBIDZIENNIK_API2_OTHER               = 217
+const val ERROR_MOBIDZIENNIK_WEB_SERVER_PROBLEM             = 218
 
 const val ERROR_LOGIN_VULCAN_INVALID_SYMBOL                 = 301
 const val ERROR_LOGIN_VULCAN_INVALID_TOKEN                  = 302
@@ -154,6 +159,17 @@ const val ERROR_LOGIN_VULCAN_NO_PUPILS                      = 331
 const val ERROR_VULCAN_API_MAINTENANCE                      = 340
 const val ERROR_VULCAN_API_BAD_REQUEST                      = 341
 const val ERROR_VULCAN_API_OTHER                            = 342
+const val ERROR_VULCAN_ATTACHMENT_DOWNLOAD                  = 343
+const val ERROR_VULCAN_WEB_DATA_MISSING                     = 344
+const val ERROR_VULCAN_WEB_429                              = 345
+const val ERROR_VULCAN_WEB_OTHER                            = 346
+const val ERROR_VULCAN_WEB_NO_CERTIFICATE                   = 347
+const val ERROR_VULCAN_WEB_NO_REGISTER                      = 348
+const val ERROR_VULCAN_WEB_CERTIFICATE_EXPIRED              = 349
+const val ERROR_VULCAN_WEB_LOGGED_OUT                       = 350
+const val ERROR_VULCAN_WEB_CERTIFICATE_POST_FAILED          = 351
+const val ERROR_VULCAN_WEB_GRADUATE_ACCOUNT                 = 352
+const val ERROR_VULCAN_WEB_NO_SCHOOLS                       = 353
 
 const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN           = 401
 const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME     = 402
@@ -184,6 +200,12 @@ 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_LOGIN_PODLASIE_API_INVALID_TOKEN            = 601
+const val ERROR_LOGIN_PODLASIE_API_DEVICE_LIMIT             = 602
+const val ERROR_PODLASIE_API_NO_TOKEN                       = 630
+const val ERROR_PODLASIE_API_OTHER                          = 631
+const val ERROR_PODLASIE_API_DATA_MISSING                   = 632
+
 const val ERROR_TEMPLATE_WEB_OTHER                          = 801
 
 const val EXCEPTION_API_TASK                                = 900
@@ -203,5 +225,9 @@ const val EXCEPTION_IDZIENNIK_WEB_API_REQUEST               = 913
 const val EXCEPTION_IDZIENNIK_API_REQUEST                   = 914
 const val EXCEPTION_EDUDZIENNIK_WEB_REQUEST                 = 920
 const val EXCEPTION_EDUDZIENNIK_FILE_REQUEST                = 921
+const val ERROR_ONEDRIVE_DOWNLOAD                           = 930
+const val EXCEPTION_VULCAN_WEB_LOGIN                        = 931
+const val EXCEPTION_VULCAN_WEB_REQUEST                      = 932
+const val EXCEPTION_PODLASIE_API_REQUEST                    = 940
 
 const val LOGIN_NO_ARGUMENTS                                = 1201

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

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

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

@@ -13,9 +13,11 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginPor
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginSynergia
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login.MobidziennikLoginApi2
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login.MobidziennikLoginWeb
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.login.PodlasieLoginApi
 import pl.szczodrzynski.edziennik.data.api.edziennik.template.login.TemplateLoginApi
 import pl.szczodrzynski.edziennik.data.api.edziennik.template.login.TemplateLoginWeb
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginWebMain
 import pl.szczodrzynski.edziennik.data.api.models.LoginMethod
 
 // librus
@@ -27,7 +29,6 @@ import pl.szczodrzynski.edziennik.data.api.models.LoginMethod
 const val SYNERGIA_API_ENABLED = false
 
 
-
 const val LOGIN_TYPE_IDZIENNIK = 3
 
 const val LOGIN_TYPE_TEMPLATE = 21
@@ -70,13 +71,13 @@ val librusLoginMethods = listOf(
         LoginMethod(LOGIN_TYPE_LIBRUS, LOGIN_METHOD_LIBRUS_SYNERGIA, LibrusLoginSynergia::class.java)
                 .withIsPossible { _, loginStore -> !loginStore.hasLoginData("fakeLogin") }
                 .withRequiredLoginMethod { profile, _ ->
-                    if (profile?.hasStudentData("accountPassword") == false) LOGIN_METHOD_LIBRUS_API else LOGIN_METHOD_NOT_NEEDED
+                    if (profile?.hasStudentData("accountPassword") == false || true) LOGIN_METHOD_LIBRUS_API else LOGIN_METHOD_NOT_NEEDED
                 },
 
         LoginMethod(LOGIN_TYPE_LIBRUS, LOGIN_METHOD_LIBRUS_MESSAGES, LibrusLoginMessages::class.java)
                 .withIsPossible { _, loginStore -> !loginStore.hasLoginData("fakeLogin") }
                 .withRequiredLoginMethod { profile, _ ->
-                    if (profile?.hasStudentData("accountPassword") == false) LOGIN_METHOD_LIBRUS_SYNERGIA else LOGIN_METHOD_NOT_NEEDED
+                    if (profile?.hasStudentData("accountPassword") == false || true) LOGIN_METHOD_LIBRUS_SYNERGIA else LOGIN_METHOD_NOT_NEEDED
                 }
 )
 
@@ -103,11 +104,11 @@ const val LOGIN_METHOD_VULCAN_WEB_OLD = 300
 const val LOGIN_METHOD_VULCAN_WEB_MESSAGES = 400
 const val LOGIN_METHOD_VULCAN_API = 500
 val vulcanLoginMethods = listOf(
-        /*LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_WEB_MAIN, VulcanLoginWebMain::class.java)
-                .withIsPossible { _, _ -> false }
+        LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_WEB_MAIN, VulcanLoginWebMain::class.java)
+                .withIsPossible { _, loginStore -> loginStore.hasLoginData("webHost") }
                 .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED },
 
-        LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_WEB_NEW, VulcanLoginWebNew::class.java)
+        /*LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_WEB_NEW, VulcanLoginWebNew::class.java)
                 .withIsPossible { _, _ -> false }
                 .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_VULCAN_WEB_MAIN },
 
@@ -118,7 +119,7 @@ val vulcanLoginMethods = listOf(
         LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_API, VulcanLoginApi::class.java)
                 .withIsPossible { _, _ -> true }
                 .withRequiredLoginMethod { _, loginStore ->
-                    if (loginStore.mode == LOGIN_MODE_VULCAN_WEB) LOGIN_METHOD_VULCAN_WEB_NEW else LOGIN_METHOD_NOT_NEEDED
+                    if (loginStore.mode == LOGIN_MODE_VULCAN_WEB) LOGIN_METHOD_VULCAN_WEB_MAIN else LOGIN_METHOD_NOT_NEEDED
                 }
 )
 
@@ -133,6 +134,7 @@ val idziennikLoginMethods = listOf(
 )
 
 const val LOGIN_TYPE_EDUDZIENNIK = 5
+const val LOGIN_MODE_EDUDZIENNIK_WEB = 0
 const val LOGIN_METHOD_EDUDZIENNIK_WEB = 100
 val edudziennikLoginMethods = listOf(
         LoginMethod(LOGIN_TYPE_EDUDZIENNIK, LOGIN_METHOD_EDUDZIENNIK_WEB, EdudziennikLoginWeb::class.java)
@@ -140,6 +142,15 @@ val edudziennikLoginMethods = listOf(
                 .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }
 )
 
+const val LOGIN_TYPE_PODLASIE = 6
+const val LOGIN_MODE_PODLASIE_API = 0
+const val LOGIN_METHOD_PODLASIE_API = 100
+val podlasieLoginMethods = listOf(
+        LoginMethod(LOGIN_TYPE_PODLASIE, LOGIN_METHOD_PODLASIE_API, PodlasieLoginApi::class.java)
+                .withIsPossible { _, _ -> true }
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }
+)
+
 val templateLoginMethods = listOf(
         LoginMethod(LOGIN_TYPE_TEMPLATE, LOGIN_METHOD_TEMPLATE_WEB, TemplateLoginWeb::class.java)
                 .withIsPossible { _, _ -> true }

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

@@ -5,6 +5,7 @@
 package pl.szczodrzynski.edziennik.data.api
 
 import kotlin.text.RegexOption.DOT_MATCHES_ALL
+import kotlin.text.RegexOption.IGNORE_CASE
 
 object Regexes {
     val STYLE_CSS_COLOR by lazy {
@@ -39,7 +40,7 @@ object Regexes {
         """\(([0-9A-ząęóżźńśłć]*?)\)$""".toRegex(DOT_MATCHES_ALL)
     }
     val MOBIDZIENNIK_LUCKY_NUMBER by lazy {
-        """class="szczesliwy_numerek".*>0*([0-9]+)(?:/0*[0-9]+)*</a>""".toRegex(DOT_MATCHES_ALL)
+        """class="szczesliwy_numerek".*?>0?([0-9]+)/?0?([0-9]+)?</a>""".toRegex(DOT_MATCHES_ALL)
     }
     val MOBIDZIENNIK_CLASS_CALENDAR by lazy {
         """events: (.+),$""".toRegex(RegexOption.MULTILINE)
@@ -67,6 +68,9 @@ object Regexes {
     }
 
 
+    val MOBIDZIENNIK_ATTENDANCE_TYPES by lazy {
+        """Legenda:.+?normal;">(.+?)</span>""".toRegex(DOT_MATCHES_ALL)
+    }
     val MOBIDZIENNIK_ATTENDANCE_TABLE by lazy {
         """<table .+?id="obecnosci_tabela">(.+?)</table>""".toRegex(DOT_MATCHES_ALL)
     }
@@ -76,11 +80,36 @@ object Regexes {
     val MOBIDZIENNIK_ATTENDANCE_ENTRIES by lazy {
         """font-size:.+?class=".*?">(.*?)</td>""".toRegex(DOT_MATCHES_ALL)
     }
+    val MOBIDZIENNIK_ATTENDANCE_COLUMNS by lazy {
+        """<tr><td class="border-right1".+?/td>(.+?)</tr>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_ATTENDANCE_COLUMN by lazy {
+        """(<td.+?>)(.*?)</td>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_ATTENDANCE_COLUMN_SPAN by lazy {
+        """colspan="(\d+)"""".toRegex()
+    }
     val MOBIDZIENNIK_ATTENDANCE_RANGE by lazy {
         """<span>([0-9:]+) - .+? (.+?)</span></a>""".toRegex(DOT_MATCHES_ALL)
     }
     val MOBIDZIENNIK_ATTENDANCE_LESSON by lazy {
-        """<strong>(.+?) - (.*?)</strong>.+?<small>.+?\((.+?), .+?(.+?)\)""".toRegex(DOT_MATCHES_ALL)
+        """<strong>(.+?)</strong>\s*<small>\s*\((.+?),\s*(.+?)\)""".toRegex(DOT_MATCHES_ALL)
+    }
+
+    val MOBIDZIENNIK_HOMEWORK_ROW by lazy {
+        """class="rowRolling">(.+?</div>\s*</td>)""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_HOMEWORK_ITEM by lazy {
+        """<p><b>(.+?):</b>\s*(.+?)\s*</p>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_HOMEWORK_BODY by lazy {
+        """Treść:</b>(.+?)<p><b>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_HOMEWORK_ID by lazy {
+        """zadanieFormularz\(([0-9]+),""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_HOMEWORK_ATTACHMENT by lazy {
+        """zalacznik(_zadania)?=([0-9]+)'.+?word-break">(.+?)</td>""".toRegex(DOT_MATCHES_ALL)
     }
 
 
@@ -122,11 +151,20 @@ object Regexes {
     val VULCAN_SHIFT_ANNOTATION by lazy {
         """\(przeniesiona (z|na) lekcj[ię] ([0-9]+), (.+)\)""".toRegex()
     }
+    val VULCAN_WEB_PERMISSIONS by lazy {
+        """permissions: '([A-z0-9/=+\-_]+?)'""".toRegex()
+    }
+    val VULCAN_WEB_SYMBOL_VALIDATE by lazy {
+        """[A-z0-9]+""".toRegex(IGNORE_CASE)
+    }
 
 
 
     val LIBRUS_ATTACHMENT_KEY by lazy {
-        """singleUseKey=([0-9A-f_]+)""".toRegex()
+        """singleUseKey=([0-9A-z_]+)""".toRegex()
+    }
+    val LIBRUS_MESSAGE_ID by lazy {
+        """/wiadomosci/[0-9]+/[0-9]+/([0-9]+?)/""".toRegex()
     }
 
 
@@ -154,6 +192,9 @@ object Regexes {
     val EDUDZIENNIK_ANNOUNCEMENT_DESCRIPTION by lazy {
         """<div class="desc">.*?<p>(.*?)</p>""".toRegex(DOT_MATCHES_ALL)
     }
+    val EDUDZIENNIK_HOMEWORK_DESCRIPTION by lazy {
+        """<div class="desc">(.*?)</div>""".toRegex(DOT_MATCHES_ALL)
+    }
 
     val EDUDZIENNIK_SUBJECT_ID by lazy {
         """/Courses/([\w-_]+?)/""".toRegex()
@@ -199,4 +240,20 @@ object Regexes {
     val EDUDZIENNIK_TEACHERS by lazy {
         """<div class="teacher">.*?<p>(.+?) (.+?)</p>""".toRegex(DOT_MATCHES_ALL)
     }
+
+
+
+
+    val LINKIFY_DATE_YMD by lazy {
+        """(1\d{3}|20\d{2})[\-./](1[0-2]|0?\d)[\-./]([1-2]\d|3[0-1]|0?\d)""".toRegex()
+    }
+    val LINKIFY_DATE_DMY by lazy {
+        """(?<![\d\-./])([1-2]\d|3[0-1]|0?\d)[\-./](1[0-2]|0?\d)(?:[\-./](1\d{3}|2?0?\d{2}))?(?![\d\-/])""".toRegex()
+    }
+    val LINKIFY_DATE_ABSOLUTE by lazy {
+        """([1-3][0-9]|[1-9])\s(sty|lut|mar|kwi|maj|cze|lip|sie|wrz|paź|lis|gru).*?\s(1[0-9]{3}|20[0-9]{2})?""".toRegex(IGNORE_CASE)
+    }
+    val LINKIFY_DATE_RELATIVE by lazy {
+        """za\s([0-9]+)?\s?(dni|dzień|tydzień|tygodnie)""".toRegex(IGNORE_CASE)
+    }
 }

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

@@ -5,29 +5,37 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik
 
 import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.R
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.Edudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.Idziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.Librus
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.Mobidziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.Podlasie
 import pl.szczodrzynski.edziennik.data.api.edziennik.template.Template
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.Vulcan
+import pl.szczodrzynski.edziennik.data.api.events.RegisterAvailabilityEvent
 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.szkolny.SzkolnyApi
 import pl.szczodrzynski.edziennik.data.api.task.IApiTask
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.entity.Message
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
+import pl.szczodrzynski.edziennik.utils.Utils.d
 
 open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTask(profileId) {
     companion object {
         private const val TAG = "EdziennikTask"
 
+        var profile: Profile? = null
+        var loginStore: LoginStore? = null
+
         fun firstLogin(loginStore: LoginStore) = EdziennikTask(-1, FirstLoginRequest(loginStore))
         fun sync() = EdziennikTask(-1, SyncRequest())
         fun syncProfile(profileId: Int, viewIds: List<Pair<Int, Int>>? = null, onlyEndpoints: List<Int>? = null, arguments: JsonObject? = null) = EdziennikTask(profileId, SyncProfileRequest(viewIds, onlyEndpoints, arguments))
@@ -36,8 +44,9 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
         fun messageSend(profileId: Int, recipients: List<Teacher>, subject: String, text: String) = EdziennikTask(profileId, MessageSendRequest(recipients, subject, text))
         fun announcementsRead(profileId: Int) = EdziennikTask(profileId, AnnouncementsReadRequest())
         fun announcementGet(profileId: Int, announcement: AnnouncementFull) = EdziennikTask(profileId, AnnouncementGetRequest(announcement))
-        fun attachmentGet(profileId: Int, message: Message, attachmentId: Long, attachmentName: String) = EdziennikTask(profileId, AttachmentGetRequest(message, attachmentId, attachmentName))
+        fun attachmentGet(profileId: Int, owner: Any, attachmentId: Long, attachmentName: String) = EdziennikTask(profileId, AttachmentGetRequest(owner, attachmentId, attachmentName))
         fun recipientListGet(profileId: Int) = EdziennikTask(profileId, RecipientListGetRequest())
+        fun eventGet(profileId: Int, event: EventFull) = EdziennikTask(profileId, EventGetRequest(event))
     }
 
     private lateinit var loginStore: LoginStore
@@ -58,21 +67,65 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
             // save the profile ID and name as the current task's
             taskName = app.getString(R.string.edziennik_notification_api_sync_title_format, profile.name)
         }
+        EdziennikTask.profile = this.profile
+        EdziennikTask.loginStore = this.loginStore
     }
 
     private var edziennikInterface: EdziennikInterface? = null
 
     internal fun run(app: App, taskCallback: EdziennikCallback) {
-        if (profile?.archived == true) {
-            taskCallback.onError(ApiError(TAG, ERROR_PROFILE_ARCHIVED))
-            return
+        profile?.let { profile ->
+            if (profile.archived) {
+                d(TAG, "The profile $profileId is archived")
+                taskCallback.onError(ApiError(TAG, ERROR_PROFILE_ARCHIVED))
+                return
+            }
+            else if (profile.shouldArchive()) {
+                d(TAG, "The profile $profileId's year ended on ${profile.dateYearEnd}, archiving")
+                ProfileArchiver(app, profile)
+            }
+            if (profile.isBeforeYear()) {
+                d(TAG, "The profile $profileId's school year has not started yet; aborting sync")
+                cancel()
+                taskCallback.onCompleted()
+                return
+            }
+
+            profile.registerName?.let { registerName ->
+                var status = app.config.sync.registerAvailability[registerName]
+                if (status == null || status.nextCheck < currentTimeUnix()) {
+                    val api = SzkolnyApi(app)
+                    api.runCatching({
+                        val availability = getRegisterAvailability()
+                        app.config.sync.registerAvailability = availability
+                        status = availability[registerName]
+                    }, onError = {
+                        taskCallback.onError(it.toApiError(TAG))
+                        return
+                    })
+                }
+
+                if (status?.available != true
+                        || status?.minVersionCode ?: BuildConfig.VERSION_CODE > BuildConfig.VERSION_CODE) {
+                    if (EventBus.getDefault().hasSubscriberForEvent(RegisterAvailabilityEvent::class.java)) {
+                        EventBus.getDefault().postSticky(
+                                RegisterAvailabilityEvent(app.config.sync.registerAvailability)
+                        )
+                    }
+                    cancel()
+                    taskCallback.onCompleted()
+                    return
+                }
+            }
         }
+
         edziennikInterface = when (loginStore.type) {
             LOGIN_TYPE_LIBRUS -> Librus(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_MOBIDZIENNIK -> Mobidziennik(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_VULCAN -> Vulcan(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_IDZIENNIK -> Idziennik(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_EDUDZIENNIK -> Edudziennik(app, profile, loginStore, taskCallback)
+            LOGIN_TYPE_PODLASIE -> Podlasie(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_TEMPLATE -> Template(app, profile, loginStore, taskCallback)
             else -> null
         }
@@ -92,12 +145,14 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
             is FirstLoginRequest -> edziennikInterface?.firstLogin()
             is AnnouncementsReadRequest -> edziennikInterface?.markAllAnnouncementsAsRead()
             is AnnouncementGetRequest -> edziennikInterface?.getAnnouncement(request.announcement)
-            is AttachmentGetRequest -> edziennikInterface?.getAttachment(request.message, request.attachmentId, request.attachmentName)
+            is AttachmentGetRequest -> edziennikInterface?.getAttachment(request.owner, request.attachmentId, request.attachmentName)
             is RecipientListGetRequest -> edziennikInterface?.getRecipientList()
+            is EventGetRequest -> edziennikInterface?.getEvent(request.event)
         }
     }
 
     override fun cancel() {
+        d(TAG, "Task ${toString()} cancelling...")
         edziennikInterface?.cancel()
     }
 
@@ -113,6 +168,7 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
     data class MessageSendRequest(val recipients: List<Teacher>, val subject: String, val text: String)
     class AnnouncementsReadRequest
     data class AnnouncementGetRequest(val announcement: AnnouncementFull)
-    data class AttachmentGetRequest(val message: Message, val attachmentId: Long, val attachmentName: String)
+    data class AttachmentGetRequest(val owner: Any, val attachmentId: Long, val attachmentName: String)
     class RecipientListGetRequest
+    data class EventGetRequest(val event: EventFull)
 }

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

@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-8-25.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik
+
+import android.content.Intent
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.Intent
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class ProfileArchiver(val app: App, val profile: Profile) {
+    companion object {
+        private const val TAG = "ProfileArchiver"
+    }
+
+    init {
+        if (profile.archiveId == null)
+            profile.archiveId = profile.id
+        d(TAG, "Processing ${profile.name}#${profile.id}, archiveId = ${profile.archiveId}")
+
+        profile.archived = true
+        app.db.profileDao().add(profile)
+        //app.db.metadataDao().setAllSeen(profile.id, true)
+        app.db.notificationDao().clear(profile.id)
+        app.db.endpointTimerDao().clear(profile.id)
+        d(TAG, "Archived profile ${profile.id} saved")
+        profile.archived = false
+
+        // guess the nearest school year
+        val today = Date.getToday()
+        profile.studentSchoolYearStart = when {
+            today.month <= profile.dateYearEnd.month -> today.year - 1
+            else -> today.year
+        }
+
+        // set default semester dates
+        profile.dateSemester1Start = Date(profile.studentSchoolYearStart, 9, 1)
+        profile.dateSemester2Start = Date(profile.studentSchoolYearStart + 1, 2, 1)
+        profile.dateYearEnd = Date(profile.studentSchoolYearStart + 1, 6, 30)
+
+        val oldId = profile.id
+        val newId = (app.db.profileDao().lastId ?: profile.id) + 1
+        profile.id = newId
+        profile.subname = "Nowy rok szkolny - ${profile.studentSchoolYearStart}"
+        profile.studentClassName = null
+
+        d(TAG, "New profile ID for ${profile.name}: ${profile.id}")
+
+        when (profile.loginStoreType) {
+            LOGIN_TYPE_LIBRUS -> {
+                profile.removeStudentData("isPremium")
+                profile.removeStudentData("pushDeviceId")
+                profile.removeStudentData("startPointsSemester1")
+                profile.removeStudentData("startPointsSemester2")
+                profile.removeStudentData("enablePointGrades")
+                profile.removeStudentData("enableDescriptiveGrades")
+            }
+            LOGIN_TYPE_MOBIDZIENNIK -> {
+
+            }
+            LOGIN_TYPE_VULCAN -> {
+                // DataVulcan.isApiLoginValid() returns false so it will update the semester
+                profile.removeStudentData("currentSemesterEndDate")
+                profile.removeStudentData("studentSemesterId")
+                profile.removeStudentData("studentSemesterNumber")
+                profile.removeStudentData("semester1Id")
+                profile.removeStudentData("semester2Id")
+                profile.removeStudentData("studentClassId")
+            }
+            LOGIN_TYPE_IDZIENNIK -> {
+                profile.removeStudentData("schoolYearId")
+            }
+            LOGIN_TYPE_EDUDZIENNIK -> {
+
+            }
+            LOGIN_TYPE_PODLASIE -> {
+
+            }
+        }
+
+        d(TAG, "Processed student data: ${profile.studentData}")
+
+        app.db.profileDao().add(profile)
+
+        if (app.profileId == oldId) {
+            val intent = Intent(
+                    Intent.ACTION_MAIN,
+                    "profileId" to newId
+            )
+            app.sendBroadcast(intent)
+        }
+    }
+}

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

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

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

@@ -7,7 +7,6 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data
 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.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
@@ -43,8 +42,8 @@ open class EdudziennikWeb(open val data: DataEdudziennik, open val lastSync: Lon
 
                 if (semester == null && url.contains("start")) {
                     profile?.also { profile ->
-                        val cookies = data.app.cookieJar.getForDomain("dziennikel.appspot.com")
-                        val semesterCookie = cookies.firstOrNull { it.name() == "semester" }?.value()?.toIntOrNull()
+                        val cookies = data.app.cookieJar.getAll("dziennikel.appspot.com")
+                        val semesterCookie = cookies["semester"]?.toIntOrNull()
 
                         semesterCookie?.let { data.currentSemester = it }
 
@@ -75,13 +74,7 @@ open class EdudziennikWeb(open val data: DataEdudziennik, open val lastSync: Lon
             }
         }
 
-        data.app.cookieJar.saveFromResponse(null, listOf(
-                Cookie.Builder()
-                        .name("sessionid")
-                        .value(data.webSessionId!!)
-                        .domain("dziennikel.appspot.com")
-                        .secure().httpOnly().build()
-        ))
+        data.app.cookieJar.set("dziennikel.appspot.com", "sessionid", data.webSessionId)
 
         Request.builder()
                 .url(url)

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

@@ -45,24 +45,25 @@ class EdudziennikWebAnnouncements(override val data: DataEdudziennik,
                     val addedDate = Date.fromIsoHm(dateString)
 
                     val announcementObject = Announcement(
-                            profileId,
-                            id,
-                            subject,
-                            null,
-                            startDate,
-                            null,
-                            teacher.id,
-                            longId
-                    )
+                            profileId = profileId,
+                            id = id,
+                            subject = subject,
+                            text = null,
+                            startDate = startDate,
+                            endDate = null,
+                            teacherId = teacher.id,
+                            addedDate = addedDate
+                    ).also {
+                        it.idString = longId
+                    }
 
-                    data.announcementIgnoreList.add(announcementObject)
+                    data.announcementList.add(announcementObject)
                     data.metadataList.add(Metadata(
                             profileId,
                             Metadata.TYPE_ANNOUNCEMENT,
                             id,
                             profile.empty,
-                            profile.empty,
-                            addedDate
+                            profile.empty
                     ))
                 }
             }

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

@@ -39,12 +39,12 @@ class EdudziennikWebAttendance(override val data: DataEdudziennik,
 
             val attendanceTypes = EDUDZIENNIK_ATTENDANCE_TYPES.find(text)?.get(1)?.split(',')?.map {
                 val type = EDUDZIENNIK_ATTENDANCE_TYPE.find(it.trim())
-                val symbol = type?.get(1)?.trim()
-                val name = type?.get(2)?.trim()
+                val symbol = type?.get(1)?.trim() ?: "?"
+                val name = type?.get(2)?.trim() ?: "nieznany rodzaj"
                 return@map Triple(
                         symbol,
                         name,
-                        when (name?.toLowerCase(Locale.ROOT)) {
+                        when (name.toLowerCase(Locale.ROOT)) {
                             "obecność" -> Attendance.TYPE_PRESENT
                             "nieobecność" -> Attendance.TYPE_ABSENT
                             "spóźnienie" -> Attendance.TYPE_BELATED
@@ -52,7 +52,7 @@ class EdudziennikWebAttendance(override val data: DataEdudziennik,
                             "dzień wolny" -> Attendance.TYPE_DAY_FREE
                             "brak zajęć" -> Attendance.TYPE_DAY_FREE
                             "oddelegowany" -> Attendance.TYPE_RELEASED
-                            else -> Attendance.TYPE_CUSTOM
+                            else -> Attendance.TYPE_UNKNOWN
                         }
                 )
             } ?: emptyList()
@@ -62,38 +62,42 @@ class EdudziennikWebAttendance(override val data: DataEdudziennik,
                 val lessonNumber = attendanceElement[2].toInt()
                 val attendanceSymbol = attendanceElement[3]
 
-                val lessons = data.app.db.timetableDao().getForDateNow(profileId, date)
+                val lessons = data.app.db.timetableDao().getAllForDateNow(profileId, date)
                 val lesson = lessons.firstOrNull { it.lessonNumber == lessonNumber }
 
                 val id = "${date.stringY_m_d}:$lessonNumber:$attendanceSymbol".crc32()
 
-                val (_, name, type) = attendanceTypes.firstOrNull { (symbol, _, _) -> symbol == attendanceSymbol }
+                val (typeSymbol, typeName, baseType) = attendanceTypes.firstOrNull { (symbol, _, _) -> symbol == attendanceSymbol }
                         ?: return@forEach
 
                 val startTime = data.lessonRanges.singleOrNull { it.lessonNumber == lessonNumber }?.startTime
                         ?: return@forEach
 
                 val attendanceObject = Attendance(
-                        profileId,
-                        id,
-                        lesson?.displayTeacherId ?: -1,
-                        lesson?.displaySubjectId ?: -1,
-                        profile.currentSemester,
-                        name,
-                        date,
-                        lesson?.displayStartTime ?: startTime,
-                        type
-                )
+                        profileId = profileId,
+                        id = id,
+                        baseType = baseType,
+                        typeName = typeName,
+                        typeShort = data.app.attendanceManager.getTypeShort(baseType),
+                        typeSymbol = typeSymbol,
+                        typeColor = null,
+                        date = date,
+                        startTime = lesson?.displayStartTime ?: startTime,
+                        semester = profile.currentSemester,
+                        teacherId = lesson?.displayTeacherId ?: -1,
+                        subjectId = lesson?.displaySubjectId ?: -1
+                ).also {
+                    it.lessonNumber = lessonNumber
+                }
 
                 data.attendanceList.add(attendanceObject)
-                if(type != Attendance.TYPE_PRESENT) {
+                if (baseType != Attendance.TYPE_PRESENT) {
                     data.metadataList.add(Metadata(
                             profileId,
                             Metadata.TYPE_ATTENDANCE,
                             id,
-                            profile.empty,
-                            profile.empty,
-                            System.currentTimeMillis()
+                            profile.empty || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == Attendance.TYPE_UNKNOWN,
+                            profile.empty || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == Attendance.TYPE_UNKNOWN
                     ))
                 }
             }

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

@@ -39,17 +39,16 @@ class EdudziennikWebEvents(override val data: DataEdudziennik,
                         ?: return@forEach
 
                 val eventObject = Event(
-                        profileId,
-                        id,
-                        date,
-                        null,
-                        title,
-                        -1,
-                        Event.TYPE_CLASS_EVENT,
-                        false,
-                        -1,
-                        -1,
-                        data.teamClass?.id ?: -1
+                        profileId = profileId,
+                        id = id,
+                        date = date,
+                        time = null,
+                        topic = title,
+                        color = null,
+                        type = Event.TYPE_CLASS_EVENT,
+                        teacherId = -1,
+                        subjectId = -1,
+                        teamId = data.teamClass?.id ?: -1
                 )
 
                 data.eventList.add(eventObject)
@@ -58,8 +57,7 @@ class EdudziennikWebEvents(override val data: DataEdudziennik,
                         Metadata.TYPE_EVENT,
                         id,
                         profile.empty,
-                        profile.empty,
-                        System.currentTimeMillis()
+                        profile.empty
                 ))
             }
 

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

@@ -46,7 +46,7 @@ class EdudziennikWebExams(override val data: DataEdudziennik,
                 if (dateString.isBlank()) return@forEach
                 val date = Date.fromY_m_d(dateString)
 
-                val lessons = data.app.db.timetableDao().getForDateNow(profileId, date)
+                val lessons = data.app.db.timetableDao().getAllForDateNow(profileId, date)
                 val startTime = lessons.firstOrNull { it.displaySubjectId == subject.id }?.displayStartTime
 
                 val eventTypeElement = examElement.child(3).child(0)
@@ -56,17 +56,16 @@ class EdudziennikWebExams(override val data: DataEdudziennik,
                 val eventType = data.getEventType(eventTypeId, eventTypeName)
 
                 val eventObject = Event(
-                        profileId,
-                        id,
-                        date,
-                        startTime,
-                        topic,
-                        -1,
-                        eventType.id,
-                        false,
-                        -1,
-                        subject.id,
-                        data.teamClass?.id ?: -1
+                        profileId = profileId,
+                        id = id,
+                        date = date,
+                        time = startTime,
+                        topic = topic,
+                        color = null,
+                        type = eventType.id,
+                        teacherId = -1,
+                        subjectId = subject.id,
+                        teamId = data.teamClass?.id ?: -1
                 )
 
                 data.eventList.add(eventObject)
@@ -75,8 +74,7 @@ class EdudziennikWebExams(override val data: DataEdudziennik,
                         Metadata.TYPE_EVENT,
                         id,
                         profile.empty,
-                        profile.empty,
-                        System.currentTimeMillis()
+                        profile.empty
                 ))
             }
 

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

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

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

@@ -126,7 +126,8 @@ class EdudziennikWebGrades(override val data: DataEdudziennik,
                             comment = null,
                             semester = semester,
                             teacherId = teacher.id,
-                            subjectId = subject.id
+                            subjectId = subject.id,
+                            addedDate = addedDate
                     )
 
                     data.gradeList.add(gradeObject)
@@ -135,8 +136,7 @@ class EdudziennikWebGrades(override val data: DataEdudziennik,
                             Metadata.TYPE_GRADE,
                             id,
                             profile.empty,
-                            profile.empty,
-                            addedDate
+                            profile.empty
                     ))
                 }
 
@@ -168,8 +168,7 @@ class EdudziennikWebGrades(override val data: DataEdudziennik,
                             Metadata.TYPE_GRADE,
                             proposedGradeObject.id,
                             profile.empty,
-                            profile.empty,
-                            System.currentTimeMillis()
+                            profile.empty
                     ))
                 }
 
@@ -201,8 +200,7 @@ class EdudziennikWebGrades(override val data: DataEdudziennik,
                             Metadata.TYPE_GRADE,
                             finalGradeObject.id,
                             profile.empty,
-                            profile.empty,
-                            System.currentTimeMillis()
+                            profile.empty
                     ))
                 }
             }

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

@@ -33,8 +33,8 @@ class EdudziennikWebHomework(override val data: DataEdudziennik,
             if (doc.getElementsByClass("message").text().trim() != "Brak prac domowych") {
                 doc.getElementsByTag("tr").forEach { homeworkElement ->
                     val dateElement = homeworkElement.getElementsByClass("date").first().child(0)
-                    val id = EDUDZIENNIK_HOMEWORK_ID.find(dateElement.attr("href"))?.get(1)?.crc32()
-                            ?: return@forEach
+                    val idStr = EDUDZIENNIK_HOMEWORK_ID.find(dateElement.attr("href"))?.get(1) ?: return@forEach
+                    val id = idStr.crc32()
                     val date = Date.fromY_m_d(dateElement.text())
 
                     val subjectElement = homeworkElement.child(1).child(0)
@@ -43,36 +43,36 @@ class EdudziennikWebHomework(override val data: DataEdudziennik,
                     val subjectName = subjectElement.text()
                     val subject = data.getSubject(subjectId, subjectName)
 
-                    val lessons = data.app.db.timetableDao().getForDateNow(profileId, date)
+                    val lessons = data.app.db.timetableDao().getAllForDateNow(profileId, date)
                     val startTime = lessons.firstOrNull { it.subjectId == subject.id }?.displayStartTime
 
                     val teacherName = homeworkElement.child(2).text()
                     val teacher = data.getTeacherByFirstLast(teacherName)
 
-                    val topic = homeworkElement.child(4).text()
+                    val topic = homeworkElement.child(4).text()?.trim()
 
                     val eventObject = Event(
-                            profileId,
-                            id,
-                            date,
-                            startTime,
-                            topic,
-                            -1,
-                            Event.TYPE_HOMEWORK,
-                            false,
-                            teacher.id,
-                            subject.id,
-                            data.teamClass?.id ?: -1
+                            profileId = profileId,
+                            id = id,
+                            date = date,
+                            time = startTime,
+                            topic = topic ?: "",
+                            color = null,
+                            type = Event.TYPE_HOMEWORK,
+                            teacherId = teacher.id,
+                            subjectId = subject.id,
+                            teamId = data.teamClass?.id ?: -1
                     )
 
+                    eventObject.attachmentNames = mutableListOf(idStr)
+
                     data.eventList.add(eventObject)
                     data.metadataList.add(Metadata(
                             profileId,
                             Metadata.TYPE_HOMEWORK,
                             id,
                             profile.empty,
-                            profile.empty,
-                            System.currentTimeMillis()
+                            profile.empty
                     ))
                 }
             }

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

@@ -24,9 +24,9 @@ class EdudziennikWebLuckyNumber(override val data: DataEdudziennik,
         webGet(TAG, data.schoolEndpoint + "Lucky", xhr = true) { text ->
             text.toIntOrNull()?.also { luckyNumber ->
                 val luckyNumberObject = LuckyNumber(
-                        profileId,
-                        Date.getToday(),
-                        luckyNumber
+                        profileId = profileId,
+                        date = Date.getToday(),
+                        number = luckyNumber
                 )
 
                 data.luckyNumberList.add(luckyNumberObject)
@@ -35,8 +35,7 @@ class EdudziennikWebLuckyNumber(override val data: DataEdudziennik,
                         Metadata.TYPE_LUCKY_NUMBER,
                         luckyNumberObject.date.value.toLong(),
                         true,
-                        profile.empty,
-                        System.currentTimeMillis()
+                        profile.empty
                 ))
             }
 

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

@@ -41,12 +41,15 @@ class EdudziennikWebNotes(override val data: DataEdudziennik,
                 val description = noteElement.child(3).text()
 
                 val noticeObject = Notice(
-                        profileId,
-                        id,
-                        description,
-                        profile.currentSemester,
-                        Notice.TYPE_NEUTRAL,
-                        teacher.id
+                        profileId = profileId,
+                        id = id,
+                        type = Notice.TYPE_NEUTRAL,
+                        semester = profile.currentSemester,
+                        text = description,
+                        category = null,
+                        points = null,
+                        teacherId = teacher.id,
+                        addedDate = addedDate
                 )
 
                 data.noticeList.add(noticeObject)
@@ -55,8 +58,7 @@ class EdudziennikWebNotes(override val data: DataEdudziennik,
                         Metadata.TYPE_NOTICE,
                         id,
                         profile.empty,
-                        profile.empty,
-                        addedDate
+                        profile.empty
                 ))
             }
 

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

@@ -124,8 +124,7 @@ class EdudziennikWebTimetable(override val data: DataEdudziennik,
                                     Metadata.TYPE_LESSON_CHANGE,
                                     lessonObject.id,
                                     seen,
-                                    seen,
-                                    System.currentTimeMillis()
+                                    seen
                             ))
                         }
                     }

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

@@ -59,7 +59,7 @@ class EdudziennikFirstLogin(val data: DataEdudziennik, val onSuccess: () -> Unit
                     profileList.add(profile)
                 }
 
-                EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore))
+                EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore))
                 onSuccess()
             }
         }

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

@@ -24,7 +24,7 @@ class EdudziennikLoginWeb(val data: DataEdudziennik, val onSuccess: () -> Unit)
             onSuccess()
         }
         else {
-            data.app.cookieJar.clearForDomain("dziennikel.appspot.com")
+            data.app.cookieJar.clear("dziennikel.appspot.com")
             if (data.loginEmail.isNotNullNorEmpty() && data.loginPassword.isNotNullNorEmpty()) {
                 loginWithCredentials()
             }
@@ -59,8 +59,8 @@ class EdudziennikLoginWeb(val data: DataEdudziennik, val onSuccess: () -> Unit)
                     }
                 }
 
-                val cookies = data.app.cookieJar.getForDomain("dziennikel.appspot.com")
-                val sessionId = cookies.firstOrNull { it.name() == "sessionid" }?.value()
+                val cookies = data.app.cookieJar.getAll("dziennikel.appspot.com")
+                val sessionId = cookies["sessionid"]
 
                 if (sessionId == null) {
                     data.error(ApiError(TAG, ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID)

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

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-14
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.helper
+
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.FileCallbackHandler
+import pl.szczodrzynski.edziennik.data.api.ERROR_FILE_DOWNLOAD
+import pl.szczodrzynski.edziennik.data.api.ERROR_REQUEST_FAILURE
+import pl.szczodrzynski.edziennik.data.api.SYSTEM_USER_AGENT
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.utils.Utils
+import java.io.File
+
+class DownloadAttachment(
+        fileUrl: String,
+        val onSuccess: (file: File) -> Unit,
+        val onProgress: (written: Long, total: Long) -> Unit,
+        val onError: (apiError: ApiError) -> Unit
+) {
+    companion object {
+        private const val TAG = "DownloadAttachment"
+    }
+
+    init {
+        val targetFile = Utils.getStorageDir()
+
+        val callback = object : FileCallbackHandler(targetFile) {
+            override fun onSuccess(file: File?, response: Response?) {
+                if (file == null) {
+                    onError(ApiError(TAG, ERROR_FILE_DOWNLOAD)
+                            .withResponse(response))
+                    return
+                }
+
+                try {
+                    onSuccess(file)
+                } catch (e: Exception) {
+                    onError(ApiError(TAG, ERROR_FILE_DOWNLOAD)
+                            .withResponse(response)
+                            .withThrowable(e))
+                }
+            }
+
+            override fun onProgress(bytesWritten: Long, bytesTotal: Long) {
+                try {
+                    this@DownloadAttachment.onProgress(bytesWritten, bytesTotal)
+                } catch (e: Exception) {
+                    onError(ApiError(TAG, ERROR_FILE_DOWNLOAD)
+                            .withThrowable(e))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                onError(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url(fileUrl)
+                .userAgent(SYSTEM_USER_AGENT)
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}

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

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

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

@@ -5,7 +5,6 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik
 
 import androidx.core.util.set
-import okhttp3.Cookie
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_API
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_WEB
@@ -24,18 +23,8 @@ class DataIdziennik(app: App, profile: Profile?, loginStore: LoginStore) : Data(
         loginMethods.clear()
         if (isWebLoginValid()) {
             loginMethods += LOGIN_METHOD_IDZIENNIK_WEB
-            app.cookieJar.saveFromResponse(null, listOf(
-                    Cookie.Builder()
-                            .name("ASP.NET_SessionId_iDziennik")
-                            .value(webSessionId!!)
-                            .domain("iuczniowie.progman.pl")
-                            .secure().httpOnly().build(),
-                    Cookie.Builder()
-                            .name(".ASPXAUTH")
-                            .value(webAuth!!)
-                            .domain("iuczniowie.progman.pl")
-                            .secure().httpOnly().build()
-            ))
+            app.cookieJar.set("iuczniowie.progman.pl", "ASP.NET_SessionId_iDziennik", webSessionId)
+            app.cookieJar.set("iuczniowie.progman.pl", ".ASPXAUTH", webAuth)
         }
         if (isApiLoginValid())
             loginMethods += LOGIN_METHOD_IDZIENNIK_API

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

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

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

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

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

@@ -68,9 +68,9 @@ class IdziennikApiCurrentRegister(override val data: DataIdziennik,
 
 
                 val luckyNumberObject = LuckyNumber(
-                        data.profileId,
-                        luckyNumberDate,
-                        luckyNumber
+                        profileId = data.profileId,
+                        date = luckyNumberDate,
+                        number = luckyNumber
                 )
 
                 data.luckyNumberList.add(luckyNumberObject)
@@ -80,8 +80,7 @@ class IdziennikApiCurrentRegister(override val data: DataIdziennik,
                                 Metadata.TYPE_LUCKY_NUMBER,
                                 luckyNumberObject.date.value.toLong(),
                                 true,
-                                data.profile?.empty ?: false,
-                                System.currentTimeMillis()
+                                data.profile?.empty ?: false
                         ))
             }
 

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

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

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

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

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

@@ -16,6 +16,8 @@ import pl.szczodrzynski.edziennik.data.db.entity.Announcement
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.getJsonObject
+import pl.szczodrzynski.edziennik.getLong
+import pl.szczodrzynski.edziennik.getString
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class IdziennikWebAnnouncements(override val data: DataIdziennik,
@@ -43,21 +45,21 @@ class IdziennikWebAnnouncements(override val data: DataIdziennik,
             for (jAnnouncementEl in json.getAsJsonArray("ListK")) {
                 val jAnnouncement = jAnnouncementEl.asJsonObject
                 // jAnnouncement
-                val announcementId = jAnnouncement.get("Id").asLong
+                val announcementId = jAnnouncement.getLong("Id") ?: -1
 
-                val rTeacher = data.getTeacherByFirstLast(jAnnouncement.get("Autor").asString)
-                val addedDate = java.lang.Long.parseLong(jAnnouncement.get("DataDodania").asString.replace("[^\\d]".toRegex(), ""))
-                val startDate = Date.fromMillis(java.lang.Long.parseLong(jAnnouncement.get("DataWydarzenia").asString.replace("[^\\d]".toRegex(), "")))
+                val rTeacher = data.getTeacherByFirstLast(jAnnouncement.getString("Autor") ?: "")
+                val addedDate = jAnnouncement.getString("DataDodania")?.replace("[^\\d]".toRegex(), "")?.toLongOrNull() ?: System.currentTimeMillis()
+                val startDate = jAnnouncement.getString("DataWydarzenia")?.replace("[^\\d]".toRegex(), "")?.toLongOrNull()?.let { Date.fromMillis(it) }
 
                 val announcementObject = Announcement(
-                        profileId,
-                        announcementId,
-                        jAnnouncement.get("Temat").asString,
-                        jAnnouncement.get("Tresc").asString,
-                        startDate,
-                        null,
-                        rTeacher.id,
-                        null
+                        profileId = profileId,
+                        id = announcementId,
+                        subject = jAnnouncement.get("Temat").asString,
+                        text = jAnnouncement.get("Tresc").asString,
+                        startDate = startDate,
+                        endDate = null,
+                        teacherId = rTeacher.id,
+                        addedDate = addedDate
                 )
                 data.announcementList.add(announcementObject)
                 data.metadataList.add(Metadata(
@@ -65,8 +67,7 @@ class IdziennikWebAnnouncements(override val data: DataIdziennik,
                         Metadata.TYPE_ANNOUNCEMENT,
                         announcementObject.id,
                         profile?.empty ?: false,
-                        profile?.empty ?: false,
-                        addedDate
+                        profile?.empty ?: false
                 ))
             }
 

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

@@ -12,10 +12,18 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNI
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.*
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_ABSENT
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_ABSENT_EXCUSED
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_BELATED
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_PRESENT
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_PRESENT_CUSTOM
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_RELEASED
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_UNKNOWN
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.getInt
 import pl.szczodrzynski.edziennik.getJsonObject
+import pl.szczodrzynski.edziennik.getString
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 
@@ -51,71 +59,97 @@ class IdziennikWebAttendance(override val data: DataIdziennik,
             for (jAttendanceEl in json.getAsJsonArray("Obecnosci")) {
                 val jAttendance = jAttendanceEl.asJsonObject
                 // jAttendance
-                val attendanceTypeIdziennik = jAttendance.get("TypObecnosci").asInt
-                if (attendanceTypeIdziennik == 5 || attendanceTypeIdziennik == 7)
-                    continue
-                val attendanceDate = Date.fromY_m_d(jAttendance.get("Data").asString)
-                val attendanceTime = Time.fromH_m(jAttendance.get("OdDoGodziny").asString)
-                if (attendanceDate.combineWith(attendanceTime) > System.currentTimeMillis())
+                val type = jAttendance.get("TypObecnosci").asInt
+
+                // skip "zajęcia nie odbyły się" and "Ferie"
+                if (type == 5 || type == 7)
                     continue
 
-                val attendanceId = jAttendance.get("IdLesson").asString.crc16().toLong()
+                val date = Date.fromY_m_d(jAttendance.get("Data").asString)
+                val time = Time.fromH_m(jAttendance.get("OdDoGodziny").asString)
+                if (date.combineWith(time) > System.currentTimeMillis())
+                    continue
+
+                val id = jAttendance.get("IdLesson").asString.crc16().toLong()
                 val rSubject = data.getSubject(jAttendance.get("Przedmiot").asString, jAttendance.get("IdPrzedmiot").asLong, "")
                 val rTeacher = data.getTeacherByFDotSpaceLast(jAttendance.get("PrzedmiotNauczyciel").asString)
 
-                var attendanceName = "obecność"
-                var attendanceType = Attendance.TYPE_CUSTOM
+                var baseType = TYPE_UNKNOWN
+                var typeName = "nieznany rodzaj"
+                var typeSymbol: String? = null
+                var typeColor: Long? = null
 
-                when (attendanceTypeIdziennik) {
-                    1 /* nieobecność usprawiedliwiona */ -> {
-                        attendanceName = "nieobecność usprawiedliwiona"
-                        attendanceType = TYPE_ABSENT_EXCUSED
+                /* https://iuczniowie.progman.pl/idziennik/mod_panelRodzica/obecnosci/obecnosciUcznia_lmt637231494660000000.js */
+                /* https://iuczniowie.progman.pl/idziennik/mod_panelRodzica/obecnosci/obecnosci_lmt637231494660000000.css */
+                when (type) {
+                    1 -> {
+                        baseType = TYPE_ABSENT_EXCUSED
+                        typeName = "nieobecność usprawiedliwiona"
+                        typeColor = 0xffffe099
                     }
-                    2 /* spóźnienie */ -> {
-                        attendanceName = "spóźnienie"
-                        attendanceType = TYPE_BELATED
+                    2 -> {
+                        baseType = TYPE_BELATED
+                        typeName = "spóźnienie"
+                        typeColor = 0xffffffaa
                     }
-                    3 /* nieobecność nieusprawiedliwiona */ -> {
-                        attendanceName = "nieobecność nieusprawiedliwiona"
-                        attendanceType = TYPE_ABSENT
+                    3 -> {
+                        baseType = TYPE_ABSENT
+                        typeName = "nieobecność nieusprawiedliwiona"
+                        typeColor = 0xffffad99
                     }
-                    4 /* zwolnienie */, 9 /* zwolniony / obecny */ -> {
-                        attendanceType = TYPE_RELEASED
-                        if (attendanceTypeIdziennik == 4)
-                            attendanceName = "zwolnienie"
-                        if (attendanceTypeIdziennik == 9)
-                            attendanceName = "zwolnienie / obecność"
+                    4, 9 -> {
+                        baseType = TYPE_RELEASED
+                        if (type == 4) {
+                            typeName = "zwolnienie"
+                            typeColor = 0xffa8beff
+                        }
+                        if (type == 9) {
+                            typeName = "zwolniony / obecny"
+                            typeSymbol = "zb"
+                            typeColor = 0xffff69b4
+                        }
                     }
-                    0 /* obecny */, 8 /* Wycieczka */ -> {
-                        attendanceType = TYPE_PRESENT
-                        if (attendanceTypeIdziennik == 8)
-                            attendanceName = "wycieczka"
+                    8 -> {
+                        baseType = TYPE_PRESENT_CUSTOM
+                        typeName = "wycieczka"
+                        typeSymbol = "w"
+                        typeColor = null
+                    }
+                    0 -> {
+                        baseType = TYPE_PRESENT
+                        typeName = "obecny"
+                        typeColor = 0xffccffcc
                     }
                 }
 
-                val semester = profile?.dateToSemester(attendanceDate) ?: 1
+                val semester = profile?.dateToSemester(date) ?: 1
 
                 val attendanceObject = Attendance(
-                        profileId,
-                        attendanceId,
-                        rTeacher.id,
-                        rSubject.id,
-                        semester,
-                        attendanceName,
-                        attendanceDate,
-                        attendanceTime,
-                        attendanceType
-                )
+                        profileId = profileId,
+                        id = id,
+                        baseType = baseType,
+                        typeName = typeName,
+                        typeShort = typeSymbol ?: data.app.attendanceManager.getTypeShort(baseType),
+                        typeSymbol = typeSymbol ?: data.app.attendanceManager.getTypeShort(baseType),
+                        typeColor = typeColor?.toInt(),
+                        date = date,
+                        startTime = time,
+                        semester = semester,
+                        teacherId = rTeacher.id,
+                        subjectId = rSubject.id
+                ).also {
+                    it.lessonTopic = jAttendance.getString("PrzedmiotTemat")
+                    it.lessonNumber = jAttendance.getInt("Godzina")
+                }
 
                 data.attendanceList.add(attendanceObject)
-                if (attendanceObject.type != TYPE_PRESENT) {
+                if (attendanceObject.baseType != TYPE_PRESENT) {
                     data.metadataList.add(Metadata(
                             profileId,
                             Metadata.TYPE_ATTENDANCE,
                             attendanceObject.id,
-                            profile?.empty ?: false,
-                            profile?.empty ?: false,
-                            System.currentTimeMillis()
+                            profile?.empty ?: false || baseType == TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN,
+                            profile?.empty ?: false || baseType == TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN
                     ))
                 }
             }

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

@@ -66,9 +66,9 @@ class IdziennikWebExams(override val data: DataIdziennik,
                 val subjectId = data.getSubject(subjectName, null, subjectName).id
                 val teacherName = exam.getString("wpisal") ?: return@forEach
                 val teacherId = data.getTeacherByLastFirst(teacherName).id
-                val topic = exam.getString("zakres") ?: ""
+                val topic = exam.getString("zakres")?.trim() ?: ""
 
-                val lessonList = data.db.timetableDao().getForDateNow(profileId, examDate)
+                val lessonList = data.db.timetableDao().getAllForDateNow(profileId, examDate)
                 val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime
 
                 val eventType = when (exam.getString("rodzaj")?.toLowerCase(Locale.getDefault())) {
@@ -80,17 +80,16 @@ class IdziennikWebExams(override val data: DataIdziennik,
                 }
 
                 val eventObject = Event(
-                        profileId,
-                        id,
-                        examDate,
-                        startTime,
-                        topic,
-                        -1,
-                        eventType,
-                        false,
-                        teacherId,
-                        subjectId,
-                        data.teamClass?.id ?: -1
+                        profileId = profileId,
+                        id = id,
+                        date = examDate,
+                        time = startTime,
+                        topic = topic,
+                        color = null,
+                        type = eventType,
+                        teacherId = teacherId,
+                        subjectId = subjectId,
+                        teamId = data.teamClass?.id ?: -1
                 )
 
                 data.eventList.add(eventObject)
@@ -99,8 +98,7 @@ class IdziennikWebExams(override val data: DataIdziennik,
                         Metadata.TYPE_EVENT,
                         eventObject.id,
                         profile?.empty ?: false,
-                        profile?.empty ?: false,
-                        System.currentTimeMillis()
+                        profile?.empty ?: false
                 ))
             }
 

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

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

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

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

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

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

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

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

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

@@ -63,6 +63,8 @@ class IdziennikWebGrades(override val data: DataIdziennik,
                         colorInt = Color.parseColor("#$gradeColor")
                     }
 
+                    val addedDate = grade.getString("Data_wystaw")?.let { Date.fromY_m_d(it).inMillis } ?: System.currentTimeMillis()
+
                     val gradeObject = Grade(
                             profileId = profileId,
                             id = id,
@@ -76,7 +78,9 @@ class IdziennikWebGrades(override val data: DataIdziennik,
                             comment = null,
                             semester = semester,
                             teacherId = teacher.id,
-                            subjectId = subject.id)
+                            subjectId = subject.id,
+                            addedDate = addedDate
+                    )
 
                     when (grade.getInt("Typ")) {
                         0 -> {
@@ -100,6 +104,8 @@ class IdziennikWebGrades(override val data: DataIdziennik,
                                         colorInt = Color.parseColor("#$historyColor")
                                     }
 
+                                    val addedDate = historyItem.getString("Data_wystaw")?.let { Date.fromY_m_d(it).inMillis } ?: System.currentTimeMillis()
+
                                     val historyObject = Grade(
                                             profileId = profileId,
                                             id = gradeObject.id * -1,
@@ -113,19 +119,18 @@ class IdziennikWebGrades(override val data: DataIdziennik,
                                             comment = null,
                                             semester = historyItem.getInt("Semestr") ?: 1,
                                             teacherId = teacher.id,
-                                            subjectId = subject.id)
+                                            subjectId = subject.id,
+                                            addedDate = addedDate
+                                    )
                                     historyObject.parentId = gradeObject.id
 
-                                    val addedDate = historyItem.getString("Data_wystaw")?.let { Date.fromY_m_d(it).inMillis } ?: System.currentTimeMillis()
-
                                     data.gradeList.add(historyObject)
                                     data.metadataList.add(Metadata(
                                             profileId,
                                             Metadata.TYPE_GRADE,
                                             historyObject.id,
                                             true,
-                                            true,
-                                            addedDate
+                                            true
                                     ))
                                 }
                                 // update the current grade's value with an average of all historical grades and itself
@@ -147,8 +152,6 @@ class IdziennikWebGrades(override val data: DataIdziennik,
                         }
                     }
 
-                    val addedDate = grade.getString("Data_wystaw")?.let { Date.fromY_m_d(it).inMillis } ?: System.currentTimeMillis()
-
                     data.gradeList.add(gradeObject)
                     data.metadataList.add(
                             Metadata(
@@ -156,8 +159,7 @@ class IdziennikWebGrades(override val data: DataIdziennik,
                                     Metadata.TYPE_GRADE,
                                     id,
                                     data.profile.empty,
-                                    data.profile.empty,
-                                    addedDate
+                                    data.profile.empty
                             ))
                 }
             }

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

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

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

@@ -13,9 +13,12 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.Notice
-import pl.szczodrzynski.edziennik.data.db.entity.Notice.*
+import pl.szczodrzynski.edziennik.data.db.entity.Notice.Companion.TYPE_NEGATIVE
+import pl.szczodrzynski.edziennik.data.db.entity.Notice.Companion.TYPE_NEUTRAL
+import pl.szczodrzynski.edziennik.data.db.entity.Notice.Companion.TYPE_POSITIVE
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.getJsonObject
+import pl.szczodrzynski.edziennik.getString
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class IdziennikWebNotices(override val data: DataIdziennik,
@@ -53,20 +56,24 @@ class IdziennikWebNotices(override val data: DataIdziennik,
                 }
 
                 val noticeObject = Notice(
-                        profileId,
-                        noticeId,
-                        jNotice.get("Tresc").asString,
-                        jNotice.get("Semestr").asInt,
-                        nType,
-                        rTeacher.id)
+                        profileId = profileId,
+                        id = noticeId,
+                        type = nType,
+                        semester = jNotice.get("Semestr").asInt,
+                        text = jNotice.getString("Tresc") ?: "",
+                        category = null,
+                        points = null,
+                        teacherId = rTeacher.id,
+                        addedDate = addedDate.inMillis
+                )
+
                 data.noticeList.add(noticeObject)
                 data.metadataList.add(Metadata(
                         profileId,
                         Metadata.TYPE_NOTICE,
                         noticeObject.id,
                         profile?.empty ?: false,
-                        profile?.empty ?: false,
-                        addedDate.inMillis
+                        profile?.empty ?: false
                 ))
             }
 

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

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

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

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

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

@@ -165,8 +165,7 @@ class IdziennikWebTimetable(override val data: DataIdziennik,
                             Metadata.TYPE_LESSON_CHANGE,
                             lessonObject.id,
                             seen,
-                            seen,
-                            System.currentTimeMillis()
+                            seen
                     ))
                 }
             }

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

@@ -89,7 +89,7 @@ class IdziennikFirstLogin(val data: DataIdziennik, val onSuccess: () -> Unit) {
                             profileList.add(profile)
                         }
 
-                EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore))
+                EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore))
                 onSuccess()
             }
         }

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

@@ -7,7 +7,6 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login
 import im.wangchao.mhttp.Request
 import im.wangchao.mhttp.Response
 import im.wangchao.mhttp.callback.TextCallbackHandler
-import okhttp3.Cookie
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
@@ -24,22 +23,12 @@ class IdziennikLoginWeb(val data: DataIdziennik, val onSuccess: () -> Unit) {
 
     init { run {
         if (data.isWebLoginValid()) {
-            data.app.cookieJar.saveFromResponse(null, listOf(
-                    Cookie.Builder()
-                            .name("ASP.NET_SessionId_iDziennik")
-                            .value(data.webSessionId!!)
-                            .domain("iuczniowie.progman.pl")
-                            .secure().httpOnly().build(),
-                    Cookie.Builder()
-                            .name(".ASPXAUTH")
-                            .value(data.webAuth!!)
-                            .domain("iuczniowie.progman.pl")
-                            .secure().httpOnly().build()
-            ))
+            data.app.cookieJar.set("iuczniowie.progman.pl", "ASP.NET_SessionId_iDziennik", data.webSessionId)
+            data.app.cookieJar.set("iuczniowie.progman.pl", ".ASPXAUTH", data.webAuth)
             onSuccess()
         }
         else {
-            data.app.cookieJar.clearForDomain("iuczniowie.progman.pl")
+            data.app.cookieJar.clear("iuczniowie.progman.pl")
             if (data.webSchoolName != null && data.webUsername != null && data.webPassword != null) {
                 loginWithCredentials()
             }
@@ -62,11 +51,11 @@ class IdziennikLoginWeb(val data: DataIdziennik, val onSuccess: () -> Unit) {
 
                 // login succeeded: there is a start page
                 if (text.contains("czyWyswietlicDostepMobilny")) {
-                    val cookies = data.app.cookieJar.getForDomain("iuczniowie.progman.pl")
+                    val cookies = data.app.cookieJar.getAll("iuczniowie.progman.pl")
                     run {
-                        data.webSessionId = cookies.singleOrNull { it.name() == "ASP.NET_SessionId_iDziennik" }?.value() ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION
-                        data.webAuth = cookies.singleOrNull { it.name() == ".ASPXAUTH" }?.value() ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH
-                        data.apiBearer = cookies.singleOrNull { it.name() == "Bearer" }?.value() ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER
+                        data.webSessionId = cookies["ASP.NET_SessionId_iDziennik"] ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION
+                        data.webAuth = cookies[".ASPXAUTH"] ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH
+                        data.apiBearer = cookies["Bearer"]?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER
                         data.loginExpiryTime = response.getUnixDate() + 30 * MINUTE /* after about 40 minutes the login didn't work already */
                         data.apiExpiryTime = response.getUnixDate() + 12 * HOUR /* actually it expires after 24 hours but I'm not sure when does the token refresh. */
 
@@ -81,13 +70,21 @@ class IdziennikLoginWeb(val data: DataIdziennik, val onSuccess: () -> Unit) {
                             data.webSelectedRegister = registerId
                         }
 
+                        // for profiles created after archiving
+                        data.schoolYearId = Regexes.IDZIENNIK_LOGIN_FIRST_SCHOOL_YEAR.find(text)?.let {
+                            it[1].toIntOrNull()
+                        } ?: data.schoolYearId
+                        data.profile?.studentClassName = Regexes.IDZIENNIK_LOGIN_FIRST_STUDENT.findAll(text)
+                                .firstOrNull { it[1].toIntOrNull() == data.registerId }
+                                ?.let { "${it[5]} ${it[6]}" } ?: data.profile?.studentClassName
+
                         data.profile?.let { profile ->
                             Regexes.IDZIENNIK_WEB_LUCKY_NUMBER.find(text)?.also {
                                 val number = it[1].toIntOrNull() ?: return@also
                                 val luckyNumberObject = LuckyNumber(
-                                        data.profileId,
-                                        Date.getToday(),
-                                        number
+                                        profileId = data.profileId,
+                                        date = Date.getToday(),
+                                        number = number
                                 )
 
                                 data.luckyNumberList.add(luckyNumberObject)
@@ -97,8 +94,7 @@ class IdziennikLoginWeb(val data: DataIdziennik, val onSuccess: () -> Unit) {
                                                 Metadata.TYPE_LUCKY_NUMBER,
                                                 luckyNumberObject.date.value.toLong(),
                                                 true,
-                                                profile.empty,
-                                                System.currentTimeMillis()
+                                                profile.empty
                                         ))
                             }
                         }

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

@@ -4,7 +4,6 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus
 
-import okhttp3.Cookie
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.currentTimeUnix
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_API
@@ -31,23 +30,11 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
             loginMethods += LOGIN_METHOD_LIBRUS_API
         if (isSynergiaLoginValid()) {
             loginMethods += LOGIN_METHOD_LIBRUS_SYNERGIA
-            app.cookieJar.saveFromResponse(null, listOf(
-                    Cookie.Builder()
-                            .name("DZIENNIKSID")
-                            .value(synergiaSessionId!!)
-                            .domain("synergia.librus.pl")
-                            .secure().httpOnly().build()
-            ))
+            app.cookieJar.set("synergia.librus.pl", "DZIENNIKSID", synergiaSessionId)
         }
         if (isMessagesLoginValid()) {
             loginMethods += LOGIN_METHOD_LIBRUS_MESSAGES
-            app.cookieJar.saveFromResponse(null, listOf(
-                    Cookie.Builder()
-                            .name("DZIENNIKSID")
-                            .value(messagesSessionId!!)
-                            .domain("wiadomosci.librus.pl")
-                            .secure().httpOnly().build()
-            ))
+            app.cookieJar.set("wiadomosci.librus.pl", "DZIENNIKSID", messagesSessionId)
         }
     }
 
@@ -133,7 +120,7 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
     private var mApiLogin: String? = null
     var apiLogin: String?
         get() { mApiLogin = mApiLogin ?: profile?.getStudentData("accountLogin", null); return mApiLogin }
-        set(value) { profile?.putStudentData("accountLogin", value) ?: return; mApiLogin = value }
+        set(value) { profile?.putStudentData("accountLogin", value); mApiLogin = value }
     /**
      * A Synergia password.
      * Used: for login (API Login Method) in Synergia mode.
@@ -142,7 +129,7 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
     private var mApiPassword: String? = null
     var apiPassword: String?
         get() { mApiPassword = mApiPassword ?: profile?.getStudentData("accountPassword", null); return mApiPassword }
-        set(value) { profile?.putStudentData("accountPassword", value) ?: return; mApiPassword = value }
+        set(value) { profile?.putStudentData("accountPassword", value); mApiPassword = value }
 
     /**
      * A JST login Code.
@@ -151,8 +138,7 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
     private var mApiCode: String? = null
     var apiCode: String?
         get() { mApiCode = mApiCode ?: loginStore.getLoginData("accountCode", null); return mApiCode }
-        set(value) {
-            loginStore.putLoginData("accountCode", value); mApiCode = value }
+        set(value) { profile?.putStudentData("accountCode", value); mApiCode = value }
     /**
      * A JST login PIN.
      * Used only during first login in JST mode.
@@ -160,8 +146,7 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
     private var mApiPin: String? = null
     var apiPin: String?
         get() { mApiPin = mApiPin ?: loginStore.getLoginData("accountPin", null); return mApiPin }
-        set(value) {
-            loginStore.putLoginData("accountPin", value); mApiPin = value }
+        set(value) { profile?.putStudentData("accountPin", value); mApiPin = value }
 
     /**
      * A Synergia API access token.
@@ -290,4 +275,10 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
     var timetableNotPublic: Boolean
         get() { mTimetableNotPublic = mTimetableNotPublic ?: profile?.getStudentData("timetableNotPublic", false); return mTimetableNotPublic ?: false }
         set(value) { profile?.putStudentData("timetableNotPublic", value) ?: return; mTimetableNotPublic = value }
+
+    /**
+     * Set to false when Recaptcha helper doesn't provide a working token.
+     * When it's set to false uses Synergia for messages.
+     */
+    var messagesLoginSuccessful: Boolean = true
 }

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

@@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.Librus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesGetMessage
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesGetRecipientList
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesSendMessage
-import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaMarkAllAnnouncementsAsRead
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.firstlogin.LibrusFirstLogin
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLogin
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
@@ -24,6 +24,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
@@ -88,9 +89,8 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
 
     override fun getMessage(message: MessageFull) {
         login(LOGIN_METHOD_LIBRUS_MESSAGES) {
-            LibrusMessagesGetMessage(data, message) {
-                completed()
-            }
+            if (data.messagesLoginSuccessful) LibrusMessagesGetMessage(data, message) { completed() }
+            else LibrusSynergiaGetMessage(data, message) { completed() }
         }
     }
 
@@ -118,11 +118,22 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
         }
     }
 
-    override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) {
-        login(LOGIN_METHOD_LIBRUS_MESSAGES) {
-            LibrusMessagesGetAttachment(data, message, attachmentId, attachmentName) {
-                completed()
+    override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) {
+        when (owner) {
+            is Message -> {
+                login(LOGIN_METHOD_LIBRUS_SYNERGIA) {
+                    if (data.messagesLoginSuccessful) LibrusMessagesGetAttachment(data, owner, attachmentId, attachmentName) { completed() }
+                    LibrusSynergiaGetAttachment(data, owner, attachmentId, attachmentName) { completed() }
+                }
             }
+            is EventFull -> {
+                login(LOGIN_METHOD_LIBRUS_SYNERGIA) {
+                    LibrusSynergiaHomeworkGetAttachment(data, owner, attachmentId, attachmentName) {
+                        completed()
+                    }
+                }
+            }
+            else -> completed()
         }
     }
 
@@ -134,6 +145,14 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
         }
     }
 
+    override fun getEvent(eventFull: EventFull) {
+        login(LOGIN_METHOD_LIBRUS_SYNERGIA) {
+            LibrusSynergiaGetHomework(data, eventFull) {
+                completed()
+            }
+        }
+    }
+
     override fun firstLogin() { LibrusFirstLogin(data) { completed() } }
     override fun cancel() {
         d(TAG, "Cancelled")

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

@@ -50,6 +50,8 @@ const val ENDPOINT_LIBRUS_API_CLASS_FREE_DAYS                          = 1130
 const val ENDPOINT_LIBRUS_SYNERGIA_INFO                                = 2010
 const val ENDPOINT_LIBRUS_SYNERGIA_GRADES                              = 2020
 const val ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK                            = 2030
+const val ENDPOINT_LIBRUS_SYNERGIA_MESSAGES_RECEIVED                   = 2040
+const val ENDPOINT_LIBRUS_SYNERGIA_MESSAGES_SENT                       = 2050
 const val ENDPOINT_LIBRUS_MESSAGES_RECEIVED                            = 3010
 const val ENDPOINT_LIBRUS_MESSAGES_SENT                                = 3020
 const val ENDPOINT_LIBRUS_MESSAGES_TRASH                               = 3030
@@ -64,7 +66,7 @@ val LibrusFeatures = listOf(
         Feature(LOGIN_TYPE_LIBRUS, FEATURE_PUSH_CONFIG, listOf(
                 ENDPOINT_LIBRUS_API_PUSH_CONFIG to LOGIN_METHOD_LIBRUS_API
         ), listOf(LOGIN_METHOD_LIBRUS_API)).withShouldSync { data ->
-                !data.app.config.sync.tokenLibrusList.contains(data.profileId)
+                (data as DataLibrus).isPremium && !data.app.config.sync.tokenLibrusList.contains(data.profileId)
         },
 
 
@@ -116,11 +118,11 @@ val LibrusFeatures = listOf(
          * Homework - using API.
          * Sync only if account has premium access.
          */
-        Feature(LOGIN_TYPE_LIBRUS, FEATURE_HOMEWORK, listOf(
+        /*Feature(LOGIN_TYPE_LIBRUS, FEATURE_HOMEWORK, listOf(
                 ENDPOINT_LIBRUS_API_HOMEWORK to LOGIN_METHOD_LIBRUS_API
         ), listOf(LOGIN_METHOD_LIBRUS_API)).withShouldSync { data ->
                 (data as DataLibrus).isPremium
-        },
+        },*/
         /**
          * Behaviour - using API.
          */
@@ -227,9 +229,9 @@ val LibrusFeatures = listOf(
          */
         Feature(LOGIN_TYPE_LIBRUS, FEATURE_HOMEWORK, listOf(
                 ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK to LOGIN_METHOD_LIBRUS_SYNERGIA
-        ), listOf(LOGIN_METHOD_LIBRUS_SYNERGIA)).withShouldSync { data ->
+        ), listOf(LOGIN_METHOD_LIBRUS_SYNERGIA))/*.withShouldSync { data ->
                 !(data as DataLibrus).isPremium
-        },
+        }*/,
 
         /**
          * Messages inbox - using messages website.

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

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-5-8.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus
+
+import android.content.Context
+import android.webkit.WebView
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import pl.szczodrzynski.edziennik.startCoroutineTimer
+import kotlin.coroutines.CoroutineContext
+
+class LibrusRecaptchaHelper(
+        val context: Context,
+        url: String,
+        html: String,
+        val onSuccess: (url: String) -> Unit,
+        val onTimeout: () -> Unit
+) : CoroutineScope {
+    companion object {
+        private const val TAG = "LibrusRecaptchaHelper"
+    }
+
+    private val job: Job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Default
+
+    private val webView by lazy {
+        WebView(context).also {
+            it.settings.javaScriptEnabled = true
+            it.webViewClient = WebViewClient()
+        }
+    }
+
+    private var timeout: Job? = null
+    private var timedOut = false
+
+    inner class WebViewClient : android.webkit.WebViewClient() {
+        override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
+            timeout?.cancel()
+            if (!timedOut) {
+                onSuccess(url)
+            }
+            return true
+        }
+    }
+
+    init {
+        launch(Dispatchers.Main) {
+            webView.loadDataWithBaseURL(url, html, "text/html", "UTF-8", null)
+        }
+        timeout = startCoroutineTimer(delayMillis = 10000L) {
+            timedOut = true
+            onTimeout()
+        }
+    }
+}

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

@@ -49,6 +49,7 @@ open class LibrusApi(open val data: DataLibrus, open val lastSync: Long?) {
                 val error = if (response?.code() == 200) null else
                     json.getString("Code") ?:
                     json.getString("Message") ?:
+                    json.getString("Status") ?:
                     response?.parserErrorBody
                 error?.let { code ->
                     when (code) {
@@ -67,6 +68,7 @@ open class LibrusApi(open val data: DataLibrus, open val lastSync: Long?) {
                         "Nieprawidłowy węzeł." -> ERROR_LIBRUS_API_INCORRECT_ENDPOINT
                         "NoticeboardProblem" -> ERROR_LIBRUS_API_NOTICEBOARD_PROBLEM
                         "DeviceRegistered" -> ERROR_LIBRUS_API_DEVICE_REGISTERED
+                        "Maintenance" -> ERROR_LIBRUS_API_MAINTENANCE
                         else -> ERROR_LIBRUS_API_OTHER
                     }.let { errorCode ->
                         if (errorCode !in ignoreErrors) {
@@ -119,6 +121,7 @@ open class LibrusApi(open val data: DataLibrus, open val lastSync: Long?) {
                 .allowErrorCode(HTTP_UNAUTHORIZED)
                 .allowErrorCode(HTTP_UNAVAILABLE)
                 .allowErrorCode(HTTP_NOT_FOUND)
+                .allowErrorCode(503)
                 .callback(callback)
                 .build()
                 .enqueue()

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

@@ -8,6 +8,7 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesGetList
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaGetMessages
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaHomework
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaInfo
 import pl.szczodrzynski.edziennik.data.db.entity.Message
@@ -201,17 +202,27 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
                 data.startProgress(R.string.edziennik_progress_endpoint_student_info)
                 LibrusSynergiaInfo(data, lastSync, onSuccess)
             }
+            ENDPOINT_LIBRUS_SYNERGIA_MESSAGES_RECEIVED -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
+                LibrusSynergiaGetMessages(data, type = Message.TYPE_RECEIVED, lastSync = lastSync, onSuccess = onSuccess)
+            }
+            ENDPOINT_LIBRUS_SYNERGIA_MESSAGES_SENT -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
+                LibrusSynergiaGetMessages(data, type = Message.TYPE_SENT, lastSync = lastSync, onSuccess = onSuccess)
+            }
 
             /**
              * MESSAGES
              */
             ENDPOINT_LIBRUS_MESSAGES_RECEIVED -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
-                LibrusMessagesGetList(data, type = Message.TYPE_RECEIVED, lastSync = lastSync, onSuccess = onSuccess)
+                if (data.messagesLoginSuccessful) LibrusMessagesGetList(data, type = Message.TYPE_RECEIVED, lastSync = lastSync, onSuccess = onSuccess)
+                else LibrusSynergiaGetMessages(data, type = Message.TYPE_RECEIVED, lastSync = lastSync, onSuccess = onSuccess)
             }
             ENDPOINT_LIBRUS_MESSAGES_SENT -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
-                LibrusMessagesGetList(data, type = Message.TYPE_SENT, lastSync = lastSync, onSuccess = onSuccess)
+                if (data.messagesLoginSuccessful) LibrusMessagesGetList(data, type = Message.TYPE_SENT, lastSync = lastSync, onSuccess = onSuccess)
+                else LibrusSynergiaGetMessages(data, type = Message.TYPE_SENT, lastSync = lastSync, onSuccess = onSuccess)
             }
 
             else -> onSuccess(endpointId)

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

@@ -12,7 +12,6 @@ import im.wangchao.mhttp.body.MediaTypeUtils
 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
@@ -55,13 +54,20 @@ open class LibrusMessages(open val data: DataLibrus, open val lastSync: Long?) {
                 }
 
                 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)
+                    text.contains("<message>Niepoprawny login i/lub hasło.</message>") -> ERROR_LOGIN_LIBRUS_MESSAGES_INVALID_LOGIN
+                    text.contains("<message>Nie odnaleziono wiadomości.</message>") -> ERROR_LIBRUS_MESSAGES_NOT_FOUND
+                    text.contains("stop.png") -> ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED
+                    text.contains("eAccessDeny") -> ERROR_LIBRUS_MESSAGES_ACCESS_DENIED
+                    text.contains("OffLine") -> ERROR_LIBRUS_MESSAGES_MAINTENANCE
+                    text.contains("<status>error</status>") -> ERROR_LIBRUS_MESSAGES_ERROR
+                    text.contains("<type>eVarWhitThisNameNotExists</type>") -> ERROR_LIBRUS_MESSAGES_ACCESS_DENIED
+                    text.contains("<error>") -> ERROR_LIBRUS_MESSAGES_OTHER
+                    else -> null
+                }?.let { errorCode ->
+                    data.error(ApiError(tag, errorCode)
+                            .withApiResponse(text)
+                            .withResponse(response))
+                    return
                 }
 
                 try {
@@ -82,14 +88,7 @@ open class LibrusMessages(open val data: DataLibrus, open val lastSync: Long?) {
             }
         }
 
-        data.app.cookieJar.saveFromResponse(null, listOf(
-                Cookie.Builder()
-                        .name("DZIENNIKSID")
-                        .value(data.messagesSessionId!!)
-                        .domain("wiadomosci.librus.pl")
-                        .secure().httpOnly().build()
-        ))
-
+        data.app.cookieJar.set("wiadomosci.librus.pl", "DZIENNIKSID", data.messagesSessionId)
 
         val docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder()
         val doc = docBuilder.newDocument()
@@ -139,13 +138,20 @@ open class LibrusMessages(open val data: DataLibrus, open val lastSync: Long?) {
                 }
 
                 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)
+                    text.contains("<message>Niepoprawny login i/lub hasło.</message>") -> ERROR_LOGIN_LIBRUS_MESSAGES_INVALID_LOGIN
+                    text.contains("<message>Nie odnaleziono wiadomości.</message>") -> ERROR_LIBRUS_MESSAGES_NOT_FOUND
+                    text.contains("stop.png") -> ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED
+                    text.contains("eAccessDeny") -> ERROR_LIBRUS_MESSAGES_ACCESS_DENIED
+                    text.contains("OffLine") -> ERROR_LIBRUS_MESSAGES_MAINTENANCE
+                    text.contains("<status>error</status>") -> ERROR_LIBRUS_MESSAGES_ERROR
+                    text.contains("<type>eVarWhitThisNameNotExists</type>") -> ERROR_LIBRUS_MESSAGES_ACCESS_DENIED
+                    text.contains("<error>") -> ERROR_LIBRUS_MESSAGES_OTHER
+                    else -> null
+                }?.let { errorCode ->
+                    data.error(ApiError(tag, errorCode)
+                            .withApiResponse(text)
+                            .withResponse(response))
+                    return
                 }
 
                 try {
@@ -166,14 +172,7 @@ open class LibrusMessages(open val data: DataLibrus, open val lastSync: Long?) {
             }
         }
 
-        data.app.cookieJar.saveFromResponse(null, listOf(
-                Cookie.Builder()
-                        .name("DZIENNIKSID")
-                        .value(data.messagesSessionId!!)
-                        .domain("wiadomosci.librus.pl")
-                        .secure().httpOnly().build()
-        ))
-
+        data.app.cookieJar.set("wiadomosci.librus.pl", "DZIENNIKSID", data.messagesSessionId)
 
         val docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder()
         val doc = docBuilder.newDocument()
@@ -253,10 +252,11 @@ open class LibrusMessages(open val data: DataLibrus, open val lastSync: Long?) {
                 .enqueue()
     }
 
-    fun sandboxGetFile(tag: String, action: String, targetFile: File, onSuccess: (file: File) -> Unit,
+    fun sandboxGetFile(tag: String, url: String, targetFile: File, onSuccess: (file: File) -> Unit,
+                       method: Int = GET,
                        onProgress: (written: Long, total: Long) -> Unit) {
 
-        d(tag, "Request: Librus/Messages - $LIBRUS_SANDBOX_URL$action")
+        d(tag, "Request: Librus/Messages - $url")
 
         val callback = object : FileCallbackHandler(targetFile) {
             override fun onSuccess(file: File?, response: Response?) {
@@ -292,9 +292,14 @@ open class LibrusMessages(open val data: DataLibrus, open val lastSync: Long?) {
         }
 
         Request.builder()
-                .url("$LIBRUS_SANDBOX_URL$action")
+                .url(url)
                 .userAgent(SYNERGIA_USER_AGENT)
-                .post()
+                .also {
+                    when (method) {
+                        POST -> it.post()
+                        else -> it.get()
+                    }
+                }
                 .callback(callback)
                 .build()
                 .enqueue()

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

@@ -44,6 +44,7 @@ open class LibrusPortal(open val data: DataLibrus) {
                         "Access token is invalid" -> ERROR_LIBRUS_PORTAL_ACCESS_DENIED
                         "ApiDisabled" -> ERROR_LIBRUS_PORTAL_API_DISABLED
                         "Account not found" -> ERROR_LIBRUS_PORTAL_SYNERGIA_NOT_FOUND
+                        "Unable to refresh the account" -> ERROR_LIBRUS_PORTAL_MAINTENANCE
                         else -> when (json.getString("hint")) {
                             "Error while decoding to JSON" -> ERROR_LIBRUS_PORTAL_ACCESS_DENIED
                             else -> ERROR_LIBRUS_PORTAL_OTHER
@@ -97,6 +98,7 @@ open class LibrusPortal(open val data: DataLibrus) {
                 .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED)
                 .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST)
                 .allowErrorCode(HttpURLConnection.HTTP_GONE)
+                .allowErrorCode(424)
                 .callback(callback)
                 .build()
                 .enqueue()

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

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

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

@@ -37,8 +37,7 @@ class LibrusApiAnnouncementMarkAsRead(override val data: DataLibrus,
                     Metadata.TYPE_ANNOUNCEMENT,
                     announcement.id,
                     announcement.seen,
-                    announcement.notified,
-                    announcement.addedDate
+                    announcement.notified
             ))
             onSuccess()
         }

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

@@ -38,15 +38,17 @@ class LibrusApiAnnouncements(override val data: DataLibrus,
                 val read = announcement.getBoolean("WasRead") ?: false
 
                 val announcementObject = Announcement(
-                        profileId,
-                        id,
-                        subject,
-                        text,
-                        startDate,
-                        endDate,
-                        teacherId,
-                        longId
-                )
+                        profileId = profileId,
+                        id = id,
+                        subject = subject,
+                        text = text,
+                        startDate = startDate,
+                        endDate = endDate,
+                        teacherId = teacherId,
+                        addedDate = addedDate
+                ).also {
+                    it.idString = longId
+                }
 
                 data.announcementList.add(announcementObject)
                 data.setSeenMetadataList.add(Metadata(
@@ -54,8 +56,7 @@ class LibrusApiAnnouncements(override val data: DataLibrus,
                         Metadata.TYPE_ANNOUNCEMENT,
                         id,
                         read,
-                        profile.empty || read,
-                        addedDate
+                        profile.empty || read
                 ))
             }
 

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

@@ -26,25 +26,39 @@ class LibrusApiAttendanceTypes(override val data: DataLibrus,
 
             attendanceTypes?.forEach { attendanceType ->
                 val id = attendanceType.getLong("Id") ?: return@forEach
-                val name = attendanceType.getString("Name") ?: ""
-                val color = attendanceType.getString("ColorRGB")?.let { Color.parseColor("#$it") } ?: -1
 
-                val standardId = when (attendanceType.getBoolean("Standard") ?: false) {
-                    true -> id
-                    false -> attendanceType.getJsonObject("StandardType")?.getLong("Id") ?: id
-                }
-                val type = when (standardId) {
+                val typeName = attendanceType.getString("Name") ?: ""
+                val typeSymbol = attendanceType.getString("Short") ?: ""
+                val typeColor = attendanceType.getString("ColorRGB")?.let { Color.parseColor("#$it") }
+
+                val isStandard = attendanceType.getBoolean("Standard") ?: false
+                val baseType = when (attendanceType.getJsonObject("StandardType")?.getLong("Id") ?: id) {
                     1L -> Attendance.TYPE_ABSENT
                     2L -> Attendance.TYPE_BELATED
                     3L -> Attendance.TYPE_ABSENT_EXCUSED
                     4L -> Attendance.TYPE_RELEASED
-                    /*100*/else -> Attendance.TYPE_PRESENT
+                    /*100*/else -> when (isStandard) {
+                        true -> Attendance.TYPE_PRESENT
+                        false -> Attendance.TYPE_PRESENT_CUSTOM
+                    }
+                }
+                val typeShort = when (isStandard) {
+                    true -> data.app.attendanceManager.getTypeShort(baseType)
+                    false -> typeSymbol
                 }
 
-                data.attendanceTypes.put(id, AttendanceType(profileId, id, name, type, color))
+                data.attendanceTypes.put(id, AttendanceType(
+                        profileId,
+                        id,
+                        baseType,
+                        typeName,
+                        typeShort,
+                        typeSymbol,
+                        typeColor
+                ))
             }
 
-            data.setSyncNext(ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES, 4*DAY)
+            data.setSyncNext(ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES, 2*DAY)
             onSuccess(ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES)
         }
     }

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

@@ -41,39 +41,44 @@ class LibrusApiAttendances(override val data: DataLibrus,
                 val lessonDate = Date.fromY_m_d(attendance.getString("Date"))
                 val teacherId = attendance.getJsonObject("AddedBy")?.getLong("Id")
                 val semester = attendance.getInt("Semester") ?: return@forEach
-                val type = attendance.getJsonObject("Type")?.getLong("Id") ?: return@forEach
-                val typeObject = data.attendanceTypes.get(type)
-                val topic = typeObject?.name ?: ""
 
-                val startTime = data.lessonRanges.get(lessonNo).startTime
+                val typeId = attendance.getJsonObject("Type")?.getLong("Id") ?: return@forEach
+                val type = data.attendanceTypes[typeId] ?: null
+
+                val startTime = data.lessonRanges.get(lessonNo)?.startTime
 
                 val lesson = if (lessonId != -1L)
                     data.librusLessons.singleOrNull { it.lessonId == lessonId }
                 else null
 
-                val attendanceObject = Attendance(
-                        profileId,
-                        id,
-                        teacherId ?: lesson?.teacherId ?: -1,
-                        lesson?.subjectId ?: -1,
-                        semester,
-                        topic,
-                        lessonDate,
-                        startTime,
-                        typeObject.type
-                )
-
                 val addedDate = Date.fromIso(attendance.getString("AddDate") ?: return@forEach)
 
+                val attendanceObject = Attendance(
+                        profileId = profileId,
+                        id = id,
+                        baseType = type?.baseType ?: Attendance.TYPE_UNKNOWN,
+                        typeName = type?.typeName ?: "nieznany rodzaj",
+                        typeShort = type?.typeShort ?: "?",
+                        typeSymbol = type?.typeSymbol ?: "?",
+                        typeColor = type?.typeColor,
+                        date = lessonDate,
+                        startTime = startTime,
+                        semester = semester,
+                        teacherId = teacherId ?: lesson?.teacherId ?: -1,
+                        subjectId = lesson?.subjectId ?: -1,
+                        addedDate = addedDate
+                ).also {
+                    it.lessonNumber = lessonNo
+                }
+
                 data.attendanceList.add(attendanceObject)
-                if(typeObject.type != Attendance.TYPE_PRESENT) {
+                if(type?.baseType != Attendance.TYPE_PRESENT) {
                     data.metadataList.add(Metadata(
                             profileId,
                             Metadata.TYPE_ATTENDANCE,
                             id,
-                            profile?.empty ?: false,
-                            profile?.empty ?: false,
-                            addedDate
+                            profile?.empty ?: false || type?.baseType == Attendance.TYPE_PRESENT_CUSTOM || type?.baseType == Attendance.TYPE_UNKNOWN,
+                            profile?.empty ?: false || type?.baseType == Attendance.TYPE_PRESENT_CUSTOM || type?.baseType == Attendance.TYPE_UNKNOWN
                     ))
                 }
             }

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

@@ -27,6 +27,17 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
 
     private val nameFormat by lazy { DecimalFormat("#.##") }
 
+    private val types by lazy {
+        mapOf(
+                1 to ("wz" to "wzorowe"),
+                2 to ("bdb" to "bardzo dobre"),
+                3 to ("db" to "dobre"),
+                4 to ("popr" to "poprawne"),
+                5 to ("ndp" to "nieodpowiednie"),
+                6 to ("ng" to "naganne")
+        )
+    }
+
     init { data.profile?.also { profile ->
         apiGet(TAG, "BehaviourGrades/Points") { json ->
 
@@ -44,7 +55,8 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
                         comment = null,
                         semester = 1,
                         teacherId = -1,
-                        subjectId = 1
+                        subjectId = 1,
+                        addedDate = profile.getSemesterStart(1).inMillis
                 )
 
                 data.gradeList.add(semester1StartGradeObject)
@@ -53,8 +65,7 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
                         Metadata.TYPE_GRADE,
                         semester1StartGradeObject.id,
                         true,
-                        true,
-                        profile.getSemesterStart(1).inMillis
+                        true
                 ))
             }
 
@@ -72,7 +83,8 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
                         comment = null,
                         semester = 2,
                         teacherId = -1,
-                        subjectId = 1
+                        subjectId = 1,
+                        addedDate = profile.getSemesterStart(2).inMillis
                 )
 
                 data.gradeList.add(semester2StartGradeObject)
@@ -81,8 +93,7 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
                         Metadata.TYPE_GRADE,
                         semester2StartGradeObject.id,
                         true,
-                        true,
-                        profile.getSemesterStart(2).inMillis
+                        true
                 ))
             }
 
@@ -95,8 +106,12 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
                 val addedDate = grade.getString("AddDate")?.let { Date.fromIso(it) }
                         ?: System.currentTimeMillis()
 
+                val text = grade.getString("Text")
+                val type = grade.getJsonObject("BehaviourGrade")?.getInt("Id")?.let { types[it] }
+
                 val name = when {
-                    value != null -> (if (value >= 0) "+" else "") + nameFormat.format(value)
+                    type != null -> type.first
+                    value != null -> (if (value > 0) "+" else "") + nameFormat.format(value)
                     shortName != null -> shortName
                     else -> return@forEach
                 }
@@ -115,14 +130,14 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
 
                 val categoryName = category?.text ?: ""
 
-                val description = grade.getJsonArray("Comments")?.asJsonObjectList()?.let { comments ->
-                    if (comments.isNotEmpty()) {
-                        data.gradeCategories.singleOrNull {
-                            it.type == GradeCategory.TYPE_BEHAVIOUR_COMMENT
-                                    && it.categoryId == comments[0].asJsonObject.getLong("Id")
-                        }?.text
-                    } else null
-                } ?: ""
+                val comments = grade.getJsonArray("Comments")
+                        ?.asJsonObjectList()
+                        ?.mapNotNull { comment ->
+                            val cId = comment.getLong("Id") ?: return@mapNotNull null
+                            data.gradeCategories[cId]?.text
+                        } ?: listOf()
+
+                val description = listOfNotNull(type?.second) + comments
 
                 val valueFrom = value ?: category?.valueFrom ?: 0f
                 val valueTo = category?.valueTo ?: 0f
@@ -136,11 +151,12 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
                         weight = -1f,
                         color = color,
                         category = categoryName,
-                        description = description,
-                        comment = null,
+                        description = text ?: description.join(" - "),
+                        comment = if (text != null) description.join(" - ") else null,
                         semester = semester,
                         teacherId = teacherId,
-                        subjectId = 1
+                        subjectId = 1,
+                        addedDate = addedDate
                 ).apply {
                     valueMax = valueTo
                 }
@@ -151,8 +167,7 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
                         Metadata.TYPE_GRADE,
                         id,
                         profile.empty,
-                        profile.empty,
-                        addedDate
+                        profile.empty
                 ))
             }
 

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

@@ -65,7 +65,8 @@ class LibrusApiDescriptiveGrades(override val data: DataLibrus,
                         comment = null,
                         semester = semester,
                         teacherId = teacherId,
-                        subjectId = subjectId
+                        subjectId = subjectId,
+                        addedDate = addedDate
                 )
 
                 data.gradeList.add(gradeObject)
@@ -74,8 +75,7 @@ class LibrusApiDescriptiveGrades(override val data: DataLibrus,
                         Metadata.TYPE_GRADE,
                         id,
                         profile.empty,
-                        profile.empty,
-                        addedDate
+                        profile.empty
                 ))
             }
 

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

@@ -35,7 +35,7 @@ class LibrusApiEvents(override val data: DataLibrus,
             events?.forEach { event ->
                 val id = event.getLong("Id") ?: return@forEach
                 val eventDate = Date.fromY_m_d(event.getString("Date"))
-                val topic = event.getString("Content") ?: ""
+                var topic = event.getString("Content")?.trim() ?: ""
                 val type = event.getJsonObject("Category")?.getLong("Id") ?: -1
                 val teacherId = event.getJsonObject("CreatedBy")?.getLong("Id") ?: -1
                 val subjectId = event.getJsonObject("Subject")?.getLong("Id") ?: -1
@@ -46,18 +46,24 @@ class LibrusApiEvents(override val data: DataLibrus,
                 val startTime = lessonRange?.startTime ?: Time.fromH_m(event.getString("TimeFrom"))
                 val addedDate = Date.fromIso(event.getString("AddDate"))
 
+                event.getJsonObject("onlineLessonUrl")?.let { onlineLesson ->
+                    val text = onlineLesson.getString("text")?.let { "$it - " } ?: ""
+                    val url = onlineLesson.getString("url")
+                    topic += "\n\n$text$url"
+                }
+
                 val eventObject = Event(
-                        profileId,
-                        id,
-                        eventDate,
-                        startTime,
-                        topic,
-                        -1,
-                        type,
-                        false,
-                        teacherId,
-                        subjectId,
-                        teamId
+                        profileId = profileId,
+                        id = id,
+                        date = eventDate,
+                        time = startTime,
+                        topic = topic,
+                        color = null,
+                        type = type,
+                        teacherId = teacherId,
+                        subjectId = subjectId,
+                        teamId = teamId,
+                        addedDate = addedDate
                 )
 
                 data.eventList.add(eventObject)
@@ -67,8 +73,7 @@ class LibrusApiEvents(override val data: DataLibrus,
                                 Metadata.TYPE_EVENT,
                                 id,
                                 profile?.empty ?: false,
-                                profile?.empty ?: false,
-                                addedDate
+                                profile?.empty ?: false
                         ))
             }
 

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

@@ -79,7 +79,8 @@ class LibrusApiGrades(override val data: DataLibrus,
                         comment = null,
                         semester = semester,
                         teacherId = teacherId,
-                        subjectId = subjectId
+                        subjectId = subjectId,
+                        addedDate = addedDate
                 )
 
                 grade.getJsonObject("Improvement")?.also {
@@ -98,8 +99,7 @@ class LibrusApiGrades(override val data: DataLibrus,
                                 Metadata.TYPE_GRADE,
                                 id,
                                 profile.empty,
-                                profile.empty,
-                                addedDate
+                                profile.empty
                         ))
             }
 

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

@@ -34,17 +34,17 @@ class LibrusApiHomework(override val data: DataLibrus,
                 val addedDate = Date.fromY_m_d(homework.getString("Date"))
 
                 val eventObject = Event(
-                        profileId,
-                        id,
-                        eventDate,
-                        null,
-                        topic,
-                        -1,
-                        -1,
-                        false,
-                        teacherId,
-                        -1,
-                        -1
+                        profileId = profileId,
+                        id = id,
+                        date = eventDate,
+                        time = null,
+                        topic = topic,
+                        color = null,
+                        type = -1,
+                        teacherId = teacherId,
+                        subjectId = -1,
+                        teamId = -1,
+                        addedDate = addedDate.inMillis
                 )
 
                 data.eventList.add(eventObject)
@@ -53,8 +53,7 @@ class LibrusApiHomework(override val data: DataLibrus,
                         Metadata.TYPE_HOMEWORK,
                         id,
                         profile?.empty ?: false,
-                        profile?.empty ?: false,
-                        addedDate.inMillis
+                        profile?.empty ?: false
                 ))
             }
 

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

@@ -4,15 +4,12 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api
 
-import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_LUCKY_NUMBER
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.getInt
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getString
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 
@@ -36,14 +33,15 @@ class LibrusApiLuckyNumber(override val data: DataLibrus,
                     val luckyNumberDate = Date.fromY_m_d(luckyNumberEl.getString("LuckyNumberDay")) ?: Date.getToday()
                     val luckyNumber = luckyNumberEl.getInt("LuckyNumber") ?: -1
                     val luckyNumberObject = LuckyNumber(
-                            profileId,
-                            luckyNumberDate,
-                            luckyNumber
+                            profileId = profileId,
+                            date = luckyNumberDate,
+                            number = luckyNumber
                     )
 
-                    //if (luckyNumberDate > Date.getToday()) {
+                    if (luckyNumberDate >= Date.getToday())
                         nextSync = luckyNumberDate.combineWith(Time(15, 0, 0))
-                    //}
+                    else
+                        nextSync = System.currentTimeMillis() + 6*HOUR*1000
 
                     data.luckyNumberList.add(luckyNumberObject)
                     data.metadataList.add(
@@ -52,8 +50,7 @@ class LibrusApiLuckyNumber(override val data: DataLibrus,
                                     Metadata.TYPE_LUCKY_NUMBER,
                                     luckyNumberObject.date.value.toLong(),
                                     true,
-                                    profile?.empty ?: false,
-                                    System.currentTimeMillis()
+                                    profile?.empty ?: false
                             ))
                 }
             }

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

@@ -46,12 +46,15 @@ class LibrusApiNotices(override val data: DataLibrus,
                 val semester = profile?.dateToSemester(addedDate) ?: 1
 
                 val noticeObject = Notice(
-                        profileId,
-                        id,
-                        categoryText + "\n" + text,
-                        semester,
-                        type,
-                        teacherId
+                        profileId = profileId,
+                        id = id,
+                        type = type,
+                        semester = semester,
+                        text = text,
+                        category = categoryText,
+                        points = null,
+                        teacherId = teacherId,
+                        addedDate = addedDate.inMillis
                 )
 
                 data.noticeList.add(noticeObject)
@@ -61,8 +64,7 @@ class LibrusApiNotices(override val data: DataLibrus,
                                 Metadata.TYPE_NOTICE,
                                 id,
                                 profile?.empty ?: false,
-                                profile?.empty ?: false,
-                                addedDate.inMillis
+                                profile?.empty ?: false
                         ))
             }
 

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

@@ -56,7 +56,8 @@ class LibrusApiPointGrades(override val data: DataLibrus,
                         comment = null,
                         semester = semester,
                         teacherId = teacherId,
-                        subjectId = subjectId
+                        subjectId = subjectId,
+                        addedDate = addedDate
                 ).apply {
                     valueMax = category?.valueTo ?: 0f
                 }
@@ -67,8 +68,7 @@ class LibrusApiPointGrades(override val data: DataLibrus,
                         Metadata.TYPE_GRADE,
                         id,
                         profile.empty,
-                        profile.empty,
-                        addedDate
+                        profile.empty
                 ))
             }
 

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

@@ -39,17 +39,16 @@ class LibrusApiPtMeetings(override val data: DataLibrus,
                 }
 
                 val eventObject = Event(
-                        profileId,
-                        id,
-                        eventDate,
-                        startTime,
-                        topic,
-                        -1,
-                        Event.TYPE_PT_MEETING,
-                        false,
-                        teacherId,
-                        -1,
-                        data.teamClass?.id ?: -1
+                        profileId = profileId,
+                        id = id,
+                        date = eventDate,
+                        time = startTime,
+                        topic = topic,
+                        color = null,
+                        type = Event.TYPE_PT_MEETING,
+                        teacherId = teacherId,
+                        subjectId = -1,
+                        teamId = data.teamClass?.id ?: -1
                 )
 
                 data.eventList.add(eventObject)
@@ -59,8 +58,7 @@ class LibrusApiPtMeetings(override val data: DataLibrus,
                                 Metadata.TYPE_EVENT,
                                 id,
                                 profile?.empty ?: false,
-                                profile?.empty ?: false,
-                                System.currentTimeMillis()
+                                profile?.empty ?: false
                         ))
             }
 

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

@@ -21,6 +21,14 @@ class LibrusApiPushConfig(override val data: DataLibrus,
     }
 
     init { data.app.config.sync.tokenLibrus?.also { tokenLibrus ->
+        if(tokenLibrus.isEmpty()) {
+            data.setSyncNext(ENDPOINT_LIBRUS_API_PUSH_CONFIG, SYNC_ALWAYS)
+            data.app.config.sync.tokenLibrusList =
+                    data.app.config.sync.tokenLibrusList + profileId
+            onSuccess(ENDPOINT_LIBRUS_API_PUSH_CONFIG)
+            return@also
+        }
+
         apiGet(TAG, "ChangeRegister", payload = JsonObject(
                 "provider" to "FCM",
                 "device" to tokenLibrus,

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

@@ -43,15 +43,15 @@ class LibrusApiTeacherFreeDays(override val data: DataLibrus,
                 val timeTo = teacherAbsence.getString("TimeTo")?.let { Time.fromH_m_s(it) }
 
                 val teacherAbsenceObject = TeacherAbsence(
-                        profileId,
-                        id,
-                        teacherId,
-                        type,
-                        name,
-                        dateFrom,
-                        dateTo,
-                        timeFrom,
-                        timeTo
+                        profileId = profileId,
+                        id = id,
+                        type = type,
+                        name = name,
+                        dateFrom = dateFrom,
+                        dateTo = dateTo,
+                        timeFrom = timeFrom,
+                        timeTo = timeTo,
+                        teacherId = teacherId
                 )
 
                 data.teacherAbsenceList.add(teacherAbsenceObject)
@@ -59,9 +59,8 @@ class LibrusApiTeacherFreeDays(override val data: DataLibrus,
                         profileId,
                         Metadata.TYPE_TEACHER_ABSENCE,
                         id,
-                        profile?.empty ?: false,
-                        profile?.empty ?: false,
-                        System.currentTimeMillis()
+                        true,
+                        profile?.empty ?: false
                 ))
             }
 

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

@@ -57,10 +57,11 @@ class LibrusApiTextGrades(override val data: DataLibrus,
                         color = category?.color ?: -1,
                         category = category?.text ?: "",
                         description = description,
-                        comment = null,
+                        comment = grade.getString("Phrase") /* whatever it is */,
                         semester = semester,
                         teacherId = teacherId,
-                        subjectId = subjectId
+                        subjectId = subjectId,
+                        addedDate = addedDate
                 )
 
                 data.gradeList.add(gradeObject)
@@ -69,8 +70,7 @@ class LibrusApiTextGrades(override val data: DataLibrus,
                         Metadata.TYPE_GRADE,
                         id,
                         profile.empty,
-                        profile.empty,
-                        addedDate
+                        profile.empty
                 ))
             }
 

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

@@ -198,8 +198,7 @@ class LibrusApiTimetables(override val data: DataLibrus,
                             Metadata.TYPE_LESSON_CHANGE,
                             lessonObject.id,
                             seen,
-                            seen,
-                            System.currentTimeMillis()
+                            seen
                     ))
         }
         data.lessonList.add(lessonObject)