[4.5.1-beta.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/codeStyles/Project.xml

@@ -1,6 +1,10 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
@@ -11,7 +15,6 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -22,7 +25,6 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -34,7 +36,6 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -45,7 +46,6 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -56,7 +56,6 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -67,7 +66,6 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -78,7 +76,6 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -90,7 +87,6 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -102,7 +98,6 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>
@@ -112,5 +107,8 @@
         </rules>
       </arrangement>
     </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
   </code_scheme>
 </component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/compiler.xml

@@ -0,0 +1,17 @@
+<?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="11" />
+      <module name="Szkolny.eu.app" target="11" />
+      <module name="Szkolny.eu.cafebar" target="11" />
+      <module name="Szkolny.eu.material-about-library" target="11" />
+      <module name="Szkolny.eu.mhttp" target="11" />
+      <module name="Szkolny.eu.nachos" target="11" />
+      <module name="Szkolny.eu.szkolny-font" target="11" />
+      <module name="Szkolny.eu.wear" target="11" />
+    </bytecodeTargetLevel>
+  </component>
+</project>

.idea/discord.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DiscordProjectSettings">
-    <option name="show" value="true" />
+    <option name="show" value="PROJECT_FILES" />
   </component>
   <component name="ProjectNotificationSettings">
     <option name="askShowProject" value="false" />

.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">

.idea/runConfigurations.xml

@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />

app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.google.gms.google-services'
-apply plugin: 'io.fabric'
+apply plugin: 'com.google.firebase.crashlytics'
 
 android {
     signingConfigs {
@@ -54,10 +54,11 @@ android {
     lintOptions {
         checkReleaseBuilds false
     }
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding = true
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility '1.8'
         targetCompatibility '1.8'
     }
@@ -75,6 +76,7 @@ android {
             version "3.10.2"
         }
     }
+    ndkVersion '21.3.6528147'
 }
 
 /*task finalizeBundleDebug(type: Copy) {
@@ -104,6 +106,8 @@ tasks.whenTaskAdded { task ->
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
+
     kapt "androidx.room:room-compiler:${versions.room}"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.5"
 
@@ -114,7 +118,7 @@ dependencies {
     implementation "androidx.core:core-ktx:${versions.ktx}"
     implementation "androidx.gridlayout:gridlayout:${versions.gridLayout}"
     implementation "androidx.legacy:legacy-support-v4:${versions.legacy}"
-    implementation "androidx.lifecycle:lifecycle-livedata:${versions.lifecycle}"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:${versions.lifecycle}"
     implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}"
     implementation "androidx.room:room-runtime:${versions.room}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
@@ -137,7 +141,7 @@ dependencies {
 
     implementation "cat.ereza:customactivityoncrash:2.2.0"
     implementation "com.applandeo:material-calendar-view:1.5.0"
-    implementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
+    implementation 'com.google.firebase:firebase-crashlytics:17.3.1'
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
     implementation "com.evernote:android-job:1.2.6"
     implementation "com.github.antonKozyriatskyi:CircularProgressIndicator:1.2.2"
@@ -145,7 +149,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.13"
+        }
+    }
     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"
@@ -153,7 +161,7 @@ dependencies {
     implementation "me.grantland:autofittextview:0.2.1"
     implementation "me.leolin:ShortcutBadger:1.1.22@aar"
     implementation "org.greenrobot:eventbus:3.1.1"
-    implementation "org.jsoup:jsoup:1.10.1"
+    implementation "org.jsoup:jsoup:1.12.1"
     implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.15"
     //implementation "se.emilsjolander:stickylistheaders:2.7.0"
     implementation 'com.github.edisonw:StickyListHeaders:master-SNAPSHOT@aar'
@@ -176,6 +184,7 @@ dependencies {
     //implementation "org.redundent:kotlin-xml-builder:1.5.3"
 
     implementation "io.github.wulkanowy:signer-android:0.1.1"
+    implementation 'com.github.wulkanowy.uonet-request-signer:hebe-jvm:a99ca50a31'
 
     implementation "androidx.work:work-runtime-ktx:${versions.work}"
 
@@ -198,6 +207,14 @@ dependencies {
     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

@@ -64,5 +64,6 @@
 
 -keep class pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing { public final byte[] pleaseStopRightNow(java.lang.String, long); }
 
--keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
--keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; }
+-keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
+-keepclassmembers 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"
@@ -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,36 +1,10 @@
-<h3>Wersja 4.0-rc.5, 2020-04-05</h3>
+<h3>Wersja 4.5.1-beta.1, 2021-02-22</h3>
 <ul>
-    <li>Możliwość pobierania załączników do zadań domowych (Librus, MobiDziennik, iDziennik).</li>
-    <li>Widok pełnej treści zadań domowych (iDziennik, EduDziennik).</li>
-    <li>Wyszukiwarka wiadomości, pozwalająca na łatwe znalezienie potrzebnej konwersacji.</li>
-    <li>Możliwość usuwania odebranych wiadomości w aplikacji.</li>
+    <li>Vulcan: dodano wyświetlanie <b>szczęśliwego numerka.</b></li>
+    <li>Vulcan: przywrócono uwagi oraz wysyłanie wiadomości.</li>
+    <li>Vulcan: usunięto wyświetlanie zadań domowych i sprawdzianów z poprzednich lat.</li>
 </ul>
-<!--<h3>Wersja 4.0-rc.3, 2020-03-29</h3>
-<ul>
-    <li><b><u>Wysyłanie wiadomości</u></b> - funkcja, na którą czekał każdy. Od teraz w Szkolnym można wysyłać oraz odpowiadać na wiadomości do nauczycieli &#x1F44F;</li>
-    <li><b>Przebudowaliśmy cały moduł synchronizacji</b>, co oznacza większą stabilność aplikacji, szybkość oraz poprawność pobieranych danych</li>
-    <li>Udoskonalony wygląd Szkolnego - sprawi, że korzystanie z aplikacji będzie jeszcze przyjemniejsze</li>
-    <li>Nowa <b>Strona główna</b> - ładniejszy wygląd oraz możliwość przestawiania kart na każdym profilu</li>
-    <li>Nowy <b>Plan lekcji</b> - z doskonałą obsługą lekcji przesuniętych oraz dwóch lekcji o tej samej godzinie</li>
-    <li>Nowe <b>Oceny</b> - z możliwością zmiany wartości plusów oraz minusów oraz wyłączenia niektórych ocen ze średniej</li>
-    <li>Opcja wyłączenia wybranych powiadomień z aplikacji</li>
-    <li>Znaczki nieprzeczytanych informacji na obrazkach profili.</li>
-    <br>
-    <br>
-    <li>Nowe okienka informacji o wydarzeniach oraz lekcjach</li>
-    <li>Nowe, przyjemniejsze powiadomienia</li>
-    <li>Dużo poprawek w widoku <b>Wiadomości</b> oraz <b>Ogłoszeń</b></li>
-    <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>Łatwiejsze dodawanie własnych wydarzeń</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>
-</ul>-->
 <br>
 <br>
 Dzięki za korzystanie ze Szkolnego!<br>
-<i>&copy; Kuba Szczodrzyński, Kacper Ziubryniewicz 2020</i>
+<i>&copy; Kuba Szczodrzyński, Kacper Ziubryniewicz 2021</i>

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

@@ -9,7 +9,7 @@
 
 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0x7b, 0x51, 0x86, 0xc5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0x42, 0xe5, 0x9a, 0x4e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
 
 unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);
 

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

@@ -43,6 +43,7 @@ import pl.szczodrzynski.edziennik.sync.SyncWorker
 import pl.szczodrzynski.edziennik.sync.UpdateWorker
 import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity
 import pl.szczodrzynski.edziennik.utils.*
+import pl.szczodrzynski.edziennik.utils.Utils.d
 import pl.szczodrzynski.edziennik.utils.managers.*
 import java.util.concurrent.TimeUnit
 import kotlin.coroutines.CoroutineContext
@@ -56,8 +57,8 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
         val profileId
             get() = profile.id
 
-        var devMode = false
         var debugMode = false
+        var devMode = false
     }
 
     val notificationChannelsManager by lazy { NotificationChannelsManager(this) }
@@ -65,6 +66,8 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
     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
@@ -99,12 +102,12 @@ 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) {
+        if (devMode || BuildConfig.DEBUG) {
             HyperLog.initialize(this)
             HyperLog.setLogLevel(Log.VERBOSE)
             HyperLog.setLogFormat(DebugLogFormat(this))
@@ -159,14 +162,20 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
         Iconics.registerFont(SzkolnyFont)
         App.db = AppDb(this)
         Themes.themeInt = config.ui.theme
-        debugMode = config.debugMode
+        devMode = config.debugMode
         MHttp.instance().customOkHttpClient(http)
 
         if (!profileLoadById(config.lastProfileId)) {
             db.profileDao().firstId?.let { profileLoadById(it) }
         }
 
-        devMode = BuildConfig.DEBUG
+        config.ui.language?.let {
+            setLanguage(it)
+        }
+
+        debugMode = BuildConfig.DEBUG
+        if (BuildConfig.DEBUG)
+            devMode = true
 
         Signing.getCert(this)
 
@@ -176,7 +185,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
 
                 if (config.devModePassword != null)
                     checkDevModePassword()
-                debugMode = devMode || config.debugMode
+                devMode = debugMode || config.debugMode
 
                 if (config.sync.enabled)
                     SyncWorker.scheduleNext(this@App, false)
@@ -249,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(),
@@ -258,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(),
@@ -267,19 +284,38 @@ 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(),
                         "Vulcan"
                 )
 
+                val pushVulcanHebeApp = 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:7e16404b9e5deaaa")
+                        .build(),
+                    "VulcanHebe"
+                )
+
                 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()
@@ -287,6 +323,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()
@@ -294,11 +331,20 @@ 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()
                         }
                     }
+                    FirebaseInstanceId.getInstance(pushVulcanHebeApp).instanceId.addOnSuccessListener { instanceIdResult ->
+                        val token = instanceIdResult.token
+                        d("Firebase", "Got VulcanHebe token: $token")
+                        if (token != config.sync.tokenVulcanHebe) {
+                            config.sync.tokenVulcanHebe = token
+                            config.sync.tokenVulcanHebeList = listOf()
+                        }
+                    }
                     FirebaseMessaging.getInstance().subscribeToTopic(packageName)
                 } catch (e: IllegalStateException) {
                     e.printStackTrace()
@@ -339,6 +385,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/Extensions.kt

@@ -42,6 +42,7 @@ 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
@@ -95,30 +96,30 @@ fun List<Teacher>.byNameFDotSpaceLast(nameFDotSpaceLast: String) = firstOrNull {
 
 fun JsonObject?.get(key: String): JsonElement? = this?.get(key)
 
-fun JsonObject?.getBoolean(key: String): Boolean? = get(key)?.let { if (it.isJsonNull) null else it.asBoolean }
-fun JsonObject?.getString(key: String): String? = get(key)?.let { if (it.isJsonNull) null else it.asString }
-fun JsonObject?.getInt(key: String): Int? = get(key)?.let { if (it.isJsonNull) null else it.asInt }
-fun JsonObject?.getLong(key: String): Long? = get(key)?.let { if (it.isJsonNull) null else it.asLong }
-fun JsonObject?.getFloat(key: String): Float? = get(key)?.let { if(it.isJsonNull) null else it.asFloat }
-fun JsonObject?.getChar(key: String): Char? = get(key)?.let { if(it.isJsonNull) null else it.asCharacter }
+fun JsonObject?.getBoolean(key: String): Boolean? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asBoolean }
+fun JsonObject?.getString(key: String): String? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asString }
+fun JsonObject?.getInt(key: String): Int? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asInt }
+fun JsonObject?.getLong(key: String): Long? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asLong }
+fun JsonObject?.getFloat(key: String): Float? = get(key)?.let { if(!it.isJsonPrimitive) null else it.asFloat }
+fun JsonObject?.getChar(key: String): Char? = get(key)?.let { if(!it.isJsonPrimitive) null else it.asCharacter }
 fun JsonObject?.getJsonObject(key: String): JsonObject? = get(key)?.let { if (it.isJsonObject) it.asJsonObject else null }
 fun JsonObject?.getJsonArray(key: String): JsonArray? = get(key)?.let { if (it.isJsonArray) it.asJsonArray else null }
 
-fun JsonObject?.getBoolean(key: String, defaultValue: Boolean): Boolean = get(key)?.let { if (it.isJsonNull) defaultValue else it.asBoolean } ?: defaultValue
-fun JsonObject?.getString(key: String, defaultValue: String): String = get(key)?.let { if (it.isJsonNull) defaultValue else it.asString } ?: defaultValue
-fun JsonObject?.getInt(key: String, defaultValue: Int): Int = get(key)?.let { if (it.isJsonNull) defaultValue else it.asInt } ?: defaultValue
-fun JsonObject?.getLong(key: String, defaultValue: Long): Long = get(key)?.let { if (it.isJsonNull) defaultValue else it.asLong } ?: defaultValue
-fun JsonObject?.getFloat(key: String, defaultValue: Float): Float = get(key)?.let { if(it.isJsonNull) defaultValue else it.asFloat } ?: defaultValue
-fun JsonObject?.getChar(key: String, defaultValue: Char): Char = get(key)?.let { if(it.isJsonNull) defaultValue else it.asCharacter } ?: defaultValue
+fun JsonObject?.getBoolean(key: String, defaultValue: Boolean): Boolean = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asBoolean } ?: defaultValue
+fun JsonObject?.getString(key: String, defaultValue: String): String = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asString } ?: defaultValue
+fun JsonObject?.getInt(key: String, defaultValue: Int): Int = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asInt } ?: defaultValue
+fun JsonObject?.getLong(key: String, defaultValue: Long): Long = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asLong } ?: defaultValue
+fun JsonObject?.getFloat(key: String, defaultValue: Float): Float = get(key)?.let { if(!it.isJsonPrimitive) defaultValue else it.asFloat } ?: defaultValue
+fun JsonObject?.getChar(key: String, defaultValue: Char): Char = get(key)?.let { if(!it.isJsonPrimitive) defaultValue else it.asCharacter } ?: defaultValue
 fun JsonObject?.getJsonObject(key: String, defaultValue: JsonObject): JsonObject = get(key)?.let { if (it.isJsonObject) it.asJsonObject else defaultValue } ?: defaultValue
 fun JsonObject?.getJsonArray(key: String, defaultValue: JsonArray): JsonArray = get(key)?.let { if (it.isJsonArray) it.asJsonArray else defaultValue } ?: defaultValue
 
-fun JsonArray.getBoolean(key: Int): Boolean? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asBoolean }
-fun JsonArray.getString(key: Int): String? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asString }
-fun JsonArray.getInt(key: Int): Int? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asInt }
-fun JsonArray.getLong(key: Int): Long? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asLong }
-fun JsonArray.getFloat(key: Int): Float? = if (key >= size()) null else get(key)?.let { if(it.isJsonNull) null else it.asFloat }
-fun JsonArray.getChar(key: Int): Char? = if (key >= size()) null else get(key)?.let { if(it.isJsonNull) null else it.asCharacter }
+fun JsonArray.getBoolean(key: Int): Boolean? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asBoolean }
+fun JsonArray.getString(key: Int): String? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asString }
+fun JsonArray.getInt(key: Int): Int? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asInt }
+fun JsonArray.getLong(key: Int): Long? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asLong }
+fun JsonArray.getFloat(key: Int): Float? = if (key >= size()) null else get(key)?.let { if(!it.isJsonPrimitive) null else it.asFloat }
+fun JsonArray.getChar(key: Int): Char? = if (key >= size()) null else get(key)?.let { if(!it.isJsonPrimitive) null else it.asCharacter }
 fun JsonArray.getJsonObject(key: Int): JsonObject? = if (key >= size()) null else get(key)?.let { if (it.isJsonObject) it.asJsonObject else null }
 fun JsonArray.getJsonArray(key: Int): JsonArray? = if (key >= size()) null else get(key)?.let { if (it.isJsonArray) it.asJsonArray else null }
 
@@ -298,7 +299,7 @@ fun colorFromCssName(name: String): Int {
         "orange" -> 0xffffa500
         "black" -> 0xff000000
         "white" -> 0xffffffff
-        else -> -1
+        else -> -1L
     }.toInt()
 }
 
@@ -454,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)
@@ -463,7 +464,6 @@ fun Activity.setLanguage(language: String) {
     }
     configuration.locale = locale
     resources.updateConfiguration(configuration, resources.displayMetrics)
-    baseContext.resources.updateConfiguration(configuration, baseContext.resources.displayMetrics)
 }
 
 /*
@@ -538,6 +538,12 @@ fun String.md5(): String {
     return BigInteger(1, md.digest(toByteArray())).toString(16).padStart(32, '0')
 }
 
+fun String.sha1Hex(): String {
+    val md = MessageDigest.getInstance("SHA-1")
+    md.update(toByteArray())
+    return md.digest().joinToString("") { "%02x".format(it) }
+}
+
 fun String.sha256(): ByteArray {
     val md = MessageDigest.getInstance("SHA-256")
     md.update(toByteArray())
@@ -673,6 +679,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) {
@@ -1162,7 +1178,7 @@ fun Iterable<Float>.averageOrNull() = this.average().let { if (it.isNaN()) null
 fun String.copyToClipboard(context: Context) {
     val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
     val clipData = ClipData.newPlainText("Tekst", this)
-    clipboard.primaryClip = clipData
+    clipboard.setPrimaryClip(clipData)
 }
 
 fun TextView.getTextPosition(range: IntRange): Rect {
@@ -1246,3 +1262,5 @@ val SwipeRefreshLayout.onScrollListener: RecyclerView.OnScrollListener
 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

@@ -18,6 +18,7 @@ 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 com.danimahardhika.cafebar.CafeBar
@@ -37,16 +38,22 @@ import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import pl.droidsonroids.gif.GifDrawable
+import pl.szczodrzynski.edziennik.data.api.ERROR_VULCAN_API_DEPRECATED
 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.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
@@ -58,6 +65,7 @@ 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.ErrorDetailsDialog
 import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar
 import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackFragment
 import pl.szczodrzynski.edziennik.ui.modules.feedback.HelpFragment
@@ -226,8 +234,8 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
             list += NavTarget(TARGET_MESSAGES_DETAILS, R.string.menu_message, MessageFragment::class).withPopTo(DRAWER_ITEM_MESSAGES)
             list += NavTarget(TARGET_MESSAGES_COMPOSE, R.string.menu_message_compose, MessagesComposeFragment::class)
             list += NavTarget(TARGET_WEB_PUSH, R.string.menu_web_push, WebPushFragment::class)
-            list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class)
             if (App.devMode) {
+                list += NavTarget(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)
@@ -294,6 +302,22 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         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 {
@@ -391,7 +415,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
         })
 
@@ -407,18 +444,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 {
@@ -516,7 +568,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                         .withIcon(CommunityMaterial.Icon2.cmd_help_circle_outline)
                         .withOnClickListener(View.OnClickListener { loadTarget(TARGET_FEEDBACK) })
         )
-        if (App.debugMode) {
+        if (App.devMode) {
             bottomSheet += BottomSheetPrimaryItem(false)
                     .withTitle(R.string.menu_debug)
                     .withIcon(CommunityMaterial.Icon.cmd_android_studio)
@@ -558,7 +610,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.nextCheckAt < 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) {
@@ -575,6 +686,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
@@ -626,6 +751,11 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
     fun onApiTaskErrorEvent(event: ApiTaskErrorEvent) {
         EventBus.getDefault().removeStickyEvent(event)
+        if (event.error.errorCode == ERROR_VULCAN_API_DEPRECATED) {
+            if (event.error.profileId != App.profileId)
+                return
+            ErrorDetailsDialog(this, listOf(event.error))
+        }
         navView.toolbar.apply {
             subtitleFormat = R.string.toolbar_subtitle
             subtitleFormatWithUnread = R.plurals.toolbar_subtitle_with_unread
@@ -879,23 +1009,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
-
-            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) {

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

@@ -105,6 +105,11 @@ 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 mArchiverEnabled: Boolean? = null
+    var archiverEnabled: Boolean
+        get() { mArchiverEnabled = mArchiverEnabled ?: values.get("archiverEnabled", true); return mArchiverEnabled ?: true }
+        set(value) { set("archiverEnabled", value); mArchiverEnabled = 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,12 +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 }
@@ -93,6 +99,10 @@ class ConfigSync(private val config: Config) {
     var tokenVulcan: String?
         get() { mTokenVulcan = mTokenVulcan ?: config.values.get("tokenVulcan", null as String?); return mTokenVulcan }
         set(value) { config.set("tokenVulcan", value); mTokenVulcan = value }
+    private var mTokenVulcanHebe: String? = null
+    var tokenVulcanHebe: String?
+        get() { mTokenVulcanHebe = mTokenVulcanHebe ?: config.values.get("tokenVulcanHebe", null as String?); return mTokenVulcanHebe }
+        set(value) { config.set("tokenVulcanHebe", value); mTokenVulcanHebe = value }
 
     private var mTokenMobidziennikList: List<Int>? = null
     var tokenMobidziennikList: List<Int>
@@ -106,4 +116,13 @@ 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 mTokenVulcanHebeList: List<Int>? = null
+    var tokenVulcanHebeList: List<Int>
+        get() { mTokenVulcanHebeList = mTokenVulcanHebeList ?: config.values.getIntList("tokenVulcanHebeList", listOf()); return mTokenVulcanHebeList ?: listOf() }
+        set(value) { config.set("tokenVulcanHebeList", value); mTokenVulcanHebeList = 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

@@ -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

@@ -49,4 +49,9 @@ class ProfileConfigGrades(private val config: ProfileConfig) {
     var dontCountGrades: List<String>
         get() { mDontCountGrades = mDontCountGrades ?: config.values.get("dontCountGrades", listOf()); return mDontCountGrades ?: listOf() }
         set(value) { config.set("dontCountGrades", value); mDontCountGrades = value }
+
+    private var mHideSticksFromOld: Boolean? = null
+    var hideSticksFromOld: Boolean
+        get() { mHideSticksFromOld = mHideSticksFromOld ?: config.values.get("hideSticksFromOld", false); return mHideSticksFromOld ?: false }
+        set(value) { config.set("hideSticksFromOld", value); mHideSticksFromOld = value }
 }

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/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"
@@ -57,6 +57,7 @@ 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"
@@ -91,10 +92,19 @@ 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}"
+const val VULCAN_HEBE_USER_AGENT = "Dart/2.10 (dart:io)"
+const val VULCAN_HEBE_APP_NAME = "DzienniczekPlus 2.0"
+const val VULCAN_HEBE_APP_VERSION = "21.02.09 (G)"
+private const val VULCAN_API_DEVICE_NAME_PREFIX = "Szkolny.eu "
+private const val VULCAN_API_DEVICE_NAME_SUFFIX = " - nie usuwać"
+val VULCAN_API_DEVICE_NAME by lazy {
+    val base = "$VULCAN_API_DEVICE_NAME_PREFIX${Build.MODEL}"
+    val baseMaxLength = 50 - VULCAN_API_DEVICE_NAME_SUFFIX.length
+    base.take(baseMaxLength) + VULCAN_API_DEVICE_NAME_SUFFIX
+}
 
 const val VULCAN_API_ENDPOINT_CERTIFICATE = "mobile-api/Uczen.v3.UczenStart/Certyfikat"
 const val VULCAN_API_ENDPOINT_STUDENT_LIST = "mobile-api/Uczen.v3.UczenStart/ListaUczniow"
@@ -111,5 +121,30 @@ 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 VULCAN_HEBE_ENDPOINT_REGISTER_NEW = "api/mobile/register/new"
+const val VULCAN_HEBE_ENDPOINT_MAIN = "api/mobile/register/hebe"
+const val VULCAN_HEBE_ENDPOINT_PUSH_ALL = "api/mobile/push/all"
+const val VULCAN_HEBE_ENDPOINT_TIMETABLE = "api/mobile/schedule"
+const val VULCAN_HEBE_ENDPOINT_TIMETABLE_CHANGES = "api/mobile/schedule/changes"
+const val VULCAN_HEBE_ENDPOINT_ADDRESSBOOK = "api/mobile/addressbook"
+const val VULCAN_HEBE_ENDPOINT_EXAMS = "api/mobile/exam"
+const val VULCAN_HEBE_ENDPOINT_GRADES = "api/mobile/grade"
+const val VULCAN_HEBE_ENDPOINT_GRADE_SUMMARY = "api/mobile/grade/summary"
+const val VULCAN_HEBE_ENDPOINT_HOMEWORK = "api/mobile/homework"
+const val VULCAN_HEBE_ENDPOINT_NOTICES = "api/mobile/note"
+const val VULCAN_HEBE_ENDPOINT_ATTENDANCE = "api/mobile/lesson"
+const val VULCAN_HEBE_ENDPOINT_MESSAGES = "api/mobile/message"
+const val VULCAN_HEBE_ENDPOINT_MESSAGES_STATUS = "api/mobile/message/status"
+const val VULCAN_HEBE_ENDPOINT_MESSAGES_SEND = "api/mobile/message"
+const val VULCAN_HEBE_ENDPOINT_LUCKY_NUMBER = "api/mobile/school/lucky"
 
 const val EDUDZIENNIK_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME}"
+
+const val PODLASIE_API_VERSION = "1.0.62"
+const val PODLASIE_API_URL = "https://cpdklaser.zeto.bialystok.pl/api"
+const val PODLASIE_API_USER_ENDPOINT = "/pobierzDaneUcznia"
+const val PODLASIE_API_LOGOUT_DEVICES_ENDPOINT = "/wyczyscUrzadzenia"

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

@@ -127,6 +127,7 @@ 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
@@ -158,6 +159,19 @@ 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_VULCAN_HEBE_OTHER                           = 354
+const val ERROR_VULCAN_API_DEPRECATED                       = 390
 
 const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN           = 401
 const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME     = 402
@@ -188,6 +202,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
@@ -207,5 +227,10 @@ 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 EXCEPTION_VULCAN_HEBE_REQUEST                     = 950
 
 const val LOGIN_NO_ARGUMENTS                                = 1201

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

@@ -13,9 +13,12 @@ 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.VulcanLoginHebe
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginWebMain
 import pl.szczodrzynski.edziennik.data.api.models.LoginMethod
 
 // librus
@@ -27,7 +30,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
@@ -97,17 +99,19 @@ val mobidziennikLoginMethods = listOf(
 const val LOGIN_TYPE_VULCAN = 4
 const val LOGIN_MODE_VULCAN_API = 0
 const val LOGIN_MODE_VULCAN_WEB = 1
+const val LOGIN_MODE_VULCAN_HEBE = 2
 const val LOGIN_METHOD_VULCAN_WEB_MAIN = 100
 const val LOGIN_METHOD_VULCAN_WEB_NEW = 200
 const val LOGIN_METHOD_VULCAN_WEB_OLD = 300
 const val LOGIN_METHOD_VULCAN_WEB_MESSAGES = 400
 const val LOGIN_METHOD_VULCAN_API = 500
+const val LOGIN_METHOD_VULCAN_HEBE = 600
 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 },
 
@@ -116,9 +120,17 @@ val vulcanLoginMethods = listOf(
                 .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_VULCAN_WEB_MAIN },*/
 
         LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_API, VulcanLoginApi::class.java)
-                .withIsPossible { _, _ -> true }
+                .withIsPossible { _, loginStore ->
+                        loginStore.mode == LOGIN_MODE_VULCAN_API
+                }
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED },
+
+        LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_HEBE, VulcanLoginHebe::class.java)
+                .withIsPossible { _, loginStore ->
+                        loginStore.mode != LOGIN_MODE_VULCAN_API
+                }
                 .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 +145,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 +153,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

@@ -12,6 +12,10 @@ object Regexes {
         """color: (\w+);?""".toRegex()
     }
 
+    val NOT_DIGITS by lazy {
+        """[^0-9]""".toRegex()
+    }
+
 
 
     val MOBIDZIENNIK_GRADES_SUBJECT_NAME by lazy {
@@ -40,7 +44,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)
@@ -68,6 +72,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)
     }
@@ -77,11 +84,20 @@ 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 {
@@ -97,7 +113,7 @@ object Regexes {
         """zadanieFormularz\(([0-9]+),""".toRegex(DOT_MATCHES_ALL)
     }
     val MOBIDZIENNIK_HOMEWORK_ATTACHMENT by lazy {
-        """zalacznik=([0-9]+)'.+?word-break">(.+?)</td>""".toRegex(DOT_MATCHES_ALL)
+        """zalacznik(_zadania)?=([0-9]+)'.+?word-break">(.+?)</td>""".toRegex(DOT_MATCHES_ALL)
     }
 
 
@@ -139,12 +155,21 @@ 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-z_]+)""".toRegex()
     }
+    val LIBRUS_MESSAGE_ID by lazy {
+        """/wiadomosci/[0-9]+/[0-9]+/([0-9]+?)/""".toRegex()
+    }
 
 
 

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.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))
@@ -59,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.nextCheckAt < 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
         }
@@ -100,6 +152,7 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
     }
 
     override fun cancel() {
+        d(TAG, "Task ${toString()} cancelling...")
         edziennikInterface?.cancel()
     }
 

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

@@ -110,7 +110,6 @@ class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStor
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
-        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/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

@@ -57,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)
@@ -74,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/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

@@ -43,7 +43,7 @@ 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()
@@ -72,8 +72,7 @@ class EdudziennikWebHomework(override val data: DataEdudziennik,
                             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/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/Idziennik.kt

@@ -133,7 +133,6 @@ class Idziennik(val app: App, val profile: Profile?, val loginStore: LoginStore,
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
-        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/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

@@ -69,7 +69,8 @@ class IdziennikApiMessagesInbox(override val data: DataIdziennik,
                         type = if (jMessage.getBoolean("rekordUsuniety") == true) TYPE_DELETED else TYPE_RECEIVED,
                         subject = subject,
                         body = body,
-                        senderId = rTeacher.id
+                        senderId = rTeacher.id,
+                        addedDate = sentDate
                 )
 
                 val messageRecipient = MessageRecipient(
@@ -87,8 +88,7 @@ class IdziennikApiMessagesInbox(override val data: DataIdziennik,
                         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

@@ -51,7 +51,8 @@ class IdziennikApiMessagesSent(override val data: DataIdziennik,
                         type = TYPE_SENT,
                         subject = subject,
                         body = body,
-                        senderId = null
+                        senderId = null,
+                        addedDate = sentDate
                 )
 
                 for (recipientEl in jMessage.getAsJsonArray("odbiorcy")) {
@@ -76,7 +77,7 @@ class IdziennikApiMessagesSent(override val data: DataIdziennik,
                 }
 
                 data.messageList.add(message)
-                data.metadataList.add(Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, true, true, sentDate))
+                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

@@ -52,14 +52,14 @@ class IdziennikWebAnnouncements(override val data: DataIdziennik,
                 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(
@@ -67,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

@@ -68,7 +68,7 @@ class IdziennikWebExams(override val data: DataIdziennik,
                 val teacherId = data.getTeacherByLastFirst(teacherName).id
                 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())) {
@@ -98,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/IdziennikWebGetMessage.kt

@@ -94,8 +94,7 @@ class IdziennikWebGetMessage(override val data: DataIdziennik,
                             Metadata.TYPE_MESSAGE,
                             message.id,
                             message.seen,
-                            message.notified,
-                            message.addedDate
+                            message.notified
                     ))
                 }
 

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

@@ -57,7 +57,7 @@ class IdziennikWebHomework(override val data: DataIdziennik,
                 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")?.trim() ?: ""
 
@@ -77,7 +77,8 @@ class IdziennikWebHomework(override val data: DataIdziennik,
                         type = Event.TYPE_HOMEWORK,
                         teacherId = teacherId,
                         subjectId = subjectId,
-                        teamId = data.teamClass?.id ?: -1
+                        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,
-                        addedDate.inMillis
+                        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

@@ -76,6 +76,11 @@ class IdziennikWebProposedGrades(override val data: DataIdziennik,
                         else -1
 
                 if (semester1Proposed != "") {
+                    val addedDate = if (data.profile.empty)
+                        data.profile.dateSemester1Start.inMillis
+                    else
+                        System.currentTimeMillis()
+
                     val gradeObject = Grade(
                             profileId = profileId,
                             id = semester1Id,
@@ -89,26 +94,26 @@ class IdziennikWebProposedGrades(override val data: DataIdziennik,
                             comment = null,
                             semester = 1,
                             teacherId = -1,
-                            subjectId = subjectObject.id
+                            subjectId = subjectObject.id,
+                            addedDate = addedDate
                     )
 
-                    val addedDate = if (data.profile.empty)
-                        data.profile.dateSemester1Start.inMillis
-                    else
-                        System.currentTimeMillis()
-
                     data.gradeList.add(gradeObject)
                     data.metadataList.add(Metadata(
                             profileId,
                             Metadata.TYPE_GRADE,
                             gradeObject.id,
                             profile.empty,
-                            profile.empty,
-                            addedDate
+                            profile.empty
                     ))
                 }
 
                 if (semester2Proposed != "") {
+                    val addedDate = if (data.profile.empty)
+                        data.profile.dateSemester2Start.inMillis
+                    else
+                        System.currentTimeMillis()
+
                     val gradeObject = Grade(
                             profileId = profileId,
                             id = semester2Id,
@@ -122,22 +127,17 @@ class IdziennikWebProposedGrades(override val data: DataIdziennik,
                             comment = null,
                             semester = 2,
                             teacherId = -1,
-                            subjectId = subjectObject.id
+                            subjectId = subjectObject.id,
+                            addedDate = addedDate
                     )
 
-                    val addedDate = if (data.profile.empty)
-                        data.profile.dateSemester2Start.inMillis
-                    else
-                        System.currentTimeMillis()
-
                     data.gradeList.add(gradeObject)
                     data.metadataList.add(Metadata(
                             profileId,
                             Metadata.TYPE_GRADE,
                             gradeObject.id,
                             profile.empty,
-                            profile.empty,
-                            addedDate
+                            profile.empty
                     ))
                 }
             }

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

@@ -59,7 +59,7 @@ class IdziennikWebSendMessage(override val data: DataIdziennik,
             IdziennikApiMessagesSent(data, null) {
                 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

@@ -70,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)
@@ -86,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

@@ -120,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.
@@ -129,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.
@@ -138,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.
@@ -147,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.
@@ -277,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,9 +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.LibrusSynergiaGetHomework
-import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaHomeworkGetAttachment
-import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaMarkAllAnnouncementsAsRead
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.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
@@ -91,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() }
         }
     }
 
@@ -124,10 +121,9 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
     override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) {
         when (owner) {
             is Message -> {
-                login(LOGIN_METHOD_LIBRUS_MESSAGES) {
-                    LibrusMessagesGetAttachment(data, owner, attachmentId, attachmentName) {
-                        completed()
-                    }
+                login(LOGIN_METHOD_LIBRUS_SYNERGIA) {
+                    if (data.messagesLoginSuccessful) LibrusMessagesGetAttachment(data, owner, attachmentId, attachmentName) { completed() }
+                    LibrusSynergiaGetAttachment(data, owner, attachmentId, attachmentName) { completed() }
                 }
             }
             is EventFull -> {
@@ -161,7 +157,6 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
-        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/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

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/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/LibrusSynergia.kt

@@ -91,6 +91,8 @@ open class LibrusSynergia(open val data: DataLibrus, open val lastSync: Long?) {
     }
 
     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")

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

@@ -13,7 +13,6 @@ import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.utils.models.Date
-import pl.szczodrzynski.edziennik.utils.models.Time
 
 class LibrusApiAttendances(override val data: DataLibrus,
                            override val lastSync: Long?,
@@ -42,9 +41,9 @@ 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[type] ?: null
-                val topic = typeObject?.name ?: ""
+
+                val typeId = attendance.getJsonObject("Type")?.getLong("Id") ?: return@forEach
+                val type = data.attendanceTypes[typeId] ?: null
 
                 val startTime = data.lessonRanges.get(lessonNo)?.startTime
 
@@ -52,29 +51,34 @@ class LibrusApiAttendances(override val data: DataLibrus,
                     data.librusLessons.singleOrNull { it.lessonId == lessonId }
                 else null
 
-                val attendanceObject = Attendance(
-                        profileId,
-                        id,
-                        teacherId ?: lesson?.teacherId ?: -1,
-                        lesson?.subjectId ?: -1,
-                        semester,
-                        topic,
-                        lessonDate,
-                        startTime ?: Time(0, 0, 0),
-                        typeObject?.type ?: Attendance.TYPE_CUSTOM
-                )
-
                 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

@@ -55,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)
@@ -64,8 +65,7 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
                         Metadata.TYPE_GRADE,
                         semester1StartGradeObject.id,
                         true,
-                        true,
-                        profile.getSemesterStart(1).inMillis
+                        true
                 ))
             }
 
@@ -83,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)
@@ -92,8 +93,7 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
                         Metadata.TYPE_GRADE,
                         semester2StartGradeObject.id,
                         true,
-                        true,
-                        profile.getSemesterStart(2).inMillis
+                        true
                 ))
             }
 
@@ -155,7 +155,8 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
                         comment = if (text != null) description.join(" - ") else null,
                         semester = semester,
                         teacherId = teacherId,
-                        subjectId = 1
+                        subjectId = 1,
+                        addedDate = addedDate
                 ).apply {
                     valueMax = valueTo
                 }
@@ -166,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")?.trim() ?: ""
+                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,6 +46,12 @@ 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 = profileId,
                         id = id,
@@ -56,7 +62,8 @@ class LibrusApiEvents(override val data: DataLibrus,
                         type = type,
                         teacherId = teacherId,
                         subjectId = subjectId,
-                        teamId = teamId
+                        teamId = teamId,
+                        addedDate = addedDate
                 )
 
                 data.eventList.add(eventObject)
@@ -66,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

@@ -43,7 +43,8 @@ class LibrusApiHomework(override val data: DataLibrus,
                         type = -1,
                         teacherId = teacherId,
                         subjectId = -1,
-                        teamId = -1
+                        teamId = -1,
+                        addedDate = addedDate.inMillis
                 )
 
                 data.eventList.add(eventObject)
@@ -52,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

@@ -33,9 +33,9 @@ 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())
@@ -50,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

@@ -58,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/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)
@@ -60,8 +60,7 @@ class LibrusApiTeacherFreeDays(override val data: DataLibrus,
                         Metadata.TYPE_TEACHER_ABSENCE,
                         id,
                         true,
-                        profile?.empty ?: false,
-                        System.currentTimeMillis()
+                        profile?.empty ?: false
                 ))
             }
 

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

@@ -60,7 +60,8 @@ class LibrusApiTextGrades(override val data: DataLibrus,
                         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)

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

@@ -97,7 +97,8 @@ class LibrusMessagesGetList(override val data: DataLibrus,
                             type = type,
                             subject = subject,
                             body = null,
-                            senderId = senderId
+                            senderId = senderId,
+                            addedDate = sentDate
                     )
 
                     val messageRecipientObject = MessageRecipient(
@@ -120,8 +121,7 @@ class LibrusMessagesGetList(override val data: DataLibrus,
                             Metadata.TYPE_MESSAGE,
                             id,
                             notified,
-                            notified,
-                            sentDate
+                            notified
                     ))
                 }
 

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

@@ -150,8 +150,7 @@ class LibrusMessagesGetMessage(override val data: DataLibrus,
                         Metadata.TYPE_MESSAGE,
                         messageObject.id,
                         true,
-                        true,
-                        messageObject.addedDate
+                        true
                 ))
             }
 

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

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

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

@@ -54,13 +54,13 @@ class LibrusSandboxDownloadAttachment(override val data: DataLibrus,
     }
 
     private fun getAttachmentCheckKey(attachmentKey: String, callback: () -> Unit) {
-        sandboxGet(LibrusMessagesGetAttachment.TAG, "CSCheckKey",
+        sandboxGet(TAG, "CSCheckKey",
                 parameters = mapOf("singleUseKey" to attachmentKey)) { json ->
 
             when (json.getString("status")) {
                 "not_downloaded_yet" -> {
                     if (getAttachmentCheckKeyTries++ > 5) {
-                        data.error(ApiError(LibrusMessagesGetAttachment.TAG, ERROR_FILE_DOWNLOAD)
+                        data.error(ApiError(TAG, ERROR_FILE_DOWNLOAD)
                                 .withApiResponse(json))
                         return@sandboxGet
                     }
@@ -75,7 +75,7 @@ class LibrusSandboxDownloadAttachment(override val data: DataLibrus,
                 }
 
                 else -> {
-                    data.error(ApiError(LibrusMessagesGetAttachment.TAG, EXCEPTION_LIBRUS_MESSAGES_REQUEST)
+                    data.error(ApiError(TAG, EXCEPTION_LIBRUS_MESSAGES_REQUEST)
                             .withApiResponse(json))
                 }
             }
@@ -85,7 +85,7 @@ class LibrusSandboxDownloadAttachment(override val data: DataLibrus,
     private fun downloadAttachment(url: String, method: Int = GET) {
         val targetFile = File(Utils.getStorageDir(), attachmentName)
 
-        sandboxGetFile(LibrusMessagesGetAttachment.TAG, url, targetFile, { file ->
+        sandboxGetFile(TAG, url, targetFile, { file ->
 
             val event = AttachmentGetEvent(
                     profileId,

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

@@ -0,0 +1,24 @@
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia
+
+import pl.szczodrzynski.edziennik.data.api.LIBRUS_SYNERGIA_MESSAGES_ATTACHMENT_URL
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusSandboxDownloadAttachment
+import pl.szczodrzynski.edziennik.data.db.entity.Message
+
+class LibrusSynergiaGetAttachment(override val data: DataLibrus,
+                                  val message: Message,
+                                  val attachmentId: Long,
+                                  val attachmentName: String,
+                                  val onSuccess: () -> Unit
+) : LibrusSynergia(data, null) {
+    companion object {
+        const val TAG = "LibrusSynergiaGetAttachment"
+    }
+
+    init {
+        redirectUrlGet(TAG, "$LIBRUS_SYNERGIA_MESSAGES_ATTACHMENT_URL/${message.id}/$attachmentId") { url ->
+            LibrusSandboxDownloadAttachment(data, url, message, attachmentId, attachmentName, onSuccess)
+        }
+    }
+}

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

@@ -0,0 +1,160 @@
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia
+
+import org.greenrobot.eventbus.EventBus
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia
+import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
+import pl.szczodrzynski.edziennik.data.db.entity.Message
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.full.MessageFull
+import pl.szczodrzynski.edziennik.data.db.full.MessageRecipientFull
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.swapFirstLastName
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class LibrusSynergiaGetMessage(override val data: DataLibrus,
+                               private val messageObject: MessageFull,
+                               val onSuccess: () -> Unit) : LibrusSynergia(data, null) {
+    companion object {
+        const val TAG = "LibrusSynergiaGetMessage"
+    }
+
+    init {
+        val endpoint = when (messageObject.type) {
+            Message.TYPE_SENT -> "wiadomosci/1/6/${messageObject.id}/f0"
+            else -> "wiadomosci/1/5/${messageObject.id}/f0"
+        }
+
+        data.profile?.also { profile ->
+            synergiaGet(TAG, endpoint) { text ->
+                val doc = Jsoup.parse(text)
+
+                val messageElement = doc.select(".container-message tr")[0].child(1)
+                val detailsElement = messageElement.child(1)
+                val readElement = messageElement.children().last()
+
+                val body = messageElement.select(".container-message-content").html()
+
+                messageObject.apply {
+                    this.body = body
+
+                    clearAttachments()
+                    if (messageElement.children().size >= 5) {
+                        messageElement.child(3).select("tr").forEachIndexed { i, attachment ->
+                            if (i == 0) return@forEachIndexed // Skip the header
+                            val filename = attachment.child(0).text().trim()
+                            val attachmentId = "wiadomosci\\\\/pobierz_zalacznik\\\\/[0-9]+?\\\\/([0-9]+)\"".toRegex()
+                                    .find(attachment.select("img").attr("onclick"))?.get(1)
+                                    ?: return@forEachIndexed
+                            addAttachment(attachmentId.toLong(), filename, -1)
+                        }
+                    }
+                }
+
+                val messageRecipientList = mutableListOf<MessageRecipientFull>()
+
+                when (messageObject.type) {
+                    Message.TYPE_RECEIVED -> {
+                        val senderFullName = detailsElement.child(0).select(".left").text()
+                        val senderGroupName = "\\[(.+?)]".toRegex().find(senderFullName)?.get(1)?.trim()
+
+                        data.teacherList.singleOrNull { it.id == messageObject.senderId }?.apply {
+                            setTeacherType(when (senderGroupName) {
+                                /* https://api.librus.pl/2.0/Messages/Role */
+                                "Pomoc techniczna Librus", "SuperAdministrator" -> Teacher.TYPE_SUPER_ADMIN
+                                "Administrator szkoły" -> Teacher.TYPE_SCHOOL_ADMIN
+                                "Dyrektor Szkoły" -> Teacher.TYPE_PRINCIPAL
+                                "Nauczyciel" -> Teacher.TYPE_TEACHER
+                                "Rodzic", "Opiekun" -> Teacher.TYPE_PARENT
+                                "Sekretariat" -> Teacher.TYPE_SECRETARIAT
+                                "Uczeń" -> Teacher.TYPE_STUDENT
+                                "Pedagog/Psycholog szkolny" -> Teacher.TYPE_PEDAGOGUE
+                                "Pracownik biblioteki" -> Teacher.TYPE_LIBRARIAN
+                                "Inny specjalista" -> Teacher.TYPE_SPECIALIST
+                                "Jednostka Nadrzędna" -> {
+                                    typeDescription = "Jednostka Nadrzędna"
+                                    Teacher.TYPE_OTHER
+                                }
+                                "Jednostka Samorządu Terytorialnego" -> {
+                                    typeDescription = "Jednostka Samorządu Terytorialnego"
+                                    Teacher.TYPE_OTHER
+                                }
+                                else -> Teacher.TYPE_OTHER
+                            })
+                        }
+
+                        val readDateText = readElement.select(".left").text()
+                        val readDate = when (readDateText.isNotNullNorEmpty()) {
+                            true -> Date.fromIso(readDateText)
+                            else -> 0
+                        }
+
+                        val messageRecipientObject = MessageRecipientFull(
+                                profileId = profileId,
+                                id = -1,
+                                messageId = messageObject.id,
+                                readDate = readDate
+                        )
+
+                        messageRecipientObject.fullName = profile.accountName
+                                ?: profile.studentNameLong
+
+                        messageRecipientList.add(messageRecipientObject)
+                    }
+
+                    Message.TYPE_SENT -> {
+
+                        readElement.select("tr").forEachIndexed { i, receiver ->
+                            if (i == 0) return@forEachIndexed // Skip the header
+
+                            val receiverFullName = receiver.child(0).text()
+                            val receiverName = receiverFullName.split('(')[0].swapFirstLastName()
+
+                            val teacher = data.teacherList.singleOrNull { it.fullName == receiverName }
+                            val receiverId = teacher?.id ?: -1
+
+                            val readDate = when (val readDateText = receiver.child(1).text().trim()) {
+                                "NIE" -> 0
+                                else -> Date.fromIso(readDateText)
+                            }
+
+                            val messageRecipientObject = MessageRecipientFull(
+                                    profileId = profileId,
+                                    id = receiverId,
+                                    messageId = messageObject.id,
+                                    readDate = readDate
+                            )
+
+                            messageRecipientObject.fullName = receiverName
+
+                            messageRecipientList.add(messageRecipientObject)
+                        }
+                    }
+                }
+
+                if (!messageObject.seen) {
+                    data.setSeenMetadataList.add(Metadata(
+                            messageObject.profileId,
+                            Metadata.TYPE_MESSAGE,
+                            messageObject.id,
+                            true,
+                            true
+                    ))
+                }
+
+                messageObject.recipients = messageRecipientList
+                data.messageRecipientList.addAll(messageRecipientList)
+
+                data.messageList.add(messageObject)
+                data.messageListReplace = true
+
+                EventBus.getDefault().postSticky(MessageGetEvent(messageObject))
+                onSuccess()
+            }
+        } ?: onSuccess()
+    }
+}

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

@@ -0,0 +1,116 @@
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.ERROR_NOT_IMPLEMENTED
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia
+import pl.szczodrzynski.edziennik.data.db.entity.*
+import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class LibrusSynergiaGetMessages(override val data: DataLibrus,
+                                override val lastSync: Long?,
+                                private val type: Int = Message.TYPE_RECEIVED,
+                                archived: Boolean = false,
+                                val onSuccess: (Int) -> Unit) : LibrusSynergia(data, lastSync) {
+    companion object {
+        const val TAG = "LibrusSynergiaGetMessages"
+    }
+
+    init {
+        val endpoint = when (type) {
+            Message.TYPE_RECEIVED -> "wiadomosci/5"
+            Message.TYPE_SENT -> "wiadomosci/6"
+            else -> null
+        }
+        val endpointId = when (type) {
+            Message.TYPE_RECEIVED -> ENDPOINT_LIBRUS_SYNERGIA_MESSAGES_RECEIVED
+            else -> ENDPOINT_LIBRUS_SYNERGIA_MESSAGES_SENT
+        }
+
+        if (endpoint != null) {
+            synergiaGet(TAG, endpoint) { text ->
+                val doc = Jsoup.parse(text)
+
+                fun getRecipientId(name: String): Long = data.teacherList.singleOrNull {
+                    it.fullNameLastFirst == name
+                }?.id ?: {
+                    val teacherObject = Teacher(
+                            profileId,
+                            -1 * Utils.crc16(name.swapFirstLastName().toByteArray()).toLong(),
+                            name.splitName()?.second!!,
+                            name.splitName()?.first!!
+                    )
+                    data.teacherList.put(teacherObject.id, teacherObject)
+                    teacherObject.id
+                }.invoke()
+
+                doc.select(".decorated.stretch tbody > tr").forEach { messageElement ->
+                    val url = messageElement.select("a").first().attr("href")
+                    val id = Regexes.LIBRUS_MESSAGE_ID.find(url)?.get(1)?.toLong() ?: return@forEach
+                    val subject = messageElement.child(3).text()
+                    val sentDate = Date.fromIso(messageElement.child(4).text())
+                    val recipientName = messageElement.child(2).text().split('(')[0].fixName()
+                    val recipientId = getRecipientId(recipientName)
+                    val read = messageElement.child(2).attr("style").isNullOrBlank()
+
+                    val senderId = when (type) {
+                        Message.TYPE_RECEIVED -> recipientId
+                        else -> null
+                    }
+
+                    val receiverId = when (type) {
+                        Message.TYPE_RECEIVED -> -1
+                        else -> recipientId
+                    }
+
+                    val notified = when (type) {
+                        Message.TYPE_SENT -> true
+                        else -> read || profile?.empty ?: false
+                    }
+
+                    val messageObject = Message(
+                            profileId = profileId,
+                            id = id,
+                            type = type,
+                            subject = subject,
+                            body = null,
+                            senderId = senderId,
+                            addedDate = sentDate
+                    )
+
+                    val messageRecipientObject = MessageRecipient(
+                            profileId,
+                            receiverId,
+                            -1,
+                            if (read) 1 else 0,
+                            id
+                    )
+
+                    messageObject.hasAttachments = !messageElement.child(1).select("img").isEmpty()
+
+                    data.messageList.add(messageObject)
+                    data.messageRecipientList.add(messageRecipientObject)
+                    data.setSeenMetadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_MESSAGE,
+                            id,
+                            notified,
+                            notified
+                    ))
+                }
+
+                when (type) {
+                    Message.TYPE_RECEIVED -> data.setSyncNext(ENDPOINT_LIBRUS_MESSAGES_RECEIVED, SYNC_ALWAYS)
+                    Message.TYPE_SENT -> data.setSyncNext(ENDPOINT_LIBRUS_MESSAGES_SENT, DAY, MainActivity.DRAWER_ITEM_MESSAGES)
+                }
+                onSuccess(endpointId)
+            }
+        } else {
+            data.error(TAG, ERROR_NOT_IMPLEMENTED)
+            onSuccess(endpointId)
+        }
+    }
+}

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

@@ -58,7 +58,7 @@ class LibrusSynergiaHomework(override val data: DataLibrus,
                             elements[9].select("input").attr("onclick")
                     )?.get(1)?.toLong() ?: return@forEachIndexed
 
-                    val lessons = data.db.timetableDao().getForDateNow(profileId, eventDate)
+                    val lessons = data.db.timetableDao().getAllForDateNow(profileId, eventDate)
                     val startTime = lessons.firstOrNull { it.subjectId == subjectId }?.startTime
 
                     val seen = when (profile.empty) {
@@ -76,7 +76,8 @@ class LibrusSynergiaHomework(override val data: DataLibrus,
                             type = Event.TYPE_HOMEWORK,
                             teacherId = teacherId,
                             subjectId = subjectId,
-                            teamId = data.teamClass?.id ?: -1
+                            teamId = data.teamClass?.id ?: -1,
+                            addedDate = addedDate.inMillis
                     )
 
                     data.eventList.add(eventObject)
@@ -85,8 +86,7 @@ class LibrusSynergiaHomework(override val data: DataLibrus,
                             Metadata.TYPE_HOMEWORK,
                             id,
                             seen,
-                            seen,
-                            addedDate.inMillis
+                            seen
                     ))
                 }
             }

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

@@ -33,7 +33,7 @@ class LibrusFirstLogin(val data: DataLibrus, val onSuccess: () -> Unit) {
                     val accounts = json.getJsonArray("accounts")
 
                     if (accounts == null || accounts.size() < 1) {
-                        EventBus.getDefault().post(FirstLoginFinishedEvent(listOf(), data.loginStore))
+                        EventBus.getDefault().postSticky(FirstLoginFinishedEvent(listOf(), data.loginStore))
                         onSuccess()
                         return@portalGet
                     }
@@ -81,7 +81,7 @@ class LibrusFirstLogin(val data: DataLibrus, val onSuccess: () -> Unit) {
                         profileList.add(profile)
                     }
 
-                    EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore))
+                    EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore))
                     onSuccess()
                 }
             }
@@ -116,14 +116,15 @@ class LibrusFirstLogin(val data: DataLibrus, val onSuccess: () -> Unit) {
                     ).apply {
                         studentData["isPremium"] = account?.getBoolean("IsPremium") == true || account?.getBoolean("IsPremiumDemo") == true
                         studentData["accountId"] = account.getInt("Id") ?: 0
-                        studentData["accountLogin"] = login
+                        studentData["accountLogin"] = data.apiLogin ?: login
+                        studentData["accountPassword"] = data.apiPassword
                         studentData["accountToken"] = data.apiAccessToken
                         studentData["accountTokenTime"] = data.apiTokenExpiryTime
                         studentData["accountRefreshToken"] = data.apiRefreshToken
                     }
                     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/librus/login/LibrusLoginApi.kt

@@ -18,6 +18,7 @@ import pl.szczodrzynski.edziennik.getUnixDate
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import java.net.HttpURLConnection.*
 
+@Suppress("ConvertSecondaryConstructorToPrimary")
 class LibrusLoginApi {
     companion object {
         private const val TAG = "LoginLibrusApi"

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

@@ -10,6 +10,7 @@ import im.wangchao.mhttp.body.MediaTypeUtils
 import im.wangchao.mhttp.callback.TextCallbackHandler
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.LibrusRecaptchaHelper
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.getUnixDate
 import pl.szczodrzynski.edziennik.utils.Utils.d
@@ -35,17 +36,39 @@ class LibrusLoginMessages(val data: DataLibrus, val onSuccess: () -> Unit) {
                     onSuccess()
                 }
 
+                text?.contains("grecaptcha.ready") == true -> {
+                    val url = response?.request()?.url()?.toString() ?: run {
+                        //data.error(TAG, ERROR_LIBRUS_MESSAGES_OTHER, response, text)
+                        data.messagesLoginSuccessful = false
+                        onSuccess()
+                        return
+                    }
+
+                    LibrusRecaptchaHelper(data.app, url, text, onSuccess = { newUrl ->
+                        loginWithSynergia(newUrl)
+                    }, onTimeout = {
+                        //data.error(TAG, ERROR_LOGIN_LIBRUS_MESSAGES_TIMEOUT, response, text)
+                        data.messagesLoginSuccessful = false
+                        onSuccess()
+                    })
+                }
+
                 text?.contains("<status>ok</status>") == true -> {
                     saveSessionId(response, text)
                     onSuccess()
                 }
                 text?.contains("<message>Niepoprawny login i/lub hasło.</message>") == true -> data.error(TAG, ERROR_LOGIN_LIBRUS_MESSAGES_INVALID_LOGIN, response, text)
                 text?.contains("stop.png") == true -> data.error(TAG, ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED, response, text)
-                text?.contains("eAccessDeny") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED, response, text)
+                text?.contains("eAccessDeny") == true -> {
+                    // data.error(TAG, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED, response, text)
+                    data.messagesLoginSuccessful = false
+                    onSuccess()
+                }
                 text?.contains("OffLine") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_MAINTENANCE, response, text)
                 text?.contains("<status>error</status>") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ERROR, response, text)
                 text?.contains("<type>eVarWhitThisNameNotExists</type>") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED, response, text)
                 text?.contains("<error>") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_OTHER, response, text)
+                else -> data.error(TAG, ERROR_LIBRUS_MESSAGES_OTHER, response, text)
             }
         }
 

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

@@ -66,7 +66,7 @@ class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) {
                     override fun onSuccess(text: String, response: Response) {
                         val location = response.headers().get("Location")
                         if (location != null) {
-                            val authMatcher = Pattern.compile("http://localhost/bar\\?code=([A-z0-9]+?)$", Pattern.DOTALL or Pattern.MULTILINE).matcher(location)
+                            val authMatcher = Pattern.compile("$LIBRUS_REDIRECT_URL\\?code=([A-z0-9]+?)$", Pattern.DOTALL or Pattern.MULTILINE).matcher(location)
                             when {
                                 authMatcher.find() -> {
                                     accessToken(authMatcher.group(1), null)
@@ -127,7 +127,7 @@ class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) {
                 .callback(object : JsonCallbackHandler() {
                     override fun onSuccess(json: JsonObject?, response: Response) {
                         val location = response.headers()?.get("Location")
-                        if (location == "http://localhost/bar?command=close") {
+                        if (location == "$LIBRUS_REDIRECT_URL?command=close") {
                             data.error(ApiError(TAG, ERROR_LIBRUS_PORTAL_MAINTENANCE)
                                     .withApiResponse(json)
                                     .withResponse(response))
@@ -146,12 +146,14 @@ class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) {
                         }
                         val error = if (response.code() == 200) null else
                             json.getJsonArray("errors")?.getString(0)
+                                    ?: json.getJsonObject("errors")?.entrySet()?.firstOrNull()?.value?.asString
                         error?.let { code ->
                             when {
                                 code.contains("Sesja logowania wygasła") -> ERROR_LOGIN_LIBRUS_PORTAL_CSRF_EXPIRED
                                 code.contains("Upewnij się, że nie") -> ERROR_LOGIN_LIBRUS_PORTAL_INVALID_LOGIN
                                 // this doesn't work anyway: `errors` is an object with `g-recaptcha-response` set
                                 code.contains("robotem") -> ERROR_CAPTCHA_LIBRUS_PORTAL
+                                code.contains("Podany adres e-mail jest nieprawidłowy.") -> ERROR_LOGIN_LIBRUS_PORTAL_INVALID_LOGIN
                                 else -> ERROR_LOGIN_LIBRUS_PORTAL_ACTION_ERROR
                             }.let { errorCode ->
                                 data.error(ApiError(TAG, errorCode)

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

@@ -130,7 +130,6 @@ class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginSto
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
-        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {

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

@@ -6,7 +6,10 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.api
 
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik
 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_PRESENT
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_RELEASED
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 
 class MobidziennikApiAttendance(val data: DataMobidziennik, rows: List<String>) {
@@ -23,7 +26,7 @@ class MobidziennikApiAttendance(val data: DataMobidziennik, rows: List<String>)
             val id = cols[0].toLong()
             val lessonId = cols[1].toLong()
             data.mobiLessons.singleOrNull { it.id == lessonId }?.let { lesson ->
-                val type = when (cols[4]) {
+                val baseType = when (cols[4]) {
                     "2" -> TYPE_ABSENT
                     "5" -> TYPE_ABSENT_EXCUSED
                     "4" -> TYPE_RELEASED
@@ -31,16 +34,37 @@ class MobidziennikApiAttendance(val data: DataMobidziennik, rows: List<String>)
                 }
                 val semester = data.profile?.dateToSemester(lesson.date) ?: 1
 
+                val typeName = when (baseType) {
+                    TYPE_ABSENT -> "nieobecność"
+                    TYPE_ABSENT_EXCUSED -> "nieobecność usprawiedliwiona"
+                    TYPE_RELEASED -> "zwolnienie"
+                    TYPE_PRESENT -> "obecność"
+                    else -> "nieznany rodzaj"
+                }
+                val typeSymbol = when (baseType) {
+                    TYPE_ABSENT -> "|"
+                    TYPE_ABSENT_EXCUSED -> "+"
+                    TYPE_RELEASED -> "z"
+                    TYPE_PRESENT -> "."
+                    else -> "?"
+                }
+
                 val attendanceObject = Attendance(
-                        data.profileId,
-                        id,
-                        lesson.teacherId,
-                        lesson.subjectId,
-                        semester,
-                        lesson.topic,
-                        lesson.date,
-                        lesson.startTime,
-                        type)
+                        profileId = data.profileId,
+                        id = id,
+                        baseType = baseType,
+                        typeName = typeName,
+                        typeShort = data.app.attendanceManager.getTypeShort(baseType),
+                        typeSymbol = typeSymbol,
+                        typeColor = null,
+                        date = lesson.date,
+                        startTime = lesson.startTime,
+                        semester = semester,
+                        teacherId = lesson.teacherId,
+                        subjectId = lesson.subjectId
+                ).also {
+                    it.lessonTopic = lesson.topic
+                }
 
                 data.attendanceList.add(attendanceObject)
                 data.metadataList.add(
@@ -48,9 +72,8 @@ class MobidziennikApiAttendance(val data: DataMobidziennik, rows: List<String>)
                                 data.profileId,
                                 Metadata.TYPE_ATTENDANCE,
                                 id,
-                                data.profile?.empty ?: false,
-                                data.profile?.empty ?: false,
-                                System.currentTimeMillis()
+                                data.profile?.empty ?: false || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == Attendance.TYPE_UNKNOWN,
+                                data.profile?.empty ?: false || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == Attendance.TYPE_UNKNOWN
                         ))
             }
         }

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

@@ -60,7 +60,9 @@ class MobidziennikApiEvents(val data: DataMobidziennik, rows: List<String>) {
                         type = type,
                         teacherId = teacherId,
                         subjectId = subjectId,
-                        teamId = teamId)
+                        teamId = teamId,
+                        addedDate = addedDate
+                )
 
                 data.eventList.add(eventObject)
                 data.metadataList.add(
@@ -69,8 +71,7 @@ class MobidziennikApiEvents(val data: DataMobidziennik, rows: List<String>) {
                                 Metadata.TYPE_EVENT,
                                 id,
                                 data.profile?.empty ?: false,
-                                data.profile?.empty ?: false,
-                                addedDate
+                                data.profile?.empty ?: false
                         ))
             }
         }

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

@@ -79,7 +79,9 @@ class MobidziennikApiGrades(val data: DataMobidziennik, rows: List<String>) {
                     comment = null,
                     semester = semester,
                     teacherId = teacherId,
-                    subjectId = subjectId)
+                    subjectId = subjectId,
+                    addedDate = addedDate
+            )
 
             if (data.profile?.empty == true) {
                 addedDate = data.profile.dateSemester1Start.inMillis
@@ -92,8 +94,7 @@ class MobidziennikApiGrades(val data: DataMobidziennik, rows: List<String>) {
                             Metadata.TYPE_GRADE,
                             id,
                             data.profile?.empty ?: false,
-                            data.profile?.empty ?: false,
-                            addedDate
+                            data.profile?.empty ?: false
                     ))
             addedDate++
         }

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

@@ -40,7 +40,8 @@ class MobidziennikApiHomework(val data: DataMobidziennik, rows: List<String>) {
                         type = Event.TYPE_HOMEWORK,
                         teacherId = teacherId,
                         subjectId = subjectId,
-                        teamId = teamId)
+                        teamId = teamId
+                )
 
                 data.eventList.add(eventObject)
                 data.metadataList.add(
@@ -49,8 +50,7 @@ class MobidziennikApiHomework(val data: DataMobidziennik, rows: List<String>) {
                                 Metadata.TYPE_HOMEWORK,
                                 id,
                                 data.profile?.empty ?: false,
-                                data.profile?.empty ?: false,
-                                System.currentTimeMillis()
+                                data.profile?.empty ?: false
                         ))
             }
         }

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

@@ -33,12 +33,16 @@ class MobidziennikApiNotices(val data: DataMobidziennik, rows: List<String>) {
             val addedDate = Date.fromYmd(cols[7]).inMillis
 
             val noticeObject = Notice(
-                    data.profileId,
-                    id,
-                    text,
-                    semester,
-                    type,
-                    teacherId)
+                    profileId = data.profileId,
+                    id = id,
+                    type = type,
+                    semester = semester,
+                    text = text,
+                    category = null,
+                    points = null,
+                    teacherId = teacherId,
+                    addedDate = addedDate
+            )
 
             data.noticeList.add(noticeObject)
             data.metadataList.add(
@@ -47,8 +51,7 @@ class MobidziennikApiNotices(val data: DataMobidziennik, rows: List<String>) {
                             Metadata.TYPE_NOTICE,
                             id,
                             data.profile?.empty ?: false,
-                            data.profile?.empty ?: false,
-                            addedDate
+                            data.profile?.empty ?: false
                     ))
         }
     }}

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

@@ -8,9 +8,9 @@ import android.util.SparseArray
 import androidx.core.util.set
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson
 import pl.szczodrzynski.edziennik.data.db.entity.LessonRange
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Lesson
 import pl.szczodrzynski.edziennik.fixName
 import pl.szczodrzynski.edziennik.keys
 import pl.szczodrzynski.edziennik.singleOrNull
@@ -44,7 +44,7 @@ class MobidziennikApiTimetable(val data: DataMobidziennik, rows: List<String>) {
 
             dataDays.remove(date.value)
 
-            val subjectId = data.subjectList.singleOrNull { it.longName == lesson[5] }?.id ?: -1
+            val subjectId = data.subjectList.singleOrNull { it.longName == lesson[5].trim() }?.id ?: -1
             val teacherId = data.teacherList.singleOrNull { it.fullNameLastFirst == (lesson[7]+" "+lesson[6]).fixName() }?.id ?: -1
             val teamId = data.teamList.singleOrNull { it.name == lesson[8]+lesson[9] }?.id ?: -1
             val classroom = lesson[11]
@@ -97,8 +97,7 @@ class MobidziennikApiTimetable(val data: DataMobidziennik, rows: List<String>) {
                                     Metadata.TYPE_LESSON_CHANGE,
                                     it.id,
                                     seen,
-                                    seen,
-                                    System.currentTimeMillis()
+                                    seen
                             ))
                 }
                 data.lessonList += it

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

@@ -17,9 +17,9 @@ class MobidziennikLuckyNumberExtractor(val data: DataMobidziennik, text: String)
                 val luckyNumber = it.groupValues[1].toInt()
 
                 val luckyNumberObject = LuckyNumber(
-                        data.profileId,
-                        Date.getToday(),
-                        luckyNumber
+                        profileId = data.profileId,
+                        date = Date.getToday(),
+                        number = luckyNumber
                 )
 
                 data.luckyNumberList.add(luckyNumberObject)
@@ -29,8 +29,7 @@ class MobidziennikLuckyNumberExtractor(val data: DataMobidziennik, text: String)
                                 Metadata.TYPE_LUCKY_NUMBER,
                                 luckyNumberObject.date.value.toLong(),
                                 true,
-                                data.profile?.empty ?: false,
-                                System.currentTimeMillis()
+                                data.profile?.empty ?: false
                         ))
             } catch (_: Exception){}
         }