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

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

.idea/compiler.xml

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

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

app/build.gradle

@@ -145,7 +145,11 @@ dependencies {
     implementation("com.github.ozodrukh:CircularReveal:2.0.1@aar") {transitive = true}
     implementation "com.heinrichreimersoftware:material-intro:1.5.8" // do not update
     implementation "com.jaredrummler:colorpicker:1.0.2"
-    implementation "com.squareup.okhttp3:okhttp:3.12.2"
+    implementation("com.squareup.okhttp3:okhttp") {
+        version {
+            strictly "3.12.2"
+        }
+    }
     implementation "com.theartofdev.edmodo:android-image-cropper:2.8.0" // do not update
     implementation "com.wdullaer:materialdatetimepicker:4.1.2"
     implementation "com.yuyh.json:jsonviewer:1.0.6"
@@ -199,8 +203,13 @@ dependencies {
 
     implementation 'com.google.android:flexbox:2.0.1'
 
-    implementation 'com.qifan.powerpermission:powerpermission:1.0.0'
-    implementation 'com.qifan.powerpermission:powerpermission-coroutines:1.0.0'
+    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

@@ -66,3 +66,4 @@
 
 -keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
 -keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; }
+-keepclassmembernames class pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo.Platform { *; }

app/src/main/AndroidManifest.xml

@@ -24,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"
@@ -135,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,8 +1,8 @@
-<h3>Wersja 4.1, 2020-05-09</h3>
+<h3>Wersja 4.4.1, 2020-09-03</h3>
 <ul>
-    <li>Naprawiona synchronizacja Wiadomości w Librusie.</li>
-    <li>Widok adresu dołączenia do lekcji online w kalendarzu (jeżeli nauczyciel wpisze adres).</li>
-    <li>Nowy moduł Frekwencji, obsługujący również lekcje zdalne.</li>
+    <li>Poprawione komunikaty o aktualizacjach aplikacji.</li>
+    <li>Mobidziennik: poprawione wyświetlanie przedmiotu w planie lekcji.</li>
+    <li>Mobidziennik: naprawiony moduł frekwencji.</li>
 </ul>
 <br>
 <br>

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

@@ -9,7 +9,7 @@
 
 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0xec, 0xc0, 0x3e, 0x4e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0x72, 0x4b, 0x61, 0x3a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
 
 unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);
 

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

@@ -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
@@ -101,9 +102,9 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 .followSslRedirects(true)
                 .retryOnConnectionFailure(true)
                 .cookieJar(cookieJar)
-                .connectTimeout(20, TimeUnit.SECONDS)
-                .writeTimeout(5, TimeUnit.SECONDS)
-                .readTimeout(10, TimeUnit.SECONDS)
+                .connectTimeout(15, TimeUnit.SECONDS)
+                .writeTimeout(10, TimeUnit.SECONDS)
+                .readTimeout(30, TimeUnit.SECONDS)
         builder.installHttpsSupport(this)
 
         if (debugMode || BuildConfig.DEBUG) {
@@ -173,6 +174,8 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
         }
 
         devMode = BuildConfig.DEBUG
+        if (BuildConfig.DEBUG)
+            debugMode = true
 
         Signing.getCert(this)
 
@@ -255,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(),
@@ -264,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(),
@@ -273,6 +284,10 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 val pushVulcanApp = FirebaseApp.initializeApp(
                         this@App,
                         FirebaseOptions.Builder()
+                                .setProjectId("dzienniczekplus")
+                                .setStorageBucket("dzienniczekplus.appspot.com")
+                                .setDatabaseUrl("https://dzienniczekplus.firebaseio.com")
+                                .setGcmSenderId("987828170337")
                                 .setApiKey("AIzaSyDW8MUtanHy64_I0oCpY6cOxB3jrvJd_iA")
                                 .setApplicationId("1:987828170337:android:ac97431a0a4578c3")
                                 .build(),
@@ -282,10 +297,12 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 try {
                     FirebaseInstanceId.getInstance().instanceId.addOnSuccessListener { instanceIdResult ->
                         val token = instanceIdResult.token
+                        d("Firebase", "Got App token: $token")
                         config.sync.tokenApp = token
                     }
                     FirebaseInstanceId.getInstance(pushMobidziennikApp).instanceId.addOnSuccessListener { instanceIdResult ->
                         val token = instanceIdResult.token
+                        d("Firebase", "Got Mobidziennik2 token: $token")
                         if (token != config.sync.tokenMobidziennik) {
                             config.sync.tokenMobidziennik = token
                             config.sync.tokenMobidziennikList = listOf()
@@ -293,6 +310,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                     }
                     FirebaseInstanceId.getInstance(pushLibrusApp).instanceId.addOnSuccessListener { instanceIdResult ->
                         val token = instanceIdResult.token
+                        d("Firebase", "Got Librus token: $token")
                         if (token != config.sync.tokenLibrus) {
                             config.sync.tokenLibrus = token
                             config.sync.tokenLibrusList = listOf()
@@ -300,6 +318,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                     }
                     FirebaseInstanceId.getInstance(pushVulcanApp).instanceId.addOnSuccessListener { instanceIdResult ->
                         val token = instanceIdResult.token
+                        d("Firebase", "Got Vulcan token: $token")
                         if (token != config.sync.tokenVulcan) {
                             config.sync.tokenVulcan = token
                             config.sync.tokenVulcanList = listOf()
@@ -345,6 +364,9 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
             if (!success) {
                 EventBus.getDefault().post(ProfileListEmptyEvent())
             }
+            else {
+                onSuccess(profile)
+            }
         }
     }
     fun profileSave() = profileSave(profile)

app/src/main/java/pl/szczodrzynski/edziennik/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
@@ -672,6 +673,16 @@ fun TextView.setText(@StringRes resid: Int, vararg formatArgs: Any) {
     text = context.getString(resid, *formatArgs)
 }
 
+fun MaterialAlertDialogBuilder.setTitle(@StringRes resid: Int, vararg formatArgs: Any): MaterialAlertDialogBuilder {
+    setTitle(context.getString(resid, *formatArgs))
+    return this
+}
+
+fun MaterialAlertDialogBuilder.setMessage(@StringRes resid: Int, vararg formatArgs: Any): MaterialAlertDialogBuilder {
+    setMessage(context.getString(resid, *formatArgs))
+    return this
+}
+
 fun JsonObject(vararg properties: Pair<String, Any?>): JsonObject {
     return JsonObject().apply {
         for (property in properties) {
@@ -1245,3 +1256,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

@@ -41,13 +41,18 @@ import pl.droidsonroids.gif.GifDrawable
 import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.*
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.szkolny.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
@@ -295,12 +300,21 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         mainSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
         errorSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
 
-        if (BuildConfig.VERSION_NAME.contains("nightly")) {
-            b.nightlyText.isVisible = true
-            b.nightlyText.text = "Nightly\n"+BuildConfig.VERSION_NAME.substringAfterLast(".")
+        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
         }
-        else
-            b.nightlyText.isVisible = false
 
         navLoading = true
 
@@ -399,7 +413,20 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         }
 
         app.db.profileDao().all.observe(this, Observer { profiles ->
-            drawer.setProfileList(profiles.filter { it.id >= 0 }.toMutableList())
+            val allArchived = profiles.all { it.archived }
+            drawer.setProfileList(profiles.filter { it.id >= 0 && (!it.archived || allArchived) }.toMutableList())
+            //prepend the archived profile if loaded
+            if (app.profile.archived && !allArchived) {
+                drawer.prependProfile(Profile(
+                        id = app.profile.id,
+                        loginStoreId = app.profile.loginStoreId,
+                        loginStoreType = app.profile.loginStoreType,
+                        name = app.profile.name,
+                        subname = "Archiwum - ${app.profile.subname}"
+                ).also {
+                    it.archived = true
+                })
+            }
             drawer.currentProfile = App.profileId
         })
 
@@ -415,7 +442,7 @@ 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,
@@ -425,6 +452,23 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         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 {
@@ -564,7 +608,66 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
          |_____/ \__, |_| |_|\___|
                   __/ |
                  |__*/
-    fun syncCurrentFeature() {
+    suspend fun syncCurrentFeature() {
+        if (app.profile.archived) {
+            MaterialAlertDialogBuilder(this)
+                    .setTitle(R.string.profile_archived_title)
+                    .setMessage(
+                            R.string.profile_archived_text,
+                            app.profile.studentSchoolYearStart,
+                            app.profile.studentSchoolYearStart + 1
+                    )
+                    .setPositiveButton(R.string.ok, null)
+                    .show()
+            swipeRefreshLayout.isRefreshing = false
+            return
+        }
+        if (app.profile.shouldArchive()) {
+            MaterialAlertDialogBuilder(this)
+                    .setTitle(R.string.profile_archiving_title)
+                    .setMessage(
+                            R.string.profile_archiving_format,
+                            app.profile.dateYearEnd.formattedString
+                    )
+                    .setPositiveButton(R.string.ok, null)
+                    .show()
+        }
+        if (app.profile.isBeforeYear()) {
+            MaterialAlertDialogBuilder(this)
+                    .setTitle(R.string.profile_year_not_started_title)
+                    .setMessage(
+                            R.string.profile_year_not_started_format,
+                            app.profile.dateSemester1Start.formattedString
+                    )
+                    .setPositiveButton(R.string.ok, null)
+                    .show()
+            swipeRefreshLayout.isRefreshing = false
+            return
+        }
+
+        app.profile.registerName?.let { registerName ->
+            var status = app.config.sync.registerAvailability[registerName]
+            if (status == null || status.nextCheck < currentTimeUnix()) {
+                withContext(Dispatchers.IO) {
+                    val api = SzkolnyApi(app)
+                    api.runCatching(this@MainActivity) {
+                        val availability = getRegisterAvailability()
+                        app.config.sync.registerAvailability = availability
+                        status = availability[registerName]
+                    }
+                }
+            }
+
+            if (status?.available != true
+                    || status?.minVersionCode ?: BuildConfig.VERSION_CODE > BuildConfig.VERSION_CODE) {
+                swipeRefreshLayout.isRefreshing = false
+                loadTarget(DRAWER_ITEM_HOME)
+                if (status != null)
+                    RegisterUnavailableDialog(this, status!!)
+                return
+            }
+        }
+
         swipeRefreshLayout.isRefreshing = true
         Toast.makeText(this, fragmentToSyncName(navTargetId), Toast.LENGTH_SHORT).show()
         val fragmentParam = when (navTargetId) {
@@ -581,6 +684,20 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                 arguments = arguments
         ).enqueue(this)
     }
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onUpdateEvent(event: Update) {
+        EventBus.getDefault().removeStickyEvent(event)
+        UpdateAvailableDialog(this, event)
+    }
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onRegisterAvailabilityEvent(event: RegisterAvailabilityEvent) {
+        EventBus.getDefault().removeStickyEvent(event)
+        app.profile.registerName?.let { registerName ->
+            event.data[registerName]?.let {
+                RegisterUnavailableDialog(this, it)
+            }
+        }
+    }
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onApiTaskStartedEvent(event: ApiTaskStartedEvent) {
         swipeRefreshLayout.isRefreshing = true
@@ -885,23 +1002,51 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
 
     fun loadProfile(id: Int) = loadProfile(id, navTargetId)
     fun loadProfile(id: Int, arguments: Bundle?) = loadProfile(id, navTargetId, arguments)
-    fun loadProfile(id: Int, drawerSelection: Int, arguments: Bundle? = null) {
+    fun loadProfile(profile: Profile) = loadProfile(
+            profile,
+            navTargetId,
+            null,
+            if (app.profile.archived) app.profile.id else null
+    )
+    private fun loadProfile(id: Int, drawerSelection: Int, arguments: Bundle? = null) {
         if (App.profileId == id) {
             drawer.currentProfile = app.profile.id
             loadTarget(drawerSelection, arguments)
             return
         }
+        val previousArchivedId = if (app.profile.archived) app.profile.id else null
         app.profileLoad(id) {
-            MessagesFragment.pageSelection = -1
-
-            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/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 }
@@ -106,4 +112,9 @@ class ConfigSync(private val config: Config) {
     var tokenVulcanList: List<Int>
         get() { mTokenVulcanList = mTokenVulcanList ?: config.values.getIntList("tokenVulcanList", listOf()); return mTokenVulcanList ?: listOf() }
         set(value) { config.set("tokenVulcanList", value); mTokenVulcanList = value }
+
+    private var mRegisterAvailability: Map<String, RegisterAvailabilityStatus>? = null
+    var registerAvailability: Map<String, RegisterAvailabilityStatus>
+        get() { mRegisterAvailability = mRegisterAvailability ?: config.values.get("registerAvailability", null as String?)?.let { it -> gson.fromJson<Map<String, RegisterAvailabilityStatus>>(it, object: TypeToken<Map<String, RegisterAvailabilityStatus>>(){}.type) }; return mRegisterAvailability ?: mapOf() }
+        set(value) { config.setMap("registerAvailability", value); mRegisterAvailability = value }
 }

app/src/main/java/pl/szczodrzynski/edziennik/config/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,7 +92,7 @@ val MOBIDZIENNIK_USER_AGENT = SYSTEM_USER_AGENT
 
 const val VULCAN_API_USER_AGENT = "MobileUserAgent"
 const val VULCAN_API_APP_NAME = "VULCAN-Android-ModulUcznia"
-const val VULCAN_API_APP_VERSION = "19.4.1.436"
+const val VULCAN_API_APP_VERSION = "20.5.1.470"
 const val VULCAN_API_PASSWORD = "CE75EA598C7743AD9B0B7328DED85B06"
 const val VULCAN_API_PASSWORD_FAKELOG = "012345678901234567890123456789AB"
 val VULCAN_API_DEVICE_NAME = "Szkolny.eu ${Build.MODEL}"
@@ -113,5 +114,11 @@ const val VULCAN_API_ENDPOINT_MESSAGES_ADD = "mobile-api/Uczen.v3.Uczen/DodajWia
 const val VULCAN_API_ENDPOINT_PUSH = "mobile-api/Uczen.v3.Uczen/UstawPushToken"
 const val VULCAN_API_ENDPOINT_MESSAGES_ATTACHMENTS = "mobile-api/Uczen.v3.Uczen/WiadomosciZalacznik"
 const val VULCAN_API_ENDPOINT_HOMEWORK_ATTACHMENTS = "mobile-api/Uczen.v3.Uczen/ZadaniaDomoweZalacznik"
+const val VULCAN_WEB_ENDPOINT_LUCKY_NUMBER = "Start.mvc/GetKidsLuckyNumbers"
+const val VULCAN_WEB_ENDPOINT_REGISTER_DEVICE = "RejestracjaUrzadzeniaToken.mvc/Get"
 
 const val EDUDZIENNIK_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME}"
+
+const val PODLASIE_API_VERSION = "1.0.31"
+const val PODLASIE_API_URL = "https://cpdklaser.zeto.bialystok.pl/api"
+const val PODLASIE_API_USER_ENDPOINT = "/pobierzDaneUcznia"

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

@@ -160,6 +160,16 @@ const val ERROR_VULCAN_API_MAINTENANCE                      = 340
 const val ERROR_VULCAN_API_BAD_REQUEST                      = 341
 const val ERROR_VULCAN_API_OTHER                            = 342
 const val ERROR_VULCAN_ATTACHMENT_DOWNLOAD                  = 343
+const val ERROR_VULCAN_WEB_DATA_MISSING                     = 344
+const val ERROR_VULCAN_WEB_429                              = 345
+const val ERROR_VULCAN_WEB_OTHER                            = 346
+const val ERROR_VULCAN_WEB_NO_CERTIFICATE                   = 347
+const val ERROR_VULCAN_WEB_NO_REGISTER                      = 348
+const val ERROR_VULCAN_WEB_CERTIFICATE_EXPIRED              = 349
+const val ERROR_VULCAN_WEB_LOGGED_OUT                       = 350
+const val ERROR_VULCAN_WEB_CERTIFICATE_POST_FAILED          = 351
+const val ERROR_VULCAN_WEB_GRADUATE_ACCOUNT                 = 352
+const val ERROR_VULCAN_WEB_NO_SCHOOLS                       = 353
 
 const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN           = 401
 const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME     = 402
@@ -190,6 +200,12 @@ const val ERROR_EDUDZIENNIK_WEB_LIMITED_ACCESS              = 521
 const val ERROR_EDUDZIENNIK_WEB_SESSION_EXPIRED             = 522
 const val ERROR_EDUDZIENNIK_WEB_TEAM_MISSING                = 530
 
+const val ERROR_LOGIN_PODLASIE_API_INVALID_TOKEN            = 601
+const val ERROR_LOGIN_PODLASIE_API_DEVICE_LIMIT             = 602
+const val ERROR_PODLASIE_API_NO_TOKEN                       = 630
+const val ERROR_PODLASIE_API_OTHER                          = 631
+const val ERROR_PODLASIE_API_DATA_MISSING                   = 632
+
 const val ERROR_TEMPLATE_WEB_OTHER                          = 801
 
 const val EXCEPTION_API_TASK                                = 900
@@ -210,5 +226,8 @@ const val EXCEPTION_IDZIENNIK_API_REQUEST                   = 914
 const val EXCEPTION_EDUDZIENNIK_WEB_REQUEST                 = 920
 const val EXCEPTION_EDUDZIENNIK_FILE_REQUEST                = 921
 const val ERROR_ONEDRIVE_DOWNLOAD                           = 930
+const val EXCEPTION_VULCAN_WEB_LOGIN                        = 931
+const val EXCEPTION_VULCAN_WEB_REQUEST                      = 932
+const val EXCEPTION_PODLASIE_API_REQUEST                    = 940
 
 const val LOGIN_NO_ARGUMENTS                                = 1201

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

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

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

@@ -40,7 +40,7 @@ object Regexes {
         """\(([0-9A-ząęóżźńśłć]*?)\)$""".toRegex(DOT_MATCHES_ALL)
     }
     val MOBIDZIENNIK_LUCKY_NUMBER by lazy {
-        """class="szczesliwy_numerek".*>0*([0-9]+)(?:/0*[0-9]+)*</a>""".toRegex(DOT_MATCHES_ALL)
+        """class="szczesliwy_numerek".*?>0?([0-9]+)/?0?([0-9]+)?</a>""".toRegex(DOT_MATCHES_ALL)
     }
     val MOBIDZIENNIK_CLASS_CALENDAR by lazy {
         """events: (.+),$""".toRegex(RegexOption.MULTILINE)
@@ -80,6 +80,15 @@ 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)
     }
@@ -142,12 +151,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.nextCheck < currentTimeUnix()) {
+                    val api = SzkolnyApi(app)
+                    api.runCatching({
+                        val availability = getRegisterAvailability()
+                        app.config.sync.registerAvailability = availability
+                        status = availability[registerName]
+                    }, onError = {
+                        taskCallback.onError(it.toApiError(TAG))
+                        return
+                    })
+                }
+
+                if (status?.available != true
+                        || status?.minVersionCode ?: BuildConfig.VERSION_CODE > BuildConfig.VERSION_CODE) {
+                    if (EventBus.getDefault().hasSubscriberForEvent(RegisterAvailabilityEvent::class.java)) {
+                        EventBus.getDefault().postSticky(
+                                RegisterAvailabilityEvent(app.config.sync.registerAvailability)
+                        )
+                    }
+                    cancel()
+                    taskCallback.onCompleted()
+                    return
+                }
+            }
         }
+
         edziennikInterface = when (loginStore.type) {
             LOGIN_TYPE_LIBRUS -> Librus(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_MOBIDZIENNIK -> Mobidziennik(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_VULCAN -> Vulcan(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_IDZIENNIK -> Idziennik(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_EDUDZIENNIK -> Edudziennik(app, profile, loginStore, taskCallback)
+            LOGIN_TYPE_PODLASIE -> Podlasie(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_TEMPLATE -> Template(app, profile, loginStore, taskCallback)
             else -> null
         }
@@ -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/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/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/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,6 +70,14 @@ 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

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

@@ -36,11 +36,14 @@ class LibrusRecaptchaHelper(
     }
 
     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()
-            onSuccess(url)
+            if (!timedOut) {
+                onSuccess(url)
+            }
             return true
         }
     }
@@ -50,6 +53,7 @@ class LibrusRecaptchaHelper(
             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/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/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

@@ -38,14 +38,18 @@ class LibrusLoginMessages(val data: DataLibrus, val onSuccess: () -> Unit) {
 
                 text?.contains("grecaptcha.ready") == true -> {
                     val url = response?.request()?.url()?.toString() ?: run {
-                        data.error(TAG, ERROR_LIBRUS_MESSAGES_OTHER, response, text)
+                        //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.error(TAG, ERROR_LOGIN_LIBRUS_MESSAGES_TIMEOUT, response, text)
+                        data.messagesLoginSuccessful = false
+                        onSuccess()
                     })
                 }
 
@@ -55,7 +59,11 @@ class LibrusLoginMessages(val data: DataLibrus, val onSuccess: () -> Unit) {
                 }
                 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)

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

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

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

@@ -91,8 +91,11 @@ class MobidziennikWebAttendance(override val data: DataMobidziennik,
 
             Regexes.MOBIDZIENNIK_ATTENDANCE_TABLE.findAll(text).forEach { tableResult ->
                 val table = tableResult[1]
+
                 val lessonDates = mutableListOf<Date>()
                 val entries = mutableListOf<String>()
+                val ranges = mutableListOf<MatchResult?>()
+
                 Regexes.MOBIDZIENNIK_ATTENDANCE_LESSON_COUNT.findAll(table).forEach {
                     val date = Date.fromY_m_d(it[1])
                     for (i in 0 until (it[2].toIntOrNull() ?: 0)) {
@@ -101,96 +104,52 @@ class MobidziennikWebAttendance(override val data: DataMobidziennik,
                 }
                 Regexes.MOBIDZIENNIK_ATTENDANCE_ENTRIES.findAll(table).mapTo(entries) { it[1] }
 
+                Regexes.MOBIDZIENNIK_ATTENDANCE_COLUMNS.findAll(table).forEach { columns ->
+                    var index = 0
+                    Regexes.MOBIDZIENNIK_ATTENDANCE_COLUMN.findAll(columns[1]).forEach { column ->
+                        if (column[1].contains("colspan")) {
+                            val colspan =
+                                    Regexes.MOBIDZIENNIK_ATTENDANCE_COLUMN_SPAN.find(column[1])
+                                            ?.get(1)
+                                            ?.toIntOrNull() ?: 0
+                            entries.addAll(index, List(colspan) { "" })
+                            ranges.addAll(List(colspan) { null })
+                            index += colspan
+                        }
+                        else {
+                            val range = Regexes.MOBIDZIENNIK_ATTENDANCE_RANGE.find(column[2])
+                            ranges.add(range)
+                            index++
+                        }
+                    }
+                }
+
                 val dateIterator = lessonDates.iterator()
                 val entriesIterator = entries.iterator()
-                Regexes.MOBIDZIENNIK_ATTENDANCE_RANGE.findAll(table).let { ranges ->
-                    val count = ranges.count()
-                    // verify the lesson count is the same as dates & entries
-                    if (count != lessonDates.count() || count != entries.count())
+
+                val count = ranges.count()
+                // verify the lesson count is the same as dates & entries
+                if (count != lessonDates.count() || count != entries.count())
+                    return@forEach
+                ranges.forEach { range ->
+                    val lessonDate = dateIterator.next()
+                    val entry = entriesIterator.next()
+                    if (range == null || entry.isBlank())
                         return@forEach
-                    ranges.forEach { range ->
-                        val lessonDate = dateIterator.next()
-                        var entry = entriesIterator.next()
-                        if (entry.isBlank())
-                            return@forEach
-                        val startTime = Time.fromH_m(range[1])
+                    val startTime = Time.fromH_m(range[1])
 
-                        range[2].split(" / ").mapNotNull { Regexes.MOBIDZIENNIK_ATTENDANCE_LESSON.find(it) }.forEachIndexed { index, lesson ->
-                            val topic = lesson[1].substringAfter(" - ", missingDelimiterValue = "").takeIf { it.isNotBlank() }
-                            if (topic?.startsWith("Lekcja odwołana: ") == true || entry.isEmpty())
-                                return@forEachIndexed
-                            val subjectName = lesson[1].substringBefore(" - ")
-                            //val team = lesson[3]
-                            val teacherName = lesson[3].fixName()
-
-                            val teacherId = data.teacherList.singleOrNull { it.fullNameLastFirst == teacherName }?.id ?: -1
-                            val subjectId = data.subjectList.singleOrNull { it.longName == subjectName }?.id ?: -1
-
-                            var typeSymbol = ""
-                            for (symbol in typeSymbols) {
-                                if (entry.startsWith(symbol) && symbol.length > typeSymbol.length)
-                                    typeSymbol = symbol
-                            }
-                            entry = entry.removePrefix(typeSymbol)
-
-                            var isCounted = true
-                            val baseType = when (typeSymbol) {
-                                "." -> TYPE_PRESENT
-                                "|" -> TYPE_ABSENT
-                                "+" -> TYPE_ABSENT_EXCUSED
-                                "s" -> TYPE_BELATED
-                                "z" -> TYPE_RELEASED
-                                else -> {
-                                    isCounted = false
-                                    when (typeSymbol) {
-                                        "e" -> TYPE_PRESENT_CUSTOM
-                                        "en" -> TYPE_ABSENT
-                                        "ep" -> TYPE_PRESENT_CUSTOM
-                                        else -> TYPE_UNKNOWN
-                                    }
-                                }
-                            }
-                            val typeName = types?.get(typeSymbol) ?: ""
-
-                            val typeShort = when (baseType) {
-                                TYPE_UNKNOWN -> typeSymbol
-                                else -> data.app.attendanceManager.getTypeShort(baseType)
-                            }
-
-                            val semester = data.profile?.dateToSemester(lessonDate) ?: 1
-
-                            val id = lessonDate.combineWith(startTime) / 6L * 10L + (lesson[0].hashCode() and 0xFFFF) + index
-
-                            val attendanceObject = Attendance(
-                                    profileId = profileId,
-                                    id = id,
-                                    baseType = baseType,
-                                    typeName = typeName,
-                                    typeShort = typeShort,
-                                    typeSymbol = typeSymbol,
-                                    typeColor = null,
-                                    date = lessonDate,
-                                    startTime = startTime,
-                                    semester = semester,
-                                    teacherId = teacherId,
-                                    subjectId = subjectId
-                            ).also {
-                                it.lessonTopic = topic
-                                it.isCounted = isCounted
-                            }
-
-                            data.attendanceList.add(attendanceObject)
-                            if (baseType != TYPE_PRESENT) {
-                                data.metadataList.add(
-                                        Metadata(
-                                                data.profileId,
-                                                Metadata.TYPE_ATTENDANCE,
-                                                id,
-                                                data.profile?.empty ?: false || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN,
-                                                data.profile?.empty ?: false || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN
-                                        ))
-                            }
-                        }
+                    range[2].split(" / ").mapNotNull {
+                        Regexes.MOBIDZIENNIK_ATTENDANCE_LESSON.find(it)
+                    }.forEachIndexed { index, lesson ->
+                        processEntry(
+                                index,
+                                lesson,
+                                lessonDate,
+                                startTime,
+                                entry,
+                                types,
+                                typeSymbols
+                        )
                     }
                 }
             }
@@ -200,4 +159,97 @@ class MobidziennikWebAttendance(override val data: DataMobidziennik,
             onSuccess()
         }
     }
+
+    private fun processEntry(
+            index: Int,
+            lesson: MatchResult,
+            lessonDate: Date,
+            startTime: Time,
+            entry: String,
+            types: Map<String?, String?>?,
+            typeSymbols: List<String>
+    ) {
+        var entry = entry
+
+        val topic = lesson[1].substringAfter(" - ", missingDelimiterValue = "").takeIf { it.isNotBlank() }
+        if (topic?.startsWith("Lekcja odwołana: ") == true || entry.isEmpty())
+            return
+        val subjectName = lesson[1].substringBefore(" - ")
+        //val team = lesson[3]
+        val teacherName = lesson[3].fixName()
+
+        val teacherId = data.teacherList.singleOrNull { it.fullNameLastFirst == teacherName }?.id ?: -1
+        val subjectId = data.subjectList.singleOrNull { it.longName == subjectName }?.id ?: -1
+
+        var typeSymbol = ""
+        for (symbol in typeSymbols) {
+            if (entry.startsWith(symbol) && symbol.length > typeSymbol.length)
+                typeSymbol = symbol
+        }
+        entry = entry.removePrefix(typeSymbol)
+
+        var isCounted = true
+        val baseType = when (typeSymbol) {
+            "." -> TYPE_PRESENT
+            "|" -> TYPE_ABSENT
+            "+" -> TYPE_ABSENT_EXCUSED
+            "s" -> TYPE_BELATED
+            "z" -> TYPE_RELEASED
+            else -> {
+                isCounted = false
+                when (typeSymbol) {
+                    "e" -> TYPE_PRESENT_CUSTOM
+                    "en" -> TYPE_ABSENT
+                    "ep" -> TYPE_PRESENT_CUSTOM
+                    else -> TYPE_UNKNOWN
+                }
+            }
+        }
+        val typeName = types?.get(typeSymbol) ?: ""
+        val typeColor = when (typeSymbol) {
+            "e" -> 0xff673ab7
+            "en" -> 0xffec407a
+            "ep" -> 0xff4caf50
+            else -> null
+        }?.toInt()
+
+        val typeShort = if (isCounted)
+            data.app.attendanceManager.getTypeShort(baseType)
+        else
+            typeSymbol
+
+        val semester = data.profile?.dateToSemester(lessonDate) ?: 1
+
+        val id = lessonDate.combineWith(startTime) / 6L * 10L + (lesson[0].hashCode() and 0xFFFF) + index
+
+        val attendanceObject = Attendance(
+                profileId = profileId,
+                id = id,
+                baseType = baseType,
+                typeName = typeName,
+                typeShort = typeShort,
+                typeSymbol = typeSymbol,
+                typeColor = typeColor,
+                date = lessonDate,
+                startTime = startTime,
+                semester = semester,
+                teacherId = teacherId,
+                subjectId = subjectId
+        ).also {
+            it.lessonTopic = topic
+            it.isCounted = isCounted
+        }
+
+        data.attendanceList.add(attendanceObject)
+        if (baseType != TYPE_PRESENT) {
+            data.metadataList.add(
+                    Metadata(
+                            data.profileId,
+                            Metadata.TYPE_ATTENDANCE,
+                            id,
+                            data.profile?.empty ?: false || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN,
+                            data.profile?.empty ?: false || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN
+                    ))
+        }
+    }
 }

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

@@ -85,7 +85,7 @@ class MobidziennikFirstLogin(val data: DataMobidziennik, val onSuccess: () -> Un
                     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/podlasie/DataPodlasie.kt

@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-12
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_PODLASIE_API
+import pl.szczodrzynski.edziennik.data.api.models.Data
+import pl.szczodrzynski.edziennik.data.db.entity.*
+import kotlin.text.replace
+
+class DataPodlasie(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
+
+    fun isApiLoginValid() = apiToken.isNotNullNorEmpty()
+
+    override fun satisfyLoginMethods() {
+        loginMethods.clear()
+        if (isApiLoginValid())
+            loginMethods += LOGIN_METHOD_PODLASIE_API
+    }
+
+    override fun generateUserCode(): String = "$schoolShortName:$loginShort:${studentId?.crc32()}"
+
+    /*                   _
+             /\         (_)
+            /  \   _ __  _
+           / /\ \ | '_ \| |
+          / ____ \| |_) | |
+         /_/    \_\ .__/|_|
+                  | |
+                  |*/
+    private var mApiToken: String? = null
+    var apiToken: String?
+        get() { mApiToken = mApiToken ?: loginStore.getLoginData("apiToken", null); return mApiToken }
+        set(value) { loginStore.putLoginData("apiToken", value); mApiToken = value }
+
+    private var mApiUrl: String? = null
+    var apiUrl: String?
+        get() { mApiUrl = mApiUrl ?: profile?.getStudentData("apiUrl", null); return mApiUrl }
+        set(value) { profile?.putStudentData("apiUrl", value) ?: return; mApiUrl = value }
+
+    /*     ____  _   _
+          / __ \| | | |
+         | |  | | |_| |__   ___ _ __
+         | |  | | __| '_ \ / _ \ '__|
+         | |__| | |_| | | |  __/ |
+          \____/ \__|_| |_|\___|*/
+    private var mStudentId: String? = null
+    var studentId: String?
+        get() { mStudentId = mStudentId ?: profile?.getStudentData("studentId", null); return mStudentId }
+        set(value) { profile?.putStudentData("studentId", value) ?: return; mStudentId = value }
+
+    private var mStudentLogin: String? = null
+    var studentLogin: String?
+        get() { mStudentLogin = mStudentLogin ?: profile?.getStudentData("studentLogin", null); return mStudentLogin }
+        set(value) { profile?.putStudentData("studentLogin", value) ?: return; mStudentLogin = value }
+
+    private var mSchoolName: String? = null
+    var schoolName: String?
+        get() { mSchoolName = mSchoolName ?: profile?.getStudentData("schoolName", null); return mSchoolName }
+        set(value) { profile?.putStudentData("schoolName", value) ?: return; mSchoolName = value }
+
+    private var mClassName: String? = null
+    var className: String?
+        get() { mClassName = mClassName ?: profile?.getStudentData("className", null); return mClassName }
+        set(value) { profile?.putStudentData("className", value) ?: return; mClassName = value }
+
+    private var mSchoolYear: String? = null
+    var schoolYear: String?
+        get() { mSchoolYear = mSchoolYear ?: profile?.getStudentData("schoolYear", null); return mSchoolYear }
+        set(value) { profile?.putStudentData("schoolYear", value) ?: return; mSchoolYear = value }
+
+    private var mCurrentSemester: Int? = null
+    var currentSemester: Int
+        get() { mCurrentSemester = mCurrentSemester ?: profile?.getStudentData("currentSemester", 0); return mCurrentSemester ?: 0 }
+        set(value) { profile?.putStudentData("currentSemester", value) ?: return; mCurrentSemester = value }
+
+    val schoolShortName: String?
+        get() = studentLogin?.split('@')?.get(1)?.replace(".podlaskie.pl", "")
+
+    val loginShort: String?
+        get() = studentLogin?.split('@')?.get(0)
+
+    fun getSubject(name: String): Subject {
+        val id = name.crc32()
+        return subjectList.singleOrNull { it.id == id } ?: run {
+            val subject = Subject(profileId, id, name, name)
+            subjectList.put(id, subject)
+            subject
+        }
+    }
+
+    fun getTeacher(firstName: String, lastName: String): Teacher {
+        val name = "$firstName $lastName".fixName()
+        return teacherList.singleOrNull { it.fullName == name } ?: run {
+            val id = name.crc32()
+            val teacher = Teacher(profileId, id, firstName, lastName)
+            teacherList.put(id, teacher)
+            teacher
+        }
+    }
+
+    fun getTeam(name: String? = null): Team {
+        if (name == "cała klasa" || name == null) return teamClass ?: run {
+            val id = className!!.crc32()
+            val teamCode = "$schoolShortName:$className"
+            val team = Team(profileId, id, className, Team.TYPE_CLASS, teamCode, -1)
+            teamList.put(id, team)
+            return team
+        } else {
+            val id = name.crc32()
+            val teamCode = "$schoolShortName:$name"
+            val team = Team(profileId, id, name, Team.TYPE_VIRTUAL, teamCode, -1)
+            teamList.put(id, team)
+            return team
+        }
+    }
+}

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

@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-12
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie
+
+import com.google.gson.JsonObject
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.data.api.edziennik.helper.DownloadAttachment
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.PodlasieData
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.firstlogin.PodlasieFirstLogin
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.login.PodlasieLogin
+import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
+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.podlasieLoginMethods
+import pl.szczodrzynski.edziennik.data.api.prepare
+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
+import java.io.File
+
+class Podlasie(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
+    companion object {
+        const val TAG = "Podlasie"
+    }
+
+    val internalErrorList = mutableListOf<Int>()
+    val data: DataPodlasie
+
+    init {
+        data = DataPodlasie(app, profile, loginStore).apply {
+            callback = wrapCallback(this@Podlasie.callback)
+            satisfyLoginMethods()
+        }
+    }
+
+    private fun completed() {
+        data.saveData()
+        callback.onCompleted()
+    }
+
+    /*    _______ _                     _                  _ _   _
+         |__   __| |              /\   | |                (_) | | |
+            | |  | |__   ___     /  \  | | __ _  ___  _ __ _| |_| |__  _ __ ___
+            | |  | '_ \ / _ \   / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \
+            | |  | | | |  __/  / ____ \| | (_| | (_) | |  | | |_| | | | | | | | |
+            |_|  |_| |_|\___| /_/    \_\_|\__, |\___/|_|  |_|\__|_| |_|_| |_| |_|
+                                           __/ |
+                                          |__*/
+    override fun sync(featureIds: List<Int>, viewId: Int?, onlyEndpoints: List<Int>?, arguments: JsonObject?) {
+        data.arguments = arguments
+        data.prepare(podlasieLoginMethods, PodlasieFeatures, featureIds, viewId, onlyEndpoints)
+        Utils.d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}")
+        Utils.d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        PodlasieLogin(data) {
+            PodlasieData(data) {
+                completed()
+            }
+        }
+    }
+
+    override fun getMessage(message: MessageFull) {
+
+    }
+
+    override fun sendMessage(recipients: List<Teacher>, subject: String, text: String) {
+
+    }
+
+    override fun markAllAnnouncementsAsRead() {
+
+    }
+
+    override fun getAnnouncement(announcement: AnnouncementFull) {
+
+    }
+
+    override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) {
+        val fileUrl = attachmentName.substringAfter(":")
+        DownloadAttachment(fileUrl,
+                onSuccess = { file ->
+                    val event = AttachmentGetEvent(
+                            data.profileId,
+                            owner,
+                            attachmentId,
+                            AttachmentGetEvent.TYPE_FINISHED,
+                            file.absolutePath
+                    )
+
+                    val attachmentDataFile = File(Utils.getStorageDir(), ".${data.profileId}_${event.ownerId}_${event.attachmentId}")
+                    Utils.writeStringToFile(attachmentDataFile, event.fileName)
+
+                    EventBus.getDefault().postSticky(event)
+
+                    completed()
+                },
+                onProgress = { written, _ ->
+                    val event = AttachmentGetEvent(
+                            data.profileId,
+                            owner,
+                            attachmentId,
+                            AttachmentGetEvent.TYPE_PROGRESS,
+                            bytesWritten = written
+                    )
+
+                    EventBus.getDefault().postSticky(event)
+                },
+                onError = { apiError ->
+                    data.error(apiError)
+                })
+    }
+
+    override fun getRecipientList() {
+
+    }
+
+    override fun getEvent(eventFull: EventFull) {
+
+    }
+
+    override fun firstLogin() {
+        PodlasieFirstLogin(data) {
+            completed()
+        }
+    }
+
+    override fun cancel() {
+        Utils.d(TAG, "Cancelled")
+        data.cancel()
+    }
+
+    private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
+        return object : EdziennikCallback {
+            override fun onCompleted() {
+                callback.onCompleted()
+            }
+
+            override fun onProgress(step: Float) {
+                callback.onProgress(step)
+            }
+
+            override fun onStartProgress(stringRes: Int) {
+                callback.onStartProgress(stringRes)
+            }
+
+            override fun onError(apiError: ApiError) {
+                // TODO Error handling
+                when (apiError.errorCode) {
+                    in internalErrorList -> {
+                        // finish immediately if the same error occurs twice during the same sync
+                        callback.onError(apiError)
+                    }
+                    else -> callback.onError(apiError)
+                }
+            }
+
+        }
+    }
+}

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

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-12
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie
+
+import pl.szczodrzynski.edziennik.data.api.FEATURE_ALWAYS_NEEDED
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_PODLASIE_API
+import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_PODLASIE
+import pl.szczodrzynski.edziennik.data.api.models.Feature
+
+const val ENDPOINT_PODLASIE_API_MAIN = 1001
+
+val PodlasieFeatures = listOf(
+        Feature(LOGIN_TYPE_PODLASIE, FEATURE_ALWAYS_NEEDED, listOf(
+                ENDPOINT_PODLASIE_API_MAIN to LOGIN_METHOD_PODLASIE_API
+        ), listOf(LOGIN_METHOD_PODLASIE_API))
+)

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

@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-12
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data
+
+import com.google.gson.JsonObject
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.RequestParams
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.JsonCallbackHandler
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.getInt
+import pl.szczodrzynski.edziennik.getJsonObject
+import pl.szczodrzynski.edziennik.toHexString
+import pl.szczodrzynski.edziennik.utils.Utils
+import java.security.MessageDigest
+import java.text.SimpleDateFormat
+import java.util.*
+
+open class PodlasieApi(open val data: DataPodlasie, open val lastSync: Long?) {
+    companion object {
+        const val TAG = "PodlasieApi"
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    val profile
+        get() = data.profile
+
+    fun apiGet(tag: String, endpoint: String, onSuccess: (json: JsonObject) -> Unit) {
+        val url = PODLASIE_API_URL + endpoint
+
+        Utils.d(tag, "Request: Podlasie/Api - $url")
+
+        if (data.apiToken == null) {
+            data.error(tag, ERROR_PODLASIE_API_NO_TOKEN)
+            return
+        }
+
+        val callback = object : JsonCallbackHandler() {
+            override fun onSuccess(json: JsonObject?, response: Response?) {
+                if (json == null || response == null) {
+                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                val error = json.getJsonObject("system_message")?.getInt("code")
+
+                error?.let { code ->
+                    when (code) {
+                        0 -> ERROR_PODLASIE_API_DATA_MISSING
+                        4 -> ERROR_LOGIN_PODLASIE_API_DEVICE_LIMIT
+                        5 -> ERROR_LOGIN_PODLASIE_API_INVALID_TOKEN
+                        200 -> null // Not an error
+                        else -> ERROR_PODLASIE_API_OTHER
+                    }?.let { errorCode ->
+                        data.error(ApiError(tag, errorCode)
+                                .withApiResponse(json)
+                                .withResponse(response))
+                        return@onSuccess
+                    }
+                }
+
+                try {
+                    onSuccess(json)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_PODLASIE_API_REQUEST)
+                            .withResponse(response)
+                            .withThrowable(e)
+                            .withApiResponse(json))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url(url)
+                .userAgent(SYSTEM_USER_AGENT)
+                .requestParams(RequestParams(mapOf(
+                        "token" to data.apiToken,
+                        "securityToken" to getSecurityToken(),
+                        "mobileId" to data.app.deviceId,
+                        "ver" to PODLASIE_API_VERSION
+                )))
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+
+    private fun getSecurityToken(): String {
+        val format = SimpleDateFormat("yyyy-MM-dd HH", Locale.ENGLISH)
+                .also { it.timeZone = TimeZone.getTimeZone("Europe/Warsaw") }.format(System.currentTimeMillis())
+        val instance = MessageDigest.getInstance("SHA-256")
+        val digest = instance.digest("-EYlwYu8u16miVd8tT?oO7cvoUVQrQN0vr!$format".toByteArray()).toHexString()
+        val digest2 = instance.digest((data.apiToken ?: "").toByteArray()).toHexString()
+        return instance.digest("$digest$digest2".toByteArray()).toHexString()
+    }
+}

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

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-12
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data
+
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.ENDPOINT_PODLASIE_API_MAIN
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api.PodlasieApiMain
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class PodlasieData(val data: DataPodlasie, val onSuccess: () -> Unit) {
+    companion object {
+        const val TAG = "PodlasieData"
+    }
+
+    init {
+        nextEndpoint(onSuccess)
+    }
+
+    private fun nextEndpoint(onSuccess: () -> Unit) {
+        if (data.targetEndpointIds.isEmpty()) {
+            onSuccess()
+            return
+        }
+        if (data.cancelled) {
+            onSuccess()
+            return
+        }
+        val id = data.targetEndpointIds.firstKey()
+        val lastSync = data.targetEndpointIds.remove(id)
+        useEndpoint(id, lastSync) {
+            data.progress(data.progressStep)
+            nextEndpoint(onSuccess)
+        }
+    }
+
+    private fun useEndpoint(endpointId: Int, lastSync: Long?, onSuccess: (endpointId: Int) -> Unit) {
+        Utils.d(TAG, "Using endpoint $endpointId. Last sync time = $lastSync")
+        when (endpointId) {
+            ENDPOINT_PODLASIE_API_MAIN -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_data)
+                PodlasieApiMain(data, lastSync, onSuccess)
+            }
+            else -> onSuccess(endpointId)
+        }
+    }
+}

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

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-13
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.getLong
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import java.util.*
+
+class PodlasieApiEvents(val data: DataPodlasie, val rows: List<JsonObject>) {
+    init {
+        rows.forEach { event ->
+            val id = event.getLong("ExternalId") ?: return@forEach
+            val date = event.getString("DateFrom")?.let { Date.fromY_m_d(it) } ?: return@forEach
+            val time = event.getString("DateFrom")?.let { Time.fromY_m_d_H_m_s(it) }
+                    ?: return@forEach
+
+            val name = event.getString("Name")?.replace("&#34;", "\"") ?: ""
+            val description = event.getString("Description")?.replace("&#34;", "\"") ?: ""
+
+            val type = when (event.getString("Category")?.toLowerCase(Locale.getDefault())) {
+                "klasówka" -> Event.TYPE_EXAM
+                "praca domowa" -> Event.TYPE_HOMEWORK
+                "wycieczka" -> Event.TYPE_EXCURSION
+                else -> Event.TYPE_DEFAULT
+            }
+
+            val teacherFirstName = event.getString("PersonEnteringDataFirstName") ?: return@forEach
+            val teacherLastName = event.getString("PersonEnteringDataLastName") ?: return@forEach
+            val teacher = data.getTeacher(teacherFirstName, teacherLastName)
+
+            val lessonList = data.db.timetableDao().getAllForDateNow(data.profileId, date)
+            val lesson = lessonList.firstOrNull { it.startTime == time }
+
+            val addedDate = event.getString("CreateDate")?.let { Date.fromIso(it) }
+                    ?: System.currentTimeMillis()
+
+            val eventObject = Event(
+                    profileId = data.profileId,
+                    id = id,
+                    date = date,
+                    time = time,
+                    topic = name,
+                    color = null,
+                    type = type,
+                    teacherId = teacher.id,
+                    subjectId = lesson?.subjectId ?: -1,
+                    teamId = data.teamClass?.id ?: -1,
+                    addedDate = addedDate
+            ).apply {
+                homeworkBody = description
+            }
+
+            data.eventList.add(eventObject)
+            data.metadataList.add(
+                    Metadata(
+                            data.profileId,
+                            if (type == Event.TYPE_HOMEWORK) Metadata.TYPE_HOMEWORK else Metadata.TYPE_EVENT,
+                            id,
+                            data.profile?.empty ?: false,
+                            data.profile?.empty ?: false
+                    ))
+        }
+
+        data.toRemove.add(DataRemoveModel.Events.future())
+    }
+}

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

@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-13
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Grade
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_FINAL
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_PROPOSED
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_FINAL
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_PROPOSED
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_FINAL
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_PROPOSED
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.getLong
+import pl.szczodrzynski.edziennik.getString
+
+class PodlasieApiFinalGrades(val data: DataPodlasie, val rows: List<JsonObject>) {
+    init { data.profile?.also { profile ->
+        rows.forEach { grade ->
+            val id = grade.getLong("ExternalId") ?: return@forEach
+            val mark = grade.getString("Mark") ?: return@forEach
+            val proposedMark = grade.getString("ProposedMark") ?: "0"
+            val name = data.app.gradesManager.getGradeNumberName(mark)
+            val value = data.app.gradesManager.getGradeValue(name)
+            val semester = grade.getString("TermShortcut")?.length ?: return@forEach
+
+            val typeName = grade.getString("Type") ?: return@forEach
+            val type = when (typeName) {
+                "S" -> if (semester == 1) TYPE_SEMESTER1_FINAL else TYPE_SEMESTER2_FINAL
+                "Y", "R" -> TYPE_YEAR_FINAL
+                else -> return@forEach
+            }
+
+            val subjectName = grade.getString("SchoolSubject") ?: return@forEach
+            val subject = data.getSubject(subjectName)
+
+            val addedDate = if (profile.empty) profile.getSemesterStart(semester).inMillis
+            else System.currentTimeMillis()
+
+            val gradeObject = Grade(
+                    profileId = data.profileId,
+                    id = id,
+                    name = name,
+                    type = type,
+                    value = value,
+                    weight = 0f,
+                    color = -1,
+                    category = null,
+                    description = null,
+                    comment = null,
+                    semester = semester,
+                    teacherId = -1,
+                    subjectId = subject.id,
+                    addedDate = addedDate
+            )
+
+            data.gradeList.add(gradeObject)
+            data.metadataList.add(
+                    Metadata(
+                            data.profileId,
+                            Metadata.TYPE_GRADE,
+                            id,
+                            profile.empty,
+                            profile.empty
+                    ))
+
+            if (proposedMark != "0") {
+                val proposedName = data.app.gradesManager.getGradeNumberName(proposedMark)
+                val proposedValue = data.app.gradesManager.getGradeValue(proposedName)
+
+                val proposedType = when (typeName) {
+                    "S" -> if (semester == 1) TYPE_SEMESTER1_PROPOSED else TYPE_SEMESTER2_PROPOSED
+                    "Y", "R" -> TYPE_YEAR_PROPOSED
+                    else -> return@forEach
+                }
+
+                val proposedGradeObject = Grade(
+                        profileId = data.profileId,
+                        id = id * (-1),
+                        name = proposedName,
+                        type = proposedType,
+                        value = proposedValue,
+                        weight = 0f,
+                        color = -1,
+                        category = null,
+                        description = null,
+                        comment = null,
+                        semester = semester,
+                        teacherId = -1,
+                        subjectId = subject.id,
+                        addedDate = addedDate
+                )
+
+                data.gradeList.add(proposedGradeObject)
+                data.metadataList.add(
+                        Metadata(
+                                data.profileId,
+                                Metadata.TYPE_GRADE,
+                                proposedGradeObject.id,
+                                profile.empty,
+                                profile.empty
+                        ))
+            }
+        }
+
+        data.toRemove.addAll(listOf(
+                TYPE_SEMESTER1_FINAL,
+                TYPE_SEMESTER1_PROPOSED,
+                TYPE_SEMESTER2_FINAL,
+                TYPE_SEMESTER2_PROPOSED,
+                TYPE_YEAR_FINAL,
+                TYPE_YEAR_PROPOSED
+        ).map {
+            DataRemoveModel.Grades.allWithType(it)
+        })
+    }}
+}

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

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-13
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api
+
+import android.graphics.Color
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Grade
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.getFloat
+import pl.szczodrzynski.edziennik.getInt
+import pl.szczodrzynski.edziennik.getLong
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class PodlasieApiGrades(val data: DataPodlasie, val rows: List<JsonObject>) {
+    init {
+        rows.forEach { grade ->
+            val id = grade.getLong("ExternalId") ?: return@forEach
+            val name = grade.getString("Mark") ?: return@forEach
+            val value = data.app.gradesManager.getGradeValue(name)
+            val weight = grade.getFloat("Weight") ?: 0f
+            val includeToAverage = grade.getInt("IncludeToAverage") != 0
+            val color = grade.getString("Color")?.let { Color.parseColor(it) } ?: -1
+            val category = grade.getString("Category") ?: ""
+            val comment = grade.getString("Comment") ?: ""
+            val semester = grade.getString("TermShortcut")?.length ?: data.currentSemester
+
+            val teacherFirstName = grade.getString("TeacherFirstName") ?: return@forEach
+            val teacherLastName = grade.getString("TeacherLastName") ?: return@forEach
+            val teacher = data.getTeacher(teacherFirstName, teacherLastName)
+
+            val subjectName = grade.getString("SchoolSubject") ?: return@forEach
+            val subject = data.getSubject(subjectName)
+
+            val addedDate = grade.getString("ReceivedDate")?.let { Date.fromY_m_d(it).inMillis }
+                    ?: System.currentTimeMillis()
+
+            val gradeObject = Grade(
+                    profileId = data.profileId,
+                    id = id,
+                    name = name,
+                    type = Grade.TYPE_NORMAL,
+                    value = value,
+                    weight = if (includeToAverage) weight else 0f,
+                    color = color,
+                    category = category,
+                    description = null,
+                    comment = comment,
+                    semester = semester,
+                    teacherId = teacher.id,
+                    subjectId = subject.id,
+                    addedDate = addedDate
+            )
+
+            data.gradeList.add(gradeObject)
+            data.metadataList.add(
+                    Metadata(
+                            data.profileId,
+                            Metadata.TYPE_GRADE,
+                            id,
+                            data.profile?.empty ?: false,
+                            data.profile?.empty ?: false
+                    ))
+        }
+
+        data.toRemove.add(DataRemoveModel.Grades.allWithType(Grade.TYPE_NORMAL))
+    }
+}

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

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-14
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class PodlasieApiHomework(val data: DataPodlasie, val rows: List<JsonObject>) {
+    init {
+        rows.reversed().forEach { homework ->
+            val id = homework.getString("ExternalId")?.crc32() ?: return@forEach
+            val topic = homework.getString("Title")?.replace("&#34;", "\"") ?: ""
+            val description = homework.getString("Message")?.replace("&#34;", "\"") ?: ""
+            val date = Date.getToday()
+            val addedDate = System.currentTimeMillis()
+
+            val eventObject = Event(
+                    profileId = data.profileId,
+                    id = id,
+                    date = date,
+                    time = null,
+                    topic = topic,
+                    color = null,
+                    type = Event.TYPE_HOMEWORK,
+                    teacherId = -1,
+                    subjectId = -1,
+                    teamId = data.teamClass?.id ?: -1,
+                    addedDate = addedDate
+            ).apply {
+                homeworkBody = description
+            }
+
+            eventObject.attachmentIds = mutableListOf()
+            eventObject.attachmentNames = mutableListOf()
+            homework.getString("Attachments")?.split(',')?.onEach { url ->
+                val filename = "&filename=(.*?)&".toRegex().find(url)?.get(1) ?: return@onEach
+                val ext = "&ext=(.*?)&".toRegex().find(url)?.get(1) ?: return@onEach
+                eventObject.attachmentIds?.add(url.crc32())
+                eventObject.attachmentNames?.add("$filename.$ext:$url")
+            }
+
+            data.eventList.add(eventObject)
+            data.metadataList.add(
+                    Metadata(
+                            data.profileId,
+                            Metadata.TYPE_HOMEWORK,
+                            id,
+                            data.profile?.empty ?: false,
+                            data.profile?.empty ?: false
+                    ))
+        }
+
+        data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK))
+    }
+}

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-13
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api
+
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie
+import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class PodlasieApiLuckyNumber(val data: DataPodlasie, val luckyNumber: Int) {
+    init {
+        val luckyNumberObject = LuckyNumber(
+                profileId = data.profileId,
+                date = Date.getToday(),
+                number = luckyNumber
+        )
+
+        data.luckyNumberList.add(luckyNumberObject)
+        data.metadataList.add(
+                Metadata(
+                        data.profileId,
+                        Metadata.TYPE_LUCKY_NUMBER,
+                        luckyNumberObject.date.value.toLong(),
+                        true,
+                        data.profile?.empty ?: false
+                ))
+    }
+}

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-12
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api
+
+import pl.szczodrzynski.edziennik.asJsonObjectList
+import pl.szczodrzynski.edziennik.data.api.PODLASIE_API_USER_ENDPOINT
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.ENDPOINT_PODLASIE_API_MAIN
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.PodlasieApi
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.getInt
+import pl.szczodrzynski.edziennik.getJsonArray
+
+class PodlasieApiMain(override val data: DataPodlasie,
+                      override val lastSync: Long?,
+                      val onSuccess: (endpointId: Int) -> Unit) : PodlasieApi(data, lastSync) {
+    companion object {
+        const val TAG = "PodlasieApiTimetable"
+    }
+
+    init {
+        apiGet(TAG, PODLASIE_API_USER_ENDPOINT) { json ->
+            data.getTeam() // Save the class team when it doesn't exist.
+
+            json.getInt("LuckyNumber")?.let { PodlasieApiLuckyNumber(data, it) }
+            json.getJsonArray("Teacher")?.asJsonObjectList()?.let { PodlasieApiTeachers(data, it) }
+            json.getJsonArray("Timetable")?.asJsonObjectList()?.let { PodlasieApiTimetable(data, it) }
+            json.getJsonArray("Marks")?.asJsonObjectList()?.let { PodlasieApiGrades(data, it) }
+            json.getJsonArray("MarkFinal")?.asJsonObjectList()?.let { PodlasieApiFinalGrades(data, it) }
+            json.getJsonArray("News")?.asJsonObjectList()?.let { PodlasieApiEvents(data, it) }
+            json.getJsonArray("Tasks")?.asJsonObjectList()?.let { PodlasieApiHomework(data, it) }
+
+            data.setSyncNext(ENDPOINT_PODLASIE_API_MAIN, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_PODLASIE_API_MAIN)
+        }
+    }
+}

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

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-13
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.getInt
+import pl.szczodrzynski.edziennik.getLong
+import pl.szczodrzynski.edziennik.getString
+
+class PodlasieApiTeachers(val data: DataPodlasie, val rows: List<JsonObject>) {
+    init {
+        rows.forEach { teacher ->
+            val id = teacher.getLong("ExternalId") ?: return@forEach
+            val firstName = teacher.getString("FirstName") ?: return@forEach
+            val lastName = teacher.getString("LastName") ?: return@forEach
+            val isEducator = teacher.getInt("Educator") == 1
+
+            val teacherObject = Teacher(
+                    profileId = data.profileId,
+                    id = id,
+                    name = firstName,
+                    surname = lastName,
+                    loginId = null
+            )
+
+            data.teacherList.put(id, teacherObject)
+
+            val teamClass = data.teamClass
+            if (isEducator && teamClass != null) {
+                data.teamList.put(teamClass.id, teamClass.apply {
+                    teacherId = id
+                })
+            }
+        }
+    }
+}

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

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-12
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson
+import pl.szczodrzynski.edziennik.getInt
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import pl.szczodrzynski.edziennik.utils.models.Week
+
+class PodlasieApiTimetable(val data: DataPodlasie, rows: List<JsonObject>) {
+    init {
+        val currentWeekStart = Week.getWeekStart()
+
+        if (Date.getToday().weekDay > 4) {
+            currentWeekStart.stepForward(0, 0, 7)
+        }
+
+        val getDate = data.arguments?.getString("weekStart") ?: currentWeekStart.stringY_m_d
+
+        val weekStart = Date.fromY_m_d(getDate)
+        val weekEnd = weekStart.clone().stepForward(0, 0, 6)
+
+        val days = mutableListOf<Int>()
+        var startDate: Date? = null
+        var endDate: Date? = null
+
+        rows.forEach { lesson ->
+            val date = lesson.getString("Date")?.let { Date.fromY_m_d(it) } ?: return@forEach
+
+            if ((date > weekEnd || date < weekStart) && data.profile?.empty != true) return@forEach
+            if (startDate == null) startDate = date.clone()
+            endDate = date.clone()
+            if (date.value !in days) days += date.value
+
+            val lessonNumber = lesson.getInt("LessonNumber") ?: return@forEach
+            val startTime = lesson.getString("TimeFrom")?.let { Time.fromH_m_s(it) }
+                    ?: return@forEach
+            val endTime = lesson.getString("TimeTo")?.let { Time.fromH_m_s(it) } ?: return@forEach
+            val subject = lesson.getString("SchoolSubject")?.let { data.getSubject(it) }
+                    ?: return@forEach
+
+            val teacherFirstName = lesson.getString("TeacherFirstName") ?: return@forEach
+            val teacherLastName = lesson.getString("TeacherLastName") ?: return@forEach
+            val teacher = data.getTeacher(teacherFirstName, teacherLastName)
+
+            val team = lesson.getString("Group")?.let { data.getTeam(it) } ?: return@forEach
+            val classroom = lesson.getString("Room")
+
+            Lesson(data.profileId, -1).also {
+                it.type = Lesson.TYPE_NORMAL
+                it.date = date
+                it.lessonNumber = lessonNumber
+                it.startTime = startTime
+                it.endTime = endTime
+                it.subjectId = subject.id
+                it.teacherId = teacher.id
+                it.teamId = team.id
+                it.classroom = classroom
+
+                it.id = it.buildId()
+                data.lessonList += it
+            }
+        }
+
+        if (startDate != null && endDate != null) {
+            if (weekEnd > endDate!!) endDate = weekEnd
+
+            while (startDate!! <= endDate!!) {
+                if (startDate!!.value !in days) {
+                    val lessonDate = startDate!!.clone()
+                    data.lessonList += Lesson(data.profileId, lessonDate.value.toLong()).apply {
+                        type = Lesson.TYPE_NO_LESSONS
+                        date = lessonDate
+                    }
+                }
+                startDate!!.stepForward(0, 0, 1)
+            }
+        }
+
+        data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd))
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/firstlogin/PodlasieFirstLogin.kt

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-12
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.firstlogin
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_PODLASIE
+import pl.szczodrzynski.edziennik.data.api.PODLASIE_API_USER_ENDPOINT
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.PodlasieApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.login.PodlasieLoginApi
+import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
+
+class PodlasieFirstLogin(val data: DataPodlasie, val onSuccess: () -> Unit) {
+    companion object {
+        const val TAG = "PodlasieFirstLogin"
+    }
+
+    private val api = PodlasieApi(data, null)
+
+    init {
+        val loginStoreId = data.loginStore.id
+        val loginStoreType = LOGIN_TYPE_PODLASIE
+
+        PodlasieLoginApi(data) {
+            api.apiGet(TAG, PODLASIE_API_USER_ENDPOINT) { json ->
+                val uuid = json.getString("Uuid")
+                val login = json.getString("Login")
+                val firstName = json.getString("FirstName")
+                val lastName = json.getString("LastName")
+                val studentNameLong = "$firstName $lastName".fixName()
+                val studentNameShort = studentNameLong.getShortName()
+                val schoolName = json.getString("SchoolName")
+                val className = json.getString("SchoolClass")
+                val schoolYear = json.getString("ActualSchoolYear")?.replace(' ', '/')
+                val semester = json.getString("ActualTermShortcut")?.length
+                val apiUrl = json.getString("URL")
+
+                val profile = Profile(
+                        loginStoreId,
+                        loginStoreId,
+                        loginStoreType,
+                        studentNameLong,
+                        login,
+                        studentNameLong,
+                        studentNameShort,
+                        null
+                ).apply {
+                    studentData["studentId"] = uuid
+                    studentData["studentLogin"] = login
+                    studentData["schoolName"] = schoolName
+                    studentData["className"] = className
+                    studentData["schoolYear"] = schoolYear
+                    studentData["currentSemester"] = semester ?: 1
+                    studentData["apiUrl"] = apiUrl
+
+                    schoolYear?.split('/')?.get(0)?.toInt()?.let {
+                        studentSchoolYearStart = it
+                    }
+                    studentClassName = className
+                }
+
+                EventBus.getDefault().postSticky(FirstLoginFinishedEvent(listOf(profile), data.loginStore))
+                onSuccess()
+            }
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/login/PodlasieLogin.kt

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-12
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.login
+
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_PODLASIE_API
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class PodlasieLogin(val data: DataPodlasie, val onSuccess: () -> Unit) {
+    companion object {
+        const val TAG = "PodlasieLogin"
+    }
+
+    private var cancelled = false
+
+    init {
+        nextLoginMethod(onSuccess)
+    }
+
+    private fun nextLoginMethod(onSuccess: () -> Unit) {
+        if (data.targetLoginMethodIds.isEmpty()) {
+            onSuccess()
+            return
+        }
+        if (cancelled) {
+            onSuccess()
+            return
+        }
+        useLoginMethod(data.targetLoginMethodIds.removeAt(0)) { usedMethodId ->
+            data.progress(data.progressStep)
+            if (usedMethodId != -1)
+                data.loginMethods.add(usedMethodId)
+            nextLoginMethod(onSuccess)
+        }
+    }
+
+    private fun useLoginMethod(loginMethodId: Int, onSuccess: (usedMethodId: Int) -> Unit) {
+        // this should never be true
+        if (data.loginMethods.contains(loginMethodId)) {
+            onSuccess(-1)
+            return
+        }
+        Utils.d(TAG, "Using login method $loginMethodId")
+        when (loginMethodId) {
+            LOGIN_METHOD_PODLASIE_API -> {
+                data.startProgress(R.string.edziennik_progress_login_podlasie_api)
+                PodlasieLoginApi(data) { onSuccess(loginMethodId) }
+            }
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/login/PodlasieLoginApi.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-5-12
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.login
+
+import pl.szczodrzynski.edziennik.data.api.ERROR_LOGIN_DATA_MISSING
+import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+
+class PodlasieLoginApi(val data: DataPodlasie, val onSuccess: () -> Unit) {
+    companion object {
+        const val TAG = "PodlasieLoginApi"
+    }
+
+    init { run {
+        if (data.isApiLoginValid()) {
+            onSuccess()
+        } else {
+            data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+        }
+    }}
+}

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

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

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

@@ -17,9 +17,14 @@ import pl.szczodrzynski.edziennik.values
 
 class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
 
+    fun isWebMainLoginValid() = webExpiryTime-30 > currentTimeUnix()
+            && webAuthCookie.isNotNullNorEmpty()
+            && webHost.isNotNullNorEmpty()
+            && webType.isNotNullNorEmpty()
+            && symbol.isNotNullNorEmpty()
     fun isApiLoginValid() = currentSemesterEndDate-30 > currentTimeUnix()
-            && apiCertificateKey.isNotNullNorEmpty()
-            && apiCertificatePrivate.isNotNullNorEmpty()
+            && apiFingerprint[symbol].isNotNullNorEmpty()
+            && apiPrivateKey[symbol].isNotNullNorEmpty()
             && symbol.isNotNullNorEmpty()
 
     override fun satisfyLoginMethods() {
@@ -40,7 +45,7 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
                         id,
                         name,
                         Team.TYPE_CLASS,
-                        "$schoolName:$name",
+                        "$schoolCode:$name",
                         -1
                 )
                 teamList.put(id, teamObject)
@@ -48,7 +53,7 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
         }
     }
 
-    override fun generateUserCode() = "$schoolName:$studentId"
+    override fun generateUserCode() = "$schoolCode:$studentId"
 
     /**
      * A UONET+ client symbol.
@@ -59,8 +64,8 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
      */
     private var mSymbol: String? = null
     var symbol: String?
-        get() { mSymbol = mSymbol ?: loginStore.getLoginData("deviceSymbol", null); return mSymbol }
-        set(value) { loginStore.putLoginData("deviceSymbol", value); mSymbol = value }
+        get() { mSymbol = mSymbol ?: profile?.getStudentData("symbol", null); return mSymbol }
+        set(value) { profile?.putStudentData("symbol", value); mSymbol = value }
 
     /**
      * Group symbol/number of the student's school.
@@ -75,16 +80,26 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
         set(value) { profile?.putStudentData("schoolSymbol", value) ?: return; mSchoolSymbol = value }
 
     /**
-     * A school ID consisting of the [symbol] and [schoolSymbol].
+     * Short name of the school, used in some places.
+     *
+     * ListaUczniow/JednostkaSprawozdawczaSkrot, e.g. "SP Wilkow"
+     */
+    private var mSchoolShort: String? = null
+    var schoolShort: String?
+        get() { mSchoolShort = mSchoolShort ?: profile?.getStudentData("schoolShort", null); return mSchoolShort }
+        set(value) { profile?.putStudentData("schoolShort", value) ?: return; mSchoolShort = value }
+
+    /**
+     * A school code consisting of the [symbol] and [schoolSymbol].
      *
      * [symbol]_[schoolSymbol]
      *
      * e.g. "poznan_000088"
      */
-    private var mSchoolName: String? = null
-    var schoolName: String?
-        get() { mSchoolName = mSchoolName ?: profile?.getStudentData("schoolName", null); return mSchoolName }
-        set(value) { profile?.putStudentData("schoolName", value) ?: return; mSchoolName = value }
+    private var mSchoolCode: String? = null
+    var schoolCode: String?
+        get() { mSchoolCode = mSchoolCode ?: profile?.getStudentData("schoolName", null); return mSchoolCode }
+        set(value) { profile?.putStudentData("schoolName", value) ?: return; mSchoolCode = value }
 
     /**
      * ID of the student.
@@ -124,6 +139,15 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
         get() { mStudentSemesterId = mStudentSemesterId ?: profile?.getStudentData("studentSemesterId", 0); return mStudentSemesterId ?: 0 }
         set(value) { profile?.putStudentData("studentSemesterId", value) ?: return; mStudentSemesterId = value }
 
+    private var mSemester1Id: Int? = null
+    var semester1Id: Int
+        get() { mSemester1Id = mSemester1Id ?: profile?.getStudentData("semester1Id", 0); return mSemester1Id ?: 0 }
+        set(value) { profile?.putStudentData("semester1Id", value) ?: return; mSemester1Id = value }
+    private var mSemester2Id: Int? = null
+    var semester2Id: Int
+        get() { mSemester2Id = mSemester2Id ?: profile?.getStudentData("semester2Id", 0); return mSemester2Id ?: 0 }
+        set(value) { profile?.putStudentData("semester2Id", value) ?: return; mSemester2Id = value }
+
     /**
      * ListaUczniow/OkresNumer, e.g. 1 or 2
      */
@@ -154,45 +178,34 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
      * After first login only 3 first characters are stored here.
      * This is later used to determine the API URL address.
      */
-    private var mApiToken: String? = null
-    var apiToken: String?
-        get() { mApiToken = mApiToken ?: loginStore.getLoginData("deviceToken", null); return mApiToken }
-        set(value) { loginStore.putLoginData("deviceToken", value); mApiToken = value }
+    private var mApiToken: Map<String?, String?>? = null
+    var apiToken: Map<String?, String?> = mapOf()
+        get() { mApiToken = mApiToken ?: loginStore.getLoginData("apiToken", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mApiToken ?: mapOf() }
+        set(value) { loginStore.putLoginData("apiToken", app.gson.toJson(value)); mApiToken = value }
 
     /**
      * A mobile API registration PIN.
      *
      * After first login, this is removed and/or set to null.
      */
-    private var mApiPin: String? = null
-    var apiPin: String?
-        get() { mApiPin = mApiPin ?: loginStore.getLoginData("devicePin", null); return mApiPin }
-        set(value) { loginStore.putLoginData("devicePin", value); mApiPin = value }
+    private var mApiPin: Map<String?, String?>? = null
+    var apiPin: Map<String?, String?> = mapOf()
+        get() { mApiPin = mApiPin ?: loginStore.getLoginData("apiPin", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mApiPin ?: mapOf() }
+        set(value) { loginStore.putLoginData("apiPin", app.gson.toJson(value)); mApiPin = value }
 
-    private var mApiCertificateKey: String? = null
-    var apiCertificateKey: String?
-        get() { mApiCertificateKey = mApiCertificateKey ?: loginStore.getLoginData("certificateKey", null); return mApiCertificateKey }
-        set(value) { loginStore.putLoginData("certificateKey", value); mApiCertificateKey = value }
+    private var mApiFingerprint: Map<String?, String?>? = null
+    var apiFingerprint: Map<String?, String?> = mapOf()
+        get() { mApiFingerprint = mApiFingerprint ?: loginStore.getLoginData("apiFingerprint", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mApiFingerprint ?: mapOf() }
+        set(value) { loginStore.putLoginData("apiFingerprint", app.gson.toJson(value)); mApiFingerprint = value }
 
-    /**
-     * This is not meant for normal usage.
-     *
-     * It provides a backward compatibility (<4.0) in order
-     * to migrate and use private keys instead of PFX.
-     */
-    private var mApiCertificatePfx: String? = null
-    var apiCertificatePfx: String?
-        get() { mApiCertificatePfx = mApiCertificatePfx ?: loginStore.getLoginData("certificatePfx", null); return mApiCertificatePfx }
-        set(value) { loginStore.putLoginData("certificatePfx", value); mApiCertificatePfx = value }
-
-    private var mApiCertificatePrivate: String? = null
-    var apiCertificatePrivate: String?
-        get() { mApiCertificatePrivate = mApiCertificatePrivate ?: loginStore.getLoginData("certificatePrivate", null); return mApiCertificatePrivate }
-        set(value) { loginStore.putLoginData("certificatePrivate", value); mApiCertificatePrivate = value }
+    private var mApiPrivateKey: Map<String?, String?>? = null
+    var apiPrivateKey: Map<String?, String?> = mapOf()
+        get() { mApiPrivateKey = mApiPrivateKey ?: loginStore.getLoginData("apiPrivateKey", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mApiPrivateKey ?: mapOf() }
+        set(value) { loginStore.putLoginData("apiPrivateKey", app.gson.toJson(value)); mApiPrivateKey = value }
 
     val apiUrl: String?
         get() {
-            val url = when (apiToken?.substring(0, 3)) {
+            val url = when (apiToken[symbol]?.substring(0, 3)) {
                 "3S1" -> "https://lekcjaplus.vulcan.net.pl"
                 "TA1" -> "https://uonetplus-komunikacja.umt.tarnow.pl"
                 "OP1" -> "https://uonetplus-komunikacja.eszkola.opolskie.pl"
@@ -217,4 +230,95 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
         get() {
             return "$apiUrl$schoolSymbol/"
         }
+
+    /*   __          __  _       ______ _____   _                 _
+         \ \        / / | |     |  ____/ ____| | |               (_)
+          \ \  /\  / /__| |__   | |__ | (___   | |     ___   __ _ _ _ __
+           \ \/  \/ / _ \ '_ \  |  __| \___ \  | |    / _ \ / _` | | '_ \
+            \  /\  /  __/ |_) | | |    ____) | | |___| (_) | (_| | | | | |
+             \/  \/ \___|_.__/  |_|   |_____/  |______\___/ \__, |_|_| |_|
+                                                             __/ |
+                                                            |__*/
+    /**
+     * Federation Services login type.
+     * This might be one of: cufs, adfs, adfslight.
+     */
+    var webType: String?
+        get() { mWebType = mWebType ?: loginStore.getLoginData("webType", null); return mWebType }
+        set(value) { loginStore.putLoginData("webType", value); mWebType = value }
+    private var mWebType: String? = null
+
+    /**
+     * Web server providing the federation services login.
+     * If this is present, WEB_MAIN login is considered as available.
+     */
+    var webHost: String?
+        get() { mWebHost = mWebHost ?: loginStore.getLoginData("webHost", null); return mWebHost }
+        set(value) { loginStore.putLoginData("webHost", value); mWebHost = value }
+    private var mWebHost: String? = null
+
+    /**
+     * An ID used in ADFS & ADFSLight login types.
+     */
+    var webAdfsId: String?
+        get() { mWebAdfsId = mWebAdfsId ?: loginStore.getLoginData("webAdfsId", null); return mWebAdfsId }
+        set(value) { loginStore.putLoginData("webAdfsId", value); mWebAdfsId = value }
+    private var mWebAdfsId: String? = null
+
+    /**
+     * A domain override for ADFS Light.
+     */
+    var webAdfsDomain: String?
+        get() { mWebAdfsDomain = mWebAdfsDomain ?: loginStore.getLoginData("webAdfsDomain", null); return mWebAdfsDomain }
+        set(value) { loginStore.putLoginData("webAdfsDomain", value); mWebAdfsDomain = value }
+    private var mWebAdfsDomain: String? = null
+
+    var webIsHttpCufs: Boolean
+        get() { mWebIsHttpCufs = mWebIsHttpCufs ?: loginStore.getLoginData("webIsHttpCufs", false); return mWebIsHttpCufs ?: false }
+        set(value) { loginStore.putLoginData("webIsHttpCufs", value); mWebIsHttpCufs = value }
+    private var mWebIsHttpCufs: Boolean? = null
+
+    var webIsScopedAdfs: Boolean
+        get() { mWebIsScopedAdfs = mWebIsScopedAdfs ?: loginStore.getLoginData("webIsScopedAdfs", false); return mWebIsScopedAdfs ?: false }
+        set(value) { loginStore.putLoginData("webIsScopedAdfs", value); mWebIsScopedAdfs = value }
+    private var mWebIsScopedAdfs: Boolean? = null
+
+    var webEmail: String?
+        get() { mWebEmail = mWebEmail ?: loginStore.getLoginData("webEmail", null); return mWebEmail }
+        set(value) { loginStore.putLoginData("webEmail", value); mWebEmail = value }
+    private var mWebEmail: String? = null
+    var webUsername: String?
+        get() { mWebUsername = mWebUsername ?: loginStore.getLoginData("webUsername", null); return mWebUsername }
+        set(value) { loginStore.putLoginData("webUsername", value); mWebUsername = value }
+    private var mWebUsername: String? = null
+    var webPassword: String?
+        get() { mWebPassword = mWebPassword ?: loginStore.getLoginData("webPassword", null); return mWebPassword }
+        set(value) { loginStore.putLoginData("webPassword", value); mWebPassword = value }
+    private var mWebPassword: String? = null
+
+    /**
+     * Expiry time of a certificate POSTed to a LoginEndpoint of the specific symbol.
+     * If the time passes, the certificate needs to be POSTed again (if valid)
+     * or re-generated.
+     */
+    var webExpiryTime: Long
+        get() { mWebExpiryTime = mWebExpiryTime ?: profile?.getStudentData("webExpiryTime", 0L); return mWebExpiryTime ?: 0L }
+        set(value) { profile?.putStudentData("webExpiryTime", value); mWebExpiryTime = value }
+    private var mWebExpiryTime: Long? = null
+
+    /**
+     * EfebSsoAuthCookie retrieved after posting a certificate
+     */
+    var webAuthCookie: String?
+        get() { mWebAuthCookie = mWebAuthCookie ?: profile?.getStudentData("webAuthCookie", null); return mWebAuthCookie }
+        set(value) { profile?.putStudentData("webAuthCookie", value); mWebAuthCookie = value }
+    private var mWebAuthCookie: String? = null
+
+    /**
+     * Permissions needed to get JSONs from home page
+     */
+    var webPermissions: String?
+        get() { mWebPermissions = mWebPermissions ?: profile?.getStudentData("webPermissions", null); return mWebPermissions }
+        set(value) { profile?.putStudentData("webPermissions", value); mWebPermissions = value }
+    private var mWebPermissions: String? = null
 }

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

@@ -157,7 +157,7 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
 
                     completed()
                 },
-                onProgress = { written, total ->
+                onProgress = { written, _ ->
                     val event = AttachmentGetEvent(
                             data.profileId,
                             owner,
@@ -194,7 +194,6 @@ class Vulcan(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/vulcan/VulcanFeatures.kt

@@ -19,6 +19,7 @@ const val ENDPOINT_VULCAN_API_NOTICES             = 1070
 const val ENDPOINT_VULCAN_API_ATTENDANCE          = 1080
 const val ENDPOINT_VULCAN_API_MESSAGES_INBOX      = 1090
 const val ENDPOINT_VULCAN_API_MESSAGES_SENT       = 1100
+const val ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS       = 2010
 
 val VulcanFeatures = listOf(
         // timetable
@@ -61,6 +62,13 @@ val VulcanFeatures = listOf(
                 !data.app.config.sync.tokenVulcanList.contains(data.profileId)
         },
 
+        /**
+         * Lucky number - using WEB Main.
+         */
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_LUCKY_NUMBER, listOf(
+                ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS to LOGIN_METHOD_VULCAN_WEB_MAIN
+        ), listOf(LOGIN_METHOD_VULCAN_WEB_MAIN)).withShouldSync { data -> data.shouldSyncLuckyNumber() },
+
         Feature(LOGIN_TYPE_VULCAN, FEATURE_ALWAYS_NEEDED, listOf(
                 ENDPOINT_VULCAN_API_UPDATE_SEMESTER to LOGIN_METHOD_VULCAN_API,
                 ENDPOINT_VULCAN_API_DICTIONARIES to LOGIN_METHOD_VULCAN_API

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

@@ -106,11 +106,11 @@ open class VulcanApi(open val data: DataVulcan, open val lastSync: Long?) {
         Request.builder()
                 .url(url)
                 .userAgent(VULCAN_API_USER_AGENT)
-                .addHeader("RequestCertificateKey", data.apiCertificateKey)
+                .addHeader("RequestCertificateKey", data.apiFingerprint[data.symbol])
                 .addHeader("RequestSignatureValue",
                         try {
                             signContent(
-                                    data.apiCertificatePrivate ?: "",
+                                    data.apiPrivateKey[data.symbol] ?: "",
                                     finalPayload.toString()
                             )
                         } catch (e: Exception) {e.printStackTrace();""})

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

@@ -7,6 +7,7 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.web.VulcanWebLuckyNumber
 import pl.szczodrzynski.edziennik.utils.Utils
 
 class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
@@ -86,6 +87,10 @@ class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
                 data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
                 VulcanApiMessagesSent(data, lastSync, onSuccess)
             }
+            ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
+                VulcanWebLuckyNumber(data, lastSync, onSuccess)
+            }
             else -> onSuccess(endpointId)
         }
     }

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

@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-4-17.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import pl.droidsonroids.jspoon.Jspoon
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.CufsCertificate
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.isNotNullNorBlank
+import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.models.Date
+import java.io.File
+import java.net.HttpURLConnection
+
+open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
+    companion object {
+        const val TAG = "VulcanWebMain"
+        const val WEB_MAIN = 0
+        const val WEB_OLD = 1
+        const val WEB_NEW = 2
+        const val WEB_MESSAGES = 3
+        const val STATE_SUCCESS = 0
+        const val STATE_NO_REGISTER = 1
+        const val STATE_LOGGED_OUT = 2
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    val profile
+        get() = data.profile
+
+    private val certificateAdapter by lazy {
+        Jspoon.create().adapter(CufsCertificate::class.java)
+    }
+
+    fun saveCertificate(xml: String) {
+        val file = File(data.app.filesDir, "cert_"+(data.webUsername ?: data.webEmail)+".xml")
+        file.writeText(xml)
+    }
+
+    fun readCertificate(): String? {
+        val file = File(data.app.filesDir, "cert_"+(data.webUsername ?: data.webEmail)+".xml")
+        if (file.canRead())
+            return file.readText()
+        return null
+    }
+
+    fun parseCertificate(xml: String): CufsCertificate {
+        val xmlParsed = xml
+                .replace("<[a-z]+?:".toRegex(), "<")
+                .replace("</[a-z]+?:".toRegex(), "</")
+                .replace("\\sxmlns.*?=\".+?\"".toRegex(), "")
+
+        return certificateAdapter.fromHtml(xmlParsed).also {
+            it.xml = xml
+        }
+    }
+
+    fun postCertificate(certificate: CufsCertificate, symbol: String, onResult: (symbol: String, state: Int) -> Unit): Boolean {
+        // check if the certificate is valid
+        if (Date.fromIso(certificate.expiryDate) < System.currentTimeMillis())
+            return false
+
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                if (response?.headers()?.get("Location")?.contains("LoginEndpoint.aspx") == true
+                        || response?.headers()?.get("Location")?.contains("?logout=true") == true) {
+                    onResult(symbol, STATE_LOGGED_OUT)
+                    return
+                }
+                if (text?.contains("LoginEndpoint.aspx?logout=true") == true) {
+                    onResult(symbol, STATE_NO_REGISTER)
+                    return
+                }
+                if (!validateCallback(text, response, jsonResponse = false)) {
+                    return
+                }
+                data.webExpiryTime = Date.fromIso(certificate.expiryDate) / 1000L
+                onResult(symbol, STATE_SUCCESS)
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url("https://uonetplus.${data.webHost}/$symbol/LoginEndpoint.aspx")
+                .withClient(data.app.httpLazy)
+                .userAgent(SYSTEM_USER_AGENT)
+                .post()
+                .addParameter("wa", "wsignin1.0")
+                .addParameter("wctx", certificate.targetUrl)
+                .addParameter("wresult", certificate.xml)
+                .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST)
+                .allowErrorCode(HttpURLConnection.HTTP_FORBIDDEN)
+                .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED)
+                .allowErrorCode(HttpURLConnection.HTTP_UNAVAILABLE)
+                .allowErrorCode(429)
+                .callback(callback)
+                .build()
+                .enqueue()
+
+        return true
+    }
+
+    fun getStartPage(symbol: String = data.symbol ?: "default", postErrors: Boolean = true, onSuccess: (html: String, schoolSymbols: List<String>) -> Unit) {
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                if (!validateCallback(text, response, jsonResponse = false) || text == null) {
+                    return
+                }
+
+                if (postErrors) {
+                    when {
+                        text.contains("status absolwenta") -> ERROR_VULCAN_WEB_GRADUATE_ACCOUNT
+                        else -> null
+                    }?.let { errorCode ->
+                        data.error(ApiError(TAG, errorCode)
+                                .withResponse(response)
+                                .withApiResponse(text))
+                        return
+                    }
+                }
+
+                data.webPermissions = Regexes.VULCAN_WEB_PERMISSIONS.find(text)?.let { it[1] }
+
+                val schoolSymbols = mutableListOf<String>()
+                val clientUrl = "://uonetplus-uczen.${data.webHost}/$symbol/"
+                var clientIndex = text.indexOf(clientUrl)
+                var count = 0
+                while (clientIndex != -1 && count < 100) {
+                    val startIndex = clientIndex + clientUrl.length
+                    val endIndex = text.indexOf('/', startIndex = startIndex)
+                    val schoolSymbol = text.substring(startIndex, endIndex)
+                    schoolSymbols += schoolSymbol
+                    clientIndex = text.indexOf(clientUrl, startIndex = endIndex)
+                    count++
+                }
+                schoolSymbols.removeAll {
+                    it.toLowerCase() == "default"
+                            || !it.matches(Regexes.VULCAN_WEB_SYMBOL_VALIDATE)
+                }
+                
+                if (postErrors && schoolSymbols.isEmpty()) {
+                    data.error(ApiError(TAG, ERROR_VULCAN_WEB_NO_SCHOOLS)
+                            .withResponse(response)
+                            .withApiResponse(text))
+                    return
+                }
+
+                onSuccess(text, schoolSymbols)
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url("https://uonetplus.${data.webHost}/$symbol/Start.mvc/Index")
+                .userAgent(SYSTEM_USER_AGENT)
+                .get()
+                .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST)
+                .allowErrorCode(HttpURLConnection.HTTP_FORBIDDEN)
+                .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED)
+                .allowErrorCode(HttpURLConnection.HTTP_UNAVAILABLE)
+                .allowErrorCode(429)
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+
+    private fun validateCallback(text: String?, response: Response?, jsonResponse: Boolean = true): Boolean {
+        if (text == null) {
+            data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                    .withResponse(response))
+            return false
+        }
+
+        if (response?.code() !in 200..302 || (jsonResponse && !text.startsWith("{"))) {
+            when {
+                text.contains("The custom error module") -> ERROR_VULCAN_WEB_429
+                else -> ERROR_VULCAN_WEB_OTHER
+            }.let { errorCode ->
+                data.error(ApiError(TAG, errorCode)
+                        .withApiResponse(text)
+                        .withResponse(response))
+                return false
+            }
+        }
+
+        val cookies = data.app.cookieJar.getAll(data.webHost ?: "vulcan.net.pl")
+        val authCookie = cookies["EfebSsoAuthCookie"]
+        if ((authCookie == null || authCookie == "null") && data.webAuthCookie != null) {
+            data.app.cookieJar.set(data.webHost ?: "vulcan.net.pl", "EfebSsoAuthCookie", data.webAuthCookie)
+        }
+        else if (authCookie.isNotNullNorBlank() && authCookie != "null" && authCookie != data.webAuthCookie) {
+            data.webAuthCookie = authCookie
+        }
+        return true
+    }
+
+    fun webGetJson(
+            tag: String,
+            webType: Int,
+            endpoint: String,
+            method: Int = POST,
+            parameters: Map<String, Any?> = emptyMap(),
+            onSuccess: (json: JsonObject, response: Response?) -> Unit
+    ) {
+        val url = "https://" + when (webType) {
+            WEB_MAIN -> "uonetplus"
+            WEB_OLD -> "uonetplus-opiekun"
+            WEB_NEW -> "uonetplus-uczen"
+            WEB_MESSAGES -> "uonetplus-uzytkownik"
+            else -> "uonetplus"
+        } + ".${data.webHost}/${data.symbol}/$endpoint"
+
+        Utils.d(tag, "Request: Vulcan/WebMain - $url")
+
+        val payload = JsonObject()
+        parameters.map { (name, value) ->
+            when (value) {
+                is JsonObject -> payload.add(name, value)
+                is JsonArray -> payload.add(name, value)
+                is String -> payload.addProperty(name, value)
+                is Int -> payload.addProperty(name, value)
+                is Long -> payload.addProperty(name, value)
+                is Float -> payload.addProperty(name, value)
+                is Char -> payload.addProperty(name, value)
+                is Boolean -> payload.addProperty(name, value)
+            }
+        }
+
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                if (!validateCallback(text, response))
+                    return
+
+                try {
+                    val json = JsonParser().parse(text).asJsonObject
+                    onSuccess(json, response)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_VULCAN_WEB_REQUEST)
+                            .withResponse(response)
+                            .withThrowable(e)
+                            .withApiResponse(text))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url(url)
+                .userAgent(SYSTEM_USER_AGENT)
+                .apply {
+                    when (method) {
+                        GET -> get()
+                        POST -> post()
+                    }
+                }
+                .setJsonBody(payload)
+                .allowErrorCode(429)
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}

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

@@ -9,6 +9,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_PRESENT
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.utils.models.Date
 
@@ -25,15 +26,38 @@ class VulcanApiAttendance(override val data: DataVulcan,
             data.db.attendanceTypeDao().getAllNow(profileId).toSparseArray(data.attendanceTypes) { it.id }
         }
 
-        val startDate: String = profile.getSemesterStart(profile.currentSemester).stringY_m_d
-        val endDate: String = profile.getSemesterEnd(profile.currentSemester).stringY_m_d
+        val semesterId = data.studentSemesterId
+        val semesterNumber = data.studentSemesterNumber
+        if (semesterNumber == 2 && lastSync ?: 0 < profile.dateSemester1Start.inMillis) {
+            getAttendance(profile, semesterId - 1, semesterNumber - 1) {
+                getAttendance(profile, semesterId, semesterNumber) {
+                    finish()
+                }
+            }
+        }
+        else {
+            getAttendance(profile, semesterId, semesterNumber) {
+                finish()
+            }
+        }
+
+    } ?: onSuccess(ENDPOINT_VULCAN_API_ATTENDANCE) }
+
+    private fun finish() {
+        data.setSyncNext(ENDPOINT_VULCAN_API_ATTENDANCE, SYNC_ALWAYS)
+        onSuccess(ENDPOINT_VULCAN_API_ATTENDANCE)
+    }
+
+    private fun getAttendance(profile: Profile, semesterId: Int, semesterNumber: Int, onSuccess: () -> Unit) {
+        val startDate = profile.getSemesterStart(semesterNumber).stringY_m_d
+        val endDate = profile.getSemesterEnd(semesterNumber).stringY_m_d
 
         apiGet(TAG, VULCAN_API_ENDPOINT_ATTENDANCE, parameters = mapOf(
                 "DataPoczatkowa" to startDate,
                 "DataKoncowa" to endDate,
                 "IdOddzial" to data.studentClassId,
                 "IdUczen" to data.studentId,
-                "IdOkresKlasyfikacyjny" to data.studentSemesterId
+                "IdOkresKlasyfikacyjny" to semesterId
         )) { json, _ ->
             json.getJsonObject("Data")?.getJsonArray("Frekwencje")?.forEach { attendanceEl ->
                 val attendance = attendanceEl.asJsonObject
@@ -47,7 +71,7 @@ class VulcanApiAttendance(override val data: DataVulcan,
                 val lessonDate = Date.fromMillis(lessonDateMillis)
                 val startTime = data.lessonRanges.get(attendance.getInt("Numer") ?: 0)?.startTime
 
-                val lessonSemester = profile.dateToSemester(lessonDate)
+                val lessonSemester = semesterNumber
 
                 val attendanceObject = Attendance(
                         profileId = profileId,
@@ -65,6 +89,7 @@ class VulcanApiAttendance(override val data: DataVulcan,
                         addedDate = lessonDate.combineWith(startTime)
                 ).also {
                     it.lessonNumber = attendance.getInt("Numer")
+                    it.isCounted = it.baseType != Attendance.TYPE_RELEASED
                 }
 
                 data.attendanceList.add(attendanceObject)
@@ -79,8 +104,7 @@ class VulcanApiAttendance(override val data: DataVulcan,
                 }
             }
 
-            data.setSyncNext(ENDPOINT_VULCAN_API_ATTENDANCE, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_VULCAN_API_ATTENDANCE)
+            onSuccess()
         }
-    } ?: onSuccess(ENDPOINT_VULCAN_API_ATTENDANCE) }
+    }
 }

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

@@ -13,6 +13,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.getBoolean
 import pl.szczodrzynski.edziennik.getJsonArray
@@ -31,11 +32,43 @@ class VulcanApiEvents(override val data: DataVulcan,
 
     init { data.profile?.also { profile ->
 
-        val startDate: String = when (profile.empty) {
-            true -> profile.getSemesterStart(profile.currentSemester).stringY_m_d
+        val semesterId = data.studentSemesterId
+        val semesterNumber = data.studentSemesterNumber
+        if (semesterNumber == 2 && lastSync ?: 0 < profile.dateSemester1Start.inMillis) {
+            getEvents(profile, semesterId - 1, semesterNumber - 1) {
+                getEvents(profile, semesterId, semesterNumber) {
+                    finish()
+                }
+            }
+        }
+        else {
+            getEvents(profile, semesterId, semesterNumber) {
+                finish()
+            }
+        }
+
+    } ?: onSuccess(if (isHomework) ENDPOINT_VULCAN_API_HOMEWORK else ENDPOINT_VULCAN_API_EVENTS) }
+
+    private fun finish() {
+        when (isHomework) {
+            true -> {
+                data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK))
+                data.setSyncNext(ENDPOINT_VULCAN_API_HOMEWORK, SYNC_ALWAYS)
+            }
+            false -> {
+                data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK))
+                data.setSyncNext(ENDPOINT_VULCAN_API_EVENTS, SYNC_ALWAYS)
+            }
+        }
+        onSuccess(if (isHomework) ENDPOINT_VULCAN_API_HOMEWORK else ENDPOINT_VULCAN_API_EVENTS)
+    }
+
+    private fun getEvents(profile: Profile, semesterId: Int, semesterNumber: Int, onSuccess: () -> Unit) {
+        val startDate = when (profile.empty) {
+            true -> profile.getSemesterStart(semesterNumber).stringY_m_d
             else -> Date.getToday().stepForward(0, -1, 0).stringY_m_d
         }
-        val endDate: String = profile.getSemesterEnd(profile.currentSemester).stringY_m_d
+        val endDate = profile.getSemesterEnd(semesterNumber).stringY_m_d
 
         val endpoint = when (isHomework) {
             true -> VULCAN_API_ENDPOINT_HOMEWORK
@@ -46,7 +79,7 @@ class VulcanApiEvents(override val data: DataVulcan,
                 "DataKoncowa" to endDate,
                 "IdOddzial" to data.studentClassId,
                 "IdUczen" to data.studentId,
-                "IdOkresKlasyfikacyjny" to data.studentSemesterId
+                "IdOkresKlasyfikacyjny" to semesterId
         )) { json, _ ->
             val events = json.getJsonArray("Data")
 
@@ -94,17 +127,7 @@ class VulcanApiEvents(override val data: DataVulcan,
                 ))
             }
 
-            when (isHomework) {
-                true -> {
-                    data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK))
-                    data.setSyncNext(ENDPOINT_VULCAN_API_HOMEWORK, SYNC_ALWAYS)
-                }
-                false -> {
-                    data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK))
-                    data.setSyncNext(ENDPOINT_VULCAN_API_EVENTS, SYNC_ALWAYS)
-                }
-            }
-            onSuccess(if (isHomework) ENDPOINT_VULCAN_API_HOMEWORK else ENDPOINT_VULCAN_API_EVENTS)
+            onSuccess()
         }
-    } ?: onSuccess(if (isHomework) ENDPOINT_VULCAN_API_HOMEWORK else ENDPOINT_VULCAN_API_EVENTS) }
+    }
 }

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

@@ -13,6 +13,7 @@ import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.entity.Grade
 import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_NORMAL
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
 import java.text.DecimalFormat
 import kotlin.math.roundToInt
@@ -27,9 +28,33 @@ class VulcanApiGrades(override val data: DataVulcan,
 
     init { data.profile?.also { profile ->
 
+        val semesterId = data.studentSemesterId
+        val semesterNumber = data.studentSemesterNumber
+        if (semesterNumber == 2 && lastSync ?: 0 < profile.dateSemester1Start.inMillis) {
+            getGrades(profile, semesterId - 1, semesterNumber - 1) {
+                getGrades(profile, semesterId, semesterNumber) {
+                    finish()
+                }
+            }
+        }
+        else {
+            getGrades(profile, semesterId, semesterNumber) {
+                finish()
+            }
+        }
+
+    } ?: onSuccess(ENDPOINT_VULCAN_API_GRADES) }
+
+    private fun finish() {
+        data.toRemove.add(DataRemoveModel.Grades.semesterWithType(data.studentSemesterNumber, TYPE_NORMAL))
+        data.setSyncNext(ENDPOINT_VULCAN_API_GRADES, SYNC_ALWAYS)
+        onSuccess(ENDPOINT_VULCAN_API_GRADES)
+    }
+
+    private fun getGrades(profile: Profile, semesterId: Int, semesterNumber: Int, onSuccess: () -> Unit) {
         apiGet(TAG, VULCAN_API_ENDPOINT_GRADES, parameters = mapOf(
                 "IdUczen" to data.studentId,
-                "IdOkresKlasyfikacyjny" to data.studentSemesterId
+                "IdOkresKlasyfikacyjny" to semesterId
         )) { json, _ ->
             val grades = json.getJsonArray("Data")
 
@@ -99,7 +124,7 @@ class VulcanApiGrades(override val data: DataVulcan,
                         category = category,
                         description = finalDescription,
                         comment = null,
-                        semester = data.studentSemesterNumber,
+                        semester = semesterNumber,
                         teacherId = teacherId,
                         subjectId = subjectId,
                         addedDate = addedDate
@@ -115,9 +140,7 @@ class VulcanApiGrades(override val data: DataVulcan,
                 ))
             }
 
-            data.toRemove.add(DataRemoveModel.Grades.semesterWithType(data.studentSemesterNumber, Grade.TYPE_NORMAL))
-            data.setSyncNext(ENDPOINT_VULCAN_API_GRADES, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_VULCAN_API_GRADES)
+            onSuccess()
         }
-    } ?: onSuccess(ENDPOINT_VULCAN_API_GRADES) }
+    }
 }

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

@@ -11,6 +11,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.Notice
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.getJsonArray
 import pl.szczodrzynski.edziennik.getLong
@@ -30,6 +31,29 @@ class VulcanApiNotices(override val data: DataVulcan,
             data.db.noticeTypeDao().getAllNow(profileId).toSparseArray(data.noticeTypes) { it.id }
         }
 
+        val semesterId = data.studentSemesterId
+        val semesterNumber = data.studentSemesterNumber
+        if (semesterNumber == 2 && lastSync ?: 0 < profile.dateSemester1Start.inMillis) {
+            getNotices(profile, semesterId - 1, semesterNumber - 1) {
+                getNotices(profile, semesterId, semesterNumber) {
+                    finish()
+                }
+            }
+        }
+        else {
+            getNotices(profile, semesterId, semesterNumber) {
+                finish()
+            }
+        }
+
+    } ?: onSuccess(ENDPOINT_VULCAN_API_NOTICES) }
+
+    private fun finish() {
+        data.setSyncNext(ENDPOINT_VULCAN_API_NOTICES, SYNC_ALWAYS)
+        onSuccess(ENDPOINT_VULCAN_API_NOTICES)
+    }
+
+    private fun getNotices(profile: Profile, semesterId: Int, semesterNumber: Int, onSuccess: () -> Unit) {
         apiGet(TAG, VULCAN_API_ENDPOINT_NOTICES, parameters = mapOf(
                 "IdUczen" to data.studentId,
                 "IdOkresKlasyfikacyjny" to data.studentSemesterId
@@ -67,8 +91,7 @@ class VulcanApiNotices(override val data: DataVulcan,
                 ))
             }
 
-            data.setSyncNext(ENDPOINT_VULCAN_API_NOTICES, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_VULCAN_API_NOTICES)
+            onSuccess()
         }
-    } ?: onSuccess(ENDPOINT_VULCAN_API_NOTICES) }
+    }
 }

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

@@ -13,6 +13,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_
 import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_FINAL
 import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_PROPOSED
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.getJsonArray
 import pl.szczodrzynski.edziennik.getJsonObject
 import pl.szczodrzynski.edziennik.utils.Utils
@@ -27,32 +28,54 @@ class VulcanApiProposedGrades(override val data: DataVulcan,
 
     init { data.profile?.also { profile ->
 
+        val semesterId = data.studentSemesterId
+        val semesterNumber = data.studentSemesterNumber
+        if (semesterNumber == 2 && lastSync ?: 0 < profile.dateSemester1Start.inMillis) {
+            getProposedGrades(profile, semesterId - 1, semesterNumber - 1) {
+                getProposedGrades(profile, semesterId, semesterNumber) {
+                    finish()
+                }
+            }
+        }
+        else {
+            getProposedGrades(profile, semesterId, semesterNumber) {
+                finish()
+            }
+        }
+
+    } ?: onSuccess(ENDPOINT_VULCAN_API_GRADES_SUMMARY) }
+
+    private fun finish() {
+        data.setSyncNext(ENDPOINT_VULCAN_API_GRADES_SUMMARY, 6*HOUR)
+        onSuccess(ENDPOINT_VULCAN_API_GRADES_SUMMARY)
+    }
+
+    private fun getProposedGrades(profile: Profile, semesterId: Int, semesterNumber: Int, onSuccess: () -> Unit) {
         apiGet(TAG, VULCAN_API_ENDPOINT_GRADES_PROPOSITIONS, parameters = mapOf(
                 "IdUczen" to data.studentId,
-                "IdOkresKlasyfikacyjny" to data.studentSemesterId
+                "IdOkresKlasyfikacyjny" to semesterId
         )) { json, _ ->
             val grades = json.getJsonObject("Data")
 
             grades.getJsonArray("OcenyPrzewidywane")?.let {
-                processGradeList(it, isFinal = false)
+                processGradeList(it, semesterNumber, isFinal = false)
             }
 
             grades.getJsonArray("OcenyKlasyfikacyjne")?.let {
-                processGradeList(it, isFinal = true)
+                processGradeList(it, semesterNumber, isFinal = true)
             }
 
-            data.setSyncNext(ENDPOINT_VULCAN_API_GRADES_SUMMARY, 6*HOUR)
-            onSuccess(ENDPOINT_VULCAN_API_GRADES_SUMMARY)
+            onSuccess()
         }
-    } ?: onSuccess(ENDPOINT_VULCAN_API_GRADES_SUMMARY) }
+    }
 
-    private fun processGradeList(grades: JsonArray, isFinal: Boolean) {
-        grades.asJsonObjectList()?.forEach { grade ->
+    private fun processGradeList(grades: JsonArray, semesterNumber: Int, isFinal: Boolean) {
+        grades.asJsonObjectList().forEach { grade ->
             val name = grade.get("Wpis").asString
             val value = Utils.getGradeValue(name)
             val subjectId = grade.get("IdPrzedmiot").asLong
 
-            val id = subjectId * -100 - data.studentSemesterNumber
+            val id = subjectId * -100 - semesterNumber
 
             val color = Utils.getVulcanGradeColor(name)
 
@@ -60,7 +83,7 @@ class VulcanApiProposedGrades(override val data: DataVulcan,
                     profileId = profileId,
                     id = id,
                     name = name,
-                    type = if (data.studentSemesterNumber == 1) {
+                    type = if (semesterNumber == 1) {
                         if (isFinal) TYPE_SEMESTER1_FINAL else TYPE_SEMESTER1_PROPOSED
                     } else {
                         if (isFinal) TYPE_SEMESTER2_FINAL else TYPE_SEMESTER2_PROPOSED
@@ -71,7 +94,7 @@ class VulcanApiProposedGrades(override val data: DataVulcan,
                     category = "",
                     description = null,
                     comment = null,
-                    semester = data.studentSemesterNumber,
+                    semester = semesterNumber,
                     teacherId = -1,
                     subjectId = subjectId
             )

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

@@ -80,7 +80,7 @@ class VulcanApiTimetable(override val data: DataVulcan,
                                 id,
                                 name,
                                 Team.TYPE_VIRTUAL,
-                                "${data.schoolName}:$name",
+                                "${data.schoolCode}:$name",
                                 teacherId ?: oldTeacherId ?: -1
                         )
                         data.teamList[id] = team

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

@@ -60,6 +60,7 @@ class VulcanApiUpdateSemester(override val data: DataVulcan,
                 data.studentClassId = studentClassId
                 data.studentSemesterId = studentSemesterId
                 data.studentSemesterNumber = studentSemesterNumber
+                data.profile.studentData["semester${studentSemesterNumber}Id"] = studentSemesterId
                 data.currentSemesterEndDate = currentSemesterEndDate
                 profile.studentClassName = studentClassName
                 dateSemester1Start?.let {

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

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-4-20.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.web
+
+import com.google.gson.annotations.SerializedName
+
+data class HomepageTile(
+        @SerializedName("Nazwa")
+        val name: String?,
+        @SerializedName("Url")
+        val url: String?,
+        @SerializedName("Zawartosc")
+        val children: List<HomepageTile>
+)

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

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-4-20.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.web
+
+import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.data.api.VULCAN_WEB_ENDPOINT_LUCKY_NUMBER
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanWebMain
+import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.getJsonArray
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import pl.szczodrzynski.edziennik.utils.models.Week
+
+class VulcanWebLuckyNumber(override val data: DataVulcan,
+                           override val lastSync: Long?,
+                           val onSuccess: (endpointId: Int) -> Unit
+) : VulcanWebMain(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanWebLuckyNumber"
+    }
+
+    init {
+        webGetJson(TAG, WEB_MAIN, VULCAN_WEB_ENDPOINT_LUCKY_NUMBER, parameters = mapOf(
+                "permissions" to data.webPermissions
+        )) { json, _ ->
+            val tiles = json
+                    .getJsonArray("data")
+                    ?.mapNotNull { data.app.gson.fromJson(it.toString(), HomepageTile::class.java) }
+                    ?.flatMap { it.children }
+
+            if (tiles == null) {
+                data.setSyncNext(ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS, SYNC_ALWAYS)
+                onSuccess(ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS)
+                return@webGetJson
+            }
+
+            var nextSync = System.currentTimeMillis() + 1* DAY *1000
+
+            tiles.firstOrNull { it.name == data.schoolShort }?.children?.firstOrNull()?.let { tile ->
+                // "Szczęśliwy numer w dzienniku: 16"
+                return@let tile.name?.substringAfterLast(' ')?.toIntOrNull()?.let { number ->
+                    // lucky number present
+                    val luckyNumberObject = LuckyNumber(
+                            profileId,
+                            Date.getToday(),
+                            number
+                    )
+
+                    data.luckyNumberList.add(luckyNumberObject)
+                    data.metadataList.add(
+                            Metadata(
+                                    profileId,
+                                    Metadata.TYPE_LUCKY_NUMBER,
+                                    luckyNumberObject.date.value.toLong(),
+                                    true,
+                                    profile?.empty ?: false
+                            ))
+                }
+            } ?: {
+                // no lucky number
+                if (Date.getToday().weekDay <= Week.FRIDAY && Time.getNow().hour >= 22) {
+                    // working days, after 10PM
+                    // consider the lucky number is disabled; sync in 4 days
+                    nextSync = System.currentTimeMillis() + 4*DAY*1000
+                }
+                else if (Date.getToday().weekDay <= Week.FRIDAY && Time.getNow().hour < 22) {
+                    // working days, before 10PM
+
+                }
+                else {
+                    // weekends
+                    nextSync = Week.getNearestWeekDayDate(Week.MONDAY).combineWith(Time(5, 0, 0))
+                }
+            }()
+
+            data.setSyncNext(ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS)
+        }
+    }
+}

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

@@ -6,12 +6,15 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.firstlogin
 
 import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_VULCAN
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_STUDENT_LIST
+import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanWebMain
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.CufsCertificate
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginWebMain
 import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.utils.models.Date
 
@@ -21,19 +24,97 @@ class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
     }
 
     private val api = VulcanApi(data, null)
+    private val web = VulcanWebMain(data, null)
     private val profileList = mutableListOf<Profile>()
+    private val loginStoreId = data.loginStore.id
+    private var firstProfileId = loginStoreId
+    private val tryingSymbols = mutableListOf<String>()
 
     init {
-        val loginStoreId = data.loginStore.id
-        val loginStoreType = LOGIN_TYPE_VULCAN
-        var firstProfileId = loginStoreId
+        if (data.loginStore.mode == LOGIN_MODE_VULCAN_WEB) {
+            VulcanLoginWebMain(data) {
+                val xml = web.readCertificate() ?: run {
+                    data.error(ApiError(TAG, ERROR_VULCAN_WEB_NO_CERTIFICATE))
+                    return@VulcanLoginWebMain
+                }
+                val certificate = web.parseCertificate(xml)
 
+                if (data.symbol != null && data.symbol != "default") {
+                    tryingSymbols += data.symbol ?: "default"
+                }
+                else {
+
+                    tryingSymbols += certificate.userInstances
+                }
+
+                checkSymbol(certificate)
+            }
+        }
+        else {
+            registerDevice {
+                EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore))
+                onSuccess()
+            }
+        }
+    }
+
+    private fun checkSymbol(certificate: CufsCertificate) {
+        if (tryingSymbols.isEmpty()) {
+            EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore))
+            onSuccess()
+            return
+        }
+
+        val result = web.postCertificate(certificate, tryingSymbols.removeAt(0)) { symbol, state ->
+            when (state) {
+                VulcanWebMain.STATE_NO_REGISTER -> {
+                    checkSymbol(certificate)
+                }
+                VulcanWebMain.STATE_LOGGED_OUT -> data.error(ApiError(TAG, ERROR_VULCAN_WEB_LOGGED_OUT))
+                VulcanWebMain.STATE_SUCCESS -> {
+                    webRegisterDevice(symbol) {
+                        checkSymbol(certificate)
+                    }
+                }
+            }
+        }
+
+        // postCertificate returns false if the cert is not valid anymore
+        if (!result) {
+            data.error(ApiError(TAG, ERROR_VULCAN_WEB_CERTIFICATE_EXPIRED)
+                    .withApiResponse(certificate.xml))
+        }
+    }
+
+    private fun webRegisterDevice(symbol: String, onSuccess: () -> Unit) {
+        web.getStartPage(symbol, postErrors = false) { _, schoolSymbols ->
+            if (schoolSymbols.isEmpty()) {
+                onSuccess()
+                return@getStartPage
+            }
+            data.symbol = symbol
+            val schoolSymbol = data.schoolSymbol ?: schoolSymbols.firstOrNull()
+            web.webGetJson(TAG, VulcanWebMain.WEB_NEW, "$schoolSymbol/$VULCAN_WEB_ENDPOINT_REGISTER_DEVICE") { result, _ ->
+                val json = result.getJsonObject("data")
+                data.symbol = symbol
+                data.apiToken = data.apiToken.toMutableMap().also {
+                    it[symbol] = json.getString("TokenKey")
+                }
+                data.apiPin = data.apiPin.toMutableMap().also {
+                    it[symbol] = json.getString("PIN")
+                }
+                registerDevice(onSuccess)
+            }
+        }
+    }
+
+    private fun registerDevice(onSuccess: () -> Unit) {
         VulcanLoginApi(data) {
-            api.apiGet(TAG, VULCAN_API_ENDPOINT_STUDENT_LIST, baseUrl = true) { json, response ->
+            api.apiGet(TAG, VULCAN_API_ENDPOINT_STUDENT_LIST, baseUrl = true) { json, _ ->
                 val students = json.getJsonArray("Data")
 
                 if (students == null || students.isEmpty()) {
-                    EventBus.getDefault().post(FirstLoginFinishedEvent(listOf(), data.loginStore))
+                    EventBus.getDefault().postSticky(FirstLoginFinishedEvent(listOf(), data.loginStore))
                     onSuccess()
                     return@apiGet
                 }
@@ -42,7 +123,8 @@ class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
                     val student = studentEl.asJsonObject
 
                     val schoolSymbol = student.getString("JednostkaSprawozdawczaSymbol") ?: return@forEach
-                    val schoolName = "${data.symbol}_$schoolSymbol"
+                    val schoolShort = student.getString("JednostkaSprawozdawczaSkrot") ?: return@forEach
+                    val schoolCode = "${data.symbol}_$schoolSymbol"
                     val studentId = student.getInt("Id") ?: return@forEach
                     val studentLoginId = student.getInt("UzytkownikLoginId") ?: return@forEach
                     val studentClassId = student.getInt("IdOddzial") ?: return@forEach
@@ -80,7 +162,7 @@ class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
                     val profile = Profile(
                             firstProfileId++,
                             loginStoreId,
-                            loginStoreType,
+                            LOGIN_TYPE_VULCAN,
                             studentNameLong,
                             userLogin,
                             studentNameLong,
@@ -88,13 +170,17 @@ class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
                             accountName
                     ).apply {
                         this.studentClassName = studentClassName
+                        studentData["symbol"] = data.symbol
+
                         studentData["studentId"] = studentId
                         studentData["studentLoginId"] = studentLoginId
                         studentData["studentClassId"] = studentClassId
                         studentData["studentSemesterId"] = studentSemesterId
                         studentData["studentSemesterNumber"] = studentSemesterNumber
+                        studentData["semester${studentSemesterNumber}Id"] = studentSemesterId
                         studentData["schoolSymbol"] = schoolSymbol
-                        studentData["schoolName"] = schoolName
+                        studentData["schoolShort"] = schoolShort
+                        studentData["schoolName"] = schoolCode
                         studentData["currentSemesterEndDate"] = currentSemesterEndDate
                     }
                     dateSemester1Start?.let {
@@ -107,7 +193,6 @@ class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
                     profileList.add(profile)
                 }
 
-                EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore))
                 onSuccess()
             }
         }

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

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-4-17.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login
+
+import pl.droidsonroids.jspoon.annotation.Selector
+
+class CufsCertificate {
+        @Selector(value = "EndpointReference Address")
+        var targetUrl: String = ""
+
+        @Selector(value = "Lifetime Created")
+        var createdDate: String = ""
+
+        @Selector(value = "Lifetime Expires")
+        var expiryDate: String = ""
+
+        @Selector(value = "Attribute[AttributeName=UserInstance] AttributeValue")
+        var userInstances: List<String> = listOf()
+
+        var xml = ""
+}

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

@@ -6,6 +6,7 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login
 
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_API
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_WEB_MAIN
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
 import pl.szczodrzynski.edziennik.utils.Utils
 
@@ -45,6 +46,10 @@ class VulcanLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
         }
         Utils.d(TAG, "Using login method $loginMethodId")
         when (loginMethodId) {
+            LOGIN_METHOD_VULCAN_WEB_MAIN -> {
+                data.startProgress(R.string.edziennik_progress_login_vulcan_web_main)
+                VulcanLoginWebMain(data) { onSuccess(loginMethodId) }
+            }
             LOGIN_METHOD_VULCAN_API -> {
                 data.startProgress(R.string.edziennik_progress_login_vulcan_api)
                 VulcanLoginApi(data) { onSuccess(loginMethodId) }

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

@@ -10,14 +10,12 @@ import im.wangchao.mhttp.Request
 import im.wangchao.mhttp.Response
 import im.wangchao.mhttp.callback.JsonCallbackHandler
 import io.github.wulkanowy.signer.android.getPrivateKeyFromCert
-import pl.szczodrzynski.edziennik.currentTimeUnix
+import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiUpdateSemester
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import java.net.HttpURLConnection.HTTP_BAD_REQUEST
 import java.util.*
@@ -29,28 +27,19 @@ class VulcanLoginApi(val data: DataVulcan, val onSuccess: () -> Unit) {
     }
 
     init { run {
+        if (data.studentSemesterNumber == 1 && data.semester1Id == 0)
+            data.semester1Id = data.studentSemesterNumber
+        if (data.studentSemesterNumber == 2 && data.semester2Id == 0)
+            data.semester2Id = data.studentSemesterNumber
+
+        copyFromLoginStore()
+
         if (data.profile != null && data.isApiLoginValid()) {
             onSuccess()
         }
         else {
-            // < v4.0 - PFX to Private Key migration
-            if (data.apiCertificatePfx.isNotNullNorEmpty()) {
-                try {
-                    data.apiCertificatePrivate = getPrivateKeyFromCert(
-                            if (data.apiToken?.get(0) == 'F') VULCAN_API_PASSWORD_FAKELOG else VULCAN_API_PASSWORD,
-                            data.apiCertificatePfx ?: ""
-                    )
-                    data.loginStore.removeLoginData("certificatePfx")
-                } catch (e: Throwable) {
-                    e.printStackTrace()
-                } finally {
-                    onSuccess()
-                    return@run
-                }
-            }
-
-            if (data.apiCertificateKey.isNotNullNorEmpty()
-                    && data.apiCertificatePrivate.isNotNullNorEmpty()
+            if (data.apiFingerprint[data.symbol].isNotNullNorEmpty()
+                    && data.apiPrivateKey[data.symbol].isNotNullNorEmpty()
                     && data.symbol.isNotNullNorEmpty()) {
                 // (see data.isApiLoginValid())
                 // the semester end date is over
@@ -58,7 +47,7 @@ class VulcanLoginApi(val data: DataVulcan, val onSuccess: () -> Unit) {
                 return@run
             }
 
-            if (data.symbol.isNotNullNorEmpty() && data.apiToken.isNotNullNorEmpty() && data.apiPin.isNotNullNorEmpty()) {
+            if (data.symbol.isNotNullNorEmpty() && data.apiToken[data.symbol].isNotNullNorEmpty() && data.apiPin[data.symbol].isNotNullNorEmpty()) {
                 loginWithToken()
             }
             else {
@@ -67,6 +56,64 @@ class VulcanLoginApi(val data: DataVulcan, val onSuccess: () -> Unit) {
         }
     }}
 
+    private fun copyFromLoginStore() {
+        data.loginStore.data.apply {
+            // < v4.0 - PFX to Private Key migration
+            if (has("certificatePfx")) {
+                try {
+                    val privateKey = getPrivateKeyFromCert(
+                            if (data.apiToken[data.symbol]?.get(0) == 'F') VULCAN_API_PASSWORD_FAKELOG else VULCAN_API_PASSWORD,
+                            getString("certificatePfx") ?: ""
+                    )
+                    data.apiPrivateKey = mapOf(
+                            data.symbol to privateKey
+                    )
+                    remove("certificatePfx")
+                } catch (e: Throwable) {
+                    e.printStackTrace()
+                }
+            }
+
+            // 4.0 - new login form - copy user input to profile
+            if (has("symbol")) {
+                data.symbol = getString("symbol")
+                remove("symbol")
+            }
+
+            // 4.0 - before Vulcan Web impl - migrate from strings to Map of Symbol to String
+            if (has("deviceSymbol")) {
+                data.symbol = getString("deviceSymbol")
+                remove("deviceSymbol")
+            }
+            if (has("certificateKey")) {
+                data.apiFingerprint = data.apiFingerprint.toMutableMap().also {
+                    it[data.symbol] = getString("certificateKey")
+                }
+                remove("certificateKey")
+            }
+            if (has("certificatePrivate")) {
+                data.apiPrivateKey = data.apiPrivateKey.toMutableMap().also {
+                    it[data.symbol] = getString("certificatePrivate")
+                }
+                remove("certificatePrivate")
+            }
+
+            // map form inputs to the symbol
+            if (has("deviceToken")) {
+                data.apiToken = data.apiToken.toMutableMap().also {
+                    it[data.symbol] = getString("deviceToken")
+                }
+                remove("deviceToken")
+            }
+            if (has("devicePin")) {
+                data.apiPin = data.apiPin.toMutableMap().also {
+                    it[data.symbol] = getString("devicePin")
+                }
+                remove("devicePin")
+            }
+        }
+    }
+
     private fun loginWithToken() {
         d(TAG, "Request: Vulcan/Login/Api - ${data.apiUrl}/$VULCAN_API_ENDPOINT_CERTIFICATE")
 
@@ -118,14 +165,22 @@ class VulcanLoginApi(val data: DataVulcan, val onSuccess: () -> Unit) {
                     return
                 }
 
-                data.apiCertificateKey = cert.getString("CertyfikatKlucz")
-                data.apiToken = data.apiToken?.substring(0, 3)
-                data.apiCertificatePrivate = getPrivateKeyFromCert(
-                        if (data.apiToken?.get(0) == 'F') VULCAN_API_PASSWORD_FAKELOG else VULCAN_API_PASSWORD,
+                val privateKey = getPrivateKeyFromCert(
+                        if (data.apiToken[data.symbol]?.get(0) == 'F') VULCAN_API_PASSWORD_FAKELOG else VULCAN_API_PASSWORD,
                         cert.getString("CertyfikatPfx") ?: ""
                 )
+
+                data.apiFingerprint = data.apiFingerprint.toMutableMap().also {
+                    it[data.symbol] = cert.getString("CertyfikatKlucz")
+                }
+                data.apiToken = data.apiToken.toMutableMap().also {
+                    it[data.symbol] = it[data.symbol]?.substring(0, 3)
+                }
+                data.apiPrivateKey = data.apiPrivateKey.toMutableMap().also {
+                    it[data.symbol] = privateKey
+                }
                 data.loginStore.removeLoginData("certificatePfx")
-                data.loginStore.removeLoginData("devicePin")
+                data.loginStore.removeLoginData("apiPin")
                 onSuccess()
             }
 
@@ -136,14 +191,33 @@ class VulcanLoginApi(val data: DataVulcan, val onSuccess: () -> Unit) {
             }
         }
 
+        val deviceId = data.app.deviceId.padStart(16, '0')
+        val loginStoreId = data.loginStore.id.toString(16).padStart(4, '0')
+        val symbol = data.symbol?.crc16()?.toString(16)?.take(2) ?: "00"
+        val uuid =
+                deviceId.substring(0..7) +
+                        "-" + deviceId.substring(8..11) +
+                        "-" + deviceId.substring(12..15) +
+                        "-" + loginStoreId +
+                        "-" + symbol + "6f72616e7a"
+
+        val deviceNameSuffix = " - nie usuwać"
+
+        val szkolnyApi = SzkolnyApi(data.app)
+        val firebaseToken = szkolnyApi.runCatching({
+            getFirebaseToken("vulcan")
+        }, onError = {
+            // screw errors
+        }) ?: data.app.config.sync.tokenVulcan
+
         Request.builder()
                 .url("${data.apiUrl}$VULCAN_API_ENDPOINT_CERTIFICATE")
                 .userAgent(VULCAN_API_USER_AGENT)
                 .addHeader("RequestMobileType", "RegisterDevice")
-                .addParameter("PIN", data.apiPin)
-                .addParameter("TokenKey", data.apiToken)
-                .addParameter("DeviceId", UUID.randomUUID().toString())
-                .addParameter("DeviceName", VULCAN_API_DEVICE_NAME)
+                .addParameter("PIN", data.apiPin[data.symbol])
+                .addParameter("TokenKey", data.apiToken[data.symbol])
+                .addParameter("DeviceId", uuid)
+                .addParameter("DeviceName", VULCAN_API_DEVICE_NAME.take(50 - deviceNameSuffix.length) + deviceNameSuffix)
                 .addParameter("DeviceNameUser", "")
                 .addParameter("DeviceDescription", "")
                 .addParameter("DeviceSystemType", "Android")
@@ -154,6 +228,7 @@ class VulcanLoginApi(val data: DataVulcan, val onSuccess: () -> Unit) {
                 .addParameter("AppVersion", VULCAN_API_APP_VERSION)
                 .addParameter("RemoteMobileAppVersion", VULCAN_API_APP_VERSION)
                 .addParameter("RemoteMobileAppName", VULCAN_API_APP_NAME)
+                .addParameter("FirebaseTokenKey", firebaseToken ?: "")
                 .postJson()
                 .allowErrorCode(HTTP_BAD_REQUEST)
                 .callback(callback)

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

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-4-16.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login
+
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanWebMain
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.fslogin.FSLogin
+import pl.szczodrzynski.fslogin.realm.CufsRealm
+
+class VulcanLoginWebMain(val data: DataVulcan, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "VulcanLoginWebMain"
+    }
+
+    private val web by lazy { VulcanWebMain(data, null) }
+
+    init { run {
+        copyFromLoginStore()
+
+        if (data.profile != null && data.isWebMainLoginValid()) {
+            onSuccess()
+        }
+        else {
+            if (data.symbol.isNotNullNorEmpty()
+                    && data.webType.isNotNullNorEmpty()
+                    && data.webHost.isNotNullNorEmpty()
+                    && (data.webEmail.isNotNullNorEmpty() || data.webUsername.isNotNullNorEmpty())
+                    && data.webPassword.isNotNullNorEmpty()) {
+                try {
+                    val success = loginWithCredentials()
+                    if (!success)
+                        data.error(ApiError(TAG, ERROR_VULCAN_WEB_DATA_MISSING))
+                } catch (e: Exception) {
+                    data.error(ApiError(TAG, EXCEPTION_VULCAN_WEB_LOGIN)
+                            .withThrowable(e))
+                }
+            }
+            else {
+                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            }
+        }
+    }}
+
+    private fun copyFromLoginStore() {
+        data.loginStore.data.apply {
+            // 4.0 - new login form - copy user input to profile
+            if (has("symbol")) {
+                data.symbol = getString("symbol")
+                remove("symbol")
+            }
+        }
+    }
+
+    private fun loginWithCredentials(): Boolean {
+        val realm = when (data.webType) {
+            "cufs" -> CufsRealm(
+                    host = data.webHost ?: return false,
+                    symbol = data.symbol ?: "default",
+                    httpCufs = data.webIsHttpCufs
+            )
+            "adfs" -> CufsRealm(
+                    host = data.webHost ?: return false,
+                    symbol = data.symbol ?: "default",
+                    httpCufs = data.webIsHttpCufs
+            ).toAdfsRealm(id = data.webAdfsId ?: return false)
+            "adfslight" -> CufsRealm(
+                    host = data.webHost ?: return false,
+                    symbol = data.symbol ?: "default",
+                    httpCufs = data.webIsHttpCufs
+            ).toAdfsLightRealm(
+                    id = data.webAdfsId ?: return false,
+                    domain = data.webAdfsDomain ?: "adfslight",
+                    isScoped = data.webIsScopedAdfs
+            )
+            else -> return false
+        }
+
+        val certificate = web.readCertificate()?.let { web.parseCertificate(it) }
+        if (certificate != null && Date.fromIso(certificate.expiryDate) > System.currentTimeMillis()) {
+            useCertificate(certificate)
+            return true
+        }
+
+        val fsLogin = FSLogin(data.app.http, debug = App.debugMode)
+        fsLogin.performLogin(
+                realm = realm,
+                username = data.webUsername ?: data.webEmail ?: return false,
+                password = data.webPassword ?: return false,
+                onSuccess = { fsCertificate ->
+                    web.saveCertificate(fsCertificate.wresult)
+                    useCertificate(web.parseCertificate(fsCertificate.wresult))
+                },
+                onFailure = { errorText ->
+                    // TODO
+                    data.error(ApiError(TAG, 0).withThrowable(RuntimeException(errorText)))
+                }
+        )
+
+        return true
+    }
+
+    private fun useCertificate(certificate: CufsCertificate) {
+        // auto-post certificate when not first login
+        if (data.profile != null && data.symbol != null && data.symbol != "default") {
+            val result = web.postCertificate(certificate, data.symbol ?: "default") { _, state ->
+                when (state) {
+                    VulcanWebMain.STATE_SUCCESS -> {
+                        web.getStartPage { _, _ -> onSuccess() }
+                    }
+                    VulcanWebMain.STATE_NO_REGISTER -> data.error(ApiError(TAG, ERROR_VULCAN_WEB_NO_REGISTER))
+                    VulcanWebMain.STATE_LOGGED_OUT -> data.error(ApiError(TAG, ERROR_VULCAN_WEB_LOGGED_OUT))
+                }
+            }
+            // postCertificate returns false if the cert is not valid anymore
+            if (!result) {
+                data.error(ApiError(TAG, ERROR_VULCAN_WEB_CERTIFICATE_EXPIRED)
+                        .withApiResponse(certificate.xml))
+            }
+        }
+        else {
+            // first login - succeed immediately
+            onSuccess()
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-9-3.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.events
+
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus
+
+data class RegisterAvailabilityEvent(
+        val data: Map< String, RegisterAvailabilityStatus>
+)

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

@@ -201,7 +201,7 @@ abstract class Data(val app: App, val profile: Profile?, val loginStore: LoginSt
                 " - ",
                 profile.studentClassName,
                 "${profile.studentSchoolYearStart}/${profile.studentSchoolYearStart + 1}"
-        ) + " " + app.getString(if (profile.isParent) R.string.login_summary_account_parent else R.string.login_summary_account_child)
+        ) + " " + app.getString(if (profile.isParent) R.string.account_type_parent else R.string.account_type_child)
 
         db.profileDao().add(profile)
         db.loginStoreDao().add(loginStore)

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

@@ -38,12 +38,12 @@ open class DataRemoveModel {
 
         fun commit(profileId: Int, dao: GradeDao) {
             if (all) {
-                if (type != null) dao.clearWithType(profileId, type)
+                if (type != null) dao.dontKeepWithType(profileId, type)
                 else dao.clear(profileId)
             }
             semester?.let {
-                if (type != null) dao.clearForSemesterWithType(profileId, it, type)
-                else dao.clearForSemester(profileId, it)
+                if (type != null) dao.dontKeepForSemesterWithType(profileId, it, type)
+                else dao.dontKeepForSemester(profileId, it)
             }
         }
     }
@@ -53,12 +53,15 @@ open class DataRemoveModel {
             fun futureExceptType(exceptType: Long) = Events(null, exceptType, null)
             fun futureExceptTypes(exceptTypes: List<Long>) = Events(null, null, exceptTypes)
             fun futureWithType(type: Long) = Events(type, null, null)
+            fun future() = Events(null, null, null)
         }
 
         fun commit(profileId: Int, dao: EventDao) {
             type?.let { dao.dontKeepFutureWithType(profileId, Date.getToday(), it) }
             exceptType?.let { dao.dontKeepFutureExceptType(profileId, Date.getToday(), it) }
             exceptTypes?.let { dao.dontKeepFutureExceptTypes(profileId, Date.getToday(), it) }
+            if (type == null && exceptType == null && exceptTypes == null)
+                dao.dontKeepFuture(profileId, Date.getToday())
         }
     }
 

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

@@ -12,12 +12,14 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
+import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.szkolny.adapter.DateAdapter
 import pl.szczodrzynski.edziennik.data.api.szkolny.adapter.TimeAdapter
 import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.SignatureInterceptor
 import pl.szczodrzynski.edziennik.data.api.szkolny.request.*
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.ApiResponse
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.WebPushResponse
 import pl.szczodrzynski.edziennik.data.db.entity.Event
@@ -27,6 +29,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.ui.modules.error.ErrorDetailsDialog
 import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar
+import pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 import retrofit2.Response
@@ -73,7 +76,7 @@ class SzkolnyApi(val app: App) : CoroutineScope {
 
     suspend inline fun <T> runCatching(errorSnackbar: ErrorSnackbar, crossinline block: SzkolnyApi.() -> T?): T? {
         return try {
-            withContext(Dispatchers.Default) { block() }
+            withContext(Dispatchers.Default) { block.invoke(this@SzkolnyApi) }
         }
         catch (e: Exception) {
             errorSnackbar.addError(e.toApiError(TAG)).show()
@@ -82,7 +85,7 @@ class SzkolnyApi(val app: App) : CoroutineScope {
     }
     suspend inline fun <T> runCatching(activity: AppCompatActivity, crossinline block: SzkolnyApi.() -> T?): T? {
         return try {
-            withContext(Dispatchers.Default) { block() }
+            withContext(Dispatchers.Default) { block.invoke(this@SzkolnyApi) }
         }
         catch (e: Exception) {
             ErrorDetailsDialog(
@@ -95,7 +98,7 @@ class SzkolnyApi(val app: App) : CoroutineScope {
     }
     inline fun <T> runCatching(block: SzkolnyApi.() -> T, onError: (e: Throwable) -> Unit): T? {
         return try {
-            block()
+            block.invoke(this@SzkolnyApi)
         }
         catch (e: Exception) {
             onError(e)
@@ -111,6 +114,22 @@ class SzkolnyApi(val app: App) : CoroutineScope {
      */
     @Throws(Exception::class)
     private inline fun <reified T> parseResponse(response: Response<ApiResponse<T>>): T {
+        app.config.update = response.body()?.update?.let { update ->
+            if (update.versionCode > BuildConfig.VERSION_CODE) {
+                if (update.updateMandatory
+                        && EventBus.getDefault().hasSubscriberForEvent(update::class.java)) {
+                    EventBus.getDefault().postSticky(update)
+                }
+                update
+            }
+            else
+                null
+        }
+
+        response.body()?.registerAvailability?.let { registerAvailability ->
+            app.config.sync.registerAvailability = registerAvailability
+        }
+
         if (response.isSuccessful && response.body()?.success == true) {
             if (Unit is T) {
                 return Unit
@@ -327,4 +346,23 @@ class SzkolnyApi(val app: App) : CoroutineScope {
 
         return parseResponse(response).message
     }
+
+    @Throws(Exception::class)
+    fun getPlatforms(registerName: String): List<LoginInfo.Platform> {
+        val response = api.appLoginPlatforms(registerName).execute()
+
+        return parseResponse(response)
+    }
+
+    @Throws(Exception::class)
+    fun getFirebaseToken(registerName: String): String {
+        val response = api.firebaseToken(registerName).execute()
+        return parseResponse(response)
+    }
+
+    @Throws(Exception::class)
+    fun getRegisterAvailability(): Map<String, RegisterAvailabilityStatus> {
+        val response = api.registerAvailability().execute()
+        return parseResponse(response)
+    }
 }

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

@@ -6,11 +6,9 @@ package pl.szczodrzynski.edziennik.data.api.szkolny
 
 import pl.szczodrzynski.edziennik.data.api.szkolny.request.*
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.*
+import pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo
 import retrofit2.Call
-import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.POST
-import retrofit2.http.Query
+import retrofit2.http.*
 
 interface SzkolnyService {
 
@@ -34,4 +32,13 @@ interface SzkolnyService {
 
     @POST("feedbackMessage")
     fun feedbackMessage(@Body request: FeedbackMessageRequest): Call<ApiResponse<FeedbackMessageResponse>>
+
+    @GET("appLogin/platforms/{registerName}")
+    fun appLoginPlatforms(@Path("registerName") registerName: String): Call<ApiResponse<List<LoginInfo.Platform>>>
+
+    @GET("firebase/token/{registerName}")
+    fun firebaseToken(@Path("registerName") registerName: String): Call<ApiResponse<String>>
+
+    @GET("registerAvailability")
+    fun registerAvailability(): Call<ApiResponse<Map<String, RegisterAvailabilityStatus>>>
 }

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

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

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

@@ -10,7 +10,10 @@ data class ApiResponse<T> (
 
     val errors: List<Error>? = null,
 
-    val data: T? = null
+    val data: T? = null,
+
+    val update: Update? = null,
+    val registerAvailability: Map<String, RegisterAvailabilityStatus>? = null
 ) {
     data class Error (val code: String, val reason: String)
 }

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-9-2.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.szkolny.response
+
+import pl.szczodrzynski.edziennik.BuildConfig
+import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.currentTimeUnix
+
+data class RegisterAvailabilityStatus(
+        val available: Boolean,
+        val name: String?,
+        val message: Message?,
+        val nextCheck: Long = currentTimeUnix() + 7 * DAY,
+        val minVersionCode: Int = BuildConfig.VERSION_CODE
+) {
+    data class Message(
+            val title: String,
+            val contentShort: String,
+            val contentLong: String,
+            val icon: String?,
+            val image: String?,
+            val url: String?
+    )
+}

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

@@ -11,5 +11,6 @@ data class Update(
         val releaseNotes: String?,
         val releaseType: String,
         val isOnGooglePlay: Boolean,
-        val downloadUrl: String?
-)
+        val downloadUrl: String?,
+        val updateMandatory: Boolean
+)

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

@@ -43,7 +43,7 @@ import pl.szczodrzynski.edziennik.data.db.migration.*
     LibrusLesson::class,
     TimetableManual::class,
     Metadata::class
-], version = 87)
+], version = 89)
 @TypeConverters(
         ConverterTime::class,
         ConverterDate::class,
@@ -172,7 +172,9 @@ abstract class AppDb : RoomDatabase() {
                 Migration84(),
                 Migration85(),
                 Migration86(),
-                Migration87()
+                Migration87(),
+                Migration88(),
+                Migration89()
         ).allowMainThreadQueries().build()
     }
 }

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

@@ -114,6 +114,9 @@ abstract class EventDao : BaseDao<Event, EventFull> {
                 " AND " + filter))
     }
 
+    @Query("UPDATE events SET keep = 0 WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate")
+    abstract fun dontKeepFuture(profileId: Int, todayDate: Date)
+
     @Query("UPDATE events SET keep = 0 WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate AND eventType = :type")
     abstract fun dontKeepFutureWithType(profileId: Int, todayDate: Date, type: Long)
 

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

@@ -82,14 +82,14 @@ abstract class GradeDao : BaseDao<Grade, GradeFull> {
     fun getByIdNow(profileId: Int, id: Long) =
             getOneNow("$QUERY WHERE grades.profileId = $profileId AND gradeId = $id")
 
-    @Query("DELETE FROM grades WHERE profileId = :profileId AND gradeType = :type")
-    abstract fun clearWithType(profileId: Int, type: Int)
+    @Query("UPDATE grades SET keep = 0 WHERE profileId = :profileId AND gradeType = :type")
+    abstract fun dontKeepWithType(profileId: Int, type: Int)
 
-    @Query("DELETE FROM grades WHERE profileId = :profileId AND gradeSemester = :semester")
-    abstract fun clearForSemester(profileId: Int, semester: Int)
+    @Query("UPDATE grades SET keep = 0 WHERE profileId = :profileId AND gradeSemester = :semester")
+    abstract fun dontKeepForSemester(profileId: Int, semester: Int)
 
-    @Query("DELETE FROM grades WHERE profileId = :profileId AND gradeSemester = :semester AND gradeType = :type")
-    abstract fun clearForSemesterWithType(profileId: Int, semester: Int, type: Int)
+    @Query("UPDATE grades SET keep = 0 WHERE profileId = :profileId AND gradeSemester = :semester AND gradeType = :type")
+    abstract fun dontKeepForSemesterWithType(profileId: Int, semester: Int, type: Int)
 
 
 

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

@@ -60,4 +60,10 @@ interface ProfileDao {
 
     @Query("UPDATE profiles SET empty = 0")
     fun setAllNotEmpty()
+
+    @Query("SELECT * FROM profiles WHERE archiveId = :archiveId AND archived = 1")
+    fun getArchivesOf(archiveId: Int): List<Profile>
+
+    @Query("SELECT * FROM profiles WHERE archiveId = :archiveId AND archived = 0 ORDER BY profileId DESC LIMIT 1")
+    fun getNotArchivedOf(archiveId: Int): Profile?
 }

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

@@ -73,6 +73,6 @@ open class Attendance(
 
     @delegate:Ignore
     val typeObject by lazy {
-        AttendanceType(profileId, baseType.toLong(),  baseType, typeName, typeShort, typeSymbol, typeColor)
+        AttendanceType(profileId, baseType.toLong(),  baseType, typeName, typeShort, typeSymbol, typeColor).also { it.isCounted = isCounted }
     }
 }

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

@@ -5,6 +5,7 @@
 package pl.szczodrzynski.edziennik.data.db.entity
 
 import androidx.room.Entity
+import androidx.room.Ignore
 
 @Entity(tableName = "attendanceTypes",
         primaryKeys = ["profileId", "id"])
@@ -23,6 +24,9 @@ data class AttendanceType (
         val typeColor: Int?
 ) : Comparable<AttendanceType> {
 
+        @Ignore
+        var isCounted: Boolean = true
+
         // attendance bar order:
         // day_free, present, present_custom, unknown, belated_excused, belated, released, absent_excused, absent,
         override fun compareTo(other: AttendanceType): Int {

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

@@ -16,7 +16,7 @@ import androidx.room.Ignore
 import com.google.gson.JsonObject
 import pl.droidsonroids.gif.GifDrawable
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_EDUDZIENNIK
+import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.utils.ProfileImageHolder
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.navlib.ImageHolder
@@ -27,7 +27,7 @@ import pl.szczodrzynski.navlib.getDrawableFromRes
 @Entity(tableName = "profiles", primaryKeys = ["profileId"])
 open class Profile(
         @ColumnInfo(name = "profileId")
-        override val id: Int,
+        override var id: Int, /* needs to be var for ProfileArchiver */
         val loginStoreId: Int,
         val loginStoreType: Int,
 
@@ -63,6 +63,12 @@ open class Profile(
     var empty = true
     var archived = false
 
+    /**
+     * A unique ID matching [archived] profiles with current ones
+     * and vice-versa.
+     */
+    var archiveId: Int? = null
+
     var syncEnabled = true
     var enableSharedEvents = true
     var registration = REGISTRATION_UNSPECIFIED
@@ -80,10 +86,27 @@ open class Profile(
     var dateYearEnd = Date(studentSchoolYearStart + 1, 6, 30)
     fun getSemesterStart(semester: Int) = if (semester == 1) dateSemester1Start else dateSemester2Start
     fun getSemesterEnd(semester: Int) = if (semester == 1) dateSemester2Start.clone().stepForward(0, 0, -1) else dateYearEnd
-    fun dateToSemester(date: Date) = if (date.value >= getSemesterStart(2).value) 2 else 1
+    fun dateToSemester(date: Date) = if (date >= dateSemester2Start) 2 else 1
     @delegate:Ignore
     val currentSemester by lazy { dateToSemester(Date.getToday()) }
 
+    fun shouldArchive(): Boolean {
+        // vulcan hotfix
+        if (dateYearEnd.month > 6) {
+            dateYearEnd.month = 6
+            dateYearEnd.day = 30
+        }
+        // fix for when versions <4.3 synced 2020/2021 year dates to older profiles during 2020 Jun-Aug
+        if (dateSemester1Start.year > studentSchoolYearStart) {
+            val diff = dateSemester1Start.year - studentSchoolYearStart
+            dateSemester1Start.year -= diff
+            dateSemester2Start.year -= diff
+            dateYearEnd.year -= diff
+        }
+        return Date.getToday() >= dateYearEnd && Date.getToday().year > studentSchoolYearStart
+    }
+    fun isBeforeYear() = false && Date.getToday() < dateSemester1Start
+
     var disabledNotifications: List<Long>? = null
 
     var lastReceiversSync: Long = 0
@@ -104,15 +127,30 @@ open class Profile(
     val isParent
         get() = accountName != null
 
+    val registerName
+        get() = when (loginStoreType) {
+            LOGIN_TYPE_LIBRUS -> "librus"
+            LOGIN_TYPE_VULCAN -> "vulcan"
+            LOGIN_TYPE_IDZIENNIK -> "idziennik"
+            LOGIN_TYPE_MOBIDZIENNIK -> "mobidziennik"
+            LOGIN_TYPE_PODLASIE -> "podlasie"
+            LOGIN_TYPE_EDUDZIENNIK -> "edudziennik"
+            else -> null
+        }
+
     override fun getImageDrawable(context: Context): Drawable {
+        if (archived) {
+            return context.getDrawableFromRes(pl.szczodrzynski.edziennik.R.drawable.profile_archived).also {
+                it.colorFilter = PorterDuffColorFilter(colorFromName(name), PorterDuff.Mode.DST_OVER)
+            }
+        }
 
         if (!image.isNullOrEmpty()) {
             try {
-                if (image?.endsWith(".gif", true) == true) {
-                    return GifDrawable(image ?: "")
-                }
-                else {
-                    return RoundedBitmapDrawableFactory.create(context.resources, image ?: "")
+                return if (image?.endsWith(".gif", true) == true) {
+                    GifDrawable(image ?: "")
+                } else {
+                    RoundedBitmapDrawableFactory.create(context.resources, image ?: "")
                     //return Drawable.createFromPath(image ?: "") ?: throw Exception()
                 }
             }
@@ -124,9 +162,13 @@ open class Profile(
         return context.getDrawableFromRes(R.drawable.profile).also {
             it.colorFilter = PorterDuffColorFilter(colorFromName(name), PorterDuff.Mode.DST_OVER)
         }
-
     }
+
     override fun getImageHolder(context: Context): ImageHolder {
+        if (archived) {
+            return ImageHolder(pl.szczodrzynski.edziennik.R.drawable.profile_archived, colorFromName(name))
+        }
+
         return if (!image.isNullOrEmpty()) {
             try {
                 ProfileImageHolder(image ?: "")
@@ -175,6 +217,12 @@ open class Profile(
                     MainActivity.DRAWER_ITEM_ATTENDANCE,
                     MainActivity.DRAWER_ITEM_ANNOUNCEMENTS
             )
+            LOGIN_TYPE_PODLASIE -> listOf(
+                    MainActivity.DRAWER_ITEM_TIMETABLE,
+                    MainActivity.DRAWER_ITEM_AGENDA,
+                    MainActivity.DRAWER_ITEM_GRADES,
+                    MainActivity.DRAWER_ITEM_HOMEWORK
+            )
             else -> listOf(
                     MainActivity.DRAWER_ITEM_TIMETABLE,
                     MainActivity.DRAWER_ITEM_AGENDA,

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

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-5-9.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.migration
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration88 : Migration(87, 88) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("UPDATE endpointTimers SET endpointLastSync = 0 WHERE endpointId IN (1030, 1040, 1050, 1060, 1070, 1080);")
+        database.execSQL("UPDATE profiles SET empty = 1 WHERE loginStoreType = 4")
+    }
+}

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

@@ -0,0 +1,10 @@
+package pl.szczodrzynski.edziennik.data.db.migration
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration89 : Migration(88, 89) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE profiles ADD COLUMN archiveId INTEGER DEFAULT NULL;")
+    }
+}

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

@@ -5,10 +5,13 @@
 package pl.szczodrzynski.edziennik.data.firebase
 
 import com.google.gson.JsonParser
+import com.google.gson.reflect.TypeToken
 import kotlinx.coroutines.*
 import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.events.FeedbackMessageEvent
+import pl.szczodrzynski.edziennik.data.api.events.RegisterAvailabilityEvent
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
 import pl.szczodrzynski.edziennik.data.api.task.PostNotifications
 import pl.szczodrzynski.edziennik.data.db.entity.*
@@ -50,6 +53,16 @@ class SzkolnyAppFirebase(val app: App, val profiles: List<Profile>, val message:
                     val message = app.gson.fromJson(message.data.getString("message"), FeedbackMessage::class.java) ?: return@launch
                     feedbackMessage(message)
                 }
+                "registerAvailability" -> launch {
+                    val data = app.gson.fromJson<Map<String, RegisterAvailabilityStatus>>(
+                            message.data.getString("registerAvailability"),
+                            object: TypeToken<Map<String, RegisterAvailabilityStatus>>(){}.type
+                    ) ?: return@launch
+                    app.config.sync.registerAvailability = data
+                    if (EventBus.getDefault().hasSubscriberForEvent(RegisterAvailabilityEvent::class.java)) {
+                        EventBus.getDefault().postSticky(RegisterAvailabilityEvent(data))
+                    }
+                }
             }
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/network/cookie/DumbCookieJar.kt

@@ -26,7 +26,7 @@ class DumbCookieJar(
 ) : CookieJar {
 
     private val prefs = context.getSharedPreferences("cookies", Context.MODE_PRIVATE)
-    private val sessionCookies = mutableSetOf<DumbCookie>()
+    val sessionCookies = mutableSetOf<DumbCookie>()
     private val savedCookies = mutableSetOf<DumbCookie>()
     private fun save(dc: DumbCookie) {
         sessionCookies.remove(dc)

app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateWorker.kt

@@ -14,6 +14,7 @@ import android.widget.Toast
 import androidx.core.app.NotificationCompat
 import androidx.work.*
 import kotlinx.coroutines.*
+import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
@@ -76,7 +77,7 @@ class UpdateWorker(val context: Context, val params: WorkerParameters) : Worker(
             try {
                 val update = overrideUpdate
                         ?: run {
-                            val updates = withContext(Dispatchers.Default) {
+                            withContext(Dispatchers.Default) {
                                 SzkolnyApi(app).runCatching({
                                     getUpdate("beta")
                                 }, {
@@ -84,15 +85,25 @@ class UpdateWorker(val context: Context, val params: WorkerParameters) : Worker(
                                 })
                             } ?: return@run null
 
-                            if (updates.isEmpty()) {
+                            if (app.config.update == null
+                                    || app.config.update?.versionCode ?: BuildConfig.VERSION_CODE <= BuildConfig.VERSION_CODE) {
                                 app.config.update = null
                                 Toast.makeText(app, app.getString(R.string.notification_no_update), Toast.LENGTH_SHORT).show()
                                 return@run null
                             }
-                            updates[0]
+                            app.config.update
                         } ?: return
 
-                app.config.update = update
+                if (update.versionCode <= BuildConfig.VERSION_CODE) {
+                    app.config.update = null
+                    return
+                }
+
+                if (EventBus.getDefault().hasSubscriberForEvent(update::class.java)) {
+                    if (!update.updateMandatory) // mandatory updates are posted by the SzkolnyApi
+                        EventBus.getDefault().postSticky(update)
+                    return
+                }
 
                 val notificationIntent = Intent(app, UpdateDownloaderService::class.java)
                 val pendingIntent = PendingIntent.getService(app, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT)